From 14c91a63a144af56d4f99957a37ade49f792c0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 11 Aug 2025 00:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B9=9F=E7=9A=84=E5=8F=91=E8=B4=A7=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/shopOrder/components/orderInfo.vue   | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/views/shop/shopOrder/components/orderInfo.vue b/src/views/shop/shopOrder/components/orderInfo.vue
index 8d876cc..35b0ee1 100644
--- a/src/views/shop/shopOrder/components/orderInfo.vue
+++ b/src/views/shop/shopOrder/components/orderInfo.vue
@@ -421,6 +421,9 @@
       </a-spin>
     </a-card>
 
+    <!-- 发货弹窗 -->
+    <DeliveryModal v-model:visible="showDelivery" :data="form" @done="handleDeliveryDone"/>
+
   </a-drawer>
 </template>
 
@@ -441,6 +444,7 @@ import {copyText} from "@/utils/common";
 import {listShopOrderGoods} from "@/api/shop/shopOrderGoods";
 import {updateShopOrder, removeShopOrder} from '@/api/shop/shopOrder';
 import {message, Modal} from 'ant-design-vue';
+import DeliveryModal from './deliveryModal.vue';
 
 const useForm = Form.useForm;
 
@@ -463,6 +467,8 @@ const isUpdate = ref(false);
 const maxAble = ref(true);
 // 订单信息
 const orderGoods = ref<BszxPay[]>([]);
+// 是否显示发货弹窗
+const showDelivery = ref(false);
 
 // 步骤条
 const steps = ref<Step[]>([
@@ -752,31 +758,18 @@ const loadSteps = (order: ShopOrder) => {
 
 /* 发货处理 */
 const handleDelivery = () => {
-  Modal.confirm({
-    title: '确认发货',
-    content: '确定要将此订单标记为已发货吗？',
-    onOk: async () => {
-      try {
-        loading.value = true;
-        // 格式化日期为后端期望的格式
-        const now = new Date();
-        const deliveryTime = toDateString(now, 'yyyy-MM-dd HH:mm:ss');
+  showDelivery.value = true;
+};
 
-        await updateShopOrder({
-          ...form,
-          deliveryStatus: 20, // 已发货
-          deliveryTime: deliveryTime
-        });
-        message.success('发货成功');
-        emit('done');
-        updateVisible(false);
-      } catch (error: any) {
-        message.error(error.message || '发货失败');
-      } finally {
-        loading.value = false;
-      }
-    }
-  });
+/* 发货完成回调 */
+const handleDeliveryDone = () => {
+  showDelivery.value = false;
+  emit('done');
+  // 重新加载订单数据以更新显示
+  if (props.data?.orderId) {
+    // 这里可以重新获取订单数据，或者直接关闭弹窗让父组件刷新
+    updateVisible(false);
+  }
 };
 
 /* 取消订单 */