From 46ab97d0028b8014060480ddc383e5b7f1386da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 5 Aug 2025 21:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E5=8F=8A=E5=8F=91=E8=B4=A7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/shopOrder/index.vue | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index 644773c..bd2e1e5 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -19,7 +19,7 @@
         <a-tab-pane key="unevaluated" tab="待评价"/>
         <a-tab-pane key="completed" tab="已完成"/>
         <a-tab-pane key="refunded" tab="已退款"/>
-        <a-tab-pane key="deleted" tab="已删除"/>
+        <a-tab-pane key="deleted" tab="已取消"/>
       </a-tabs>
       <ele-pro-table
         ref="tableRef"
@@ -265,47 +265,47 @@ const reload = (where?: ShopOrderParam) => {
 };
 
 const onTabs = () => {
-  // 根据tabs的key设置筛选条件
+  // 使用statusFilter进行筛选，这是后端专门为订单状态筛选设计的字段
   const filterParams: Record<string, any> = {};
 
+  // 根据文档，statusFilter的值对应：
+  // -1全部，0待支付，1待发货，2待核销，3待收货，4待评价，5已完成，6已退款，7已删除
   switch (activeKey.value) {
     case 'all':
-      // 全部订单，不设置任何筛选条件
+      // 全部订单（排除已删除）
+      filterParams.statusFilter = -1;
       break;
     case 'unpaid':
-      // 待支付：支付状态为0（未付款）
-      filterParams.payStatus = 0;
+      // 待支付
+      filterParams.statusFilter = 0;
       break;
     case 'undelivered':
-      // 待发货：已付款但未发货
-      filterParams.payStatus = 1;
-      filterParams.deliveryStatus = 10; // 未核销
+      // 待发货
+      filterParams.statusFilter = 1;
       break;
     case 'unverified':
-      // 待核销：已付款但未核销
-      filterParams.payStatus = 1;
-      filterParams.deliveryStatus = 10;
+      // 待核销
+      filterParams.statusFilter = 2;
       break;
     case 'unreceived':
-      // 待收货：已发货但未收货
-      filterParams.payStatus = 1;
-      filterParams.deliveryStatus = 30; // 部分核销
+      // 待收货
+      filterParams.statusFilter = 3;
       break;
     case 'unevaluated':
-      // 待评价：已完成但未评价
-      filterParams.orderStatus = 1; // 已完成
+      // 待评价
+      filterParams.statusFilter = 4;
       break;
     case 'completed':
       // 已完成
-      filterParams.orderStatus = 1;
+      filterParams.statusFilter = 5;
       break;
     case 'refunded':
       // 已退款
-      filterParams.orderStatus = 6;
+      filterParams.statusFilter = 6;
       break;
     case 'deleted':
-      // 已删除
-      filterParams.orderStatus = 2; // 已取消
+      // 已删除/已取消
+      filterParams.statusFilter = 7;
       break;
   }