From 88f81c658c875c0c90c0ab2fe86b1dfe70d1f7ac Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Fri, 14 Mar 2025 17:18:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=87=91=E5=B8=81=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E5=B1=95=E7=A4=BA6=E3=80=8112=E6=9C=88=E4=BB=BD?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E5=85=8D=E8=B4=B9=E9=87=91=E5=B8=81=E3=80=81?=
 =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gold-system/src/views/usergold/index.vue     |  6 +++---
 gold-system/src/views/usergoldInfo/index.vue | 30 ++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/gold-system/src/views/usergold/index.vue b/gold-system/src/views/usergold/index.vue
index 6ec1bdc..000a7df 100644
--- a/gold-system/src/views/usergold/index.vue
+++ b/gold-system/src/views/usergold/index.vue
@@ -673,17 +673,17 @@ const get30 = function () {
             </el-table-column>
             <el-table-column prop="freeCoin" label="免费金币" width="130">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.freeCoin) / 100 }}</span>
+                <span>{{ scope.row.freeCoin / 100 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="rechargeCoin" label="永久金币" width="150">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.rechargeCoin) / 100 }}</span>
+                <span>{{ scope.row.rechargeCoin / 100 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="taskCoin" label="任务金币" width="130">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.taskCoin) / 100 }}</span>
+                <span>{{ scope.row.taskCoin / 100 }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="name" label="提交人" width="150" />
diff --git a/gold-system/src/views/usergoldInfo/index.vue b/gold-system/src/views/usergoldInfo/index.vue
index f92c857..2d4d603 100644
--- a/gold-system/src/views/usergoldInfo/index.vue
+++ b/gold-system/src/views/usergoldInfo/index.vue
@@ -268,18 +268,36 @@ onMounted(async function () {
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="freeJb" label="免费金币" width="110">
+            <el-table-column prop="buyJb" label="永久金币" width="110">
               <template #default="scope">
-                <span>{{
-                  Math.abs(scope.row.free6 + scope.row.free12) / 100
-                }}</span>
+                <span>{{ Math.abs(scope.row.buyJb) / 100 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="buyJb" label="永久金币" width="110">
+            <el-table-column prop="freeJb" label="免费金币" width="110">
               <template #default="scope">
-                <span>{{ Math.abs(scope.row.buyJb) / 100 }}</span>
+                <el-dropdown>
+                  <span class="el-dropdown-link">
+                    <span>{{
+                      Math.abs(scope.row.free6 + scope.row.free12) / 100
+                    }}</span>
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                  </span>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item
+                        >6月份到期金币:
+                        {{ scope.row.free6 / 100 }}</el-dropdown-item
+                      >
+                      <el-dropdown-item
+                        >12月份到期金币:
+                        {{ scope.row.free12 / 100 }}</el-dropdown-item
+                      >
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
               </template>
             </el-table-column>
+
             <el-table-column prop="coreJb" label="任务金币" width="160">
               <template #default="scope">
                 <span>{{ Math.abs(scope.row.coreJb) / 100 }}</span>