feat(v3.4.15): admin delivery track drawer and mini-user store list polish

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-07 13:25:55 +08:00
parent e4e9eb2169
commit 10fa361983
14 changed files with 404 additions and 106 deletions
@@ -3,13 +3,26 @@ import {
  Button, Descriptions, Drawer, Form, Input, Space, Table, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
+import OrderTrackDrawer from '../components/OrderTrackDrawer';
 import { request } from '../lib/api';
 import { ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';

 type Row = {
-  id: string; provider: string; trackingNo: string | null; providerOrderNo: string | null; updatedAt: string;
-  order?: { orderNo: string; status: string; receiverName: string; receiverPhone: string; deliveryType: string };
+  id: string;
+  orderId: string;
+  provider: string;
+  trackingNo: string | null;
+  providerOrderNo: string | null;
+  updatedAt: string;
+  order?: {
+    id: string;
+    orderNo: string;
+    status: string;
+    receiverName: string;
+    receiverPhone: string;
+    deliveryType: string;
+  };
 };

 export default function DeliveriesPage() {
@@ -29,6 +42,22 @@ export default function DeliveriesPage() {
  );
  const [detail, setDetail] = useState<Row | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [trackOpen, setTrackOpen] = useState(false);
+  const [trackOrderId, setTrackOrderId] = useState<string | null>(null);
+  const [trackOrderNo, setTrackOrderNo] = useState<string | null>(null);
+  const [trackOrderStatus, setTrackOrderStatus] = useState<string | null>(null);
+
+  function openTrack(row: Row) {
+    const orderId = row.orderId || row.order?.id;
+    if (!orderId) {
+      message.warning('缺少关联订单，无法查询路由');
+      return;
+    }
+    setTrackOrderId(orderId);
+    setTrackOrderNo(row.order?.orderNo ?? null);
+    setTrackOrderStatus(row.order?.status ?? null);
+    setTrackOpen(true);
+  }

  const columns: ColumnsType<Row> = [
    { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
@@ -39,14 +68,17 @@ export default function DeliveriesPage() {
    { title: '收货人', dataIndex: ['order', 'receiverName'], width: 90 },
    { title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
    {
-      title: '操作', width: 80,
+      title: '操作', width: 140,
      render: (_, row) => (
-        <Button type="link" size="small" onClick={async () => {
-          const d = await request<Row>(`/admin/deliveries/${row.id}`);
-          setDetail(d);
-          editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
-          setDrawerOpen(true);
-        }}>编辑</Button>
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => openTrack(row)}>路由</Button>
+          <Button type="link" size="small" onClick={async () => {
+            const d = await request<Row>(`/admin/deliveries/${row.id}`);
+            setDetail(d);
+            editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
+            setDrawerOpen(true);
+          }}>编辑</Button>
+        </Space>
      ),
    },
  ];
@@ -87,9 +119,22 @@ export default function DeliveriesPage() {
              <Form.Item name="providerOrderNo" label="第三方单号"><Input /></Form.Item>
              <Form.Item name="trackingNo" label="运单号"><Input /></Form.Item>
            </Form>
+            <Button
+              style={{ marginTop: 8 }}
+              onClick={() => openTrack(detail)}
+            >
+              查看路由
+            </Button>
          </>
        )}
      </Drawer>
+      <OrderTrackDrawer
+        open={trackOpen}
+        orderId={trackOrderId}
+        orderNo={trackOrderNo}
+        orderStatus={trackOrderStatus}
+        onClose={() => setTrackOpen(false)}
+      />
    </div>
  );
 }
@@ -30,6 +30,7 @@ import {
 } from '../lib/constants';
 import { FULFILLMENT_HOLD_REASON_LABELS } from '@dukang/shared-types';
 import ProxyOrderModal from '../components/ProxyOrderModal';
+import OrderTrackDrawer from '../components/OrderTrackDrawer';

 type ShipDefaults = {
  provider: string;
@@ -186,6 +187,7 @@ export default function OrdersPage() {
  const [shipMode, setShipMode] = useState<ShipMode>('EXPRESS');
  const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
  const [proxyOpen, setProxyOpen] = useState(false);
+  const [trackOpen, setTrackOpen] = useState(false);
  const canDeleteOrders = (profile?.permissionKeys ?? []).includes('orders_delete');
  const canProxyOrder = (profile?.permissionKeys ?? []).includes('orders');

@@ -859,7 +861,20 @@ export default function OrdersPage() {
            </Descriptions>

            {detail.delivery && (
-              <Descriptions column={1} bordered size="small" title="配送" style={{ marginTop: 16 }}>
+              <Descriptions
+                column={1}
+                bordered
+                size="small"
+                title={
+                  <Space>
+                    <span>配送</span>
+                    <Button type="link" size="small" style={{ padding: 0 }} onClick={() => setTrackOpen(true)}>
+                      查看路由
+                    </Button>
+                  </Space>
+                }
+                style={{ marginTop: 16 }}
+              >
                <Descriptions.Item label="快递公司">
                  {detail.delivery.logisticsCompany ||
                    DELIVERY_PROVIDER_LABELS[detail.delivery.provider] ||
@@ -1232,6 +1247,14 @@ export default function OrdersPage() {
          void openDetail(order.id);
        }}
      />
+
+      <OrderTrackDrawer
+        open={trackOpen}
+        orderId={detail?.id ?? null}
+        orderNo={detail?.orderNo}
+        orderStatus={detail?.status}
+        onClose={() => setTrackOpen(false)}
+      />
    </div>
  );
 }