diff --git a/.env.development b/.env.development
index 47e6eb1..b8ccd8b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 VITE_APP_NAME=后台管理(开发环境)
 #VITE_API_URL=http://127.0.0.1:9200/api
-VITE_SERVER_API_URL=http://127.0.0.1:8000/api
+#VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 
 #VITE_API_URL=https://cms-api.s209.websoft.top/api
diff --git a/src/api/shop/shopOrder/model/index.ts b/src/api/shop/shopOrder/model/index.ts
index 7b9ac00..3c5da42 100644
--- a/src/api/shop/shopOrder/model/index.ts
+++ b/src/api/shop/shopOrder/model/index.ts
@@ -99,6 +99,8 @@ export interface ShopOrder {
   expressId?: number;
   // 快递公司名称
   expressName?: string;
+  // 物流单号
+  expressNo?: string;
   // 发货人
   sendName?: string;
   // 发货人联系方式
diff --git a/src/views/shop/shopOrder/components/deliveryModal.vue b/src/views/shop/shopOrder/components/deliveryModal.vue
index e918e9e..5d1c43d 100644
--- a/src/views/shop/shopOrder/components/deliveryModal.vue
+++ b/src/views/shop/shopOrder/components/deliveryModal.vue
@@ -73,6 +73,19 @@
         </a-row>
       </a-form-item>
 
+      <!-- 物流单号 -->
+      <a-form-item
+        label="物流单号"
+        name="expressNo"
+        v-if="form.deliveryType === 0"
+      >
+        <a-input
+          v-model:value="form.expressNo"
+          placeholder="请输入物流单号"
+          :maxlength="50"
+        />
+      </a-form-item>
+
       <template v-if="form.deliveryType !== 1">
         <a-form-item label="发货人" name="sendName">
           <a-input
@@ -96,19 +109,6 @@
         </a-form-item>
       </template>
 
-      <!-- 快递单号 -->
-      <!--      <a-form-item-->
-      <!--        label="快递单号"-->
-      <!--        name="trackingNumber"-->
-      <!--        v-if="form.deliveryType === 0"-->
-      <!--      >-->
-      <!--        <a-input-->
-      <!--          v-model:value="form.trackingNumber"-->
-      <!--          placeholder="请输入快递单号"-->
-      <!--          :maxlength="50"-->
-      <!--        />-->
-      <!--      </a-form-item>-->
-
       <!--      &lt;!&ndash; 分单发货 &ndash;&gt;-->
       <!--      <a-form-item label="分单发货" v-if="form.deliveryType === 0">-->
       <!--        <a-switch-->
@@ -178,7 +178,7 @@
     deliveryMethod: 'manual', // manual手动填写 print电子面单打印
     expressId: undefined as number | undefined,
     expressName: '',
-    trackingNumber: '',
+    expressNo: '',
     partialDelivery: false,
     deliveryNote: '',
     sendName: '',
@@ -210,18 +210,16 @@
         }
       }
     ],
-    // trackingNumber: [
-    //   {
-    //     required: true,
-    //     message: '请输入快递单号',
-    //     validator: (_: any, value: any) => {
-    //       if (form.deliveryType === 0 && !value) {
-    //         return Promise.reject('请输入快递单号');
-    //       }
-    //       return Promise.resolve();
-    //     }
-    //   }
-    // ],
+    expressNo: [
+      {
+        validator: (_: any, value: any) => {
+          if (form.deliveryType === 0 && !value) {
+            return Promise.reject('请输入物流单号');
+          }
+          return Promise.resolve();
+        }
+      }
+    ],
     deliveryTime: [{ required: true, message: '请选择发货时间' }],
     sendName: [
       {
@@ -298,6 +296,7 @@
       if (type !== 0) {
         form.expressId = undefined;
         form.expressName = '';
+        form.expressNo = '';
         form.deliveryMethod = 'manual';
       }
       if (type === 1) {
@@ -339,24 +338,31 @@
 
       // 如果是快递配送，添加快递信息
       if (form.deliveryType === 0) {
+        const express =
+          expressList.value.find((item) => item.expressId === form.expressId) ||
+          undefined;
         updateData.expressId = form.expressId;
         updateData.sendName = form.sendName;
         updateData.sendPhone = form.sendPhone;
         updateData.sendAddress = form.sendAddress;
-        // updateData.expressName = form.expressName;
-        // updateData.trackingNumber = form.trackingNumber;
+        updateData.expressName = form.expressName || express?.expressName;
+        updateData.expressNo = form.expressNo;
       } else if (form.deliveryType === 2) {
         // 商家送货需要记录发货人信息，但不需要快递公司
         updateData.sendName = form.sendName;
         updateData.sendPhone = form.sendPhone;
         updateData.sendAddress = form.sendAddress;
         updateData.expressId = undefined;
+        updateData.expressName = undefined;
+        updateData.expressNo = undefined;
       } else {
         // 无需发货，清理快递/发货信息
         updateData.expressId = undefined;
         updateData.sendName = undefined;
         updateData.sendPhone = undefined;
         updateData.sendAddress = undefined;
+        updateData.expressName = undefined;
+        updateData.expressNo = undefined;
       }
 
       // 分单发货
@@ -387,7 +393,7 @@
         form.deliveryMethod = 'manual';
         form.expressId = undefined;
         form.expressName = '';
-        form.trackingNumber = '';
+        form.expressNo = '';
         form.partialDelivery = false;
         form.deliveryNote = '';
         form.sendName = '';
diff --git a/src/views/shop/shopOrder/components/orderInfo.vue b/src/views/shop/shopOrder/components/orderInfo.vue
index b926c23..9ae0f29 100644
--- a/src/views/shop/shopOrder/components/orderInfo.vue
+++ b/src/views/shop/shopOrder/components/orderInfo.vue
@@ -433,13 +433,17 @@
             label="快递公司"
             :labelStyle="{ width: '90px', color: '#808080' }"
           >
-            {{ form.shopOrderDelivery.expressName || '未填写' }}
+            {{
+              form.expressName ||
+              form.shopOrderDelivery?.expressName ||
+              '未填写'
+            }}
           </a-descriptions-item>
           <a-descriptions-item
             label="物流单号"
             :labelStyle="{ width: '90px', color: '#808080' }"
           >
-            {{ form.shopOrderDelivery.expressNo || '未填写' }}
+            {{ form.expressNo || form.shopOrderDelivery?.expressNo || '未填写' }}
           </a-descriptions-item>
         </a-descriptions>
       </a-spin>
@@ -653,6 +657,10 @@
     deliveryTime: undefined,
     // 无需发货备注
     deliveryNote: undefined,
+    // 快递公司名称
+    expressName: undefined,
+    // 物流单号
+    expressNo: undefined,
     // 优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡
     couponType: undefined,
     // 优惠说明