From 36cd84541949efd0976579ab1a2d2d24c74fbd68 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Sat, 14 Dec 2024 10:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=85=B3=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/audit/rechargeAudit.vue  |  7 +++-
 vue/gold-system/src/views/audit/refundAudit.vue    |  3 ++
 vue/gold-system/src/views/consume/allConsume.vue   |  4 +-
 .../src/views/recharge/adminRecharge.vue           |  4 ++
 vue/gold-system/src/views/recharge/allRecharge.vue |  4 ++
 vue/gold-system/src/views/refund/addRefund.vue     |  2 +-
 vue/gold-system/src/views/refund/allRefund.vue     |  6 ++-
 vue/gold-system/src/views/workspace/index.vue      | 45 +++++++++++++++++-----
 8 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue
index b6a8620..a1e5bd1 100644
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@@ -183,17 +183,20 @@ const get7Days = function () {
 const adminAll = function () {
   console.log("adminAll");
   rechargeVo.value.status = "";
+  getObj.value.pageNum = 1;
   get();
 };
 //待审核充值明细
 const adminWait = function () {
   rechargeVo.value.status = 0;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminWait");
 };
 //已通过充值明细
 const adminPass = function () {
   rechargeVo.value.status = 1;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminPass");
 };
@@ -405,10 +408,10 @@ onMounted(async function () {
           </el-col>
           <el-col :span="8">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">支付方式：</el-text>
+              <el-text class="mx-1" size="large">充值方式：</el-text>
               <el-select
                 v-model="rechargeVo.payWay"
-                placeholder="请选择支付方式"
+                placeholder="请选择充值方式"
                 size="large"
                 style="width: 240px"
                 clearable
diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue
index f897570..bf93975 100644
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@@ -170,17 +170,20 @@ const get7Days = function () {
 const adminAll = function () {
   console.log("adminAll");
   consumeDetail.value.status = "";
+  getObj.value.pageNum = 1;
   get();
 };
 //待审核充值明细
 const adminWait = function () {
   consumeDetail.value.status = 0;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminWait");
 };
 //已通过充值明细
 const adminPass = function () {
   consumeDetail.value.status = 1;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminPass");
 };
diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index 09735d1..21e6772 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -235,7 +235,7 @@ getGoods();
               <el-text class="mx-1" size="large">商品名称：</el-text>
               <el-select
                 v-model="detailVo.productName"
-                placeholder="请选择活动名称"
+                placeholder="请选择商品名称"
                 size="large"
                 style="width: 240px"
                 clearable
@@ -254,7 +254,7 @@ getGoods();
               <el-text class="mx-1" size="large">消费平台：</el-text>
               <el-select
                 v-model="detailVo.consumePlatform"
-                placeholder="请选择支付方式"
+                placeholder="请选择消费平台"
                 size="large"
                 style="width: 240px"
                 clearable
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index bd5930f..7f2fbd7 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -152,23 +152,27 @@ const get7Days = function () {
 const adminAll = function () {
     console.log('adminAll');
     rechargeVo.value.status = '';
+    getObj.value.pageNum = 1;
     get();
 }
 //待审核充值明细
 const adminWait = function () {
     rechargeVo.value.status = 0;
+    getObj.value.pageNum = 1;
     get();
     console.log('adminWait');
 }
 //已通过充值明细
 const adminPass = function () {
     rechargeVo.value.status = 1;
+    getObj.value.pageNum = 1;
     get();
     console.log('adminPass');
 }
 //已驳回充值明细
 const adminReject = function () {
     rechargeVo.value.status = 2;
+    getObj.value.pageNum = 1;
     get();
     console.log('adminReject');
 }
diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index c309d4f..b98a847 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -168,23 +168,27 @@ const get7Days = function () {
 const adminAll = function () {
   console.log("adminAll");
   rechargeVo.value.status = "";
+  getObj.value.pageNum = 1;
   get();
 };
 //待审核充值明细
 const adminWait = function () {
   rechargeVo.value.status = 0;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminWait");
 };
 //已通过充值明细
 const adminPass = function () {
   rechargeVo.value.status = 1;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminPass");
 };
 //已驳回充值明细
 const adminReject = function () {
   rechargeVo.value.status = 2;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminReject");
 };
diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue
index 90b5bf8..2145092 100644
--- a/vue/gold-system/src/views/refund/addRefund.vue
+++ b/vue/gold-system/src/views/refund/addRefund.vue
@@ -237,7 +237,7 @@ const getProductByOrderCode = async function (item) {
   try {
     // 发送POST请求
     const result = await API.post(
-      "http://192.168.8.174:10010/refund/searchByOrderCode?orderCode=" + item,
+      "http://192.168.8.93:10010/refund/searchByOrderCode?orderCode=" + item,
       {}
     );
     addRefund.value.contactId = result.data.detailId;
diff --git a/vue/gold-system/src/views/refund/allRefund.vue b/vue/gold-system/src/views/refund/allRefund.vue
index 1f2808a..5ed4f71 100644
--- a/vue/gold-system/src/views/refund/allRefund.vue
+++ b/vue/gold-system/src/views/refund/allRefund.vue
@@ -151,23 +151,27 @@ const get7Days = function () {
 const adminAll = function () {
   console.log("adminAll");
   detail.value.auditStatus = "";
+  getObj.value.pageNum = 1;
   get();
 };
 //待审核充值明细
 const adminWait = function () {
   detail.value.auditStatus = 0;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminWait");
 };
 //已通过充值明细
 const adminPass = function () {
   detail.value.auditStatus = 1;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminPass");
 };
 //已驳回充值明细
 const adminReject = function () {
   detail.value.auditStatus = 2;
+  getObj.value.pageNum = 1;
   get();
   console.log("adminReject");
 };
@@ -304,7 +308,7 @@ getGoods();
               <el-text class="mx-1" size="large">退款商品：</el-text>
               <el-select
                 v-model="detail.refundGoods"
-                placeholder="请选择支付方式"
+                placeholder="请选择退款商品"
                 size="large"
                 style="width: 240px"
                 clearable
diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index e447c60..edebc8e 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -290,31 +290,58 @@ const get = async function () {
     ConsumeRank.value = areaTotalConsume.value;
 
     option3Data.value = [
-      { value: Math.abs(statistics.value.rechargeSumCoin), name: "充值金币" },
-      { value: Math.abs(statistics.value.freeSumCoin), name: "免费金币" },
-      { value: Math.abs(statistics.value.taskSumCoin), name: "任务金币" },
+      {
+        value: Math.abs(statistics.value.rechargeSumCoin),
+        name: "充值金币" + " | " + statistics.value.rechargeSumCoin,
+      },
+      {
+        value: Math.abs(statistics.value.freeSumCoin),
+        name: "免费金币" + " | " + statistics.value.freeSumCoin,
+      },
+      {
+        value: Math.abs(statistics.value.taskSumCoin),
+        name: "任务金币" + " | " + statistics.value.taskSumCoin,
+      },
     ];
 
     option4Data.value = [
       {
         value: Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin),
-        name: "充值金币",
+        name:
+          "充值金币" +
+          " | " +
+          Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin),
       },
       {
         value: Math.abs(getYearConsumeCoin.value.yearSumFreeCoin),
-        name: "免费金币",
+        name:
+          "免费金币" +
+          " | " +
+          Math.abs(getYearConsumeCoin.value.yearSumFreeCoin),
       },
       {
         value: Math.abs(getYearConsumeCoin.value.yearSumTaskCoin),
-        name: "任务金币",
+        name:
+          "任务金币" +
+          " | " +
+          Math.abs(getYearConsumeCoin.value.yearSumTaskCoin),
       },
     ];
     console.log("option4Data", option4Data.value);
 
     option5Data.value = [
-      { value: Math.abs(getSumCoin.value.todayRecharge), name: "充值金币" },
-      { value: Math.abs(getSumCoin.value.todayFree), name: "免费金币" },
-      { value: Math.abs(getSumCoin.value.todayTask), name: "任务金币" },
+      {
+        value: Math.abs(getSumCoin.value.todayRecharge),
+        name: "充值金币" + " | " + getSumCoin.value.todayRecharge,
+      },
+      {
+        value: Math.abs(getSumCoin.value.todayFree),
+        name: "免费金币" + " | " + getSumCoin.value.todayFree,
+      },
+      {
+        value: Math.abs(getSumCoin.value.todayTask),
+        name: "任务金币" + " | " + getSumCoin.value.todayTask,
+      },
     ];
     console.log("option5Data", option5Data.value);
     // 平台数据处理