diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 8b87d89..552860d 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -312,7 +312,8 @@ const statsData = ref({ avgTransferAmount_to_lastmonth: 0, avgAmountChange: 0, successRate: 0, - monthlySuccessCount: 0 + monthlySuccessCount: 0, + totalUserAmount:0 }) // 最新用户和订单 @@ -351,7 +352,7 @@ const stats = computed(() => [ { key: 'transferAmount', label: '总沉淀', - value: `¥${statsData.value.totalTransferAmount.toLocaleString()}`, + value: `¥${(statsData.value.totalTransferAmount - statsData.value.avgTransferAmount || 0).toLocaleString()}`, icon: 'Money', class: 'stat-warning', change: `今日 ¥${statsData.value.todayTransferAmount.toLocaleString()}`, @@ -407,6 +408,13 @@ const stats = computed(() => [ change: `本月成功 ${statsData.value.monthlySuccessCount || 0} 笔`, changeClass: 'positive', changeIcon: 'TrendCharts' + }, + { + key: 'avgTransferAmount', + label: '平台待收取利润', + value: `¥${((statsData.value.totalTransferAmount + Number(statsData.value.totalUserAmount)) || 0).toLocaleString()}`, + icon: 'ShoppingBag', + class: 'stat-warning', } ]) @@ -675,6 +683,7 @@ const fetchDashboardData = async () => { totalUsers: userStats.value.totalUsers || 0, totalTransfers: transferStats.value.total?.transfers || 0, totalTransferAmount: transferStats.value.total?.total_merchant_balance || 0, + totalUserAmount: transferStats.value.total?.total_user_balance || 0, pendingTransfers: transferStats.value.total?.pending || 0, todayTransfers: transferStats.value.today?.transfers || 0, todayTransferAmount: transferStats.value.today?.amount || 0, diff --git a/src/views/Transfers.vue b/src/views/Transfers.vue index fe1233f..786092d 100644 --- a/src/views/Transfers.vue +++ b/src/views/Transfers.vue @@ -99,6 +99,14 @@ + + + + + + - - -