This is a merge operation!!!

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>

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="汇率:">