From 08ebb5c4726cc0e489327a2d0bbf0e125e2f7374 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 9 Jul 2025 14:41:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E6=B1=87?=
 =?UTF-8?q?=E7=8E=87=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=20-=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E8=B4=A7=E5=B8=81=E5=90=8D=E7=A7=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=AF=BB=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/managerecharge/rate.vue | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index c995ecc..9811b8b 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -94,7 +94,7 @@ const checkFreeGoldRadio = function (rule, value, callback) {
 }
 // 定义表单验证规则
 const rules = reactive({
-  rateName: [{required: true, message: '请选择货币名称', trigger: 'blur'}],
+  // rateName: [{required: true, message: '请选择货币名称', trigger: 'blur'}],
   num: [{validator: checkFreeGoldRadio, trigger: 'blur'}],
 })
 
@@ -426,18 +426,11 @@ onMounted(async function () {
           status-icon
       >
         <el-form-item prop="rateName" label="货币名称:">
-          <el-select
+          <el-input
               v-model="rateEdit.rateName"
-              placeholder="请选择"
+              disabled
               style="width: 240px"
-          >
-            <el-option
-                v-for="item in rateNames"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
+          />
         </el-form-item>
 
         <el-form-item prop="num" label="汇率:">

From 87637af774470ef12e532bcc10c1b48995b38973 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 9 Jul 2025 15:01:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/addCoinConsume.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue
index aaaf5e9..29e3c75 100644
--- a/src/views/consume/addCoinConsume.vue
+++ b/src/views/consume/addCoinConsume.vue
@@ -607,9 +607,21 @@ onMounted(async function () {
           </el-col>
           <el-col :span="14">
             <el-form-item label="历史金币总数">
-              <p v-if="!isNaN(Number(user.historySumGold))">
-                {{ Number(user.historySumGold) }}
+              <!-- 检查 user.historySumGold 是否为有效的数字 -->
+              <p style="color: #2fa1ff; margin-right: 5px" v-if="!isNaN(Number(user.historySumGold))">
+                {{ Number(user.historySumGold )  }}
               </p>
+
+              <!-- 如果不是有效的数字，显示默认值 -->
+              <p v-else></p>
+            </el-form-item>
+            <el-form-item style="margin-top: -23px">
+           <span
+               style="display: inline; white-space: nowrap; color: #b1b1b1"
+               v-if="user.historyPermanentGold !== undefined"
+           >(永久金币:{{ user.historyPermanentGold }};免费金币:{{
+               (user.historyFreeGold)
+             }};任务金币:{{ user.historyTaskGold }})</span>
             </el-form-item>
           </el-col>
         </el-row>