From 71779b645677906fb81c18d2e6ad3a3b56012b68 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Tue, 22 Jul 2025 11:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E6=88=B7=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=20=E9=87=91=E5=B8=81=E6=80=BB=E6=95=B0=E7=AD=89=20?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=20=E4=B8=BA=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/usergold/clientCountBalance.vue | 44 ++++++++++++++++++++++---------
 src/views/usergold/clientCountDetail.vue  | 16 +++++------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue
index 05e657b..3c78b29 100644
--- a/src/views/usergold/clientCountBalance.vue
+++ b/src/views/usergold/clientCountBalance.vue
@@ -368,10 +368,10 @@ const handleMarketChange = (val) => {
     <el-col>
       <el-card>
         <div>
-          金币总数：{{ Math.abs(goldtotal) / 100 }}
-          永久金币：{{ Math.abs(permanentGold) / 100 }}
-          免费金币：{{ Math.abs(freeGold) / 100 }}
-          任务金币：{{ Math.abs(taskGold) / 100 }}
+          金币总数：{{ (goldtotal || 0) / 100 }}
+          永久金币：{{(permanentGold || 0) / 100 }}
+          免费金币：{{ (freeGold || 0) / 100 }}
+          任务金币：{{ (taskGold || 0) / 100 }}
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 626px; overflow-y: auto">
@@ -390,31 +390,31 @@ const handleMarketChange = (val) => {
             <el-table-column prop="allJb" label="金币总数" width="120" aligh="center">
               <template #default="scope">
                 <span>{{
-                  (scope.row.currentPermanentGold +
-                    scope.row.currentFreeJune +
-                    scope.row.currentFreeDecember +
-                    scope.row.currentTaskGold) / 100
+                    ((scope.row.currentPermanentGold || 0 ) +
+                        (scope.row.currentFreeJune|| 0 ) +
+                        (scope.row.currentFreeDecember|| 0 ) +
+                        (scope.row.currentTaskGold || 0) / 100)
                 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="110">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.currentPermanentGold) / 100 }}</span>
+                <span>{{ (scope.row.currentPermanentGold || 0) / 100 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentFreeJune" label="6月份到期免费金币" sortable="custom" width="110">
               <template #default="scope">
-                <span>{{ scope.row.currentFreeJune / 100 }}</span>
+                <span>{{ (scope.row.currentFreeJune || 0) / 100 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentFreeDecember" label="12月份到期免费金币" sortable="custom" width="110">
               <template #default="scope">
-                <span>{{ scope.row.currentFreeDecember / 100 }}</span>
+                <span>{{ (scope.row.currentFreeDecember || 0) / 100 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentTaskGold" label="任务金币" sortable="custom" width="130">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.currentTaskGold) / 100 }}</span>
+                <span>{{(scope.row.currentTaskGold || 0) / 100 }}</span>
               </template>
             </el-table-column>
 
@@ -442,8 +442,26 @@ const handleMarketChange = (val) => {
             </el-table-column>
             <el-table-column prop="sumConsume" label="历史消费" width="150">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.sumConsume) / 100 }}</span>
+                <el-popover trigger="hover" placement="left" width="150">
+                  <template #default>
+                    <div>
+                      <div>永久金币：{{ (scope.row.sumConsumeGold || 0) / 100 }}</div>
+                      <div>免费金币：{{ (scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0) / 100 }}</div>
+                      <div>任务金币：{{ (scope.row.sumConsumeJune || 0) / 100 }}</div>
+                    </div>
+                  </template>
+                  <template #reference>
+                    <span>
+                      {{
+                        (scope.row.sumConsumeGold || 0) / 100 +
+                        (scope.row.sumConsumeTaskGold || 0) / 100 +
+                        (scope.row.sumConsumeJune || 0) / 100 +
+                        (scope.row.sumConsumeDecember || 0) / 100
+                      }}</span>
+                  </template>
+                </el-popover>
               </template>
+
             </el-table-column>
           </el-table>
         </div>
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue
index 1b54293..ee6b37d 100644
--- a/src/views/usergold/clientCountDetail.vue
+++ b/src/views/usergold/clientCountDetail.vue
@@ -537,10 +537,10 @@ const handleMarketChange = (val) => {
       <el-col>
         <el-card>
           <div>
-            金币总数：{{ (totalGoldTotal) / 100 }}
-            永久金币：{{ (totalPermanentGold) / 100 }}
-            免费金币：{{ (totalFreeGold) / 100 }}
-            任务金币：{{ (totalTaskGold) / 100 }}
+            金币总数：{{ (totalGoldTotal || 0) / 100 }}
+            永久金币：{{ (totalPermanentGold || 0) / 100 }}
+            免费金币：{{ (totalFreeGold || 0) / 100 }}
+            任务金币：{{ (totalTaskGold || 0) / 100 }}
           </div>
           <div style="height: 584px; overflow-y: auto">
             <el-table :data="tableData" style="width: 100%" @sort-change="handleSortChange" height="584px">
@@ -577,23 +577,23 @@ const handleMarketChange = (val) => {
                         : scope.row.sumGold / 100
                     }}
                   </span> -->
-                  <span>{{ scope.row.sumGold / 100 }}</span>
+                  <span>{{ (scope.row.sumGold || 0) / 100 }}</span>
                 </template>
               </el-table-column>
 
               <el-table-column prop="permanentGold" sortable="custom" label="永久金币" width="110">
                 <template #default="scope">
-                  <span>{{ scope.row.permanentGold / 100 }}</span>
+                  <span>{{ (scope.row.permanentGold || 0) / 100 }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="freeGold" sortable="custom" label="免费金币" width="110">
                 <template #default="scope">
-                  <span>{{ calculateFreeGold(scope.row) / 100 }}</span>
+                  <span>{{ (calculateFreeGold(scope.row) || 0) / 100 }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="taskGold" sortable="custom" label="任务金币" width="110">
                 <template #default="scope">
-                  <span>{{ scope.row.taskGold / 100 }}</span>
+                  <span>{{ (scope.row.taskGold || 0) / 100 }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="adminName" label="提交人" width="110"/>