From a5faf0bb059449c876fefae77e6388b12a85f1c3 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Sun, 24 Aug 2025 10:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E5=90=88=E8=AE=A1+=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/usergold/gold/clientCountDetail.vue | 2 +- src/views/workspace/index.vue | 38 ++++++++++++++++----------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index 0bb5fb6..4575fac 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -558,7 +558,7 @@ const format3 = (num) => {
- 金币总数：{{ format3(totalGoldTotal || 0) }}     + 金币变动总数：{{ format3(totalGoldTotal || 0) }}     永久金币：{{ format3(totalPermanentGold || 0) }}     免费金币：{{ format3(totalFreeGold || 0) }}     任务金币：{{ format3(totalTaskGold || 0) }} diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue index 7ed8add..3c6974c 100644 --- a/src/views/workspace/index.vue +++ b/src/views/workspace/index.vue @@ -60,14 +60,12 @@
全年累计消费金币数
{{ yearlyReduce / 100 }}
-
消费：{{ yearlyConsume / 100 }}
-
退款：{{ yearlyRefund / 100 }}
+
消费：{{ yearlyConsume / 100 }}
+
退款：{{ yearlyRefund / 100 }}
 @@ -75,7 +73,7 @@ 全年累计充值人头数 {{ yearlyRechargeNum }} - 周同比:{{ sumWow }}%     + 周同比:{{ sumWow }}%     - 日环比:{{ sumDaily }}%     + 日环比:{{ sumDaily }}%    
@@ -125,10 +123,11 @@
-
合计  - 永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}   - 免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}   - 任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }} +
合计  + 永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}   + 免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}   + 任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}   +
合计 {{ sumConsume / 100 }}
昨天 @@ -213,6 +212,7 @@ const sumRechargeTask = ref(0) const sumConsumePermanent = ref(0) const sumConsumeFree = ref(0) const sumConsumeTask = ref(0) +const sumConsume = ref(0) // 用户信息 const adminData = ref({}) // 卡片数据相关 @@ -501,7 +501,8 @@ const processChartData = (marketCards) => { rechargeTask: [], consumePermanent: [], consumeFree: [], - consumeTask: [] + consumeTask: [], + sumConsume: [] } // 这是图表的合计数，怎样遍历？？？？？ const sumRechargePermanent1 = ref(0) @@ -510,6 +511,8 @@ const processChartData = (marketCards) => { const sumConsumePermanent1 = ref(0) const sumConsumeFree1 = ref(0) const sumConsumeTask1 = ref(0) + const sumConsume1 = ref(0) + marketCards.forEach(market => { chartData.rechargePermanent.push(market.sumRechargePermanent / 100 || 0) @@ -518,6 +521,7 @@ const processChartData = (marketCards) => { chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0) chartData.consumeFree.push(market.sumConsumeFree / 100 || 0) chartData.consumeTask.push(market.sumConsumeTask / 100 || 0) + chartData.sumConsume.push(market.sumConsume / 100 || 0) // 合计数合计数合计数咋算 sumRechargePermanent1.value += (market.sumRechargePermanent || 0) @@ -526,6 +530,7 @@ const processChartData = (marketCards) => { sumConsumePermanent1.value += (market.sumConsumePermanent || 0) sumConsumeFree1.value += (market.sumConsumeFree || 0) sumConsumeTask1.value += (market.sumConsumeTask || 0) + sumConsume1.value += (market.sumConsume || 0) }) sumRechargePermanent.value = sumRechargePermanent1.value sumRechargeFree.value = sumRechargeFree1.value @@ -533,6 +538,7 @@ const processChartData = (marketCards) => { sumConsumePermanent.value = sumConsumePermanent1.value sumConsumeFree.value = sumConsumeFree1.value sumConsumeTask.value = sumConsumeTask1.value + sumConsume.value = sumConsume1.value updateChart(chartData) }