From 2d0f12d0cdf0dade5885f47a1395bac2a9c8b9cf Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Tue, 27 Jan 2026 20:20:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BF=AB=E9=80=92=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8F=91=E8=B4=A7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在发货表单中添加快递公司选择字段，支持多种快递公司选项
优化发货信息处理逻辑，包括邮件地址和联系信息的正确处理
---
 src/pages/Order/List/index.tsx | 78 ++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx
index 57818b9..509d326 100644
--- a/src/pages/Order/List/index.tsx
+++ b/src/pages/Order/List/index.tsx
@@ -130,7 +130,7 @@ const ListPage: React.FC = () => {
         label: '已申请退款',
       },
       {
-        
+
         key: 'refund_approved',
         label: "已退款",
         // label: '退款申请已通过',
@@ -174,7 +174,7 @@ const ListPage: React.FC = () => {
       hideInTable: true,
       valueType: 'dateRange',
     },
-    
+
     {
       title: '订阅',
       dataIndex: 'isSubscription',
@@ -215,7 +215,7 @@ const ListPage: React.FC = () => {
       dataIndex: 'keyword',
       hideInTable: true,
     },
-     {
+    {
       title: '订单ID',
       dataIndex: 'externalOrderId',
     },
@@ -253,7 +253,7 @@ const ListPage: React.FC = () => {
       dataIndex: 'billing_phone',
       render: (_, record) => record.shipping?.phone || record.billing?.phone,
     },
-     {
+    {
       title: '换货次数',
       dataIndex: 'exchange_frequency',
       hideInSearch: true,
@@ -919,7 +919,7 @@ const Detail: React.FC<{
                 <ul>
                   {record?.items?.map((item: any) => (
                     <li key={item.id}>
-                      {item.name}:{item.quantity} 
+                      {item.name}:{item.quantity}
                     </li>
                   ))}
                 </ul>
@@ -927,13 +927,13 @@ const Detail: React.FC<{
             }}
           />
           {/* 显示 related order */}
-<ProDescriptions.Item
-  label="关联"
-  span={3}
-  render={(_, record) => {
-    return <RelatedOrders data={record?.related} />;
-  }}
-/>
+          <ProDescriptions.Item
+            label="关联"
+            span={3}
+            render={(_, record) => {
+              return <RelatedOrders data={record?.related} />;
+            }}
+          />
           {/* 订单内容 */}
           <ProDescriptions.Item
             label="订单内容"
@@ -1197,10 +1197,16 @@ const Shipping: React.FC<{
   const [rates, setRates] = useState<API.RateDTO[]>([]);
   const [ratesLoading, setRatesLoading] = useState(false);
   const { message } = App.useApp();
-const [shipmentPlatforms, setShipmentPlatforms] = useState([
+  const [shipmentPlatforms, setShipmentPlatforms] = useState([
     { label: 'uniuni', value: 'uniuni' },
     { label: 'tms.freightwaves', value: 'freightwaves' },
-  ]); 
+  ]);
+  const [courierCompany, setCourierCompany] = useState([
+    { label: 'UNIUNI', value: 'UNIUNI' },
+    { label: 'PuroYYZ', value: 'PuroYYZ' },
+    { label: 'CPYYZ', value: 'CPYYZ' },
+    { label: 'UPSYYZ7000NEW', value: 'UPSYYZ7000NEW' },
+  ]);
   return (
     <ModalForm
       formRef={formRef}
@@ -1252,6 +1258,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
         return {
           shipmentPlatform: 'freightwaves',
+          courierCompany: 'UNIUNI',
           ...data,
           // payment_method_id: shipmentInfo?.payment_method_id,
           stockPointId: shipmentInfo?.stockPointId,
@@ -1278,7 +1285,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             },
             origin: {
               name: data?.siteName,
-              email_addresses: data?.email,
+              email_addresses: shipmentInfo?.email_addresses,
               contact_name: data?.siteName,
               phone_number: shipmentInfo?.phone_number,
               address: {
@@ -1345,6 +1352,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
               postal_code: details.origin.address.postal_code,
               address_line_1: details.origin.address.address_line_1,
               phone_number: details.origin.phone_number,
+              email_addresses: details.origin.email_addresses,
             }),
           );
 
@@ -1366,17 +1374,25 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
       }}
     >
 
-     <Row gutter={16}>
+      <Row gutter={16}>
         <Col span={8}>
-     <ProFormSelect
-        name="shipmentPlatform"
-        label="发货平台"
-        options={shipmentPlatforms}
-        placeholder="请选择发货平台"
-        rules={[{ required: true, message: '请选择一个选项' }]}
-      />
-      </Col>
-       </Row>
+          <ProFormSelect
+            name="shipmentPlatform"
+            label="发货平台"
+            options={shipmentPlatforms}
+            placeholder="请选择发货平台"
+            rules={[{ required: true, message: '请选择一个选项' }]}
+          />
+        </Col>
+        <Col span={8}>
+          <ProFormSelect
+            name="courierCompany"
+            label="快递公司"
+            options={courierCompany}
+            placeholder="请选择快递公司"
+          />
+        </Col>
+      </Row>
       <ProFormText
         label="订单号"
         readonly
@@ -2043,14 +2059,14 @@ const SalesChange: React.FC<{
           [],
         );
 
-        
+
         // setOptions(
         //   data.sales?.map((item) => ({
         //     label: item.name,
         //     value: item.sku,
         //   })) || [],
         // );
-        return { ...data};
+        return { ...data };
       }}
       onFinish={async (formData: any) => {
         const { sales } = formData;
@@ -2064,14 +2080,14 @@ const SalesChange: React.FC<{
         return true;
       }}
     >
- <ProFormList
+      <ProFormList
         label="换货订单"
         name="items"
       >
         <ProForm.Group>
 
           <ProFormSelect
-             params={{ }}
+            params={{}}
             request={async ({ keyWords }) => {
               try {
                 const { data } = await wpproductcontrollerSearchproducts({
@@ -2110,7 +2126,7 @@ const SalesChange: React.FC<{
               precision: 0,
             }}
           />
-        
+
         </ProForm.Group>
       </ProFormList>
 
@@ -2120,7 +2136,7 @@ const SalesChange: React.FC<{
       >
         <ProForm.Group>
 
-        
+
           <ProFormSelect
             params={{}}
             request={async ({ keyWords }) => {