From 64ed256e7d8f269374c80d9b4e3ed732a5dbb9bb Mon Sep 17 00:00:00 2001
From: sunzhuangzhuang <961120009@qq.com>
Date: Mon, 15 Sep 2025 10:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Dashboard.vue | 13 +++++++++++--
 src/views/Transfers.vue | 24 ++++++++++++++++--------
 vite.config.js          | 12 ++++++------
 3 files changed, 33 insertions(+), 16 deletions(-)

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 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="转出区域" width="150">
+          <template #default="{ row }">
+            <div>
+              <div>{{row.from_district}}</div>
+              <div class="real-name">{{row.from_province}}-{{row.from_city}}</div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="转入用户" width="150">
           <template #default="{ row }">
             <div>
@@ -107,6 +115,14 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="转入区域" width="150">
+          <template #default="{ row }">
+            <div>
+              <div>{{row.to_district}}</div>
+              <div class="real-name">{{row.to_province}} -{{row.to_city}}</div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="金额" width="100">
           <template #default="{ row }">
             <span class="amount">¥{{ row.amount }}</span>
@@ -119,14 +135,6 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="坏账标识" width="100">
-          <template #default="{ row }">
-            <el-tag v-if="row.is_bad_debt" type="danger" size="small">
-              坏账
-            </el-tag>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
         <el-table-column label="凭证" width="100">
           <template #default="{ row }">
             <el-button
diff --git a/vite.config.js b/vite.config.js
index ab36e00..3b21ff2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -4,8 +4,8 @@ import { resolve } from 'path'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: '/admin',
-  // base: '/',
+  // base: '/admin',
+  base: '/',
   plugins: [vue()],
   resolve: {
     alias: {
@@ -20,10 +20,10 @@ export default defineConfig({
         target: 'http://localhost:3000',
         changeOrigin: true
       },
-      '/admin': {
-        target: 'http://localhost:3000',
-        changeOrigin: true
-      },
+      // '/admin': {
+      //   target: 'http://localhost:3000',
+      //   changeOrigin: true
+      // },
       '/uploads': {
         target: 'http://localhost:3000',
         changeOrigin: true