From cef7934d1210574b1264f688a2735fbc2d1d3728 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Thu, 3 Apr 2025 11:46:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B04/1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/views/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gold-system/src/views/index.vue b/gold-system/src/views/index.vue index 3c7ee9c..5764ca9 100644 --- a/gold-system/src/views/index.vue +++ b/gold-system/src/views/index.vue @@ -98,7 +98,7 @@ const handleSelect = (index) => { @open="handleOpen" @close="handleClose" > - + Date: Sun, 6 Apr 2025 10:11:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?4/6=E5=8F=B7=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/views/audit/rechargeAudit.vue | 12 ++--- gold-system/src/views/audit/refundAudit.vue | 8 ++-- gold-system/src/views/consume/allConsume.vue | 4 +- gold-system/src/views/permissions/index.vue | 8 ++-- gold-system/src/views/recharge/adminRecharge.vue | 24 +++++----- gold-system/src/views/recharge/allRecharge.vue | 4 +- gold-system/src/views/refund/allRefund.vue | 4 +- gold-system/src/views/usergold/index.vue | 57 +++++++++++++----------- gold-system/src/views/usergoldInfo/index.vue | 4 +- gold-system/src/views/workspace/index.vue | 8 ++-- 10 files changed, 70 insertions(+), 63 deletions(-) diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index bb51e39..a693861 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -227,12 +227,12 @@ const search = function () { }; // 重置 const reset = function () { - rechargeVo.value.activityId = ""; - rechargeVo.value.jwcode = ""; - rechargeVo.value.payWay = ""; - rechargeVo.value.area = ""; - rechargeVo.value.startDate = ""; - rechargeVo.value.endDate = ""; + delete rechargeVo.value.activityId; + delete rechargeVo.value.jwcode; + delete rechargeVo.value.payWay; + delete rechargeVo.value.area; + delete rechargeVo.value.startDate; + delete rechargeVo.value.endDate; getTime.value = {}; }; // 今天 diff --git a/gold-system/src/views/audit/refundAudit.vue b/gold-system/src/views/audit/refundAudit.vue index c4b6d0e..efdd20d 100644 --- a/gold-system/src/views/audit/refundAudit.vue +++ b/gold-system/src/views/audit/refundAudit.vue @@ -63,8 +63,8 @@ const activeName = ref("all"); // 退款类型选项 const refundType = [ { - value: "退款金币", - label: "退款金币", + value: "退款商品", + label: "退款商品", }, ]; @@ -603,11 +603,11 @@ const handleSortChange = (column) => { - +
diff --git a/gold-system/src/views/consume/allConsume.vue b/gold-system/src/views/consume/allConsume.vue index 2fb9aa7..eb29736 100644 --- a/gold-system/src/views/consume/allConsume.vue +++ b/gold-system/src/views/consume/allConsume.vue @@ -413,13 +413,13 @@ const handleSortChange = (column) => { - +
- 所属部门： + 职位名称： @@ -489,7 +489,7 @@ onMounted(async function () { - + From eb1dcaacd737b36489ec42b73b0d60a78394a82b Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Tue, 8 Apr 2025 09:03:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=AC=AC=E5=9B=9B=E5=91=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B04/8=E5=8F=B7=E6=AD=A3=E5=BC=8F=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/views/audit/rechargeAudit.vue | 12 +++- gold-system/src/views/consume/addConsume.vue | 6 +- gold-system/src/views/index.vue | 4 +- gold-system/src/views/recharge/addRecharge.vue | 6 +- gold-system/src/views/recharge/adminRecharge.vue | 88 +++++++++++++++++------- gold-system/src/views/recharge/allRecharge.vue | 85 ++++++++++++++++------- gold-system/src/views/refund/addRefund.vue | 6 +- gold-system/src/views/usergold/index.vue | 4 +- 8 files changed, 148 insertions(+), 63 deletions(-) diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index 1e1aeaa..bbca564 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -413,6 +413,7 @@ const pass = function (row) { passObj.value.paidGold = row.paidGold; passObj.value.freeGold = row.freeGold; passObj.value.adminName = adminData.value.adminName; + console.log("通过对象", passObj.value); }; @@ -421,6 +422,7 @@ const passConfirm = async function () { try { console.log("通过对象", passObj.value); // 发送POST请求 + // passObj.value.flag = 0; const result = await API.post( "http://54.251.137.151:10702/audit/audit/goldedit", passObj.value @@ -689,7 +691,11 @@ const handleSortChange = (column) => { label="充值金额" sortable="“custom”" width="110px" - /> + > + + { width="110px" > { width="110px" >

- {{ Number(user.totalRechargeGold) / 100 }} + {{ Number(user.totalRechargeGold / 100) }}

@@ -503,11 +503,11 @@ onMounted(async function () { - + diff --git a/gold-system/src/views/index.vue b/gold-system/src/views/index.vue index af32ccd..9ff7a6f 100644 --- a/gold-system/src/views/index.vue +++ b/gold-system/src/views/index.vue @@ -164,8 +164,8 @@ const handleSelect = (index) => { 金币充值 新增充值 - 客服充值明细 - 所有充值明细 +

- {{ Number(user.totalRechargeGold) / 100 }} + {{ Number(user.totalRechargeGold/100) }}

@@ -1122,11 +1122,11 @@ onMounted(async function () { - + diff --git a/gold-system/src/views/recharge/adminRecharge.vue b/gold-system/src/views/recharge/adminRecharge.vue index 81cdab9..8637122 100644 --- a/gold-system/src/views/recharge/adminRecharge.vue +++ b/gold-system/src/views/recharge/adminRecharge.vue @@ -85,14 +85,25 @@ const delObj = ref({}); // 方法 // 合计数存储 -const totalData = ref({ - totalmoney: 0, - totalRcoin: 0, - totalFcoin: 0, -}); +const trueGold = ref(0); +const trueRGold = ref(0); +const trueFGold = ref(0); +//全部 const totalmoney = ref(0); const totalRcoin = ref(0); const totalFcoin = ref(0); +//待审核 +const pendingGold = ref(0); +const pendingRGold = ref(0); +const pendingFGold = ref(0); +// 已通过金币数 +const approvedGold = ref(0); +const approvedRGold = ref(0); +const approvedFGold = ref(0); +// 已驳回金币数 +const rejectedGold = ref(0); +const rejectedRGold = ref(0); +const rejectedFGold = ref(0); // 搜索=========================================================================== // 搜索方法 const get = async function (val) { @@ -148,18 +159,37 @@ const get = async function (val) { totalmoney.value = 0; totalRcoin.value = 0; totalFcoin.value = 0; - } else { - // 做一个判断，如果result2.data[i].flag="待审核"，那么 totalData.value = result2.data[i]，否则就赋值为0 - for (let i = 0; i < result2.data.length; i++) { - if (result2.data[i].flag == "已通过") { - totalData.value = result2.data[i]; - totalmoney.value = totalData.value.sumRaudit1 || 0; - totalRcoin.value = totalData.value.sumRaudit1 || 0; - totalFcoin.value = totalData.value.sumRaudit2 || 0; - break; + } + if (result2.data) { + result2.data.forEach((item) => { + switch (item.flag) { + case "待审核": + // 若 item.raudit 为空则赋值为 0 + // 若 item.sumRaudit 为空则赋值为 0 + pendingGold.value = item.sumRaudit || 0; + pendingRGold.value = item.sumRaudit1 || 0; + pendingFGold.value = item.sumRaudit2 || 0; + break; + case "已通过": + approvedGold.value = item.sumRaudit || 0; + approvedRGold.value = item.sumRaudit1 || 0; + approvedFGold.value = item.sumRaudit2 || 0; + break; + case "已驳回": + rejectedGold.value = item.sumRaudit || 0; + rejectedRGold.value = item.sumRaudit1 || 0; + rejectedFGold.value = item.sumRaudit2 || 0; + break; } - } + }); } + trueGold.value = + pendingGold.value + approvedGold.value + rejectedGold.value; + trueRGold.value = + pendingRGold.value + approvedRGold.value + rejectedRGold.value; + trueFGold.value = + pendingFGold.value + approvedFGold.value + rejectedFGold.value; + // 将响应结果存储到响应式数据中 console.log("请求成功", result); // 存储表格数据 @@ -249,25 +279,35 @@ const adminAll = function () { get(); }; //待审核充值明细 -const adminWait = function () { +const adminWait = async function () { rechargeVo.value.status = 0; getObj.value.pageNum = 1; - get(); + await get(); console.log("adminWait"); + + trueGold.value = pendingGold.value; + trueRGold.value = pendingRGold.value; + trueFGold.value = pendingFGold.value; }; //已通过充值明细 -const adminPass = function () { +const adminPass = async function () { rechargeVo.value.status = 1; getObj.value.pageNum = 1; - get(); + await get(); + trueGold.value = approvedGold.value; + trueRGold.value = approvedRGold.value; + trueFGold.value = approvedFGold.value; console.log("adminPass"); }; //已驳回充值明细 -const adminReject = function () { +const adminReject = async function () { rechargeVo.value.status = 2; getObj.value.pageNum = 1; - get(); + await get(); console.log("adminReject"); + trueGold.value = rejectedGold.value; + trueRGold.value = rejectedRGold.value; + trueFGold.value = rejectedFGold.value; }; //点击标签页 const handleClick = function (tab, event) { @@ -506,9 +546,9 @@ const handleSortChange = (column) => {
- 充值金额：{{ totalmoney }}新币，永久金币：{{ - totalRcoin - }}金币，免费金币：{{ totalFcoin }}金币 + 充值金额：{{ trueRGold }}新币，永久金币：{{ + trueRGold + }}金币，免费金币：{{ trueFGold }}金币
diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue index d16e7cb..589a14a 100644 --- a/gold-system/src/views/recharge/allRecharge.vue +++ b/gold-system/src/views/recharge/allRecharge.vue @@ -70,14 +70,26 @@ const getPayWay = async function () { // 方法 // 合计数存储 -const totalData = ref({ - totalmoney: 0, - totalRcoin: 0, - totalFcoin: 0, -}); +// 合计数存储 +const trueGold = ref(0); +const trueRGold = ref(0); +const trueFGold = ref(0); +//全部 const totalmoney = ref(0); const totalRcoin = ref(0); const totalFcoin = ref(0); +//待审核 +const pendingGold = ref(0); +const pendingRGold = ref(0); +const pendingFGold = ref(0); +// 已通过金币数 +const approvedGold = ref(0); +const approvedRGold = ref(0); +const approvedFGold = ref(0); +// 已驳回金币数 +const rejectedGold = ref(0); +const rejectedRGold = ref(0); +const rejectedFGold = ref(0); // 搜索============================================================== // 搜索方法 const get = async function (val) { @@ -134,18 +146,36 @@ const get = async function (val) { totalmoney.value = 0; totalRcoin.value = 0; totalFcoin.value = 0; - } else { - // 做一个判断，如果result2.data[i].flag="待审核"，那么 totalData.value = result2.data[i]，否则就赋值为0 - for (let i = 0; i < result2.data.length; i++) { - if (result2.data[i].flag == "已通过") { - totalData.value = result2.data[i]; - totalmoney.value = totalData.value.sumRaudit1; - totalRcoin.value = totalData.value.sumRaudit1; - totalFcoin.value = totalData.value.sumRaudit2; - break; + } + if (result2.data) { + result2.data.forEach((item) => { + switch (item.flag) { + case "待审核": + // 若 item.raudit 为空则赋值为 0 + // 若 item.sumRaudit 为空则赋值为 0 + pendingGold.value = item.sumRaudit || 0; + pendingRGold.value = item.sumRaudit1 || 0; + pendingFGold.value = item.sumRaudit2 || 0; + break; + case "已通过": + approvedGold.value = item.sumRaudit || 0; + approvedRGold.value = item.sumRaudit1 || 0; + approvedFGold.value = item.sumRaudit2 || 0; + break; + case "已驳回": + rejectedGold.value = item.sumRaudit || 0; + rejectedRGold.value = item.sumRaudit1 || 0; + rejectedFGold.value = item.sumRaudit2 || 0; + break; } - } + }); } + trueGold.value = + pendingGold.value + approvedGold.value + rejectedGold.value; + trueRGold.value = + pendingRGold.value + approvedRGold.value + rejectedRGold.value; + trueFGold.value = + pendingFGold.value + approvedFGold.value + rejectedFGold.value; // 将响应结果存储到响应式数据中 console.log("请求成功", result); @@ -236,24 +266,33 @@ const adminAll = function () { get(); }; //待审核充值明细 -const adminWait = function () { +const adminWait = async function () { rechargeVo.value.status = 0; getObj.value.pageNum = 1; - get(); + await get(); console.log("adminWait"); + trueGold.value = pendingGold.value; + trueRGold.value = pendingRGold.value; + trueFGold.value = pendingFGold.value; }; //已通过充值明细 -const adminPass = function () { +const adminPass = async function () { rechargeVo.value.status = 1; getObj.value.pageNum = 1; - get(); + await get(); console.log("adminPass"); + trueGold.value = approvedGold.value; + trueRGold.value = approvedRGold.value; + trueFGold.value = approvedFGold.value; }; //已驳回充值明细 -const adminReject = function () { +const adminReject = async function () { rechargeVo.value.status = 2; getObj.value.pageNum = 1; - get(); + await get(); + trueGold.value = rejectedGold.value; + trueRGold.value = rejectedRGold.value; + trueFGold.value = rejectedFGold.value; console.log("adminReject"); }; //点击标签页 @@ -473,8 +512,8 @@ const handleSortChange = (column) => {
- 充值金额：{{ totalmoney / 100 }}新币，永久金币：{{ - totalRcoin / 100 + 充值金额：{{ trueRGold / 100 }}新币，永久金币：{{ + trueRGold / 100 }}金币，免费金币：{{ totalFcoin / 100 }}金币
diff --git a/gold-system/src/views/refund/addRefund.vue b/gold-system/src/views/refund/addRefund.vue index 9f339a2..bde75bd 100644 --- a/gold-system/src/views/refund/addRefund.vue +++ b/gold-system/src/views/refund/addRefund.vue @@ -414,7 +414,7 @@ onMounted(async function () {

- {{ Number(user.totalRechargeGold) / 100 }} + {{ Number(user.totalRechargeGold / 100) }}

@@ -471,11 +471,11 @@ onMounted(async function () { - + diff --git a/gold-system/src/views/usergold/index.vue b/gold-system/src/views/usergold/index.vue index 122d47e..56fd828 100644 --- a/gold-system/src/views/usergold/index.vue +++ b/gold-system/src/views/usergold/index.vue @@ -254,8 +254,8 @@ const json_fields = (row) => { row.jwcode, // 姓名 row.area, // 精网号 row.platform, // 所属地区 - row.count, // 平台信息 - row.updateType, // 更新数量 + row.consumePlatform, // 平台信息 + row.gold, // 更新数量 row.rechargeCoin, // 免费金币 row.freeCoin, // 永久金币 row.taskCoin, // 任务金币