diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 552860d..63e2a8c 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -254,7 +254,9 @@ import { ShoppingBag, Plus, Lock, - Unlock + Unlock, + Sugar, + Watermelon, } from '@element-plus/icons-vue' import VChart from 'vue-echarts' import { use } from 'echarts/core' @@ -352,7 +354,7 @@ const stats = computed(() => [ { key: 'transferAmount', label: '总沉淀', - value: `¥${(statsData.value.totalTransferAmount - statsData.value.avgTransferAmount || 0).toLocaleString()}`, + value: `¥${(statsData.value.totalTransferAmount || 0).toLocaleString()}`, icon: 'Money', class: 'stat-warning', change: `今日 ¥${statsData.value.todayTransferAmount.toLocaleString()}`, @@ -374,7 +376,7 @@ const stats = computed(() => [ label: '今日新增用户', value: statsData.value.todayUsers || 0, icon: 'Plus', - class: 'stat-success', + class: 'stat-primary', change: `昨日 ${statsData.value.yesterdayUsers || 0} 人`, changeClass: 'neutral', changeIcon: 'TrendCharts' @@ -410,12 +412,19 @@ const stats = computed(() => [ changeIcon: 'TrendCharts' }, { - key: 'avgTransferAmount', - label: '平台待收取利润', - value: `¥${((statsData.value.totalTransferAmount + Number(statsData.value.totalUserAmount)) || 0).toLocaleString()}`, - icon: 'ShoppingBag', - class: 'stat-warning', - } + key: 'agent_income', + label: '代理收益', + value: `${(statsData.value.agent_income || 0).toLocaleString()}`, + icon: 'Watermelon', + class: 'stat-primary', + }, + { + key: 'directly_income', + label: '直营代理收益', + value: `${(statsData.value.directly_income || 0).toLocaleString()}`, + icon: 'Sugar', + class: 'stat-success', + }, ]) // 用户增长图表配置 @@ -704,7 +713,11 @@ const fetchDashboardData = async () => { return Math.round(((currentAvg - lastMonthAvg) / lastMonthAvg) * 100); })(), successRate: transferStats.value.total?.transfers > 0 ? ((transferStats.value.total?.received_count || 0) / transferStats.value.total.transfers * 100) : 95, - monthlySuccessCount: transferStats.value.monthly?.confirmed_count || transferStats.value.monthly?.transfers || 0 + monthlySuccessCount: transferStats.value.monthly?.confirmed_count || transferStats.value.monthly?.transfers || 0, + + + agent_income: transferStats.value.total.agent_total || 0, + directly_income: transferStats.value.total.directly_total || 0 } console.log(statsData.value,'statsData.value');