From 87aef33a663e3bfccfff7860e1e1ff306aedc0bb Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 24 Aug 2025 13:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/menuUtils.js                         |  2 +-
 src/views/audit/gold/rechargeAudit.vue         |  2 +-
 src/views/history/history.vue                  |  2 +-
 src/views/recharge/gold/coinRechargeDetail.vue | 10 +++++-----
 src/views/refund/gold/coinRefundDetail.vue     |  4 ++--
 src/views/usergold/gold/clientCountDetail.vue  |  5 +++--
 src/views/workspace/index.vue                  |  8 ++++----
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js
index 3c9877a..553477a 100644
--- a/src/utils/menuUtils.js
+++ b/src/utils/menuUtils.js
@@ -67,7 +67,7 @@ export const getRoutePath = (menu) => {
         '权限管理': '/permissions',
 
 
-        '金币客户账户明细': '/usergold',
+        '客户金币账户明细': '/usergold',
         '金豆客户账户明细': '/userbean',
     };
 
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index adc0d04..c6974c3 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -84,7 +84,7 @@
       <el-table-column prop="rejectReason" v-if="activeName === 'reject'" label="驳回理由" width="200px"
         show-overflow-tooltip />
       <el-table-column v-if="activeName !== 'wait'" prop="auditName" label="审核人" width="100px" />
-      <el-table-column prop="payTime" sortable="custom" label="付款时间" width="200px">
+      <el-table-column prop="payTime" sortable="custom" label="交款时间" width="200px">
         <template #default="scope">
           {{ moment(scope.row.payTime).format('YYYY-MM-DD HH:mm:ss') }}
         </template>
diff --git a/src/views/history/history.vue b/src/views/history/history.vue
index 6153065..f86fd57 100644
--- a/src/views/history/history.vue
+++ b/src/views/history/history.vue
@@ -12,7 +12,7 @@
         <el-input v-model="searchObj.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw"
             clearable></el-input>
 
-        <el-text size="large" style="width: 80px">充值时间：</el-text>
+        <el-text size="large" style="width: 80px">更新时间：</el-text>
         <el-date-picker v-model="dateRange" type="datetimerange" :default-time="defaultTime" range-separator="至"
             start-placeholder="开始时间" end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" />
 
diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue
index 4ee6d10..4244bd3 100644
--- a/src/views/recharge/gold/coinRechargeDetail.vue
+++ b/src/views/recharge/gold/coinRechargeDetail.vue
@@ -268,7 +268,7 @@ const getArea = async function () {
 
 //定义充值方式的加载状态
 const isLoadingPlatform = ref(false)
-// 充值方式
+// 充值平台
 const platform = ref([])
 //获取充值方式的函数
 const getPlatform = async () => {
@@ -613,8 +613,8 @@ const getTagText = (state) => {
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值方式：</el-text>
-              <el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable>
+              <el-text class="mx-1" size="large">充值平台：</el-text>
+              <el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值平台" style="width: 180px" clearable>
                 <el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
@@ -656,9 +656,9 @@ const getTagText = (state) => {
       <el-card>
         <div>
           充值新币：{{ format3(permanentGolds) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
+          总金币数：{{ format3(permanentGolds+freeGolds) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
           永久金币：{{ format3(permanentGolds) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
           免费金币：{{ format3(freeGolds ) }}金币
-
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
@@ -678,7 +678,7 @@ const getTagText = (state) => {
             <el-table-column prop="money" sortable="custom" label="充值金额" width="110px" />
             <el-table-column prop="permanentGold" label="永久金币" sortable="custom" width="110px" />
             <el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px" />
-            <el-table-column prop="payPlatform" label="充值方式" width="110px" />
+            <el-table-column prop="payPlatform" label="充值平台" width="110px" />
             <el-table-column prop="payModel" label="支付方式" width="100px" />
             <el-table-column prop="remark" label="备注" width="150px" show-overflow-tooltip />
             <el-table-column prop="adminName" label="提交人" width="100px" />
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index b47638d..4f2e12a 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -600,7 +600,7 @@ const getMarket = async function () {
             <el-table-column prop="market" label="所属地区" width="110px" />
             <el-table-column prop="goodsName" label="商品名称" width="110px" show-overflow-tooltip />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
-            <el-table-column prop="sumGold" label="金额总数" width="110px" sortable="custom" />
+            <el-table-column prop="sumGold" label="退款金币总数" width="150px" sortable="custom" />
             <el-table-column prop="refundModel" label="退款方式" width="110px">
               <template #default="scope">
                 {{ scope.row.refundModel === 0 ? '全部退款' : scope.row.refundModel === 1 ? '部分退款' : '' }}
@@ -611,7 +611,7 @@ const getMarket = async function () {
             <el-table-column prop="taskGold" sortable="custom" label="任务金币" width="110px" />
             <el-table-column prop="remark" label="退款原因" width="160px" show-overflow-tooltip />
             <el-table-column prop="adminName" label="提交人" width="100px" />
-            <el-table-column prop="createTime" sortable="custom" label="提交时间" width="180px">
+            <el-table-column prop="createTime" sortable="custom" label="退款时间" width="180px">
               <template #default="scope">
                 {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
               </template>
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue
index 4575fac..21f97e6 100644
--- a/src/views/usergold/gold/clientCountDetail.vue
+++ b/src/views/usergold/gold/clientCountDetail.vue
@@ -558,10 +558,11 @@ const format3 = (num) => {
         </el-card>
         <el-card>
           <div>
-            金币变动总数：{{ format3(totalGoldTotal  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
+            金币净变化：{{ format3(totalGoldTotal  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
             永久金币：{{ format3(totalPermanentGold  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
             免费金币：{{ format3(totalFreeGold  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
-            任务金币：{{ format3(totalTaskGold  || 0) }}
+            任务金币：{{ format3(totalTaskGold  || 0) }}&nbsp;&nbsp;
+            <a style="color:#b1b1b1;">(当前合计仅显示筛选范围内的金币净变化（充值总额 - 消费总额 + 退款总额)</a>
           </div>
           <div style="height: 584px; overflow-y: auto">
             <el-table :data="tableData" style="width: 100%" @sort-change="handleSortChange" height="584px">
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 553d25d..8cb6a56 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -123,10 +123,10 @@
         </el-tabs>
       </div>
       <div class="condition">
-        <div style="display:flex;">合计&nbsp;
-          <span>永久金币</span> {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
-          <span>免费金币</span> {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
-          <span>任务金币</span> {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}&nbsp;&nbsp;
+        <div style="display:flex;">合计&nbsp;&nbsp;
+          <span>永久金币：</span> {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
+          <span>免费金币：</span> {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
+          <span>任务金币：</span> {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}&nbsp;&nbsp;
           <div v-if="activeTab === 'consume'">合计 {{ sumConsume / 100 }}</div>
         </div>
         <div @change="handleDatePickerChange" style="margin-left:auto;margin-right: 0.5%;">