From 3690fd00f7002f2ecf5dc500d6b351f09576dc9c Mon Sep 17 00:00:00 2001
From: tikkhun <tikkhun@163.com>
Date: Thu, 22 Jan 2026 15:12:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增客户统计页面组件
- 在物流DTO中添加tracking_id字段注释
- 移除不再使用的cubejs-client依赖
- 修复店铺布局中的加载状态变量名
- 优化订单页面物流信息显示逻辑，支持更多字段展示
---
 package.json                           |  2 --
 src/pages/Customer/Statistic/index.tsx |  7 +++++++
 src/pages/Site/Shop/Layout.tsx         |  8 ++++----
 src/pages/Site/Shop/Orders/index.tsx   | 21 ++++++++++++++-------
 src/servers/api/typings.d.ts           |  2 ++
 5 files changed, 27 insertions(+), 13 deletions(-)

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 (
+    <div>
+      <h1>客户统计</h1>
+    </div>
+  );
+}
\ 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 = () => {
       <Row gutter={16} style={{ height: 'calc(100vh - 100px)' }}>
         <Col span={4} style={{ height: '100%' }}>
           <Sider
-            style={{ background: 'white', height: '100%', overflow: 'hidden',zIndex:1 }}
+            style={{ background: 'white', height: '100%', overflow: 'hidden', zIndex: 1 }}
           >
             <div style={{ padding: '0 10px 16px' }}>
               <div
@@ -125,10 +125,10 @@ 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 (
           <div>
-            {record.fulfillments.map((item: any, index: number) => (
+            {record.fulfillments.map((item, index: number) => (
               <div
                 key={index}
                 style={{ display: 'flex', flexDirection: 'column' }}
               >
                 <span>
-                  {item.tracking_provider
-                    ? `快递方式: ${item.tracking_provider}`
+                  {item.shipping_provider
+                    ? `快递方式: ${item.shipping_provider}`
                     : ''}
                 </span>
-                {item.tracking_number
-                  ? `物流单号: ${item.tracking_number}`
-                  : ''}
+                {
+                  item.shipping_method
+                    ? `发货方式: ${item.shipping_method}`
+                    : ''
+                }
                 <span>
-                  {item.date_shipped ? `发货日期: ${item.date_shipped}` : ''}
+                  {item.tracking_number
+                    ? `物流单号: ${item.tracking_number}`
+                    : ''}
+                </span>
+                <span>
+                  {item.date_created ? `发货日期: ${item.date_created}` : ''}
                 </span>
               </div>
             ))}
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;
     /** 物流公司 */