1

package1/order/orderDetail.vue

@@ -146,7 +146,8 @@
 								<text v-if="orderDetail.status == 3 && orderDetail.deliveryType == 1 && !(orderDetail.deliveryInfo && orderDetail.deliveryInfo.transferDelivery == 1)">{{orderDetail.shopDelivery == 1 ? '商家配送已接单' : '配送员已接单'}}</text>
 								<text v-if="orderDetail.status == 3 && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo && orderDetail.deliveryInfo.transferDelivery == 1 && !orderDetail.deliveryInfo.transferArriveTime">等待商家送达中转点</text>
 								<text v-if="orderDetail.status == 3 && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo && orderDetail.deliveryInfo.transferDelivery == 1 && orderDetail.deliveryInfo.transferArriveTime">待配送员取货</text>
-								<text v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2">待消费</text>
+								<text v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 && orderDetail.userRequireMake == null">待消费</text>
+								<text v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 && orderDetail.userRequireMake != null">核销中</text>
 								<text v-if="orderDetail.status == 4 && orderDetail.deliveryType == 1">{{orderDetail.deliveryInfo && orderDetail.deliveryInfo.transferDelivery == 1 ? '中转配送中' : '配送员已取货'}}</text>
 								<text v-if="orderDetail.status == 5">订单已完成</text>
 								<text v-if="orderDetail.status == 7">等待同意退款</text>
@@ -198,12 +199,12 @@
 					<view class="flow-line" :class="{'active': orderDetail.status >= 3 || orderDetail.status == 5}"></view>
 					<view class="flow-item" :class="{'active': orderDetail.status >= 3 || orderDetail.status == 5}">
 						<view class="flow-dot"></view>
-						<view class="flow-name">{{orderDetail.deliveryType == 1 ? '已接单' : '待消费'}}</view>
+						<view class="flow-name">{{orderDetail.deliveryType == 1 ? '已接单' : selfPickupFlowStatusName}}</view>
 					</view>
-					<view class="flow-line" :class="{'active': orderDetail.status >= 4 || orderDetail.status == 5}"></view>
-					<view class="flow-item" :class="{'active': orderDetail.status >= 4 || orderDetail.status == 5}">
+					<view class="flow-line" :class="{'active': orderDetail.status >= 4 || orderDetail.status == 5 || isSelfPickupMaking}"></view>
+					<view class="flow-item" :class="{'active': orderDetail.status >= 4 || orderDetail.status == 5 || isSelfPickupMaking}">
 						<view class="flow-dot"></view>
-						<view class="flow-name">{{orderDetail.deliveryType == 1 ? '配送中' : '核销中'}}</view>
+						<view class="flow-name">{{orderDetail.deliveryType == 1 ? '配送中' : '备货中'}}</view>
 					</view>
 					<view class="flow-line" :class="{'active': isOrderFlowFinalActive}"></view>
 					<view class="flow-item" :class="{'active': isOrderFlowFinalActive}">
@@ -511,7 +512,7 @@
 						<view style="height: 80rpx;line-height: 80rpx;display: flex;"
 							v-if="orderDetail.deliveryType == 2">
 							<view style="flex: 1;color: #777;font-weight: 700;">
-								核销时间
+								订单完成时间
 							</view>
 							<view style="color: #000;font-weight: 700;">
 								{{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));
 			}