Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/audit/rechargeAudit.vue

@@ -18,7 +18,9 @@ const admin = ref({
 const tableData = ref([]);
 // 搜索======================================
 // 搜索rechargeVo
-const rechargeVo = ref({});
+const rechargeVo = ref({
+  rechargeWay: "客服充值",
+});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,

vue/gold-system/src/views/managerecharge/activity.vue

@@ -481,7 +481,9 @@ onMounted(async function () {
             placeholder="请输入"
             style="width: 80px"
           />：1
-          <div style="color: grey">(提示：当前规则每10新币可兑换1免费金币)</div>
+          <div style="color: grey">
+            (提示：当前规则每{{ addObj.rechargeRatio }}新币可兑换1免费金币)
+          </div>
         </el-form-item>
 
         <el-form-item prop="startTime" label="开始时间:">

vue/gold-system/src/views/managerecharge/rate.vue

@@ -434,7 +434,9 @@ const delConfirm = async function (row) {
             <el-table-column prop="currency" label="货币名称" :span="2" />
             <el-table-column prop="exchangeRate" label="汇率" :span="2">
               <template #default="scope">
-                <p>{{ scope.row.exchangeRate }} ：1新币</p>
+                <p>
+                  {{ scope.row.exchangeRate }}{{ scope.row.currency }} ：1新币
+                </p>
               </template>
             </el-table-column>
 
@@ -443,11 +445,6 @@ const delConfirm = async function (row) {
                 <span>{{ formatDate(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="updateTime" label="更新时间" :span="3">
-              <template #default="scope">
-                <span>{{ formatDate(scope.row.updateTime) }}</span>
-              </template>
-            </el-table-column> -->
             <el-table-column prop="adminName" label="提交人" :span="1" />
             <el-table-column prop="status" label="状态">
               <template #default="scope">
@@ -590,7 +587,10 @@ const delConfirm = async function (row) {
         <el-form-item prop="exchangeRate" label="汇率:">
           <el-input v-model="rateAdd.exchangeRate" style="width: 120px" />
           <p class="unit">:1</p>
-          <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
+          <p>
+            (提示：当前规则每 {{ rateAdd.exchangeRate }}
+            {{ rateAdd.currency }}可兑换 1 新币)
+          </p>
         </el-form-item>
         <el-form-item prop="adminId" label="提交人:">
           <el-input :value="adminData.name" disabled style="width: 240px" />
@@ -659,7 +659,10 @@ const delConfirm = async function (row) {
         <el-form-item label="汇率:">
           <el-input v-model="rateEdit.exchangeRate" style="width: 120px" />
           <p class="unit">:1</p>
-          <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
+          <p>
+            (提示：当前规则每 {{ rateEdit.exchangeRate }}
+            {{ rateEdit.currency }}可兑换 1 新币)
+          </p>
         </el-form-item>
         <el-form-item label="提交人:">
           <el-input disabled :value="adminData.name" style="width: 240px" />

vue/gold-system/src/views/recharge/addRecharge.vue

@@ -720,14 +720,17 @@ const batchAdd = function () {
       <el-input v-model="addRecharge.paidGold" style="width: 100px" />
       <p style="margin-right: 20px">个</p>
       <p>免费金币</p>
-      <el-input v-model="addRecharge.freeGold" disabled style="width: 100px" />
+      <el-input v-model="addRecharge.freeGold" style="width: 100px" />
       <p>个</p>
     </el-form-item>
     <el-form-item prop="rechargeGold" label="充值金额">
       <el-select prop="rechargeGold" v-model="Rate" placeholder="货币名称" style="width: 95px; margin-right: 5px">
         <el-option v-for="item in currency" :key="item.value" :label="item.currency" :value="item.exchangeRate" />
       </el-select>
-      <el-input disabled v-model="addRecharge.rechargeGold" style="width: 200px" />
+      <el-input
+        v-model="addRecharge.rechargeGold"
+        style="width: 200px"
+      />
     </el-form-item>
     <el-form-item prop="payWay" label="收款方式">
       <el-select v-model="addRecharge.payWay" placeholder="请选择" style="width: 300px">