From 8ba5014fd707bc29476f7b76571e131011b89344 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Tue, 18 Mar 2025 10:17:45 +0800
Subject: [PATCH] update

---
 src/views/dashboard/Dashboard.vue | 97 +++++++++++++++++++++++--------
 1 file changed, 74 insertions(+), 23 deletions(-)

diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index 987e324..93e6475 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -45,11 +45,17 @@
             />
             <div class="sub-stats">
               <a-statistic 
-                title="已下单用户" 
+                title="下单用户数" 
                 :value="dashboardData.has_order_user_count || 0"
+                :value-style="{ color: '#722ed1' }"
               />
               <a-statistic 
-                title="付费用户" 
+                title="完成配送用户数" 
+                :value="dashboardData.has_order_completed_user_count || 0"
+                :value-style="{ color: '#722ed1' }"
+              />
+              <a-statistic 
+                title="付费用户数" 
                 :value="dashboardData.has_paid_user_count || 0"
                 :value-style="{ color: '#722ed1' }"
               />
@@ -67,25 +73,38 @@
                     <path d="M832 312H696v-16c0-101.6-82.4-184-184-184s-184 82.4-184 184v16H192c-17.7 0-32 14.3-32 32v536c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V344c0-17.7-14.3-32-32-32z m-432-16c0-61.9 50.1-112 112-112s112 50.1 112 112v16H400v-16z m392 544H232V384h96v88c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-88h224v88c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-88h96v456z" fill="currentColor"></path>
                   </svg>
                 </span>
-                配送订单
+                配送订单数
               </span>
             </template>
-            <a-statistic 
-              title="配送订单数" 
-              :value="dashboardData.order_count || 0"
-              class="main-stat"
-              :value-style="{ color: '#fa8c16' }"
-            />
+            <div class="main-stat-row">
+              <a-statistic 
+                title="配送订单数" 
+                :value="dashboardData.order_count || 0"
+                class="main-stat"
+                :value-style="{ color: '#fa8c16' }"
+              />
+              <a-statistic 
+                title="完成配送订单数" 
+                :value="dashboardData.order_completed_count || 0"
+                class="main-stat"
+                :value-style="{ color: '#fa8c16' }"
+              />
+            </div>
             <div class="sub-stats">
               <a-statistic 
                 title="付费订单数" 
                 :value="dashboardData.order_pay_count || 0"
                 :value-style="{ color: '#fa8c16' }"
               />
+              <a-statistic 
+                title="未支付订单数" 
+                :value="dashboardData.order_unpaid_count || 0"
+                :value-style="{ color: '#fa8c16' }"
+              />
               <a-statistic 
                 title="付费率" 
                 :value="paymentRate"
-                :precision="2"
+                :precision="1"
                 suffix="%"
                 :value-style="{ color: '#fa8c16' }"
               />
@@ -104,23 +123,36 @@
                     <path d="M426.6 599.7V521H344c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h82.6v-78.7c0-4.4 3.6-8 8-8h52c4.4 0 8 3.6 8 8V457H592c4.4 0 8 3.6 8 8v48c0 4.4-3.6 8-8 8h-97.4v78.7c0 4.4-3.6 8-8 8h-52c-4.4 0-8-3.6-8-8z" fill="currentColor"></path>
                   </svg>
                 </span>
-                订单金额
+                配送订单金额
               </span>
             </template>
-            <a-statistic 
-              title="配送订单总金额" 
-              :value="dashboardData.order_amount || 0"
-              :precision="2"
-              prefix="¥"
-              class="main-stat"
-              :value-style="{ color: '#52c41a' }"
-            />
+            <div class="main-stat-row">
+              <a-statistic 
+                title="总配送订单" 
+                :value="dashboardData.order_amount || 0"
+                :precision="1"
+                class="main-stat"
+                :value-style="{ color: '#52c41a' }"
+              />
+              <a-statistic 
+                title="完成配送订单" 
+                :value="dashboardData.completed_order_amount || 0"
+                :precision="1"
+                class="main-stat"
+                :value-style="{ color: '#52c41a' }"
+              />
+            </div>
             <div class="sub-stats">
               <a-statistic 
-                title="付费订单总金额" 
+                title="付费订单" 
                 :value="dashboardData.pay_amount || 0"
-                :precision="2"
-                prefix="¥"
+                :precision="1"
+                :value-style="{ color: '#52c41a' }"
+              />
+              <a-statistic 
+                title="未支付订单" 
+                :value="dashboardData.unpaid_amount || 0"
+                :precision="1"
                 :value-style="{ color: '#52c41a' }"
               />
             </div>
@@ -204,11 +236,16 @@ export default defineComponent({
       total_user_count: 0,
       has_order_user_count: 0,
       has_paid_user_count: 0,
+      has_order_completed_user_count: 0,
       order_count: 0,
       order_pay_count: 0,
+      order_unpaid_count: 0,
+      order_completed_count: 0,
       pay_rate: 0,
       order_amount: 0,
-      pay_amount: 0
+      pay_amount: 0,
+      completed_order_amount: 0,
+      unpaid_amount: 0
     })
     
     const deliverymanList = ref([])
@@ -525,6 +562,20 @@ export default defineComponent({
   }
 }
 
+.main-stat-row {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 16px;
+  
+  .main-stat {
+    margin-bottom: 0;
+    
+    :deep(.ant-statistic-content) {
+      font-size: 24px;
+    }
+  }
+}
+
 .sub-stats {
   display: flex;
   justify-content: space-between;