From 22cc8ce22157a32bfcd4ee14d824769c6e318cec Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 23:30:57 +0800
Subject: [PATCH] 修改取消订单列表展示的问题

---
 src/utils/orderWorkflow.ts |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/utils/orderWorkflow.ts b/src/utils/orderWorkflow.ts
index a13246c..4a46a8c 100644
--- a/src/utils/orderWorkflow.ts
+++ b/src/utils/orderWorkflow.ts
@@ -6,10 +6,12 @@
 // 璁㈠崟鐘舵�佹灇涓撅紙鎸夌収娴佺▼椤哄簭锛�
 export enum OrderStatus {
   WAIT_UPLOAD = '寰呬笂浼犳枃浠�',      // 1
-  WAIT_AUTHORIZE = '寰呮巿鏉�',       // 2  
+  WAIT_AUTHORIZE = '寰呮巿鏉�',       // 2
+  WAIT_APPROVAL_AUTHORIZE = '寰呭鎵规巿鏉�',
   WAIT_CONFIRM = '寰呬氦鏄撶‘璁�',     // 3
   COMPLETED = '宸插畬鎴�',           // 4
-  EVALUATED = '宸茶瘎浠�'            // 5 (鏈�缁堢姸鎬�)
+  EVALUATED = '宸茶瘎浠�',            // 5 (鏈�缁堢姸鎬�)
+  CANCELED = '宸插彇娑�'
 }
 
 // 鎿嶄綔绫诲瀷鏋氫妇
@@ -21,7 +23,8 @@
   CONFIRM_TRADE = '浜ゆ槗纭',
   EVALUATE = '璇勪环',
   CANCEL_ORDER = '鍙栨秷璁㈠崟',
-  COMPLETED = '宸插畬鎴�'
+  COMPLETED = '宸插畬鎴�',
+  WAIT_APPROVAL_AUTHORIZE = '瀹℃壒'
 }
 
 // 椤甸潰绫诲瀷鏋氫妇
@@ -50,6 +53,11 @@
       { type: ActionType.TRACK },
       { type: ActionType.AUTHORIZE, routeName: 'tradeApproval' }
     ],
+    [OrderStatus.WAIT_APPROVAL_AUTHORIZE]: [
+      { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
+      { type: ActionType.TRACK },
+      { type: ActionType.WAIT_APPROVAL_AUTHORIZE, routeName: 'tradeApproval' }
+    ],
     [OrderStatus.WAIT_CONFIRM]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
       { type: ActionType.TRACK }
@@ -59,6 +67,10 @@
       { type: ActionType.TRACK }
     ],
     [OrderStatus.EVALUATED]: [
+      { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
+      { type: ActionType.TRACK }
+    ],
+    [OrderStatus.CANCELED]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
       { type: ActionType.TRACK }
     ]
@@ -75,6 +87,11 @@
       { type: ActionType.TRACK },
       { type: ActionType.CANCEL_ORDER }
     ],
+    [OrderStatus.WAIT_APPROVAL_AUTHORIZE]: [
+      { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
+      { type: ActionType.TRACK },
+      { type: ActionType.WAIT_APPROVAL_AUTHORIZE, routeName: 'tradeApproval' }
+    ],
     [OrderStatus.WAIT_CONFIRM]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
       { type: ActionType.TRACK },
@@ -89,6 +106,10 @@
     [OrderStatus.EVALUATED]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
       { type: ActionType.TRACK }
+    ],
+    [OrderStatus.CANCELED]: [
+      { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
+      { type: ActionType.TRACK }
     ]
   },
   [PageType.SELLER_CENTER]: {
@@ -99,6 +120,11 @@
     [OrderStatus.WAIT_AUTHORIZE]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
       { type: ActionType.TRACK }
+    ],
+    [OrderStatus.WAIT_APPROVAL_AUTHORIZE]: [
+      { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
+      { type: ActionType.TRACK },
+      { type: ActionType.WAIT_APPROVAL_AUTHORIZE, routeName: 'tradeApproval' }
     ],
     [OrderStatus.WAIT_CONFIRM]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
@@ -111,17 +137,23 @@
     [OrderStatus.EVALUATED]: [
       { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
       { type: ActionType.TRACK }
+    ],
+    [OrderStatus.CANCELED]: [
+      { type: ActionType.VIEW, routeName: 'tradeOrderDetail' },
+      { type: ActionType.TRACK }
     ]
   }
 }
 
 // 鐘舵�佹祦杞槧灏勶紙褰撳墠鐘舵�� -> 涓嬩竴涓姸鎬侊級
 const STATUS_FLOW_MAP: Record<OrderStatus, OrderStatus | null> = {
-  [OrderStatus.WAIT_UPLOAD]: OrderStatus.WAIT_AUTHORIZE,
+  [OrderStatus.WAIT_UPLOAD]: OrderStatus.WAIT_APPROVAL_AUTHORIZE,
   [OrderStatus.WAIT_AUTHORIZE]: OrderStatus.WAIT_CONFIRM,
+  [OrderStatus.WAIT_APPROVAL_AUTHORIZE]: OrderStatus.WAIT_CONFIRM,
   [OrderStatus.WAIT_CONFIRM]: OrderStatus.COMPLETED,
   [OrderStatus.COMPLETED]: OrderStatus.EVALUATED,
-  [OrderStatus.EVALUATED]: null // 鏈�缁堢姸鎬侊紝鏃犱笅涓�鐘舵��
+  [OrderStatus.EVALUATED]: null, // 鏈�缁堢姸鎬侊紝鏃犱笅涓�鐘舵��
+  [OrderStatus.CANCELED]: null
 }
 
 /**
@@ -245,12 +277,16 @@
         return OrderStatus.WAIT_UPLOAD
       case '寰呮巿鏉�':
         return OrderStatus.WAIT_AUTHORIZE
+      case '寰呭鎵规巿鏉�':
+        return OrderStatus.WAIT_APPROVAL_AUTHORIZE
       case '寰呬氦鏄撶‘璁�':
         return OrderStatus.WAIT_CONFIRM
       case '宸插畬鎴�':
         return OrderStatus.COMPLETED
       case '宸茶瘎浠�':
         return OrderStatus.EVALUATED
+      case '宸插彇娑�':
+        return OrderStatus.CANCELED
       default:
         console.warn(`鏈煡鐨勮鍗曠姸鎬�: ${serverStatus}锛岄粯璁よ繑鍥炲緟鎺堟潈鐘舵�乣)
         return OrderStatus.WAIT_AUTHORIZE

--
Gitblit v1.8.0