From 1d9838f72e01d37c3bd6315167223eeeac59bab6 Mon Sep 17 00:00:00 2001 From: zhuotianyuan Date: Thu, 22 Jan 2026 17:30:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=91=E8=B4=A7=E5=B9=B3=E5=8F=B0=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在发货表单中新增发货平台选择器 - 将公司名称字段改为非必填 - 添加控制台日志用于调试 - 优化地址选择器的数据处理逻辑 --- src/pages/Order/List/index.tsx | 56 +++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 082aa39..9b5d061 100644 --- a/src/pages/Order/List/index.tsx +++ b/src/pages/Order/List/index.tsx @@ -77,6 +77,7 @@ import { } from 'antd'; import React, { useMemo, useRef, useState } from 'react'; import RelatedOrders from '../../Subscription/Orders/RelatedOrders'; +import dayjs from 'dayjs'; const ListPage: React.FC = () => { const actionRef = useRef(); @@ -1267,7 +1268,10 @@ const Shipping: React.FC<{ const [rates, setRates] = useState([]); const [ratesLoading, setRatesLoading] = useState(false); const { message } = App.useApp(); - +const [shipmentPlatforms, setShipmentPlatforms] = useState([ + { label: 'uniuni', value: 'uniuni' }, + { label: 'tms.freightwaves', value: 'freightwaves' }, + ]); return ( { @@ -1318,7 +1323,8 @@ const Shipping: React.FC<{ if (reShipping) data.sales = [{}]; let shipmentInfo = localStorage.getItem('shipmentInfo'); if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo); - return { + const a = { + shipmentPlatform: 'uniuni', ...data, // payment_method_id: shipmentInfo?.payment_method_id, stockPointId: shipmentInfo?.stockPointId, @@ -1378,6 +1384,8 @@ const Shipping: React.FC<{ }, }, }; + console.log('data',a) + return a }} onFinish={async ({ customer_note, @@ -1441,7 +1449,18 @@ const Shipping: React.FC<{ } }} > - + + + + + + { + onChange={(row) => { + console.log(row); + const { + address, + phone_number, + phone_number_extension, + stockPointId, + } = row; formRef?.current?.setFieldsValue({ stockPointId, + // address_id: row.id, details: { origin: { + address, phone_number: { phone: phone_number, @@ -1595,6 +1618,11 @@ const Shipping: React.FC<{ /> } > + {/* */} Date: Thu, 22 Jan 2026 17:42:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat(api=E7=B1=BB=E5=9E=8B):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0shipmentPlatform=E5=92=8Caddress=5Fid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=B0DTO=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/servers/api/typings.d.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts index 9c2d29e..b044bbc 100644 --- a/src/servers/api/typings.d.ts +++ b/src/servers/api/typings.d.ts @@ -1627,9 +1627,11 @@ declare namespace API { details?: ShippingDetailsDTO; stockPointId?: number; orderIds?: number[]; + shipmentPlatform?: string; }; type ShipmentFeeBookDTO = { + shipmentPlatform?: string; stockPointId?: number; sender?: string; startPhone?: string; @@ -1650,6 +1652,7 @@ declare namespace API { dimensionUom?: string; weight?: number; weightUom?: string; + address_id?: number; }; type ShippingAddress = { -- 2.40.1 From 860b7970c8dba34ff195a77d922fb2a826315499 Mon Sep 17 00:00:00 2001 From: zhuotianyuan Date: Thu, 22 Jan 2026 18:02:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E5=B0=86ProFromSelect=E6=94=B9=E4=B8=BAProFormSelect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Product/GroupBy/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Product/GroupBy/index.tsx b/src/pages/Product/GroupBy/index.tsx index 44a34c4..ce23216 100644 --- a/src/pages/Product/GroupBy/index.tsx +++ b/src/pages/Product/GroupBy/index.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState, useMemo } from 'react'; -import { PageContainer, ProFromSelect } from '@ant-design/pro-components'; +import { PageContainer, ProFormSelect } from '@ant-design/pro-components'; import { Card, Collapse, Divider, Image, Select, Space, Typography, message } from 'antd'; import { categorycontrollerGetall } from '@/servers/api/category'; import { productcontrollerGetproductlistgrouped } from '@/servers/api/product'; @@ -272,7 +272,7 @@ const ProductGroupBy: React.FC = () => { {categoryAttributes.map(attr => (
{attr.title}： - Date: Fri, 23 Jan 2026 16:36:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(=E5=9C=B0=E5=9D=80=E8=A1=A8=E5=8D=95):?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=B0=E5=9C=B0=E5=9D=80=E8=A1=A8=E5=8D=95=E5=92=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在地址更新表单中新增邮箱字段，并在订单列表页面显示该字段 --- src/pages/Logistics/Address/index.tsx | 9 +++++++++ src/pages/Order/List/index.tsx | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/Logistics/Address/index.tsx b/src/pages/Logistics/Address/index.tsx index dde2f26..2e7ef78 100644 --- a/src/pages/Logistics/Address/index.tsx +++ b/src/pages/Logistics/Address/index.tsx @@ -393,6 +393,13 @@ const UpdateForm: React.FC<{ })); }} /> + + + Date: Fri, 23 Jan 2026 16:42:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(Order/List):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97=E5=92=8C=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除console.log调试语句和无效的公司名称必填验证规则 --- src/pages/Order/List/index.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 8a9b3d7..6da24ef 100644 --- a/src/pages/Order/List/index.tsx +++ b/src/pages/Order/List/index.tsx @@ -1384,7 +1384,6 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([ }, }, }; - console.log('data',a) return a }} onFinish={async ({ @@ -1716,7 +1715,6 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([ Date: Fri, 23 Jan 2026 16:48:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(Address):=20=E8=B0=83=E6=95=B4=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E4=B8=BAlg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Logistics/Address/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/Logistics/Address/index.tsx b/src/pages/Logistics/Address/index.tsx index 2e7ef78..b99a2aa 100644 --- a/src/pages/Logistics/Address/index.tsx +++ b/src/pages/Logistics/Address/index.tsx @@ -396,6 +396,7 @@ const UpdateForm: React.FC<{