From ca5879b35085ec4063410b6253c6199d94edcae0 Mon Sep 17 00:00:00 2001
From: lihaoyuan <18278596806@163.com>
Date: Mon, 27 Oct 2025 15:48:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E8=87=AA=E8=A1=8C=E5=8F=91=E8=B4=A7=EF=BC=8C=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/order/components/OrderItem.vue      | 34 +++++++++++++++++--
 .../pages/order/order.vue                     |  1 +
 2 files changed, 32 insertions(+), 3 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 861e79c..c60d54c 100644
--- a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
+++ b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
@@ -15,7 +15,7 @@
             $u.timeFormat(orderItem.arrival_time, "mm-dd hh:MM")
           }}前送达
         </view>
-        <u-icon
+       <u-icon
           v-if="currOrderItem.sf_order_info.feed && !isErrorOrder"
           class="icon"
           name="arrow-right"
@@ -222,9 +222,15 @@
         class="body"
 		v-if="orderItem.is_deny_return"
       >
-        <view class="btn btn_cancel" @click="handerShowCancelOrder" >
-          取消订单
+        <view v-if="orderItem.operate_flag==0"class="btn btn_cancel" @click="handerSynOrder" >
+          自行发货
         </view>
+		<view v-if="orderItem.operate_flag==1"class="btn btn_cancel" @click="handerFinishOrder" >
+		  订单完成
+		</view>
+		<view class="btn btn_cancel" @click="handerShowCancelOrder" >
+		  取消订单
+		</view>
         <view class="btn btn_refund" @click="handerShowPartOrderRefund" >
           部分退款
         </view>
@@ -471,6 +477,8 @@ import {
   GetExpediteSFOrder,
   GetInitiativeOrderRefund,
   GetOrderPicking,
+  SelDelivery,
+  SelFinishDelivery
 } from "@/api/order";
 
 import { makePhoneCall } from "@/utils/callPhone";
@@ -666,6 +674,26 @@ export default {
         this.orderItemIndex
       );
     },
+	async handerSynOrder(){
+		let params = {
+		  order_id: this.orderItem.order_id,
+		};
+		let res=await SelDelivery(params);
+		if(res&&res.status==200){
+			uni.$u.toast("处理完成");
+      this.$emit('refreshOrderList'); 
+		}
+	},
+	async handerFinishOrder(){
+		let params = {
+		  order_id: this.orderItem.order_id,
+		};
+		let res=await SelFinishDelivery(params);
+		if(res&&res.status==200){
+			uni.$u.toast("处理完成");
+      this.$emit('refreshOrderList'); 
+		}
+	},
     makePhone(phone) {
       console.log(makePhoneCall);
 
diff --git a/java-mall-app-shop-admin/pages/order/order.vue b/java-mall-app-shop-admin/pages/order/order.vue
index 4a4cba6..43b9a39 100644
--- a/java-mall-app-shop-admin/pages/order/order.vue
+++ b/java-mall-app-shop-admin/pages/order/order.vue
@@ -188,6 +188,7 @@
           :isErrorOrder="true"
           @cancelOrder="handerCancelOrder"
           @showRefundOrderInfo="handerShowRefundOrderInfo"
+          @refreshOrderList="handleRefresh"
         ></OrderItem>
         <view
           class="no-data"