diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 7edac3b..14f3722 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -23,7 +23,6 @@ const Page = () => { try { const { data, success, code, message: msg } = await usercontrollerLogin({...values, deviceId}); if (success) { - message.success('登录成功'); localStorage.setItem('token', data?.token as string); const { data: user } = await usercontrollerGetuser(); diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 581d64b..aaab5a8 100644 --- a/src/pages/Order/List/index.tsx +++ b/src/pages/Order/List/index.tsx @@ -499,6 +499,7 @@ const Detail: React.FC<{ orderId, }); if (!success || !data) return { data: {} }; + // 合并订单中相同的sku,只显示一次记录总数 data.sales = data.sales?.reduce( (acc: API.OrderSale[], cur: API.OrderSale) => { let idx = acc.findIndex((v: any) => v.productId === cur.productId); diff --git a/src/pages/Statistics/Sales/index.tsx b/src/pages/Statistics/Sales/index.tsx index fabbc20..5ca0853 100644 --- a/src/pages/Statistics/Sales/index.tsx +++ b/src/pages/Statistics/Sales/index.tsx @@ -35,6 +35,12 @@ const ListPage: React.FC = () => { ], }, }, + { + title: '排除套装', + dataIndex: 'exceptPackage', + valueType: 'switch', + hideInTable: true, + }, { title: '产品名称', dataIndex: 'name', diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts index e5987fd..15a98be 100644 --- a/src/servers/api/typings.d.ts +++ b/src/servers/api/typings.d.ts @@ -501,7 +501,7 @@ declare namespace API { /** sku */ sku?: string; quantity?: number; - isPackage?: boolean; + exceptPackage?: boolean; isYoone?: boolean; isZex?: boolean; size?: number; @@ -522,7 +522,7 @@ declare namespace API { /** sku */ sku?: string; quantity?: number; - isPackage?: boolean; + exceptPackage?: boolean; isYoone?: boolean; isZex?: boolean; size?: number;