From bf337f16a626621b9177084cabfbbcc913b6618f Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Wed, 22 Jul 2026 10:55:20 +0800
Subject: [PATCH] 1
---
package1/order/orderDetail.vue | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index f8a9153..c993487 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -146,7 +146,8 @@
{{orderDetail.shopDelivery == 1 ? '商家配送已接单' : '配送员已接单'}}
等待商家送达中转点
待配送员取货
- 待消费
+ 待消费
+ 核销中
{{orderDetail.deliveryInfo && orderDetail.deliveryInfo.transferDelivery == 1 ? '中转配送中' : '配送员已取货'}}
订单已完成
等待同意退款
@@ -198,12 +199,12 @@
- {{orderDetail.deliveryType == 1 ? '已接单' : '待消费'}}
+ {{orderDetail.deliveryType == 1 ? '已接单' : selfPickupFlowStatusName}}
-
-
+
+
- {{orderDetail.deliveryType == 1 ? '配送中' : '核销中'}}
+ {{orderDetail.deliveryType == 1 ? '配送中' : '备货中'}}
@@ -511,7 +512,7 @@
- 核销时间
+ 订单完成时间
{{orderDetail.shopMakeTime | formatTime}}
@@ -1004,6 +1005,14 @@
};
return statusNameMap[Number(this.orderDetail.status)] || '已完成';
},
+ selfPickupFlowStatusName() {
+ return this.orderDetail.status == 3 && this.orderDetail.deliveryType == 2 && this.orderDetail.userRequireMake != null
+ ? '核销中'
+ : '待消费';
+ },
+ isSelfPickupMaking() {
+ return this.orderDetail.status == 3 && this.orderDetail.deliveryType == 2 && this.orderDetail.userRequireMake != null;
+ },
isOrderFlowFinalActive() {
return [5, 7, 8, 11, 12].includes(Number(this.orderDetail.status));
}