diff --git a/package.json b/package.json index f05ffb3..7ceb5ad 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,6 @@ "@ant-design/charts": "^2.2.6", "@ant-design/icons": "^5.0.1", "@ant-design/pro-components": "^2.4.4", - "@cubejs-client/core": "^1.6.4", - "@cubejs-client/react": "^1.6.4", "@fingerprintjs/fingerprintjs": "^4.6.2", "@monaco-editor/react": "^4.7.0", "@tinymce/tinymce-react": "^6.3.0", diff --git a/src/pages/Customer/Statistic/index.tsx b/src/pages/Customer/Statistic/index.tsx index e69de29..bffaff7 100644 --- a/src/pages/Customer/Statistic/index.tsx +++ b/src/pages/Customer/Statistic/index.tsx @@ -0,0 +1,7 @@ +export default function Statistic() { + return ( +
+

客户统计

+
+ ); +} \ No newline at end of file diff --git a/src/pages/Site/Shop/Layout.tsx b/src/pages/Site/Shop/Layout.tsx index 3ca0cc0..6411551 100644 --- a/src/pages/Site/Shop/Layout.tsx +++ b/src/pages/Site/Shop/Layout.tsx @@ -19,7 +19,7 @@ const ShopLayout: React.FC = () => { const fetchSites = async () => { try { - setEditingSiteLoading(true); + setLoading(true); const { data = [] } = await sitecontrollerAll(); setSites(data); @@ -95,7 +95,7 @@ const ShopLayout: React.FC = () => {
{ (site) => site.id === Number(siteId), ); if (currentSite) { - function normalizeEditing (site: SiteItem){ + function normalizeEditing(site: SiteItem) { return { ...site, - areas: site.areas?.map(area=>area.code) || [], + areas: site.areas?.map(area => area.code) || [], } } setEditingSite(normalizeEditing(currentSite)); diff --git a/src/pages/Site/Shop/Orders/index.tsx b/src/pages/Site/Shop/Orders/index.tsx index 22a1ae1..c563f19 100644 --- a/src/pages/Site/Shop/Orders/index.tsx +++ b/src/pages/Site/Shop/Orders/index.tsx @@ -228,21 +228,28 @@ const OrdersPage: React.FC = () => { // 遍历物流信息数组, 显示每个物流的提供商和单号 return (
- {record.fulfillments.map((item: any, index: number) => ( + {record.fulfillments.map((item, index: number) => (
- {item.tracking_provider - ? `快递方式: ${item.tracking_provider}` + {item.shipping_provider + ? `快递方式: ${item.shipping_provider}` : ''} - {item.tracking_number - ? `物流单号: ${item.tracking_number}` - : ''} + { + item.shipping_method + ? `发货方式: ${item.shipping_method}` + : '' + } - {item.date_shipped ? `发货日期: ${item.date_shipped}` : ''} + {item.tracking_number + ? `物流单号: ${item.tracking_number}` + : ''} + + + {item.date_created ? `发货日期: ${item.date_created}` : ''}
))} diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts index 3db8ad0..9c2d29e 100644 --- a/src/servers/api/typings.d.ts +++ b/src/servers/api/typings.d.ts @@ -456,6 +456,8 @@ declare namespace API { }; type FulfillmentDTO = { + /** 物流id */ + tracking_id?: string; /** 物流单号 */ tracking_number?: string; /** 物流公司 */