Browse Source

Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化

zhangyong/feature-20250815160302-金币优化
lihuilin 2 months ago
parent
commit
ae4707ab17
  1. 2
      src/views/usergold/gold/clientCountDetail.vue
  2. 38
      src/views/workspace/index.vue

2
src/views/usergold/gold/clientCountDetail.vue

@ -558,7 +558,7 @@ const format3 = (num) => {
</el-card> </el-card>
<el-card> <el-card>
<div> <div>
金币总数{{ format3(totalGoldTotal || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
金币变动总数{{ format3(totalGoldTotal || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(totalPermanentGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp; 永久金币{{ format3(totalPermanentGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(totalFreeGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp; 免费金币{{ format3(totalFreeGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(totalTaskGold || 0) }} 任务金币{{ format3(totalTaskGold || 0) }}

38
src/views/workspace/index.vue

@ -60,14 +60,12 @@
<el-card class="card-item"> <el-card class="card-item">
<div class="card-title">全年累计消费金币数</div> <div class="card-title">全年累计消费金币数</div>
<div class="card-title">{{ yearlyReduce / 100 }}</div> <div class="card-title">{{ yearlyReduce / 100 }}</div>
<div class="center-card">消费{{ yearlyConsume / 100 }}</div>
<div class="center-card">退款{{ yearlyRefund / 100 }}</div>
<div style="padding-left: 30%;">消费{{ yearlyConsume / 100 }}</div>
<div style="padding-left: 30%;">退款{{ yearlyRefund / 100 }}</div>
<template #footer> <template #footer>
<div></div>
<div class="margin-bottom center-card">昨日新增消费{{ dailyConsume / 100 }}</div>
<div class="margin-bottom center-card">昨日新增消耗{{ dailyReduce / 100 }}</div>
<div class="margin-bottom center-card">昨日新增退款{{ dailyRefund / 100 }}</div>
<div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增消费{{ dailyConsume / 100 }}</div>
<div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增消耗{{ dailyReduce / 100 }}</div>
<div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增退款{{ dailyRefund / 100 }}</div>
</template> </template>
</el-card> </el-card>
@ -75,7 +73,7 @@
<el-card class="card-item"> <el-card class="card-item">
<el-col class="card-title">全年累计充值人头数</el-col> <el-col class="card-title">全年累计充值人头数</el-col>
<el-col class="card-title">{{ yearlyRechargeNum }}</el-col> <el-col class="card-title">{{ yearlyRechargeNum }}</el-col>
<el-col class="center-card">周同比:{{ sumWow }}%&nbsp;&nbsp;&nbsp;&nbsp;
<el-col style="padding-left: 35%;">周同比:{{ sumWow }}%&nbsp;&nbsp;&nbsp;&nbsp;
<template v-if="sumWow > 0"> <template v-if="sumWow > 0">
<el-icon style="color:red"> <el-icon style="color:red">
<ArrowUpBold /> <ArrowUpBold />
@ -92,7 +90,7 @@
</el-icon> </el-icon>
</template> </template>
</el-col> </el-col>
<el-col class="center-card">日环比:{{ sumDaily }}%&nbsp;&nbsp;&nbsp;&nbsp;
<el-col style="padding-left: 35%;">日环比:{{ sumDaily }}%&nbsp;&nbsp;&nbsp;&nbsp;
<template v-if="sumDaily > 0"> <template v-if="sumDaily > 0">
<el-icon style="color:red"> <el-icon style="color:red">
<ArrowUpBold /> <ArrowUpBold />
@ -110,8 +108,8 @@
</template> </template>
</el-col> </el-col>
<template #footer> <template #footer>
<el-col class="margin-bottom center-card">昨日充值人数{{ ydayRechargeNum }}</el-col>
<el-col class="margin-bottom center-card">其中首充{{ firstRecharge }}</el-col>
<el-col style="padding-left: 35%;margin-bottom:0.5%">昨日充值人数{{ ydayRechargeNum }}</el-col>
<el-col style="padding-left: 35%;">其中首充{{ firstRecharge }}</el-col>
</template> </template>
</el-card> </el-card>
</div> </div>
@ -125,10 +123,11 @@
</el-tabs> </el-tabs>
</div> </div>
<div class="condition"> <div class="condition">
<div>合计&nbsp;
永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}
<div style="display:flex;">合计&nbsp;
<span>永久金币</span> {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
<span>免费金币</span> {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
<span>任务金币</span> {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}&nbsp;&nbsp;
<div v-if="activeTab === 'consume'">合计 {{ sumConsume / 100 }}</div>
</div> </div>
<div @change="handleDatePickerChange" style="margin-left:auto;margin-right: 0.5%;"> <div @change="handleDatePickerChange" style="margin-left:auto;margin-right: 0.5%;">
<el-button @click="getYes()" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天 <el-button @click="getYes()" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天
@ -214,6 +213,7 @@ const sumRechargeTask = ref(0)
const sumConsumePermanent = ref(0) const sumConsumePermanent = ref(0)
const sumConsumeFree = ref(0) const sumConsumeFree = ref(0)
const sumConsumeTask = ref(0) const sumConsumeTask = ref(0)
const sumConsume = ref(0)
// //
const adminData = ref({}) const adminData = ref({})
// //
@ -511,7 +511,8 @@ const processChartData = (marketCards) => {
rechargeTask: [], rechargeTask: [],
consumePermanent: [], consumePermanent: [],
consumeFree: [], consumeFree: [],
consumeTask: []
consumeTask: [],
sumConsume: []
} }
// //
const sumRechargePermanent1 = ref(0) const sumRechargePermanent1 = ref(0)
@ -520,6 +521,8 @@ const processChartData = (marketCards) => {
const sumConsumePermanent1 = ref(0) const sumConsumePermanent1 = ref(0)
const sumConsumeFree1 = ref(0) const sumConsumeFree1 = ref(0)
const sumConsumeTask1 = ref(0) const sumConsumeTask1 = ref(0)
const sumConsume1 = ref(0)
marketCards.forEach(market => { marketCards.forEach(market => {
chartData.rechargePermanent.push(market.sumRechargePermanent / 100 || 0) chartData.rechargePermanent.push(market.sumRechargePermanent / 100 || 0)
@ -528,6 +531,7 @@ const processChartData = (marketCards) => {
chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0) chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0)
chartData.consumeFree.push(market.sumConsumeFree / 100 || 0) chartData.consumeFree.push(market.sumConsumeFree / 100 || 0)
chartData.consumeTask.push(market.sumConsumeTask / 100 || 0) chartData.consumeTask.push(market.sumConsumeTask / 100 || 0)
chartData.sumConsume.push(market.sumConsume / 100 || 0)
// //
sumRechargePermanent1.value += (market.sumRechargePermanent || 0) sumRechargePermanent1.value += (market.sumRechargePermanent || 0)
@ -536,6 +540,7 @@ const processChartData = (marketCards) => {
sumConsumePermanent1.value += (market.sumConsumePermanent || 0) sumConsumePermanent1.value += (market.sumConsumePermanent || 0)
sumConsumeFree1.value += (market.sumConsumeFree || 0) sumConsumeFree1.value += (market.sumConsumeFree || 0)
sumConsumeTask1.value += (market.sumConsumeTask || 0) sumConsumeTask1.value += (market.sumConsumeTask || 0)
sumConsume1.value += (market.sumConsume || 0)
}) })
sumRechargePermanent.value = sumRechargePermanent1.value sumRechargePermanent.value = sumRechargePermanent1.value
sumRechargeFree.value = sumRechargeFree1.value sumRechargeFree.value = sumRechargeFree1.value
@ -543,6 +548,7 @@ const processChartData = (marketCards) => {
sumConsumePermanent.value = sumConsumePermanent1.value sumConsumePermanent.value = sumConsumePermanent1.value
sumConsumeFree.value = sumConsumeFree1.value sumConsumeFree.value = sumConsumeFree1.value
sumConsumeTask.value = sumConsumeTask1.value sumConsumeTask.value = sumConsumeTask1.value
sumConsume.value = sumConsume1.value
updateChart(chartData) updateChart(chartData)
} }

Loading…
Cancel
Save