diff --git a/.umirc.ts b/.umirc.ts index f1934e1..bff8c8b 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -180,7 +180,7 @@ export default defineConfig({ component: './Product/Permutation', }, { - name: '产品品牌空间', + name: '产品聚合空间', path: '/product/groupBy', component: './Product/GroupBy', }, diff --git a/src/pages/Product/GroupBy/index.tsx b/src/pages/Product/GroupBy/index.tsx index ce23216..b197a4a 100644 --- a/src/pages/Product/GroupBy/index.tsx +++ b/src/pages/Product/GroupBy/index.tsx @@ -238,7 +238,7 @@ const ProductGroupBy: React.FC = () => { const { Title, Text } = Typography; return ( - +
{/* Filter Section */}
diff --git a/src/pages/Product/List/EditForm.tsx b/src/pages/Product/List/EditForm.tsx index 29614d2..7f99614 100644 --- a/src/pages/Product/List/EditForm.tsx +++ b/src/pages/Product/List/EditForm.tsx @@ -35,7 +35,6 @@ const EditForm: React.FC<{ const [stockStatus, setStockStatus] = useState< 'in-stock' | 'out-of-stock' | null >(null); - const [sites, setSites] = useState([]); const [categories, setCategories] = useState([]); const [activeAttributes, setActiveAttributes] = useState([]); @@ -44,10 +43,6 @@ const EditForm: React.FC<{ productcontrollerGetcategoriesall().then((res: any) => { setCategories(res?.data || []); }); - // 获取站点列表用于站点SKU选择 - sitecontrollerAll().then((res: any) => { - setSites(res?.data || []); - }); }, []); useEffect(() => { @@ -118,9 +113,6 @@ const EditForm: React.FC<{ components: components, type: type, categoryId: (record as any).categoryId || (record as any).category?.id, - // 初始化站点SKU为字符串数组 - // 修改后代码: - siteSkus: (record.siteSkus || []).map((code) => ({ code })), }; }, [record, components, type]); return ( @@ -187,7 +179,7 @@ const EditForm: React.FC<{ attributes, type: values.type, // 直接使用 type categoryId: values.categoryId, - siteSkus: values.siteSkus.map((v: { code: string }) => v.code) || [], // 直接传递字符串数组 + siteSkus: values.siteSkus.map((v: { sku: string }) => v.sku) || [], // 直接传递字符串数组 // 连带更新 components components: values.type === 'bundle' @@ -251,7 +243,7 @@ const EditForm: React.FC<{ )} > { <> {record.siteSkus?.map((siteSku, index) => ( - {siteSku} + {siteSku.sku} ))} 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 = {