From daf01c0da83fa5cdae29c9ddf82db3122757a98c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 15 Oct 2025 13:25:52 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90mall=20=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E3=80=91=E4=BA=A4=E6=98=93=E8=AE=A2=E5=8D=95=EF=BC=8890%=20ele?=
 =?UTF-8?q?=20=E9=83=A8=E5=88=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/trade/order/modules/delivery-form.vue   | 7 ++-----
 apps/web-ele/src/api/mall/trade/order/index.ts             | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue b/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue
index a500032fa..727856c03 100644
--- a/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue
+++ b/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue
@@ -18,7 +18,7 @@ const emit = defineEmits(['success']);
 const formData = ref({
   id: 0,
   expressType: 'express',
-  logisticsId: 0,
+  logisticsId: undefined,
   logisticsNo: '',
 });
 
@@ -70,11 +70,8 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      formData.value.id = data.id;
-      // 根据当前物流信息判断发货方式
+      formData.value = data as any;
       formData.value.expressType = data.logisticsId === 0 ? 'none' : 'express';
-      formData.value.logisticsId = data.logisticsId || 0;
-      formData.value.logisticsNo = data.logisticsNo || '';
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
diff --git a/apps/web-ele/src/api/mall/trade/order/index.ts b/apps/web-ele/src/api/mall/trade/order/index.ts
index e0229783b..07f4b173e 100644
--- a/apps/web-ele/src/api/mall/trade/order/index.ts
+++ b/apps/web-ele/src/api/mall/trade/order/index.ts
@@ -121,7 +121,7 @@ export namespace MallOrderApi {
     /** 配送模板编号 */
     deliveryTemplateId?: null | number;
     /** 发货物流公司编号 */
-    logisticsId?: null | number;
+    logisticsId?: number;
     /** 发货物流单号 */
     logisticsNo?: string;
     /** 发货时间 */