From 667ad68af160cc1f4d7de2cc755d0f4a91000058 Mon Sep 17 00:00:00 2001
From: lihaoyuan <18278596806@163.com>
Date: Mon, 3 Nov 2025 15:08:17 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E9=A2=84=E8=AE=A2=E5=8D=95=E4=B8=8E=E6=AD=A3=E5=B8=B8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8C=BA=E5=88=86=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=BC=82=E5=B8=B8=E6=97=B6=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E8=87=AA=E8=A1=8C=E5=8F=91=E8=B4=A7=E5=92=8C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/order/components/OrderItem.vue        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
index c60d54c..95f77ab 100644
--- a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
+++ b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
@@ -10,11 +10,16 @@
           <view class="name">{{ orderItem.sf_order_info.operator_name }}</view>
           <view class="btn_call" @click="handerExpedite">催快递</view>
         </view>
-        <view class="item time">
+        <view class="item time" v-if="orderItem.booking_state==1">
           立即送达/{{
             $u.timeFormat(orderItem.arrival_time, "mm-dd hh:MM")
           }}前送达
         </view>
+        <view class="item time" v-if="orderItem.booking_state==2">
+          预订单/{{
+            $u.timeFormat(orderItem.booking_begin_time, "mm-dd hh:MM")
+          }}前送达
+        </view>
        <u-icon
           v-if="currOrderItem.sf_order_info.feed && !isErrorOrder"
           class="icon"
@@ -60,7 +65,7 @@
         <view class="box"></view>
       </view>
       <view class="order_picking_box" v-if="!isErrorOrder">
-        <view class="order_picking_text">
+        <view class="order_picking_text" v-if="orderItem.booking_state==1">
           拣货中：
           <text>{{ getRemainingTime(orderItem.arrival_time) }}</text>
         </view>
@@ -220,12 +225,12 @@
       </view>
       <view
         class="body"
-		v-if="orderItem.is_deny_return"
+		    v-if="orderItem.is_deny_return==2"
       >
-        <view v-if="orderItem.operate_flag==0"class="btn btn_cancel" @click="handerSynOrder" >
+        <view v-if="orderItem.operate_flag==0&&isErrorOrder"class="btn btn_cancel" @click="handerSelDelivery" >
           自行发货
         </view>
-		<view v-if="orderItem.operate_flag==1"class="btn btn_cancel" @click="handerFinishOrder" >
+		<view v-if="orderItem.operate_flag==1&&isErrorOrder"class="btn btn_cancel" @click="handerFinishOrder" >
 		  订单完成
 		</view>
 		<view class="btn btn_cancel" @click="handerShowCancelOrder" >
@@ -674,7 +679,7 @@ export default {
         this.orderItemIndex
       );
     },
-	async handerSynOrder(){
+	async handerSelDelivery(){
 		let params = {
 		  order_id: this.orderItem.order_id,
 		};