Merge pull request 'v3.5.9版本迭代列表优化' (#48) from dev_jacy into dev

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/48

apps/admin-web/src/admin.css

@@ -46,6 +46,34 @@ body,
   text-overflow: clip;
 }
 
+/* 拖表头分割线改列宽 */
+.admin-layout .ant-table-thead > tr > th.admin-th-resizable {
+  position: relative;
+}
+
+.admin-col-resize-handle {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  width: 10px;
+  cursor: col-resize;
+  z-index: 3;
+  user-select: none;
+  touch-action: none;
+}
+
+.admin-col-resize-handle:hover,
+.admin-col-resizing .admin-col-resize-handle {
+  background: rgba(22, 119, 255, 0.18);
+}
+
+body.admin-col-resizing,
+body.admin-col-resizing * {
+  cursor: col-resize !important;
+  user-select: none !important;
+}
+
 /* 操作列保持可见 */
 .admin-layout .ant-table-cell:has(.ant-btn),
 .ant-drawer .ant-table-cell:has(.ant-btn),
@@ -81,6 +109,23 @@ body,
   font-size: 12px;
 }
 
+.admin-primary-link {
+  display: inline;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  background: none;
+  font: inherit;
+  color: inherit;
+  text-decoration: underline;
+  text-underline-offset: 3px;
+  cursor: pointer;
+}
+
+.admin-primary-link:hover {
+  color: #1677ff;
+}
+
 .admin-table-nowrap .ant-table-cell,
 .admin-table-nowrap .ant-table-cell-ellipsis {
   white-space: nowrap;

apps/admin-web/src/components/AdminPrimaryLink.tsx

@@ -0,0 +1,25 @@
+import type { MouseEvent, ReactNode } from 'react';
+
+/** HQ 主列表主展示列：下划线，点击进入编辑或详情 */
+export function AdminPrimaryLink({
+  children,
+  onClick,
+}: {
+  children?: ReactNode;
+  onClick: (e?: MouseEvent) => void;
+}) {
+  const empty = children == null || children === '';
+  return (
+    <button
+      type="button"
+      className="admin-primary-link"
+      onClick={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        onClick(e);
+      }}
+    >
+      {empty ? '—' : children}
+    </button>
+  );
+}

apps/admin-web/src/lib/ListColumnPrefsContext.tsx

@@ -35,7 +35,11 @@ export function ListColumnPrefsProvider({
       `/admin/me/list-columns/${listKey}`,
       {
         method: 'PUT',
-        body: JSON.stringify(next ? { order: next.order, hidden: next.hidden } : { reset: true }),
+        body: JSON.stringify(
+          next
+            ? { order: next.order, hidden: next.hidden, widths: next.widths }
+            : { reset: true },
+        ),
       },
     );
     setPrefs(res.listColumnPrefs ?? {});

apps/admin-web/src/lib/api.ts

@@ -202,6 +202,7 @@ export type AdminOrderRow = {
   productName?: string;
   productSpec?: string;
   quantity?: number;
+  saleUnit?: string;
   receiverName: string;
   receiverPhone: string;
   receiverProvince?: string;

apps/admin-web/src/lib/column-resize.tsx

@@ -0,0 +1,67 @@
+import type { MouseEvent, ReactNode } from 'react';
+import type { ColumnType } from 'antd/es/table';
+
+export const MIN_COL_WIDTH = 48;
+export const MAX_COL_WIDTH = 960;
+
+export function clampColWidth(n: number): number {
+  return Math.min(MAX_COL_WIDTH, Math.max(MIN_COL_WIDTH, Math.round(n)));
+}
+
+export function beginColumnResize(
+  e: MouseEvent,
+  startWidth: number,
+  onMove: (width: number) => void,
+  onEnd: (width: number) => void,
+) {
+  e.preventDefault();
+  e.stopPropagation();
+  const startX = e.clientX;
+  let latest = clampColWidth(startWidth);
+  let moved = false;
+  document.body.classList.add('admin-col-resizing');
+
+  const onMouseMove = (ev: globalThis.MouseEvent) => {
+    moved = true;
+    latest = clampColWidth(startWidth + ev.clientX - startX);
+    onMove(latest);
+  };
+  const onMouseUp = () => {
+    document.removeEventListener('mousemove', onMouseMove);
+    document.removeEventListener('mouseup', onMouseUp);
+    document.body.classList.remove('admin-col-resizing');
+    if (moved) onEnd(latest);
+  };
+  document.addEventListener('mousemove', onMouseMove);
+  document.addEventListener('mouseup', onMouseUp);
+}
+
+export function withResizeTitle<T>(
+  title: ColumnType<T>['title'],
+  onMouseDown: (e: MouseEvent) => void,
+): ColumnType<T>['title'] {
+  const handle: ReactNode = (
+    <span
+      role="separator"
+      aria-orientation="vertical"
+      aria-label="拖动调整列宽"
+      className="admin-col-resize-handle"
+      onClick={(ev) => ev.stopPropagation()}
+      onMouseDown={onMouseDown}
+    />
+  );
+  if (typeof title === 'function') {
+    return (props) => (
+      <>
+        {title(props)}
+        {handle}
+      </>
+    );
+  }
+  return (
+    <>
+      {title}
+      {handle}
+    </>
+  );
+}

apps/admin-web/src/lib/constants.ts

@@ -7,6 +7,12 @@ export const DELIVERY_PROVIDER_LABELS: Record<string, string> = {
   MANUAL: '手动',
 };
 
+export const DELIVERY_TYPE_LABELS: Record<string, string> = {
+  LOCAL: '同城',
+  CROSS_CITY: '跨城',
+  ON_SITE_PICKUP: '现场提货',
+};
+
 export const ORDER_STATUS_LABELS: Record<string, string> = {
   PENDING_PAY: '待付款',
   PENDING_SHIP: '待发货',

apps/admin-web/src/lib/list-column-prefs.ts

@@ -55,7 +55,20 @@ export function applyColumnPrefs<T>(
   const visible = new Set(visibleColumnKeys(defaultKeys, pref));
   const orderedKeys = mergeColumnOrder(defaultKeys, pref).filter((k) => visible.has(k));
   const byKey = new Map(configurable.map((c) => [c.key, c.col]));
-  return [...orderedKeys.map((k) => byKey.get(k)!).filter(Boolean), ...actions.map((c) => c.col)];
+  return [
+    ...orderedKeys
+      .map((k) => {
+        const col = byKey.get(k);
+        if (!col) return null;
+        const w = pref?.widths?.[k];
+        return w != null ? { ...col, width: w } : col;
+      })
+      .filter((c): c is ColumnType<T> => !!c),
+    ...actions.map((c) => {
+      const w = pref?.widths?.[c.key];
+      return w != null ? { ...c.col, width: w } : c.col;
+    }),
+  ];
 }
 
 export type ListColumnSettingItem = {

apps/admin-web/src/lib/useAdminListColumns.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 import { Button, message } from 'antd';
 import { SettingOutlined } from '@ant-design/icons';
 import type { ColumnsType, ColumnType } from 'antd/es/table';
@@ -9,9 +9,11 @@ import {
   ACTIONS_COLUMN_KEY,
   SERIAL_COLUMN_KEY,
   applyColumnPrefs,
+  columnKey,
   settingItems,
   type ListColumnSettingItem,
 } from './list-column-prefs';
+import { beginColumnResize, withResizeTitle } from './column-resize';
 
 type Options = {
   page?: number;
@@ -27,7 +29,13 @@ export function useAdminListColumns<T>(
   const { prefs, save } = useListColumnPrefs();
   const [open, setOpen] = useState(false);
   const [saving, setSaving] = useState(false);
+  const [localWidths, setLocalWidths] = useState<Record<string, number>>({});
   const pref = prefs[listKey];
+  const prefRef = useRef(pref);
+  prefRef.current = pref;
+  const localWidthsRef = useRef(localWidths);
+  localWidthsRef.current = localWidths;
+  const itemsRef = useRef<ListColumnSettingItem[]>([]);
 
   const configured = useMemo(
     () => applyColumnPrefs(allColumns as ColumnType<T>[], pref),
@@ -38,6 +46,7 @@ export function useAdminListColumns<T>(
     () => settingItems(allColumns as ColumnType<T>[], pref),
     [allColumns, pref],
   );
+  itemsRef.current = items;
 
   const serialCol: ColumnType<T> = useMemo(
     () => ({
@@ -50,37 +59,98 @@ export function useAdminListColumns<T>(
     [page, pageSize],
   );
 
-  const columns = useMemo<ColumnsType<T>>(
+  const persistPref = useCallback(
-    () => [
+    async (next: { order: string[]; hidden: string[]; widths?: Record<string, number> } | null) => {
+      if (!next) {
+        setLocalWidths({});
+        await save(listKey, null);
+        return;
+      }
+      await save(listKey, next);
+    },
+    [listKey, save],
+  );
+
+  const persist = useCallback(
+    async (next: ListColumnSettingItem[] | null) => {
+      setSaving(true);
+      try {
+        if (!next) {
+          await persistPref(null);
+        } else {
+          const widths = { ...(prefRef.current?.widths ?? {}), ...localWidthsRef.current };
+          await persistPref({
+            order: next.map((i) => i.key),
+            hidden: next.filter((i) => !i.visible).map((i) => i.key),
+            ...(Object.keys(widths).length ? { widths } : {}),
+          });
+        }
+        setOpen(false);
+        message.success(next ? '列设置已保存' : '已恢复默认列');
+      } catch (e) {
+        message.error(e instanceof Error ? e.message : '保存失败');
+      } finally {
+        setSaving(false);
+      }
+    },
+    [persistPref],
+  );
+
+  const persistWidth = useCallback(
+    async (key: string, width: number) => {
+      const current = prefRef.current;
+      const prevW = current?.widths?.[key];
+      if (prevW === width) return;
+      const order = current?.order?.length ? current.order : itemsRef.current.map((i) => i.key);
+      const hidden = current?.hidden ?? [];
+      const widths = { ...(current?.widths ?? {}), ...localWidthsRef.current, [key]: width };
+      try {
+        await persistPref({ order, hidden, widths });
+      } catch (e) {
+        message.error(e instanceof Error ? e.message : '列宽保存失败');
+      }
+    },
+    [persistPref],
+  );
+
+  const columns = useMemo<ColumnsType<T>>(() => {
+    const merged: ColumnType<T>[] = [
       serialCol,
       ...configured.map((col) =>
         col.title === '操作' || col.key === ACTIONS_COLUMN_KEY || col.key === 'actions'
           ? { ...col, key: col.key ?? ACTIONS_COLUMN_KEY }
           : col,
       ),
-    ],
+    ];
-    [configured, serialCol],
+    const widths = { ...(pref?.widths ?? {}), ...localWidths };
-  );
+    return merged.map((col, i) => {
-
+      const key = columnKey(col, i);
-  async function persist(next: ListColumnSettingItem[] | null) {
+      const width = widths[key] ?? (typeof col.width === 'number' ? col.width : undefined);
-    setSaving(true);
+      const prevHeader = col.onHeaderCell;
-    try {
+      return {
-      if (!next) {
+        ...col,
-        await save(listKey, null);
+        key,
-      } else {
+        width,
-        await save(listKey, {
+        title: withResizeTitle(col.title, (e) => {
-          order: next.map((i) => i.key),
+          const th = (e.currentTarget as HTMLElement).closest('th');
-          hidden: next.filter((i) => !i.visible).map((i) => i.key),
+          const startWidth = width ?? th?.getBoundingClientRect().width ?? 120;
-        });
+          beginColumnResize(
-      }
+            e,
-      setOpen(false);
+            startWidth,
-      message.success(next ? '列设置已保存' : '已恢复默认列');
+            (next) => setLocalWidths((prev) => ({ ...prev, [key]: next })),
-    } catch (e) {
+            (next) => void persistWidth(key, next),
-      message.error(e instanceof Error ? e.message : '保存失败');
+          );
-    } finally {
+        }),
-      setSaving(false);
+        onHeaderCell: (column) => {
-    }
+          const extra = typeof prevHeader === 'function' ? prevHeader(column) : {};
-  }
+          return {
+            ...extra,
+            className: [extra.className, 'admin-th-resizable'].filter(Boolean).join(' '),
+          };
+        },
+      };
+    });
+  }, [configured, serialCol, pref?.widths, localWidths, persistWidth]);
 
   const settingsButton = (
     <Button icon={<SettingOutlined />} onClick={() => setOpen(true)}>

apps/admin-web/src/pages/BenefitCouponsPage.tsx

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
   Button,
   Descriptions,
@@ -9,6 +10,7 @@ import {
   Modal,
   Popconfirm,
   Select,
+  Space,
   Table,
   Tag,
   Typography,
@@ -17,11 +19,22 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import type { AdminBenefitGrantRequest } from '@dukang/shared-types';
 import { request } from '../lib/api';
-import { COUPON_STATUS_LABELS, fmtTime } from '../lib/constants';
+import { COUPON_STATUS_LABELS, DELIVERY_TYPE_LABELS, fmtTime } from '../lib/constants';
 import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
+type CouponOrder = {
+  id?: string;
+  orderNo?: string;
+  productName?: string | null;
+  productSpec?: string | null;
+  quantity?: number | null;
+  saleUnit?: string | null;
+  deliveryType?: string | null;
+  payAmount?: number | string | null;
+};
 
 type Row = {
   id: string;
@@ -32,10 +45,43 @@ type Row = {
   status: string;
   sourceProduct: string;
   createdAt: string;
-  user?: { userNo: string; phone: string | null };
+  user?: { id?: string; userNo: string; phone: string | null };
-  order?: { orderNo: string } | null;
+  order?: CouponOrder | null;
 };
 
+function saleUnitLabel(unit?: string | null) {
+  if (unit === 'BOX') return '箱';
+  if (unit === 'BOTTLE') return '瓶';
+  return '';
+}
+
+function formatPayAmount(v?: number | string | null) {
+  if (v == null || v === '') return '';
+  const n = Number(v);
+  return Number.isFinite(n) ? `¥${n.toFixed(2)}` : '';
+}
+
+/** 来源：有订单时展示商品名、规格、数量、配送方式、金额；手动发放沿用 sourceProduct */
+function formatCouponSource(row: { sourceProduct?: string; order?: CouponOrder | null }) {
+  const order = row.order;
+  if (!order?.orderNo && !order?.productName) {
+    return row.sourceProduct || '—';
+  }
+  const unit = saleUnitLabel(order.saleUnit);
+  const qty =
+    order.quantity != null ? `${order.quantity}${unit}` : '';
+  const delivery = DELIVERY_TYPE_LABELS[order.deliveryType ?? ''] || order.deliveryType || '';
+  const amount = formatPayAmount(order.payAmount);
+  const parts = [
+    order.productName || row.sourceProduct,
+    order.productSpec,
+    qty,
+    delivery,
+    amount,
+  ].filter((p) => p != null && String(p).trim() !== '');
+  return parts.join(' / ') || row.sourceProduct || '—';
+}
+
 type CouponRedeemRecord = {
   id: string;
   redeemNo: string;
@@ -60,11 +106,10 @@ type CouponRedeemSummary = {
 type CouponDetail = Row & {
   redeemSummary?: CouponRedeemSummary | null;
   redeemRecords?: CouponRedeemRecord[];
-  user?: { userNo?: string; phone?: string | null };
-  order?: { orderNo?: string } | null;
 };
 
 export default function BenefitCouponsPage() {
+  const navigate = useNavigate();
   const [form] = Form.useForm();
   const [grantForm] = Form.useForm<AdminBenefitGrantRequest>();
   const [filters, setFilters] = useState<Record<string, string>>({});
@@ -102,20 +147,61 @@ export default function BenefitCouponsPage() {
   }
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '券号', dataIndex: 'couponNo', width: 200, ellipsis: false },
+    {
-    { title: '用户', dataIndex: ['user', 'userNo'], width: 120, ellipsis: false },
+      title: '券号',
+      dataIndex: 'couponNo',
+      width: 200,
+      ellipsis: false,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            setDetail(await request(`/admin/benefit/coupons/${row.id}`));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
+    {
+      title: '用户',
+      dataIndex: ['user', 'userNo'],
+      width: 120,
+      ellipsis: false,
+      render: (v: string | undefined, row) =>
+        row.user?.id ? (
+          <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}>
+            {v}
+          </AdminPrimaryLink>
+        ) : (
+          v || '—'
+        ),
+    },
     { title: '手机号', dataIndex: ['user', 'phone'], width: 120, render: (v) => v || '—' },
     {
       title: '订单',
       dataIndex: ['order', 'orderNo'],
       width: 180,
       ellipsis: false,
-      render: (v) => v || '—',
+      render: (v: string | undefined) =>
+        v ? (
+          <AdminPrimaryLink onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}>
+            {v}
+          </AdminPrimaryLink>
+        ) : (
+          '—'
+        ),
     },
     { title: '总额', dataIndex: 'totalAmount', width: 80, render: (v) => `¥${v}` },
     { title: '余额', dataIndex: 'balance', width: 80, render: (v) => `¥${v}` },
     { title: '状态', dataIndex: 'status', width: 90, render: (s) => <Tag>{COUPON_STATUS_LABELS[s] || s}</Tag> },
-    { title: '来源', dataIndex: 'sourceProduct' },
+    {
+      title: '来源',
+      dataIndex: 'sourceProduct',
+      width: 360,
+      ellipsis: false,
+      render: (_: string, row) => formatCouponSource(row),
+    },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作',
@@ -276,15 +362,37 @@ export default function BenefitCouponsPage() {
           <>
             <Descriptions column={1} bordered size="small">
               <Descriptions.Item label="券号">{detail.couponNo}</Descriptions.Item>
-              <Descriptions.Item label="用户">{detail.user?.userNo ?? '—'}</Descriptions.Item>
+              <Descriptions.Item label="用户">
+                {detail.user?.id ? (
+                  <AdminPrimaryLink
+                    onClick={() => navigate('/users', { state: { openUserId: String(detail.user!.id) } })}
+                  >
+                    {detail.user?.userNo}
+                  </AdminPrimaryLink>
+                ) : (
+                  (detail.user?.userNo ?? '—')
+                )}
+              </Descriptions.Item>
               <Descriptions.Item label="手机号">{detail.user?.phone ?? '—'}</Descriptions.Item>
-              <Descriptions.Item label="关联订单">{detail.order?.orderNo ?? '—'}</Descriptions.Item>
+              <Descriptions.Item label="关联订单">
+                {detail.order?.orderNo ? (
+                  <AdminPrimaryLink
+                    onClick={() =>
+                      navigate(`/orders?orderNo=${encodeURIComponent(detail.order!.orderNo!)}`)
+                    }
+                  >
+                    {detail.order.orderNo}
+                  </AdminPrimaryLink>
+                ) : (
+                  '—'
+                )}
+              </Descriptions.Item>
               <Descriptions.Item label="总额">¥{Number(detail.totalAmount).toFixed(2)}</Descriptions.Item>
               <Descriptions.Item label="余额">¥{Number(detail.balance).toFixed(2)}</Descriptions.Item>
               <Descriptions.Item label="状态">
                 {COUPON_STATUS_LABELS[detail.status] || detail.status}
               </Descriptions.Item>
-              <Descriptions.Item label="来源">{detail.sourceProduct}</Descriptions.Item>
+              <Descriptions.Item label="来源">{formatCouponSource(detail)}</Descriptions.Item>
             </Descriptions>
 
             <Typography.Title level={5} style={{ marginTop: 16, marginBottom: 8 }}>

apps/admin-web/src/pages/CityWarehousesPage.tsx

@@ -31,6 +31,7 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -232,7 +233,14 @@ export default function CityWarehousesPage() {
         </span>
       ),
     },
-    { title: '仓库', dataIndex: 'name', width: 140 },
+    {
+      title: '仓库',
+      dataIndex: 'name',
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
     { title: '地址', dataIndex: 'address', width: 180 },
     { title: '联系人', dataIndex: 'contactName', width: 90 },
     { title: '电话', dataIndex: 'contactPhone', width: 120 },

apps/admin-web/src/pages/DeliveriesPage.tsx

@@ -8,6 +8,7 @@ import { request } from '../lib/api';
 import { ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -62,7 +63,23 @@ export default function DeliveriesPage() {
   }
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
+    {
+      title: '订单号',
+      dataIndex: ['order', 'orderNo'],
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          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);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     { title: 'provider', dataIndex: 'provider', width: 90 },
     { title: '运单号', dataIndex: 'trackingNo', width: 140, render: (v) => v || '—' },
     { title: '第三方单号', dataIndex: 'providerOrderNo', width: 140, render: (v) => v || '—' },

apps/admin-web/src/pages/DevPlanTasksPage.tsx

@@ -31,6 +31,7 @@ import { downloadBase64File } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
@@ -243,7 +244,14 @@ export default function DevPlanTasksPage() {
   }
 
   const baseColumns: ColumnsType<DevPlanTaskDto> = [
-    { title: '任务号', dataIndex: 'taskNo', width: 160 },
+    {
+      title: '任务号',
+      dataIndex: 'taskNo',
+      width: 160,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '类型',
       dataIndex: 'type',

apps/admin-web/src/pages/DevPlanVersionsPage.tsx

@@ -23,6 +23,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 
@@ -122,7 +123,9 @@ export default function DevPlanVersionsPage() {
   }
 
   const baseColumns: ColumnsType<DevPlanVersionDto> = [
-    { title: '版本号', dataIndex: 'versionNo', width: 120 },
+    { title: '版本号', dataIndex: 'versionNo', width: 120, render: (v, row) => (
+      <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
+    ) },
     {
       title: '状态',
       dataIndex: 'status',

apps/admin-web/src/pages/DomainEventsPage.tsx

@@ -5,6 +5,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -59,7 +60,20 @@ export default function DomainEventsPage() {
 
   const baseColumns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v) },
-    { title: '类型', dataIndex: 'eventType', width: 130, render: (v) => <Tag>{v}</Tag> },
+    {
+      title: '类型',
+      dataIndex: 'eventType',
+      width: 130,
+      render: (v, r) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            setDetail(await request<Row>(`/admin/logs/domain-events/${r.id}`));
+          }}
+        >
+          <Tag>{v}</Tag>
+        </AdminPrimaryLink>
+      ),
+    },
     { title: '关联', render: (_, r) => `${r.refType} #${r.refId}` },
     { title: '状态', dataIndex: 'status', width: 100 },
     { title: '摘要', render: (_, r) => r.param1 || r.remark || '—' },

apps/admin-web/src/pages/FulfillmentProvidersPage.tsx

@@ -29,6 +29,7 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 const TYPE_OPTIONS = Object.entries(FULFILLMENT_PROVIDER_TYPE_LABELS).map(([value, label]) => ({
@@ -177,7 +178,13 @@ export default function FulfillmentProvidersPage() {
 
   const baseColumns: ColumnsType<FulfillmentProviderDto> = [
     { title: '编码', dataIndex: 'code', width: 100 },
-    { title: '名称', dataIndex: 'name' },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '类型',
       dataIndex: 'type',

apps/admin-web/src/pages/HqAccountsPage.tsx

@@ -8,6 +8,7 @@ import { request, type HqProfile, type Paginated } from '../lib/api';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -69,7 +70,31 @@ export default function HqAccountsPage() {
   const cityOptions = cities.map((c) => ({ value: c.id, label: c.name }));
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '姓名', dataIndex: 'name' },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      render: (v, row) =>
+        isSuperAdmin ? (
+          <AdminPrimaryLink
+            onClick={() => {
+              setDetail(row);
+              editForm.setFieldsValue({
+                name: row.name,
+                phone: row.phone,
+                loginName: row.loginName,
+                adminRole: row.adminRole,
+                status: row.status,
+                cityIds: row.cityIds ?? [],
+              });
+              setDrawerOpen(true);
+            }}
+          >
+            {v}
+          </AdminPrimaryLink>
+        ) : (
+          v
+        ),
+    },
     { title: '用户名', dataIndex: 'loginName', width: 120, render: (v) => v || '—' },
     { title: '手机', dataIndex: 'phone', width: 130 },
     {

apps/admin-web/src/pages/HqLogsPage.tsx

@@ -1,204 +1,215 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
-import {
+import {
-  Button, Descriptions, Drawer, Form, Input, Select, Space, Table, Tag, Typography,
+  Button, Descriptions, Drawer, Form, Input, Select, Space, Table, Tag, Typography,
-} from 'antd';
+} from 'antd';
-import type { ColumnsType } from 'antd/es/table';
+import type { ColumnsType } from 'antd/es/table';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
-import { request } from '../lib/api';
+import { request } from '../lib/api';
-import { AdminCellLine } from '../components/AdminCellLine';
+import { AdminCellLine } from '../components/AdminCellLine';
-import { fmtTime } from '../lib/constants';
+import { fmtTime } from '../lib/constants';
-import { HQ_OPERATION_ACTION_OPTIONS, resolveHqOperationLabel } from '../lib/hq-log';
+import { HQ_OPERATION_ACTION_OPTIONS, resolveHqOperationLabel } from '../lib/hq-log';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
+
-type Row = {
+
-  id: string;
+type Row = {
-  hqAccountId: string | null;
+  id: string;
-  hqName: string | null;
+  hqAccountId: string | null;
-  hqPhone: string | null;
+  hqName: string | null;
-  hqRole: string | null;
+  hqPhone: string | null;
-  action: string | null;
+  hqRole: string | null;
-  actionLabel: string;
+  action: string | null;
-  refType: string | null;
+  actionLabel: string;
-  refId: string | null;
+  refType: string | null;
-  status: string | null;
+  refId: string | null;
-  remark: string | null;
+  status: string | null;
-  detail: Record<string, unknown> | null;
+  remark: string | null;
-  createdAt: string;
+  detail: Record<string, unknown> | null;
-};
+  createdAt: string;
-
+};
-export default function HqLogsPage() {
+
-  const [searchParams, setSearchParams] = useSearchParams();
+export default function HqLogsPage() {
-  const [form] = Form.useForm();
+  const [searchParams, setSearchParams] = useSearchParams();
-  const [filters, setFilters] = useState<Record<string, string>>(() => ({
+  const [form] = Form.useForm();
-    hqAccountId: searchParams.get('hqAccountId') ?? '',
+  const [filters, setFilters] = useState<Record<string, string>>(() => ({
-    action: searchParams.get('action') ?? '',
+    hqAccountId: searchParams.get('hqAccountId') ?? '',
-    refType: searchParams.get('refType') ?? '',
+    action: searchParams.get('action') ?? '',
-  }));
+    refType: searchParams.get('refType') ?? '',
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
+  }));
-    '/admin/logs/hq',
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
-    () => {
+    '/admin/logs/hq',
-      const qs = new URLSearchParams();
+    () => {
-      if (filters.hqAccountId) qs.set('hqAccountId', filters.hqAccountId);
+      const qs = new URLSearchParams();
-      if (filters.action) qs.set('action', filters.action);
+      if (filters.hqAccountId) qs.set('hqAccountId', filters.hqAccountId);
-      if (filters.refType) qs.set('refType', filters.refType);
+      if (filters.action) qs.set('action', filters.action);
-      return qs;
+      if (filters.refType) qs.set('refType', filters.refType);
-    },
+      return qs;
-    [filters],
+    },
-  );
+    [filters],
-  const [detail, setDetail] = useState<Row | null>(null);
+  );
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detail, setDetail] = useState<Row | null>(null);
-
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  useEffect(() => {
+
-    form.setFieldsValue(filters);
+  useEffect(() => {
-  }, [form, filters]);
+    form.setFieldsValue(filters);
-
+  }, [form, filters]);
-  const baseColumns: ColumnsType<Row> = [
+
-    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+  const baseColumns: ColumnsType<Row> = [
-    {
+    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-      title: '操作人',
+    {
-      width: 200,
+      title: '操作人',
-
+      width: 200,
-      render: (_, r) => (
+      render: (_, r) => (
-        <AdminCellLine
+        <AdminCellLine
-          primary={r.hqName}
+          primary={r.hqName}
-          secondary={[r.hqPhone, r.hqAccountId ? `#${r.hqAccountId}` : ''].filter(Boolean).join(' ') || null}
+          secondary={[r.hqPhone, r.hqAccountId ? `#${r.hqAccountId}` : ''].filter(Boolean).join(' ') || null}
-        />
+        />
-      ),
+      ),
-    },
+    },
-    {
+    {
-      title: '行为',
+      title: '行为',
-      dataIndex: 'actionLabel',
+      dataIndex: 'actionLabel',
-      width: 160,
+      width: 160,
-      render: (v, r) => <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>,
+      render: (v, r) => (
-    },
+        <AdminPrimaryLink
-    { title: '对象类型', dataIndex: 'refType', width: 120, render: (v) => v || '—' },
+          onClick={async () => {
-    { title: '对象 ID', dataIndex: 'refId', width: 100, render: (v) => v || '—' },
+            const res = await request<Row>(`/admin/logs/hq/${r.id}`);
-    {
+            setDetail(res);
-      title: '操作',
+            setDrawerOpen(true);
-      width: 80,
+          }}
-      render: (_, row) => (
+        >
-        <Button
+          <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>
-          type="link"
+        </AdminPrimaryLink>
-          size="small"
+      ),
-          onClick={async () => {
+    },
-            const res = await request<Row>(`/admin/logs/hq/${row.id}`);
+    { title: '对象类型', dataIndex: 'refType', width: 120, render: (v) => v || '—' },
-            setDetail(res);
+    { title: '对象 ID', dataIndex: 'refId', width: 100, render: (v) => v || '—' },
-            setDrawerOpen(true);
+    {
-          }}
+      title: '操作',
-        >
+      width: 80,
-          详情
+      render: (_, row) => (
-        </Button>
+        <Button
-      ),
+          type="link"
-    },
+          size="small"
-  ];
+          onClick={async () => {
+            const res = await request<Row>(`/admin/logs/hq/${row.id}`);
+            setDetail(res);
+            setDrawerOpen(true);
+          }}
+        >
+          详情
+        </Button>
+      ),
+    },
+  ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-hq', baseColumns, { page, pageSize });
 
-
+  return (
     <div>
-    <div>
+      {settingsModal}
       <Typography.Title level={4}>HQ 操作日志</Typography.Title>
-      <Typography.Title level={4}>HQ 操作日志</Typography.Title>
+          {settingsButton}
-          {settingsButton}
+      <Typography.Paragraph type="secondary">
-      <Typography.Paragraph type="secondary">
+        记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
-        记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
+      </Typography.Paragraph>
-      </Typography.Paragraph>
+
-
+      <Form
-      <Form
+        form={form}
-        form={form}
+        layout="inline"
-        layout="inline"
+        style={{ marginBottom: 16 }}
-        style={{ marginBottom: 16 }}
+        onFinish={(values) => {
-        onFinish={(values) => {
+          setFilters(values);
-          setFilters(values);
+          setPage(1);
-          setPage(1);
+          const qs = new URLSearchParams();
-          const qs = new URLSearchParams();
+          if (values.hqAccountId) qs.set('hqAccountId', values.hqAccountId);
-          if (values.hqAccountId) qs.set('hqAccountId', values.hqAccountId);
+          if (values.action) qs.set('action', values.action);
-          if (values.action) qs.set('action', values.action);
+          if (values.refType) qs.set('refType', values.refType);
-          if (values.refType) qs.set('refType', values.refType);
+          setSearchParams(qs);
-          setSearchParams(qs);
+        }}
-        }}
+      >
-      >
+        <Form.Item name="hqAccountId" label="HQ 账户 ID">
-        <Form.Item name="hqAccountId" label="HQ 账户 ID">
+          <Input allowClear style={{ width: 140 }} />
-          <Input allowClear style={{ width: 140 }} />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item name="action" label="行为">
-        <Form.Item name="action" label="行为">
+          <Select
-          <Select
+            allowClear
-            allowClear
+            showSearch
-            showSearch
+            optionFilterProp="label"
-            optionFilterProp="label"
+            style={{ width: 180 }}
-            style={{ width: 180 }}
+            options={HQ_OPERATION_ACTION_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
-            options={HQ_OPERATION_ACTION_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
+          />
-          />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item name="refType" label="对象类型">
-        <Form.Item name="refType" label="对象类型">
+          <Input allowClear placeholder="ORDER / USER / CITY..." style={{ width: 140 }} />
-          <Input allowClear placeholder="ORDER / USER / CITY..." style={{ width: 140 }} />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item>
-        <Form.Item>
+          <Space>
-          <Space>
+            <Button type="primary" htmlType="submit">查询</Button>
-            <Button type="primary" htmlType="submit">查询</Button>
+            <Button onClick={() => {
-            <Button onClick={() => {
+              form.resetFields();
-              form.resetFields();
+              setFilters({ hqAccountId: '', action: '', refType: '' });
-              setFilters({ hqAccountId: '', action: '', refType: '' });
+              setSearchParams({});
-              setSearchParams({});
+              setPage(1);
-              setPage(1);
+              void reload();
-              void reload();
+            }}
-            }}
+            >
-            >
+              重置
-              重置
+            </Button>
-            </Button>
+          </Space>
-          </Space>
+        </Form.Item>
-        </Form.Item>
+      </Form>
-      </Form>
+
-
+      <Table
-      <Table
+        rowKey="id"
-        rowKey="id"
+        loading={loading}
-        loading={loading}
+        columns={columns}
-        columns={columns}
+        dataSource={data?.items ?? []}
-        dataSource={data?.items ?? []}
+        scroll={{ x: 'max-content' }}
-        scroll={{ x: 'max-content' }}
+        pagination={{
-        pagination={{
+          current: page,
-          current: page,
+          pageSize,
-          pageSize,
+          total: data?.total ?? 0,
-          total: data?.total ?? 0,
+          showSizeChanger: true,
-          showSizeChanger: true,
+          onChange: (p, ps) => {
-          onChange: (p, ps) => {
+            setPage(p);
-            setPage(p);
+            setPageSize(ps);
-            setPageSize(ps);
+          },
-          },
+        }}
-        }}
+      />
-      />
+
-
+      <Drawer title="操作详情" width={640} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
-      <Drawer title="操作详情" width={640} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
+        {detail && (
-        {detail && (
+          <>
-          <>
+            <Descriptions column={1} bordered size="small">
-            <Descriptions column={1} bordered size="small">
+              <Descriptions.Item label="日志 ID">{detail.id}</Descriptions.Item>
-              <Descriptions.Item label="日志 ID">{detail.id}</Descriptions.Item>
+              <Descriptions.Item label="时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
-              <Descriptions.Item label="时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
+              <Descriptions.Item label="操作人">
-              <Descriptions.Item label="操作人">
+                <AdminCellLine
-                <AdminCellLine
+                  primary={detail.hqName}
-                  primary={detail.hqName}
+                  secondary={[detail.hqPhone, detail.hqAccountId ? `ID:${detail.hqAccountId}` : ''].filter(Boolean).join(' ') || null}
-                  secondary={[detail.hqPhone, detail.hqAccountId ? `ID:${detail.hqAccountId}` : ''].filter(Boolean).join(' ') || null}
+                />
-                />
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="角色">{detail.hqRole || '—'}</Descriptions.Item>
-              <Descriptions.Item label="角色">{detail.hqRole || '—'}</Descriptions.Item>
+              <Descriptions.Item label="行为">
-              <Descriptions.Item label="行为">
+                {detail.actionLabel || resolveHqOperationLabel(detail.action)}
-                {detail.actionLabel || resolveHqOperationLabel(detail.action)}
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="对象">{detail.refType} / {detail.refId}</Descriptions.Item>
-              <Descriptions.Item label="对象">{detail.refType} / {detail.refId}</Descriptions.Item>
+              <Descriptions.Item label="状态">{detail.status || '—'}</Descriptions.Item>
-              <Descriptions.Item label="状态">{detail.status || '—'}</Descriptions.Item>
+              <Descriptions.Item label="备注">{detail.remark || '—'}</Descriptions.Item>
-              <Descriptions.Item label="备注">{detail.remark || '—'}</Descriptions.Item>
+            </Descriptions>
-            </Descriptions>
+            <Typography.Title level={5} style={{ marginTop: 16 }}>请求/响应快照</Typography.Title>
-            <Typography.Title level={5} style={{ marginTop: 16 }}>请求/响应快照</Typography.Title>
+            <pre style={{
-            <pre style={{
+              margin: 0, padding: 12, background: '#f5f5f5', borderRadius: 4,
-              margin: 0, padding: 12, background: '#f5f5f5', borderRadius: 4,
+              maxHeight: 400, overflow: 'auto', fontSize: 12,
-              maxHeight: 400, overflow: 'auto', fontSize: 12,
+            }}
-            }}
+            >
-            >
+              {JSON.stringify(detail.detail, null, 2)}
-              {JSON.stringify(detail.detail, null, 2)}
+            </pre>
-            </pre>
+          </>
-          </>
+        )}
-        )}
+      </Drawer>
-      </Drawer>
+    </div>
-    </div>
+  );
-  );
+}

apps/admin-web/src/pages/InvoicesPage.tsx

@@ -31,6 +31,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -204,7 +205,13 @@ export default function InvoicesPage() {
           ? INVOICE_CATEGORY_LABELS[r.invoiceCategory] ?? r.invoiceCategory
           : '—',
     },
-    { title: '名称', dataIndex: 'titleName' },
+    {
+      title: '名称',
+      dataIndex: 'titleName',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '状态',
       width: 110,

apps/admin-web/src/pages/KnowledgeBasesPage.tsx

@@ -26,6 +26,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -127,7 +128,13 @@ export default function KnowledgeBasesPage() {
   };
 
   const baseColumns: ColumnsType<KnowledgeBaseDto> = [
-    { title: '名称', dataIndex: 'name' },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
     { title: '说明', dataIndex: 'description' },
     { title: '文档数', dataIndex: 'documentCount', width: 90 },
     {

apps/admin-web/src/pages/LlmConfigsPage.tsx

@@ -26,6 +26,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -156,7 +157,13 @@ export default function LlmConfigsPage() {
   };
 
   const baseColumns: ColumnsType<LlmApiConfigDto> = [
-    { title: '名称', dataIndex: 'name' },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '提供商',
       dataIndex: 'provider',

apps/admin-web/src/pages/LogisticsBillsPage.tsx

@@ -30,6 +30,7 @@ import { downloadExcelCsv } from '../lib/exportExcel';
 import { request } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 type BillRow = {
   id: string;
@@ -246,7 +247,14 @@ export default function LogisticsBillsPage() {
   const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.logisticsAmount), 0);
 
   const billColumns: ColumnsType<BillRow> = [
-    { title: '账单号', dataIndex: 'billNo', width: 170 },
+    {
+      title: '账单号',
+      dataIndex: 'billNo',
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '承运商',
       width: 140,

apps/admin-web/src/pages/OrdersPage.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Link, useSearchParams } from 'react-router-dom';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Alert,
   Button,
@@ -27,10 +27,12 @@ import dayjs, { type Dayjs } from 'dayjs';
 import { ORDER_TYPE_LABELS } from '@dukang/shared-types';
 import { request, type AdminOrderItem, type AdminOrderRow, type HqProfile, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { downloadBase64File } from '../lib/exportExcel';
 import {
   ADMIN_OPTIONS_PAGE_SIZE,
   DELIVERY_PROVIDER_LABELS,
+  DELIVERY_TYPE_LABELS,
   ORDER_STATUS_COLORS,
   ORDER_STATUS_LABELS,
   ORDER_STATUS_OPERATOR_LABELS,
@@ -273,6 +275,7 @@ function warehouseToDefaults(wh: WarehouseOption, base?: ShipDefaults | null): S
 }
 
 export default function OrdersPage() {
+  const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const initialOrderNo = searchParams.get('orderNo')?.trim() || '';
   const [form] = Form.useForm();
@@ -593,63 +596,98 @@ export default function OrdersPage() {
 
   const baseColumns: ColumnsType<AdminOrderRow> = [
     {
-      title: '商品',
+      title: '订单号',
-      width: 240,
+      dataIndex: 'orderNo',
-      render: (_, row) => (
+      width: 180,
-        <div>
+      render: (v, row) => (
-          <Space size={4} wrap>
+        <Space size={4}>
-            <span>{row.productName || '—'}</span>
+          <AdminPrimaryLink onClick={() => openDetail(row.id)}>{v}</AdminPrimaryLink>
-            {row.isTest ? <Tag color="orange">测试</Tag> : null}
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
-            {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
+        </Space>
-            {row.orderType === 'PROXY' || row.isProxyOrder ? (
-              <Tag color="purple">代下单</Tag>
-            ) : null}
-          </Space>
-          <div>
-            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-              {[row.productSpec, row.quantity != null ? `×${row.quantity}` : null]
-                .filter(Boolean)
-                .join(' ')}
-            </Typography.Text>
-          </div>
-        </div>
       ),
     },
     {
-      title: '状态 / 实付',
+      title: '用户',
-      width: 130,
+      key: 'user',
+      width: 120,
+      render: (_, row) =>
+        row.user?.id ? (
+          <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}>
+            {row.user.userNo}
+          </AdminPrimaryLink>
+        ) : (
+          (row.user?.userNo || '—')
+        ),
+    },
+    {
+      title: '商品',
+      key: 'productName',
+      width: 180,
       render: (_, row) => (
-        <div>
+        <Space size={4} wrap>
-          <Tag color={ORDER_STATUS_COLORS[row.status] || 'default'}>
+          <span>{row.productName || '—'}</span>
-            {ORDER_STATUS_LABELS[row.status] || row.status}
+          {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
-          </Tag>
+          {row.orderType === 'PROXY' || row.isProxyOrder ? (
-          <div>¥{row.payAmount}</div>
+            <Tag color="purple">代下单</Tag>
-        </div>
+          ) : null}
+        </Space>
       ),
     },
+    {
+      title: '规格',
+      dataIndex: 'productSpec',
+      width: 140,
+      render: (v: string | undefined) => v || '—',
+    },
+    {
+      title: '数量',
+      dataIndex: 'quantity',
+      width: 80,
+      render: (v: number | undefined, row) =>
+        v == null ? '—' : `${v}${row.saleUnit === 'BOX' ? '箱' : '瓶'}`,
+    },
+    {
+      title: '配送方式',
+      dataIndex: 'deliveryType',
+      width: 100,
+      render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 100,
+      render: (s: string) => (
+        <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
+      ),
+    },
+    {
+      title: '实付',
+      dataIndex: 'payAmount',
+      width: 90,
+      render: (v: number) => `¥${v}`,
+    },
     {
       title: '好客权益',
       width: 200,
       render: (_, row) => formatBenefitBrief(row),
     },
     {
-      title: '收货信息',
+      title: '收货人',
-      width: 240,
+      dataIndex: 'receiverName',
-      render: (_, row) => {
+      width: 90,
-        const address = formatReceiverAddress(row);
+      render: (v: string | undefined) => v || '—',
-        return (
+    },
-          <div>
+    {
-            <div>
+      title: '电话',
-              {row.receiverName || '—'} {row.receiverPhone || ''}
+      dataIndex: 'receiverPhone',
-            </div>
+      width: 120,
-            {address ? (
+      render: (v: string | undefined) => v || '—',
-              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+    },
-                {address}
+    {
-              </Typography.Text>
+      title: '地址',
-            ) : null}
+      key: 'receiverAddress',
-          </div>
+      width: 260,
-        );
+      render: (_, row) => formatReceiverAddress(row) || '—',
-      },
     },
     {
       title: '下单时间',

apps/admin-web/src/pages/PartnerAccountsPage.tsx

@@ -5,7 +5,7 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { PARTNER_PERMISSION_KEYS, PARTNER_PERMISSION_LABELS, PARTNER_STAFF_ROLE_LABELS, type PartnerPermissionKey } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
-import { AdminCellLine } from '../components/AdminCellLine';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, ORDER_STATUS_LABELS, PARTNER_BILL_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 
@@ -176,14 +176,13 @@ export default function PartnerAccountsPage() {
       title: '姓名 / 类型',
       width: 200,
       render: (_, row) => (
-        <AdminCellLine
+        <span className="admin-cell-line">
-          primary={row.name}
+          <AdminPrimaryLink onClick={() => void openAccount(row.id)}>{row.name}</AdminPrimaryLink>
-          secondary={
+          <span className="admin-cell-line-secondary">
-            row.parentAccountId
+            {' · '}
-              ? `子账号 · ${staffRoleLabel(row.staffRole)}`
+            {row.parentAccountId ? `子账号 · ${staffRoleLabel(row.staffRole)}` : '主账号'}
-              : '主账号'
+          </span>
-          }
+        </span>
-        />
       ),
     },
     { title: '手机', dataIndex: 'phone', width: 120 },

apps/admin-web/src/pages/PartnerLogsPage.tsx

@@ -1,237 +1,252 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
-import { Button, Descriptions, Drawer, Form, Input, Segmented, Space, Table, Tag, Typography } from 'antd';
+import { Button, Descriptions, Drawer, Form, Input, Segmented, Space, Table, Tag, Typography } from 'antd';
-import type { ColumnsType } from 'antd/es/table';
+import type { ColumnsType } from 'antd/es/table';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
-import {
+import {
-  PARTNER_LOG_CATEGORY_OPTIONS,
+  PARTNER_LOG_CATEGORY_OPTIONS,
-  PARTNER_LOG_CATEGORY_LABELS,
+  PARTNER_LOG_CATEGORY_LABELS,
-  PARTNER_STAFF_ROLE_LABELS,
+  PARTNER_STAFF_ROLE_LABELS,
-  resolvePartnerLogCategory,
+  resolvePartnerLogCategory,
-  type PartnerLogCategory,
+  type PartnerLogCategory,
-  type PartnerStaffRole,
+  type PartnerStaffRole,
-} from '@dukang/shared-types';
+} from '@dukang/shared-types';
-import { request } from '../lib/api';
+import { request } from '../lib/api';
-import { AdminCellLine } from '../components/AdminCellLine';
+import { AdminCellLine } from '../components/AdminCellLine';
-import { fmtTime } from '../lib/constants';
+import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
+
-type Row = {
+
-  id: string;
+type Row = {
-  partnerId: string;
+  id: string;
-  partnerAccountId: string | null;
+  partnerId: string;
-  accountName: string | null;
+  partnerAccountId: string | null;
-  accountPhone: string | null;
+  accountName: string | null;
-  companyName: string | null;
+  accountPhone: string | null;
-  isSubAccount?: boolean;
+  companyName: string | null;
-  staffRole?: string | null;
+  isSubAccount?: boolean;
-  category: PartnerLogCategory | null;
+  staffRole?: string | null;
-  eventName: string;
+  category: PartnerLogCategory | null;
-  clientApp: string | null;
+  eventName: string;
-  refType: string | null;
+  clientApp: string | null;
-  refId: string | null;
+  refType: string | null;
-  extraJson: Record<string, unknown> | null;
+  refId: string | null;
-  createdAt: string;
+  extraJson: Record<string, unknown> | null;
-};
+  createdAt: string;
-
+};
-function summarizeExtra(json: Record<string, unknown> | null) {
+
-  if (!json) return '—';
+function summarizeExtra(json: Record<string, unknown> | null) {
-  const text = JSON.stringify(json);
+  if (!json) return '—';
-  return text.length > 80 ? `${text.slice(0, 80)}…` : text;
+  const text = JSON.stringify(json);
-}
+  return text.length > 80 ? `${text.slice(0, 80)}…` : text;
-
+}
-export default function PartnerLogsPage() {
+
-  const [searchParams, setSearchParams] = useSearchParams();
+export default function PartnerLogsPage() {
-  const [form] = Form.useForm();
+  const [searchParams, setSearchParams] = useSearchParams();
-  const [category, setCategory] = useState(searchParams.get('category') ?? '');
+  const [form] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>(() => ({
+  const [category, setCategory] = useState(searchParams.get('category') ?? '');
-    partnerId: searchParams.get('partnerId') ?? '',
+  const [filters, setFilters] = useState<Record<string, string>>(() => ({
-    partnerAccountId: searchParams.get('partnerAccountId') ?? '',
+    partnerId: searchParams.get('partnerId') ?? '',
-    phone: searchParams.get('phone') ?? '',
+    partnerAccountId: searchParams.get('partnerAccountId') ?? '',
-    companyName: searchParams.get('companyName') ?? '',
+    phone: searchParams.get('phone') ?? '',
-    eventName: searchParams.get('eventName') ?? '',
+    companyName: searchParams.get('companyName') ?? '',
-  }));
+    eventName: searchParams.get('eventName') ?? '',
-  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
+  }));
-    '/admin/logs/partners',
+  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
-    () => {
+    '/admin/logs/partners',
-      const qs = new URLSearchParams();
+    () => {
-      if (filters.partnerId) qs.set('partnerId', filters.partnerId);
+      const qs = new URLSearchParams();
-      if (filters.partnerAccountId) qs.set('partnerAccountId', filters.partnerAccountId);
+      if (filters.partnerId) qs.set('partnerId', filters.partnerId);
-      if (filters.phone) qs.set('phone', filters.phone);
+      if (filters.partnerAccountId) qs.set('partnerAccountId', filters.partnerAccountId);
-      if (filters.companyName) qs.set('companyName', filters.companyName);
+      if (filters.phone) qs.set('phone', filters.phone);
-      if (filters.eventName) qs.set('eventName', filters.eventName);
+      if (filters.companyName) qs.set('companyName', filters.companyName);
-      if (category) qs.set('category', category);
+      if (filters.eventName) qs.set('eventName', filters.eventName);
-      return qs;
+      if (category) qs.set('category', category);
-    },
+      return qs;
-    [filters, category],
+    },
-  );
+    [filters, category],
-  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
+  );
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
-
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  useEffect(() => {
+
-    form.setFieldsValue(filters);
+  useEffect(() => {
-  }, [form, filters]);
+    form.setFieldsValue(filters);
-
+  }, [form, filters]);
-  const baseColumns: ColumnsType<Row> = [
+
-    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+  const baseColumns: ColumnsType<Row> = [
-    {
+    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-      title: '合伙人',
+    {
-      width: 180,
+      title: '合伙人',
-
+      width: 180,
-      render: (_, r) => (
+      render: (_, r) => (
-        r.isSubAccount ? (
+        r.isSubAccount ? (
-          <Tag color="blue">子账号</Tag>
+          <Tag color="blue">子账号</Tag>
-        ) : (
+        ) : (
-          <AdminCellLine primary={r.companyName} secondary={r.partnerId} />
+          <AdminCellLine primary={r.companyName} secondary={r.partnerId} />
-        )
+        )
-      ),
+      ),
-    },
+    },
-    {
+    {
-      title: '账号',
+      title: '账号',
-      width: 150,
+      width: 150,
-
+      render: (_, r) => (
-      render: (_, r) => (
+        <AdminCellLine
-        <AdminCellLine
+          primary={r.accountName}
-          primary={r.accountName}
+          secondary={
-          secondary={
+            r.isSubAccount && r.staffRole
-            r.isSubAccount && r.staffRole
+              ? `${r.accountPhone || ''} · ${PARTNER_STAFF_ROLE_LABELS[r.staffRole as PartnerStaffRole] || r.staffRole}`
-              ? `${r.accountPhone || ''} · ${PARTNER_STAFF_ROLE_LABELS[r.staffRole as PartnerStaffRole] || r.staffRole}`
+              : r.accountPhone || r.partnerAccountId
-              : r.accountPhone || r.partnerAccountId
+          }
-          }
+        />
-        />
+      ),
-      ),
+    },
-    },
+    {
-    {
+      title: '分类',
-      title: '分类',
+      dataIndex: 'category',
-      dataIndex: 'category',
+      width: 100,
-      width: 100,
+      render: (v: PartnerLogCategory | null, r) => (
-      render: (v: PartnerLogCategory | null, r) => (
+        <Tag>{PARTNER_LOG_CATEGORY_LABELS[v ?? ''] || resolvePartnerLogCategory(r.eventName) || '其他'}</Tag>
-        <Tag>{PARTNER_LOG_CATEGORY_LABELS[v ?? ''] || resolvePartnerLogCategory(r.eventName) || '其他'}</Tag>
+      ),
-      ),
+    },
-    },
+    {
-    { title: '事件', dataIndex: 'eventName', width: 180 },
+      title: '事件',
-    {
+      dataIndex: 'eventName',
-      title: '关联',
+      width: 180,
-      width: 120,
+      render: (v, row) => (
-      render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
+        <AdminPrimaryLink
-    },
+          onClick={async () => {
-    {
+            setDetail(await request(`/admin/logs/partners/${row.id}`));
-      title: '摘要',
+            setDrawerOpen(true);
-
+          }}
-      render: (_, r) => summarizeExtra(r.extraJson),
+        >
-    },
+          {v}
-    {
+        </AdminPrimaryLink>
-      title: '操作',
+      ),
-      width: 80,
+    },
-      render: (_, row) => (
+    {
-        <Button
+      title: '关联',
-          type="link"
+      width: 120,
-          size="small"
+      render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
-          onClick={async () => {
+    },
-            setDetail(await request(`/admin/logs/partners/${row.id}`));
+    {
-            setDrawerOpen(true);
+      title: '摘要',
-          }}
+      render: (_, r) => summarizeExtra(r.extraJson),
-        >
+    },
-          详情
+    {
-        </Button>
+      title: '操作',
-      ),
+      width: 80,
+      render: (_, row) => (
+        <Button
+          type="link"
+          size="small"
+          onClick={async () => {
+            setDetail(await request(`/admin/logs/partners/${row.id}`));
+            setDrawerOpen(true);
+          }}
+        >
+          详情
+        </Button>
+      ),
+    },
+  ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-partners', baseColumns, { page, pageSize });
 
-
+  return (
     <div>
-
+      {settingsModal}
-  return (
+      <Typography.Title level={4} style={{ marginBottom: 16 }}>
-    <div>
+        合伙人日志
       </Typography.Title>
-      <Typography.Title level={4} style={{ marginBottom: 16 }}>
+          {settingsButton}
-        合伙人日志
+      <Segmented
-      </Typography.Title>
+        options={PARTNER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
-          {settingsButton}
+        value={category}
-      <Segmented
+        onChange={(v) => {
-        options={PARTNER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
+          setCategory(String(v));
-        value={category}
+          setPage(1);
-        onChange={(v) => {
+          setSearchParams((prev) => {
-          setCategory(String(v));
+            const next = new URLSearchParams(prev);
-          setPage(1);
+            if (v) next.set('category', String(v));
-          setSearchParams((prev) => {
+            else next.delete('category');
-            const next = new URLSearchParams(prev);
+            return next;
-            if (v) next.set('category', String(v));
+          });
-            else next.delete('category');
+        }}
-            return next;
+        style={{ marginBottom: 16 }}
-          });
+      />
-        }}
+      <Form
-        style={{ marginBottom: 16 }}
+        form={form}
-      />
+        layout="inline"
-      <Form
+        style={{ marginBottom: 16, flexWrap: 'wrap', gap: 8 }}
-        form={form}
+        onFinish={(values) => {
-        layout="inline"
+          setFilters(values);
-        style={{ marginBottom: 16, flexWrap: 'wrap', gap: 8 }}
+          setPage(1);
-        onFinish={(values) => {
+        }}
-          setFilters(values);
+      >
-          setPage(1);
+        <Form.Item name="phone" label="手机号">
-        }}
+          <Input placeholder="账号手机号" allowClear style={{ width: 140 }} />
-      >
+        </Form.Item>
-        <Form.Item name="phone" label="手机号">
+        <Form.Item name="companyName" label="公司">
-          <Input placeholder="账号手机号" allowClear style={{ width: 140 }} />
+          <Input placeholder="合伙人公司" allowClear style={{ width: 140 }} />
-        </Form.Item>
+        </Form.Item>
-        <Form.Item name="companyName" label="公司">
+        <Form.Item name="partnerId" label="合伙人ID">
-          <Input placeholder="合伙人公司" allowClear style={{ width: 140 }} />
+          <Input placeholder="partnerId" allowClear style={{ width: 120 }} />
-        </Form.Item>
+        </Form.Item>
-        <Form.Item name="partnerId" label="合伙人ID">
+        <Form.Item name="eventName" label="事件名">
-          <Input placeholder="partnerId" allowClear style={{ width: 120 }} />
+          <Input placeholder="partner_sms_login" allowClear style={{ width: 160 }} />
-        </Form.Item>
+        </Form.Item>
-        <Form.Item name="eventName" label="事件名">
+        <Form.Item>
-          <Input placeholder="partner_sms_login" allowClear style={{ width: 160 }} />
+          <Space>
-        </Form.Item>
+            <Button type="primary" htmlType="submit">
-        <Form.Item>
+              查询
-          <Space>
+            </Button>
-            <Button type="primary" htmlType="submit">
+            <Button
-              查询
+              onClick={() => {
-            </Button>
+                form.resetFields();
-            <Button
+                setFilters({
-              onClick={() => {
+                  partnerId: '',
-                form.resetFields();
+                  partnerAccountId: '',
-                setFilters({
+                  phone: '',
-                  partnerId: '',
+                  companyName: '',
-                  partnerAccountId: '',
+                  eventName: '',
-                  phone: '',
+                });
-                  companyName: '',
+                setPage(1);
-                  eventName: '',
+              }}
-                });
+            >
-                setPage(1);
+              重置
-              }}
+            </Button>
-            >
+          </Space>
-              重置
+        </Form.Item>
-            </Button>
+      </Form>
-          </Space>
+      <Table
-        </Form.Item>
+        rowKey="id"
-      </Form>
+        loading={loading}
-      <Table
+        columns={columns}
-        rowKey="id"
+        dataSource={data?.items ?? []}
-        loading={loading}
+        pagination={{
-        columns={columns}
+          current: page,
-        dataSource={data?.items ?? []}
+          pageSize,
-        pagination={{
+          total: data?.total ?? 0,
-          current: page,
+          showSizeChanger: true,
-          pageSize,
+          onChange: (p, ps) => {
-          total: data?.total ?? 0,
+            setPage(p);
-          showSizeChanger: true,
+            setPageSize(ps);
-          onChange: (p, ps) => {
+          },
-            setPage(p);
+        }}
-            setPageSize(ps);
+        scroll={{ x: 'max-content' }}
-          },
+      />
-        }}
+      <Drawer title="日志详情" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={520}>
-        scroll={{ x: 'max-content' }}
+        {detail && (
-      />
+          <Descriptions column={1} bordered size="small">
-      <Drawer title="日志详情" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={520}>
+            {Object.entries(detail).map(([k, v]) => (
-        {detail && (
+              <Descriptions.Item key={k} label={k}>
-          <Descriptions column={1} bordered size="small">
+                {typeof v === 'object' ? JSON.stringify(v, null, 2) : String(v ?? '—')}
-            {Object.entries(detail).map(([k, v]) => (
+              </Descriptions.Item>
-              <Descriptions.Item key={k} label={k}>
+            ))}
-                {typeof v === 'object' ? JSON.stringify(v, null, 2) : String(v ?? '—')}
+          </Descriptions>
-              </Descriptions.Item>
+        )}
-            ))}
+      </Drawer>
-          </Descriptions>
+    </div>
-        )}
+  );
-      </Drawer>
+}

apps/admin-web/src/pages/PartnersPage.tsx

@@ -1,410 +1,417 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
-import {
+import {
-  Button,
+  Button,
-  Drawer,
+  Drawer,
-  Form,
+  Form,
-  Input,
+  Input,
-  InputNumber,
+  InputNumber,
-  Modal,
+  Modal,
-  Select,
+  Select,
-  Space,
+  Space,
-  Table,
+  Table,
-  Tabs,
+  Tabs,
-  Tag,
+  Tag,
-  Typography,
+  Typography,
-  message,
+  message,
-} from 'antd';
+} from 'antd';
-import type { ColumnsType } from 'antd/es/table';
+import type { ColumnsType } from 'antd/es/table';
-import {
+import {
-  CITY_PARTNER_SCOPE_LABELS,
+  CITY_PARTNER_SCOPE_LABELS,
-  CityPartnerScopeType,
+  CityPartnerScopeType,
-  PARTNER_PERMISSION_KEYS,
+  PARTNER_PERMISSION_KEYS,
-  PARTNER_PERMISSION_LABELS,
+  PARTNER_PERMISSION_LABELS,
-  type PartnerPermissionKey,
+  type PartnerPermissionKey,
-} from '@dukang/shared-types';
+} from '@dukang/shared-types';
-import { request, type Paginated } from '../lib/api';
+import { request, type Paginated } from '../lib/api';
-import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
+import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
-import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
+import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
-import { useAdminList } from '../lib/useAdminList';
+import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
+
-type Row = {
+
-  id: string;
+type Row = {
-  companyName: string;
+  id: string;
-  phone: string;
+  companyName: string;
-  name: string;
+  phone: string;
-  contactPhone?: string | null;
+  name: string;
-  cityId?: string | null;
+  contactPhone?: string | null;
-  cityName?: string | null;
+  cityId?: string | null;
-  scopeType?: string;
+  cityName?: string | null;
-  districtCodes?: string[] | null;
+  scopeType?: string;
-  orderCommissionRate?: number;
+  districtCodes?: string[] | null;
-  redeemCommissionRate?: number;
+  orderCommissionRate?: number;
-  storeCount: number;
+  redeemCommissionRate?: number;
-  accountCount: number;
+  storeCount: number;
-  createdAt: string;
+  accountCount: number;
-};
+  createdAt: string;
-
+};
-type PartnerDetail = Row & {
+
-  address?: string;
+type PartnerDetail = Row & {
-  districtCodes?: string[] | null;
+  address?: string;
-  bindingStatus?: string;
+  districtCodes?: string[] | null;
-  bankAccountName?: string | null;
+  bindingStatus?: string;
-  bankAccountNo?: string | null;
+  bankAccountName?: string | null;
-  bankBranch?: string | null;
+  bankAccountNo?: string | null;
-  managedWarehouseId?: string | null;
+  bankBranch?: string | null;
-  children?: Array<{
+  managedWarehouseId?: string | null;
-    id: string;
+  children?: Array<{
-    phone: string;
+    id: string;
-    name: string;
+    phone: string;
-    staffRole?: string;
+    name: string;
-    permissions?: string[];
+    staffRole?: string;
-    status: string;
+    permissions?: string[];
-  }>;
+    status: string;
-};
+  }>;
-
+};
-type CityOption = { id: string; name: string; code: string };
+
-type WarehouseOption = { id: string; name: string };
+type CityOption = { id: string; name: string; code: string };
-
+type WarehouseOption = { id: string; name: string };
-const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
+
-const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({ value: k, label: PARTNER_PERMISSION_LABELS[k] }));
+const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
-
+const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({ value: k, label: PARTNER_PERMISSION_LABELS[k] }));
-function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
+
-  if (!values?.length) return [];
+function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
-  if (Array.isArray(values[0])) {
+  if (!values?.length) return [];
-    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
+  if (Array.isArray(values[0])) {
-  }
+    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
-  return values as string[];
+  }
-}
+  return values as string[];
-
+}
-export default function PartnersPage() {
+
-  const [form] = Form.useForm();
+export default function PartnersPage() {
-  const [editForm] = Form.useForm();
+  const [form] = Form.useForm();
-  const [createForm] = Form.useForm();
+  const [editForm] = Form.useForm();
-  const [subForm] = Form.useForm();
+  const [createForm] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [subForm] = Form.useForm();
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
+  const [filters, setFilters] = useState<Record<string, string>>({});
-    '/admin/partners',
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
-    () => {
+    '/admin/partners',
-      const qs = new URLSearchParams();
+    () => {
-      if (filters.companyName) qs.set('companyName', filters.companyName);
+      const qs = new URLSearchParams();
-      if (filters.contactPhone) qs.set('contactPhone', filters.contactPhone);
+      if (filters.companyName) qs.set('companyName', filters.companyName);
-      return qs;
+      if (filters.contactPhone) qs.set('contactPhone', filters.contactPhone);
-    },
+      return qs;
-    [filters],
+    },
-  );
+    [filters],
-  const [detail, setDetail] = useState<PartnerDetail | null>(null);
+  );
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detail, setDetail] = useState<PartnerDetail | null>(null);
-  const [createOpen, setCreateOpen] = useState(false);
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [subOpen, setSubOpen] = useState(false);
+  const [createOpen, setCreateOpen] = useState(false);
-  const [cities, setCities] = useState<CityOption[]>([]);
+  const [subOpen, setSubOpen] = useState(false);
-  const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
+  const [cities, setCities] = useState<CityOption[]>([]);
-  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+  const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
-  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-  const [createCityId, setCreateCityId] = useState<string | undefined>();
+  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-
+  const [createCityId, setCreateCityId] = useState<string | undefined>();
-  const createCityCode = createCityId ? cities.find((c) => c.id === createCityId)?.code : undefined;
+
-  const editCityCode = detail?.cityId ? cities.find((c) => c.id === detail.cityId)?.code : undefined;
+  const createCityCode = createCityId ? cities.find((c) => c.id === createCityId)?.code : undefined;
-
+  const editCityCode = detail?.cityId ? cities.find((c) => c.id === detail.cityId)?.code : undefined;
-  function formatApiError(err: unknown): string | null {
+
-    if (err && typeof err === 'object' && 'errorFields' in err) return null;
+  function formatApiError(err: unknown): string | null {
-    if (!(err instanceof Error)) return '操作失败';
+    if (err && typeof err === 'object' && 'errorFields' in err) return null;
-    return err.message.replace(/\b(\d{6})\b/g, (code) => {
+    if (!(err instanceof Error)) return '操作失败';
-      const label = districtCodeLabel(code);
+    return err.message.replace(/\b(\d{6})\b/g, (code) => {
-      return label !== code ? `${label}(${code})` : code;
+      const label = districtCodeLabel(code);
-    });
+      return label !== code ? `${label}(${code})` : code;
-  }
+    });
-
+  }
-  const loadCities = useCallback(async () => {
+
-    const res = await request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`);
+  const loadCities = useCallback(async () => {
-    setCities(res.items);
+    const res = await request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`);
-  }, []);
+    setCities(res.items);
-
+  }, []);
-  const loadWarehouses = useCallback(async (cityId: string) => {
+
-    const rows = await request<WarehouseOption[]>(`/admin/cities/${cityId}/warehouses`);
+  const loadWarehouses = useCallback(async (cityId: string) => {
-    setWarehouses(rows.map((w) => ({ id: w.id, name: (w as { name: string }).name })));
+    const rows = await request<WarehouseOption[]>(`/admin/cities/${cityId}/warehouses`);
-  }, []);
+    setWarehouses(rows.map((w) => ({ id: w.id, name: (w as { name: string }).name })));
-
+  }, []);
-  useEffect(() => {
+
-    void loadCities();
+  useEffect(() => {
-  }, [loadCities]);
+    void loadCities();
-
+  }, [loadCities]);
-  async function openPartner(id: string) {
+
-    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
+  async function openPartner(id: string) {
-    setDetail(d);
+    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
-    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
+    setDetail(d);
-    if (d.cityId) await loadWarehouses(d.cityId);
+    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
-    editForm.setFieldsValue({
+    if (d.cityId) await loadWarehouses(d.cityId);
-      name: d.name,
+    editForm.setFieldsValue({
-      phone: d.phone,
+      name: d.name,
-      companyName: d.companyName,
+      phone: d.phone,
-      contactPhone: d.contactPhone ?? d.phone,
+      companyName: d.companyName,
-      address: d.address ?? '',
+      contactPhone: d.contactPhone ?? d.phone,
-      scopeType: d.scopeType,
+      address: d.address ?? '',
-      districtCodes: d.districtCodes ?? [],
+      scopeType: d.scopeType,
-      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
+      districtCodes: d.districtCodes ?? [],
-      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
+      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
-      bindingStatus: d.bindingStatus,
+      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
-      managedWarehouseId: d.managedWarehouseId,
+      bindingStatus: d.bindingStatus,
-      bankAccountName: d.bankAccountName ?? '',
+      managedWarehouseId: d.managedWarehouseId,
-      bankAccountNo: d.bankAccountNo ?? '',
+      bankAccountName: d.bankAccountName ?? '',
-      bankBranch: d.bankBranch ?? '',
+      bankAccountNo: d.bankAccountNo ?? '',
-    });
+      bankBranch: d.bankBranch ?? '',
-    setDrawerOpen(true);
+    });
-  }
+    setDrawerOpen(true);
-
+  }
-  async function savePartner() {
+
-    if (!detail) return;
+  async function savePartner() {
-    try {
+    if (!detail) return;
-      const v = await editForm.validateFields();
+    try {
-      const body = {
+      const v = await editForm.validateFields();
-        ...v,
+      const body = {
-        orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+        ...v,
-        redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+        orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-        districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+        redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-      };
+        districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-      await request(`/admin/partners/${detail.id}`, { method: 'PUT', body: JSON.stringify(body) });
+      };
-      message.success('已保存');
+      await request(`/admin/partners/${detail.id}`, { method: 'PUT', body: JSON.stringify(body) });
-      setDrawerOpen(false);
+      message.success('已保存');
-      void reload();
+      setDrawerOpen(false);
-    } catch (e) {
+      void reload();
-      const msg = formatApiError(e);
+    } catch (e) {
-      if (msg) message.error(msg);
+      const msg = formatApiError(e);
-    }
+      if (msg) message.error(msg);
-  }
+    }
-
+  }
-  const baseColumns: ColumnsType<Row> = [
+
-    { title: '城市', dataIndex: 'cityName', width: 100 },
+  const baseColumns: ColumnsType<Row> = [
-    {
+    { title: '城市', dataIndex: 'cityName', width: 100 },
-      title: '区县',
+    {
-      dataIndex: 'districtCodes',
+      title: '区县',
-      width: 160,
+      dataIndex: 'districtCodes',
-
+      width: 160,
-      render: (codes: string[] | null | undefined, row) =>
+      render: (codes: string[] | null | undefined, row) =>
-        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
+        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
-    },
+    },
-    { title: '公司名', dataIndex: 'companyName' },
+    {
-    { title: '主账号', dataIndex: 'phone', width: 130 },
+      title: '公司名',
-    {
+      dataIndex: 'companyName',
-      title: '管辖',
+      render: (v, row) => (
-      dataIndex: 'scopeType',
+        <AdminPrimaryLink onClick={() => void openPartner(row.id)}>{v}</AdminPrimaryLink>
-      width: 100,
+      ),
-      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
+    },
-    },
+    { title: '主账号', dataIndex: 'phone', width: 130 },
-    { title: '门店', dataIndex: 'storeCount', width: 70 },
+    {
-    { title: '子账号', dataIndex: 'accountCount', width: 80, render: (n) => Math.max(0, n - 1) },
+      title: '管辖',
-    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
+      dataIndex: 'scopeType',
-    {
+      width: 100,
-      title: '操作',
+      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
-      width: 120,
+    },
-      render: (_, row) => (
+    { title: '门店', dataIndex: 'storeCount', width: 70 },
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+    { title: '子账号', dataIndex: 'accountCount', width: 80, render: (n) => Math.max(0, n - 1) },
-          管理
+    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
-        </Button>
+    {
-      ),
+      title: '操作',
-    },
+      width: 120,
-  ];
+      render: (_, row) => (
+        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+          管理
+        </Button>
+      ),
+    },
+  ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('partners', baseColumns, { page, pageSize });
 
-
+  return (
     <div>
-    <div>
+      {settingsModal}
-      {settingsModal}
+      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>开城合伙人</Typography.Title>
-        <Typography.Title level={4} style={{ margin: 0 }}>开城合伙人</Typography.Title>
+          {settingsButton}
-          {settingsButton}
+        <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
-        <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
+          新建城市合伙人
-          新建城市合伙人
+        </Button>
-        </Button>
+      </Space>
-      </Space>
+      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
+        <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
-        <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
+        <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>
-        <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>
+        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
-        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
+      </Form>
-      </Form>
+      <Table
-      <Table
+        rowKey="id"
-        rowKey="id"
+        className="admin-table-nowrap"
-        className="admin-table-nowrap"
+        loading={loading}
-        loading={loading}
+        columns={columns}
-        columns={columns}
+        dataSource={data?.items ?? []}
-        dataSource={data?.items ?? []}
+        pagination={{
-        pagination={{
+          current: page,
-          current: page,
+          pageSize,
-          pageSize,
+          total: data?.total ?? 0,
-          total: data?.total ?? 0,
+          showSizeChanger: true,
-          showSizeChanger: true,
+          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
-          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
+        }}
-        }}
+      />
-      />
+
-
+      <Drawer
-      <Drawer
+        title="城市合伙人"
-        title="城市合伙人"
+        width={640}
-        width={640}
+        open={drawerOpen}
-        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
-        onClose={() => setDrawerOpen(false)}
+        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
-        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
+      >
-      >
+        {detail && (
-        {detail && (
+          <Tabs
-          <Tabs
+            items={[
-            items={[
+              {
-              {
+                key: 'info',
-                key: 'info',
+                label: '基本信息',
-                label: '基本信息',
+                children: (
-                children: (
+                  <Form form={editForm} layout="vertical">
-                  <Form form={editForm} layout="vertical">
+                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="contactPhone" label="业务联系电话"><Input /></Form.Item>
-                    <Form.Item name="contactPhone" label="业务联系电话"><Input /></Form.Item>
+                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
-                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
+                    </Form.Item>
-                    </Form.Item>
+                    {editScopeType === CityPartnerScopeType.DISTRICT && (
-                    {editScopeType === CityPartnerScopeType.DISTRICT && (
+                      <Form.Item
-                      <Form.Item
+                        name="districtCodes"
-                        name="districtCodes"
+                        label="区县"
-                        label="区县"
+                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
-                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
+                      >
-                      >
+                        <CityDistrictMultiSelect cityCode={editCityCode} />
-                        <CityDistrictMultiSelect cityCode={editCityCode} />
+                      </Form.Item>
-                      </Form.Item>
+                    )}
-                    )}
+                    <Space style={{ width: '100%' }} size="large">
-                    <Space style={{ width: '100%' }} size="large">
+                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                    </Space>
-                    </Space>
+                    <Form.Item name="managedWarehouseId" label="管仓仓库">
-                    <Form.Item name="managedWarehouseId" label="管仓仓库">
+                      <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
-                      <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
+                    </Form.Item>
-                    </Form.Item>
+                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
-                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
+                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
-                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
+                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
-                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
+                  </Form>
-                  </Form>
+                ),
-                ),
+              },
-              },
+              {
-              {
+                key: 'staff',
-                key: 'staff',
+                label: '子账号',
-                label: '子账号',
+                children: (
-                children: (
+                  <>
-                  <>
+                    <Button type="primary" style={{ marginBottom: 12 }} onClick={() => { subForm.resetFields(); setSubOpen(true); }}>
-                    <Button type="primary" style={{ marginBottom: 12 }} onClick={() => { subForm.resetFields(); setSubOpen(true); }}>
+                      添加子账号
-                      添加子账号
+                    </Button>
-                    </Button>
+                    <Table
-                    <Table
+                      size="small"
-                      size="small"
+                      rowKey="id"
-                      rowKey="id"
+                      pagination={false}
-                      pagination={false}
+                      dataSource={detail.children ?? []}
-                      dataSource={detail.children ?? []}
+                      columns={[
-                      columns={[
+                        { title: '姓名', dataIndex: 'name' },
-                        { title: '姓名', dataIndex: 'name' },
+                        { title: '手机', dataIndex: 'phone' },
-                        { title: '手机', dataIndex: 'phone' },
+                        { title: '状态', dataIndex: 'status', render: (s) => <Tag>{s}</Tag> },
-                        { title: '状态', dataIndex: 'status', render: (s) => <Tag>{s}</Tag> },
+                        {
-                        {
+                          title: '权限',
-                          title: '权限',
+                          dataIndex: 'permissions',
-                          dataIndex: 'permissions',
+                          render: (p: string[] | undefined) => p?.map((k) => PARTNER_PERMISSION_LABELS[k as keyof typeof PARTNER_PERMISSION_LABELS] || k).join('、') || '—',
-                          render: (p: string[] | undefined) => p?.map((k) => PARTNER_PERMISSION_LABELS[k as keyof typeof PARTNER_PERMISSION_LABELS] || k).join('、') || '—',
+                        },
-                        },
+                      ]}
-                      ]}
+                    />
-                    />
+                  </>
-                  </>
+                ),
-                ),
+              },
-              },
+            ]}
-            ]}
+          />
-          />
+        )}
-        )}
+      </Drawer>
-      </Drawer>
+
-
+      <Modal
-      <Modal
+        title="新建城市合伙人"
-        title="新建城市合伙人"
+        open={createOpen}
-        open={createOpen}
+        width={560}
-        width={560}
+        onCancel={() => setCreateOpen(false)}
-        onCancel={() => setCreateOpen(false)}
+        onOk={async () => {
-        onOk={async () => {
+          try {
-          try {
+            const v = await createForm.validateFields();
-            const v = await createForm.validateFields();
+            await request('/admin/partners', {
-            await request('/admin/partners', {
+              method: 'POST',
-              method: 'POST',
+              body: JSON.stringify({
-              body: JSON.stringify({
+                ...v,
-                ...v,
+                orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-                orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+                redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-                redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+                districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-                districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+              }),
-              }),
+            });
-            });
+            message.success('已创建');
-            message.success('已创建');
+            setCreateOpen(false);
-            setCreateOpen(false);
+            createForm.resetFields();
-            createForm.resetFields();
+            void reload();
-            void reload();
+          } catch (e) {
-          } catch (e) {
+            const msg = formatApiError(e);
-            const msg = formatApiError(e);
+            if (msg) message.error(msg);
-            if (msg) message.error(msg);
+          }
-          }
+        }}
-        }}
+      >
-      >
+        <Form form={createForm} layout="vertical" initialValues={{ orderCommissionRate: 0, redeemCommissionRate: 3, scopeType: CityPartnerScopeType.CITY_WIDE }}>
-        <Form form={createForm} layout="vertical" initialValues={{ orderCommissionRate: 0, redeemCommissionRate: 3, scopeType: CityPartnerScopeType.CITY_WIDE }}>
+          <Form.Item name="cityId" label="开城城市" rules={[{ required: true }]}>
-          <Form.Item name="cityId" label="开城城市" rules={[{ required: true }]}>
+            <Select
-            <Select
+              options={cities.map((c) => ({ value: c.id, label: `${c.name} (${c.code})` }))}
-              options={cities.map((c) => ({ value: c.id, label: `${c.name} (${c.code})` }))}
+              onChange={(id) => {
-              onChange={(id) => {
+                setCreateCityId(id);
-                setCreateCityId(id);
+                createForm.setFieldsValue({ districtCodes: undefined });
-                createForm.setFieldsValue({ districtCodes: undefined });
+                void loadWarehouses(id);
-                void loadWarehouses(id);
+              }}
-              }}
+            />
-            />
+          </Form.Item>
-          </Form.Item>
+          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
-            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
+          </Form.Item>
-          </Form.Item>
+          {createScopeType === CityPartnerScopeType.DISTRICT && (
-          {createScopeType === CityPartnerScopeType.DISTRICT && (
+            <Form.Item
-            <Form.Item
+              name="districtCodes"
-              name="districtCodes"
+              label="区县"
-              label="区县"
+              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
-              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
+            >
-            >
+              <CityDistrictMultiSelect cityCode={createCityCode} />
-              <CityDistrictMultiSelect cityCode={createCityCode} />
+            </Form.Item>
-            </Form.Item>
+          )}
-          )}
+          <Space style={{ width: '100%' }} size="large">
-          <Space style={{ width: '100%' }} size="large">
+            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+          </Space>
-          </Space>
+          {createCityId && (
-          {createCityId && (
+            <Form.Item name="managedWarehouseId" label="管仓仓库（可选）">
-            <Form.Item name="managedWarehouseId" label="管仓仓库（可选）">
+              <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
-              <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
+            </Form.Item>
-            </Form.Item>
+          )}
-          )}
+        </Form>
-        </Form>
+      </Modal>
-      </Modal>
+
-
+      <Modal
-      <Modal
+        title="添加子账号"
-        title="添加子账号"
+        open={subOpen}
-        open={subOpen}
+        onCancel={() => setSubOpen(false)}
-        onCancel={() => setSubOpen(false)}
+        onOk={async () => {
-        onOk={async () => {
+          if (!detail) return;
-          if (!detail) return;
+          const v = await subForm.validateFields();
-          const v = await subForm.validateFields();
+          await request('/admin/partner-accounts', {
-          await request('/admin/partner-accounts', {
+            method: 'POST',
-            method: 'POST',
+            body: JSON.stringify({ ...v, parentAccountId: detail.id }),
-            body: JSON.stringify({ ...v, parentAccountId: detail.id }),
+          });
-          });
+          message.success('已创建');
-          message.success('已创建');
+          setSubOpen(false);
-          setSubOpen(false);
+          void openPartner(detail.id);
-          void openPartner(detail.id);
+        }}
-        }}
+      >
-      >
+        <Form form={subForm} layout="vertical">
-        <Form form={subForm} layout="vertical">
+          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="permissions" label="权限">
-          <Form.Item name="permissions" label="权限">
+            <Select mode="multiple" options={PERM_OPTIONS} />
-            <Select mode="multiple" options={PERM_OPTIONS} />
+          </Form.Item>
-          </Form.Item>
+        </Form>
-        </Form>
+      </Modal>
-      </Modal>
+    </div>
-    </div>
+  );
-  );
+}

apps/admin-web/src/pages/PendingRedeemPage.tsx

@@ -1,271 +1,279 @@
-import { useState } from 'react';
+import { useState } from 'react';
-import {
+import {
-  Button,
+  Button,
-  Descriptions,
+  Descriptions,
-  Drawer,
+  Drawer,
-  Form,
+  Form,
-  Image,
+  Image,
-  Input,
+  Input,
-  Modal,
+  Modal,
-  Select,
+  Select,
-  Space,
+  Space,
-  Table,
+  Table,
-  Tag,
+  Tag,
-  Typography,
+  Typography,
-  message,
+  message,
-} from 'antd';
+} from 'antd';
-import type { ColumnsType } from 'antd/es/table';
+import type { ColumnsType } from 'antd/es/table';
-import {
+import {
-  REDEEM_PENDING_STATUS_LABELS,
+  REDEEM_PENDING_STATUS_LABELS,
-  type RedeemPendingItem,
+  type RedeemPendingItem,
-  type RedeemPendingStatus,
+  type RedeemPendingStatus,
-} from '@dukang/shared-types';
+} from '@dukang/shared-types';
-import { request } from '../lib/api';
+import { request } from '../lib/api';
-import { fmtTime } from '../lib/constants';
+import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
+
-const STATUS_COLOR: Record<RedeemPendingStatus, string> = {
+
-  PENDING: 'orange',
+const STATUS_COLOR: Record<RedeemPendingStatus, string> = {
-  COMPLETED: 'green',
+  PENDING: 'orange',
-  REJECTED: 'default',
+  COMPLETED: 'green',
-};
+  REJECTED: 'default',
-
+};
-export default function PendingRedeemPage() {
+
-  const [form] = Form.useForm();
+export default function PendingRedeemPage() {
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [form] = Form.useForm();
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<RedeemPendingItem>(
+  const [filters, setFilters] = useState<Record<string, string>>({});
-    '/admin/redeem-pending',
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<RedeemPendingItem>(
-    () => {
+    '/admin/redeem-pending',
-      const qs = new URLSearchParams();
+    () => {
-      if (filters.status) qs.set('status', filters.status);
+      const qs = new URLSearchParams();
-      if (filters.pendingNo) qs.set('pendingNo', filters.pendingNo);
+      if (filters.status) qs.set('status', filters.status);
-      if (filters.redeemToken) qs.set('redeemToken', filters.redeemToken);
+      if (filters.pendingNo) qs.set('pendingNo', filters.pendingNo);
-      if (filters.storeId) qs.set('storeId', filters.storeId);
+      if (filters.redeemToken) qs.set('redeemToken', filters.redeemToken);
-      return qs;
+      if (filters.storeId) qs.set('storeId', filters.storeId);
-    },
+      return qs;
-    [filters],
+    },
-  );
+    [filters],
-  const [detail, setDetail] = useState<RedeemPendingItem | null>(null);
+  );
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detail, setDetail] = useState<RedeemPendingItem | null>(null);
-  const [acting, setActing] = useState(false);
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [rejectOpen, setRejectOpen] = useState(false);
+  const [acting, setActing] = useState(false);
-  const [rejectReason, setRejectReason] = useState('');
+  const [rejectOpen, setRejectOpen] = useState(false);
-
+  const [rejectReason, setRejectReason] = useState('');
-  async function openDetail(id: string) {
+
-    const res = await request<RedeemPendingItem>(`/admin/redeem-pending/${id}`);
+  async function openDetail(id: string) {
-    setDetail(res);
+    const res = await request<RedeemPendingItem>(`/admin/redeem-pending/${id}`);
-    setDrawerOpen(true);
+    setDetail(res);
-  }
+    setDrawerOpen(true);
-
+  }
-  async function complete() {
+
-    if (!detail) return;
+  async function complete() {
-    setActing(true);
+    if (!detail) return;
-    try {
+    setActing(true);
-      await request(`/admin/redeem-pending/${detail.id}/complete`, { method: 'POST', body: '{}' });
+    try {
-      message.success('已补核销');
+      await request(`/admin/redeem-pending/${detail.id}/complete`, { method: 'POST', body: '{}' });
-      setDrawerOpen(false);
+      message.success('已补核销');
-      void reload();
+      setDrawerOpen(false);
-    } catch (e) {
+      void reload();
-      message.error(e instanceof Error ? e.message : '补核销失败');
+    } catch (e) {
-    } finally {
+      message.error(e instanceof Error ? e.message : '补核销失败');
-      setActing(false);
+    } finally {
-    }
+      setActing(false);
-  }
+    }
-
+  }
-  async function reject() {
+
-    if (!detail || !rejectReason.trim()) {
+  async function reject() {
-      message.error('请填写驳回原因');
+    if (!detail || !rejectReason.trim()) {
-      return;
+      message.error('请填写驳回原因');
-    }
+      return;
-    setActing(true);
+    }
-    try {
+    setActing(true);
-      await request(`/admin/redeem-pending/${detail.id}/reject`, {
+    try {
-        method: 'POST',
+      await request(`/admin/redeem-pending/${detail.id}/reject`, {
-        body: JSON.stringify({ reason: rejectReason.trim() }),
+        method: 'POST',
-      });
+        body: JSON.stringify({ reason: rejectReason.trim() }),
-      message.success('已驳回');
+      });
-      setRejectOpen(false);
+      message.success('已驳回');
-      setDrawerOpen(false);
+      setRejectOpen(false);
-      void reload();
+      setDrawerOpen(false);
-    } catch (e) {
+      void reload();
-      message.error(e instanceof Error ? e.message : '驳回失败');
+    } catch (e) {
-    } finally {
+      message.error(e instanceof Error ? e.message : '驳回失败');
-      setActing(false);
+    } finally {
-    }
+      setActing(false);
-  }
+    }
-
+  }
-  const baseColumns: ColumnsType<RedeemPendingItem> = [
+
-    { title: '待处理单号', dataIndex: 'pendingNo', width: 170 },
+  const baseColumns: ColumnsType<RedeemPendingItem> = [
-    {
+    {
-      title: '核销码 ID',
+      title: '待处理单号',
-      dataIndex: 'redeemToken',
+      dataIndex: 'pendingNo',
-      width: 160,
+      width: 170,
-
+      render: (v, row) => (
-      render: (v: string) => <Typography.Text copyable={{ text: v }}>{v.slice(0, 8)}…</Typography.Text>,
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
-    },
+      ),
-    { title: '门店', dataIndex: ['store', 'name'], width: 140, render: (_, row) => row.store?.name || '—' },
+    },
-    {
+    {
-      title: '用户',
+      title: '核销码 ID',
-      width: 120,
+      dataIndex: 'redeemToken',
-      render: (_, row) => row.user?.userNo || row.user?.phone || '—',
+      width: 160,
-    },
+      render: (v: string) => <Typography.Text copyable={{ text: v }}>{v.slice(0, 8)}…</Typography.Text>,
-    { title: '金额', dataIndex: 'amount', width: 90, render: (v) => `¥${v}` },
+    },
-    { title: '失败次数', dataIndex: 'failCount', width: 90 },
+    { title: '门店', dataIndex: ['store', 'name'], width: 140, render: (_, row) => row.store?.name || '—' },
-    {
+    {
-      title: '状态',
+      title: '用户',
-      dataIndex: 'status',
+      width: 120,
-      width: 100,
+      render: (_, row) => row.user?.userNo || row.user?.phone || '—',
-      render: (s: RedeemPendingStatus) => (
+    },
-        <Tag color={STATUS_COLOR[s]}>{REDEEM_PENDING_STATUS_LABELS[s] || s}</Tag>
+    { title: '金额', dataIndex: 'amount', width: 90, render: (v) => `¥${v}` },
-      ),
+    { title: '失败次数', dataIndex: 'failCount', width: 90 },
-    },
+    {
-    { title: '提交时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+      title: '状态',
-    {
+      dataIndex: 'status',
-      title: '操作',
+      width: 100,
-      width: 80,
+      render: (s: RedeemPendingStatus) => (
-      fixed: 'right',
+        <Tag color={STATUS_COLOR[s]}>{REDEEM_PENDING_STATUS_LABELS[s] || s}</Tag>
-      render: (_, row) => (
+      ),
-        <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+    },
-          详情
+    { title: '提交时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-        </Button>
+    {
-      ),
+      title: '操作',
-    },
+      width: 80,
-  ];
+      fixed: 'right',
+      render: (_, row) => (
+        <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+          详情
+        </Button>
+      ),
+    },
+  ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('redeem-pending', baseColumns, { page, pageSize });
 
-
+  return (
     <div>
-    <div>
+      {settingsModal}
       <Typography.Title level={4}>待处理核销（弱网兜底）</Typography.Title>
-      <Typography.Title level={4}>待处理核销（弱网兜底）</Typography.Title>
+          {settingsButton}
-          {settingsButton}
+      <Form
-      <Form
+        form={form}
-        form={form}
+        layout="inline"
-        layout="inline"
+        style={{ marginBottom: 16 }}
-        style={{ marginBottom: 16 }}
+        onFinish={(v) => {
-        onFinish={(v) => {
+          setFilters(v);
-          setFilters(v);
+          setPage(1);
-          setPage(1);
+        }}
-        }}
+      >
-      >
+        <Form.Item name="pendingNo" label="待处理单号">
-        <Form.Item name="pendingNo" label="待处理单号">
+          <Input allowClear />
-          <Input allowClear />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item name="redeemToken" label="核销码 ID">
-        <Form.Item name="redeemToken" label="核销码 ID">
+          <Input allowClear />
-          <Input allowClear />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item name="storeId" label="门店 ID">
-        <Form.Item name="storeId" label="门店 ID">
+          <Input allowClear />
-          <Input allowClear />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item name="status" label="状态">
-        <Form.Item name="status" label="状态">
+          <Select
-          <Select
+            allowClear
-            allowClear
+            style={{ width: 120 }}
-            style={{ width: 120 }}
+            options={Object.entries(REDEEM_PENDING_STATUS_LABELS).map(([value, label]) => ({
-            options={Object.entries(REDEEM_PENDING_STATUS_LABELS).map(([value, label]) => ({
+              value,
-              value,
+              label,
-              label,
+            }))}
-            }))}
+          />
-          />
+        </Form.Item>
-        </Form.Item>
+        <Form.Item>
-        <Form.Item>
+          <Button type="primary" htmlType="submit">
-          <Button type="primary" htmlType="submit">
+            查询
-            查询
+          </Button>
-          </Button>
+        </Form.Item>
-        </Form.Item>
+      </Form>
-      </Form>
+
-
+      <Table
-      <Table
+        rowKey="id"
-        rowKey="id"
+        loading={loading}
-        loading={loading}
+        columns={columns}
-        columns={columns}
+        dataSource={data?.items ?? []}
-        dataSource={data?.items ?? []}
+        scroll={{ x: 'max-content' }}
-        scroll={{ x: 'max-content' }}
+        pagination={{
-        pagination={{
+          current: page,
-          current: page,
+          pageSize,
-          pageSize,
+          total: data?.total ?? 0,
-          total: data?.total ?? 0,
+          showSizeChanger: true,
-          showSizeChanger: true,
+          onChange: (p, ps) => {
-          onChange: (p, ps) => {
+            setPage(p);
-            setPage(p);
+            setPageSize(ps);
-            setPageSize(ps);
+          },
-          },
+        }}
-        }}
+      />
-      />
+
-
+      <Drawer
-      <Drawer
+        title="待处理核销详情"
-        title="待处理核销详情"
+        width={560}
-        width={560}
+        open={drawerOpen}
-        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
-        onClose={() => setDrawerOpen(false)}
+        extra={
-        extra={
+          detail?.status === 'PENDING' && (
-          detail?.status === 'PENDING' && (
+            <Space>
-            <Space>
+              <Button danger onClick={() => { setRejectReason(''); setRejectOpen(true); }}>
-              <Button danger onClick={() => { setRejectReason(''); setRejectOpen(true); }}>
+                驳回
-                驳回
+              </Button>
-              </Button>
+              <Button type="primary" loading={acting} onClick={() => void complete()}>
-              <Button type="primary" loading={acting} onClick={() => void complete()}>
+                人工补核销
-                人工补核销
+              </Button>
-              </Button>
+            </Space>
-            </Space>
+          )
-          )
+        }
-        }
+      >
-      >
+        {detail && (
-        {detail && (
+          <>
-          <>
+            {detail.photoUrl && (
-            {detail.photoUrl && (
+              <div style={{ textAlign: 'center', marginBottom: 16 }}>
-              <div style={{ textAlign: 'center', marginBottom: 16 }}>
+                <Image src={detail.photoUrl} alt="核销码照片" style={{ maxHeight: 280 }} />
-                <Image src={detail.photoUrl} alt="核销码照片" style={{ maxHeight: 280 }} />
+              </div>
-              </div>
+            )}
-            )}
+            <Descriptions column={1} bordered size="small">
-            <Descriptions column={1} bordered size="small">
+              <Descriptions.Item label="待处理单号">{detail.pendingNo}</Descriptions.Item>
-              <Descriptions.Item label="待处理单号">{detail.pendingNo}</Descriptions.Item>
+              <Descriptions.Item label="核销码 ID">
-              <Descriptions.Item label="核销码 ID">
+                <Typography.Text copyable>{detail.redeemToken}</Typography.Text>
-                <Typography.Text copyable>{detail.redeemToken}</Typography.Text>
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="状态">
-              <Descriptions.Item label="状态">
+                <Tag color={STATUS_COLOR[detail.status]}>
-                <Tag color={STATUS_COLOR[detail.status]}>
+                  {REDEEM_PENDING_STATUS_LABELS[detail.status]}
-                  {REDEEM_PENDING_STATUS_LABELS[detail.status]}
+                </Tag>
-                </Tag>
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="金额">¥{detail.amount}</Descriptions.Item>
-              <Descriptions.Item label="金额">¥{detail.amount}</Descriptions.Item>
+              <Descriptions.Item label="类型">{detail.redeemType}</Descriptions.Item>
-              <Descriptions.Item label="类型">{detail.redeemType}</Descriptions.Item>
+              <Descriptions.Item label="失败次数">{detail.failCount}</Descriptions.Item>
-              <Descriptions.Item label="失败次数">{detail.failCount}</Descriptions.Item>
+              <Descriptions.Item label="门店">
-              <Descriptions.Item label="门店">
+                {detail.store?.name || '—'}（{detail.store?.id}）
-                {detail.store?.name || '—'}（{detail.store?.id}）
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="用户">
-              <Descriptions.Item label="用户">
+                {detail.user?.userNo || '—'} / {detail.user?.phone || '无手机'}
-                {detail.user?.userNo || '—'} / {detail.user?.phone || '无手机'}
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="关联核销单">
-              <Descriptions.Item label="关联核销单">
+                {detail.redeemRecord?.redeemNo || '—'}
-                {detail.redeemRecord?.redeemNo || '—'}
+              </Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="驳回原因">{detail.rejectReason || '—'}</Descriptions.Item>
-              <Descriptions.Item label="驳回原因">{detail.rejectReason || '—'}</Descriptions.Item>
+              <Descriptions.Item label="备注">{detail.remark || '—'}</Descriptions.Item>
-              <Descriptions.Item label="备注">{detail.remark || '—'}</Descriptions.Item>
+              <Descriptions.Item label="提交时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
-              <Descriptions.Item label="提交时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
+              <Descriptions.Item label="处理时间">
-              <Descriptions.Item label="处理时间">
+                {detail.processedAt ? fmtTime(detail.processedAt) : '—'}
-                {detail.processedAt ? fmtTime(detail.processedAt) : '—'}
+              </Descriptions.Item>
-              </Descriptions.Item>
+            </Descriptions>
-            </Descriptions>
+          </>
-          </>
+        )}
-        )}
+      </Drawer>
-      </Drawer>
+
-
+      <Modal
-      <Modal
+        title="驳回待处理单"
-        title="驳回待处理单"
+        open={rejectOpen}
-        open={rejectOpen}
+        okText="确认驳回"
-        okText="确认驳回"
+        okButtonProps={{ danger: true, loading: acting, disabled: !rejectReason.trim() }}
-        okButtonProps={{ danger: true, loading: acting, disabled: !rejectReason.trim() }}
+        onOk={() => void reject()}
-        onOk={() => void reject()}
+        onCancel={() => setRejectOpen(false)}
-        onCancel={() => setRejectOpen(false)}
+      >
-      >
+        <Input.TextArea
-        <Input.TextArea
+          rows={3}
-          rows={3}
+          placeholder="请填写驳回原因"
-          placeholder="请填写驳回原因"
+          value={rejectReason}
-          value={rejectReason}
+          onChange={(e) => setRejectReason(e.target.value)}
-          onChange={(e) => setRejectReason(e.target.value)}
+        />
-        />
+      </Modal>
-      </Modal>
+    </div>
-    </div>
+  );
-  );
+}

apps/admin-web/src/pages/ProductDetailTemplatesPage.tsx

@@ -14,6 +14,7 @@ import DetailImageUrlList from '../components/DetailImageUrlList';
 import type { ProductDetailTemplateDto } from '../lib/product-detail-templates';
 import { TEMPLATE_MAX_DETAIL_IMAGES } from '../lib/product-detail-templates';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = ProductDetailTemplateDto;
@@ -140,7 +141,23 @@ export default function ProductDetailTemplatesPage() {
 
   const baseColumns: ColumnsType<Row> = [
     { title: '编码', dataIndex: 'code', width: 120 },
-    { title: '名称', dataIndex: 'name', width: 120 },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 120,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            const d = await request<Record<string, unknown>>(`/admin/product-detail-templates/${row.id}`);
+            setDetail(d);
+            editForm.setFieldsValue(mapToForm(d));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     { title: '说明', dataIndex: 'description', width: 200 },
     { title: '香型', dataIndex: 'aromaType', width: 90, render: (v) => (v ? AROMA_TYPE_LABELS[v] || v : '—') },
     { title: '详情图', dataIndex: 'detailImageUrls', width: 80, render: (v: string[] | undefined) => v?.length ?? 0 },

apps/admin-web/src/pages/ProductsPage.tsx

@@ -15,6 +15,7 @@ import ProductDetailTemplatePicker from '../components/ProductDetailTemplatePick
 import ProductSpecsEditor from '../components/ProductSpecsEditor';
 import type { FormInstance } from 'antd/es/form';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type ProductDetailContentDto = {
@@ -391,7 +392,14 @@ export default function ProductsPage() {
 
   const baseColumns: ColumnsType<Row> = useMemo(() => [
     { title: '香型', dataIndex: 'aromaType', width: 80, render: (v) => AROMA_TYPE_LABELS[v] || v },
-    { title: '品名', dataIndex: 'name', width: 200 },
+    { title: '品名', dataIndex: 'name', width: 200, render: (v, row) => (
+      <AdminPrimaryLink onClick={async () => {
+        const d = await request<Record<string, unknown>>(`/admin/products/${row.id}`);
+        setDetail(d);
+        editForm.setFieldsValue(mapDetailToForm(d));
+        setDrawerOpen(true);
+      }}>{v}</AdminPrimaryLink>
+    ) },
     {
       title: '累计销售',
       dataIndex: 'soldBottles',

apps/admin-web/src/pages/PromoCodesPage.tsx

@@ -15,6 +15,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = PromoCodeItem;
@@ -77,7 +78,14 @@ export default function PromoCodesPage() {
   }, []);
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '名称', dataIndex: 'name', width: 160 },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 160,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => navigate(`/promo-codes/${row.id}`)}>{v}</AdminPrimaryLink>
+      ),
+    },
     { title: '码值', dataIndex: 'code', width: 110 },
     {
       title: '场景',

apps/admin-web/src/pages/RedeemRecordsPage.tsx

@@ -8,6 +8,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -84,7 +85,7 @@ export default function RedeemRecordsPage() {
       width: 200,
       render: (v, row) => (
         <span>
-          {v}
+          <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
           {row.isTest ? (
             <Tag color="orange" style={{ marginLeft: 6 }}>
               测试

apps/admin-web/src/pages/StoreAccountsPage.tsx

@@ -7,6 +7,7 @@ import { request, type Paginated } from '../lib/api';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, STORE_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type StoreBrief = { id: string; name: string; status: string; cityName?: string };
@@ -83,7 +84,14 @@ export default function StoreAccountsPage() {
       width: 120,
       render: (v, row) => (
         <Space size={4}>
-          <span>{v}</span>
+          <AdminPrimaryLink
+            onClick={async () => {
+              setDetail(await request(`/admin/store-accounts/${row.id}`));
+              setDrawerOpen(true);
+            }}
+          >
+            {v}
+          </AdminPrimaryLink>
           {row.isTest ? <Tag color="orange">测试</Tag> : null}
         </Space>
       ),

apps/admin-web/src/pages/StoreCategoriesPage.tsx

@@ -5,6 +5,7 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type CategoryNode = {
@@ -130,7 +131,7 @@ export default function StoreCategoriesPage() {
       render: (name, row) => (
         <span style={{ paddingLeft: row.level === 2 ? 24 : 0 }}>
           {row.level === 2 ? `${row.parentName || ''} / ` : ''}
-          {name}
+          <AdminPrimaryLink onClick={() => openEdit(row)}>{name}</AdminPrimaryLink>
         </span>
       ),
     },

apps/admin-web/src/pages/StoreLogsPage.tsx

@@ -13,6 +13,7 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -103,7 +104,23 @@ export default function StoreLogsPage() {
         <Tag>{STORE_LOG_CATEGORY_LABELS[v ?? ''] || resolveStoreLogCategory(r.eventName) || '其他'}</Tag>
       ),
     },
-    { title: '事件', dataIndex: 'eventName', width: 160 },
+    {
+      title: '事件',
+      dataIndex: 'eventName',
+      width: 160,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            const parsed = parseCompositeId(row.id);
+            if (!parsed) return;
+            setDetail(await request(`/admin/logs/stores/${parsed.source}/${parsed.rawId}`));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '来源', dataIndex: 'source', width: 100,
       render: (v: Row['source']) => SOURCE_LABELS[v] || v,

apps/admin-web/src/pages/StoreMediaPage.tsx

@@ -8,6 +8,7 @@ import { ADMIN_OPTIONS_PAGE_SIZE, MEDIA_TYPE_LABELS, fmtTime } from '../lib/cons
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -43,7 +44,22 @@ export default function StoreMediaPage() {
   }
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '门店', dataIndex: ['store', 'name'], width: 140 },
+    {
+      title: '门店',
+      dataIndex: ['store', 'name'],
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={() => {
+            setEditing(row);
+            editForm.setFieldsValue(row);
+            setEditOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     { title: '类型', dataIndex: 'mediaType', width: 80, render: (t) => <Tag>{MEDIA_TYPE_LABELS[t] || t}</Tag> },
     {
       title: '预览', dataIndex: 'url', width: 100,

apps/admin-web/src/pages/StorePackageAuditsPage.tsx

@@ -33,6 +33,7 @@ import { notifyPackageAuditChanged } from '../lib/admin-events';
 import { fmtTime } from '../lib/constants';
 import StorePackageAuditPanel from '../components/StorePackageAuditPanel';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
   PENDING: '待审核',
@@ -199,7 +200,15 @@ function InfoChangeAuditPanel({
   }
 
   const columns: ColumnsType<StoreInfoChangeRequestDto> = [
-    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
+    {
+      title: '门店',
+      dataIndex: 'storeName',
+      render: (_, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>
+          {row.storeName || row.storeId}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -471,7 +480,15 @@ export default function StorePackageAuditsPage() {
   }
 
   const baseColumns: ColumnsType<StorePackageChangeRequestDto> = [
-    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
+    {
+      title: '门店',
+      dataIndex: 'storeName',
+      render: (_, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>
+          {row.storeName || row.storeId}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '状态',
       dataIndex: 'status',

apps/admin-web/src/pages/StoreWithdrawalsPage.tsx

@@ -21,6 +21,7 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -156,7 +157,7 @@ export default function StoreWithdrawalsPage() {
       width: 180,
       render: (v, row) => (
         <Space>
-          <Typography.Link onClick={() => void openDetail(row.id)}>{v}</Typography.Link>
+          <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
           {row.overdue ? <Tag color="magenta">超时</Tag> : null}
         </Space>
       ),

apps/admin-web/src/pages/StoresPage.tsx

@@ -40,6 +40,7 @@ import {
 } from '../lib/storeCreate';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
 import OssUpload from '../components/OssUpload';
@@ -739,7 +740,7 @@ export default function StoresPage() {
         const name = v || '—';
         return (
           <Space size={4} wrap={false}>
-            <span>{name}</span>
+            <AdminPrimaryLink onClick={() => void openStoreDetail(row)}>{name === '—' ? '' : name}</AdminPrimaryLink>
             {row.isTest ? <Tag color="orange">测试</Tag> : null}
           </Space>
         );

apps/admin-web/src/pages/SupportTicketsPage.tsx

@@ -47,6 +47,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 const DISPATCH_WECOM_STORAGE_KEY = 'support_ticket_dispatch_wecom';
@@ -505,7 +506,13 @@ export default function SupportTicketsPage() {
         </Space>
       ),
     },
-    { title: '标题', dataIndex: 'title' },
+    {
+      title: '标题',
+      dataIndex: 'title',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(String(row.id))}>{v}</AdminPrimaryLink>
+      ),
+    },
     { title: '创建人', dataIndex: 'creatorName', width: 100 },
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {

apps/admin-web/src/pages/TestWhitelistPage.tsx

@@ -21,6 +21,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { request, type Paginated } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const MOCK_KEYS = ['MOCK_SMS', 'MOCK_WECHAT', 'MOCK_PAY'] as const;
 
@@ -254,7 +255,22 @@ export default function TestWhitelistPage() {
   }
 
   const phoneColumns: ColumnsType<PhoneRow> = [
-    { title: '手机号', dataIndex: 'phone', width: 140 },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={() => {
+            setEditRow(row);
+            editForm.setFieldsValue({ note: row.note ?? '' });
+            setEditOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '备注',
       dataIndex: 'note',

apps/admin-web/src/pages/ThirdPartyLogsPage.tsx

@@ -5,6 +5,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -95,7 +96,21 @@ export default function ThirdPartyLogsPage() {
       title: '请求摘要',
       render: (_, r) => summarizeJson(r.requestBody),
     },
-    { title: '外部单号', dataIndex: 'externalNo', width: 140, render: (v) => v || '—' },
+    {
+      title: '外部单号',
+      dataIndex: 'externalNo',
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            setDetail(await request(`/common/third-party-logs/${row.id}`));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '操作',
       width: 80,

apps/admin-web/src/pages/TicketsPage.tsx

@@ -26,6 +26,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -118,7 +119,21 @@ export default function TicketsPage() {
   }
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '工单号', dataIndex: 'ticketNo', width: 180 },
+    {
+      title: '工单号',
+      dataIndex: 'ticketNo',
+      width: 180,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            setDetail(await request(`/admin/tickets/${row.id}`));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '类型',
       dataIndex: 'ticketType',

apps/admin-web/src/pages/UserLogsPage.tsx

@@ -8,6 +8,7 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -80,7 +81,21 @@ export default function UserLogsPage() {
         <Tag>{CATEGORY_LABELS[v ?? ''] || resolveUserLogCategory(r.eventName) || '其他'}</Tag>
       ),
     },
-    { title: '事件', dataIndex: 'eventName', width: 160 },
+    {
+      title: '事件',
+      dataIndex: 'eventName',
+      width: 160,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            setDetail(await request(`/admin/logs/users/${row.id}`));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     {
       title: '关联', width: 120,
       render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),

apps/admin-web/src/pages/UsersPage.tsx

@@ -20,6 +20,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { USER_SOURCE_TYPE_LABELS, resolveUserLogCategory, type UserSourceType } from '@dukang/shared-types';
 import { request, type AdminUserRow, type HqProfile, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 
 type UserOrderRow = {
@@ -332,7 +333,9 @@ export default function UsersPage() {
       title: '昵称',
       dataIndex: 'nickname',
       width: 140,
-      render: (v: string | null) => v || '—',
+      render: (v: string | null, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
     },
     {
       title: '备注',

apps/admin-web/src/pages/WechatBindingsPage.tsx

@@ -1,318 +1,321 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
-import {
+import {
-  Button, Descriptions, Drawer, Form, Input, Select, Space, Table, Tag, Typography,
+  Button, Descriptions, Drawer, Form, Input, Select, Space, Table, Tag, Typography,
-} from 'antd';
+} from 'antd';
-import type { ColumnsType } from 'antd/es/table';
+import type { ColumnsType } from 'antd/es/table';
-import { request } from '../lib/api';
+import { request } from '../lib/api';
-import { AdminCellLine } from '../components/AdminCellLine';
+import { AdminCellLine } from '../components/AdminCellLine';
-import { fmtTime, maskPhone } from '../lib/constants';
+import { fmtTime, maskPhone } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
+
-type ActorType = 'USER' | 'STORE' | 'PARTNER' | 'HQ';
+
-
+type ActorType = 'USER' | 'STORE' | 'PARTNER' | 'HQ';
-type Identity = {
+
-  actorType: ActorType;
+type Identity = {
-  actorId: string;
+  actorType: ActorType;
-  phone: string | null;
+  actorId: string;
-  name: string | null;
+  phone: string | null;
-  wxOpenId: string;
+  name: string | null;
-  wxUnionId: string | null;
+  wxOpenId: string;
-  phoneVerified?: boolean;
+  wxUnionId: string | null;
-  refLabel: string | null;
+  phoneVerified?: boolean;
-  refId: string | null;
+  refLabel: string | null;
-  lastLoginAt: string | null;
+  refId: string | null;
-  status: string | number;
+  lastLoginAt: string | null;
-};
+  status: string | number;
-
+};
-type GroupRow = {
+
-  groupKey: string;
+type GroupRow = {
-  unionId: string | null;
+  groupKey: string;
-  identityCount: number;
+  unionId: string | null;
-  actorTypes: ActorType[];
+  identityCount: number;
-  multiRole: boolean;
+  actorTypes: ActorType[];
-  primaryPhone: string | null;
+  multiRole: boolean;
-  latestLoginAt: string | null;
+  primaryPhone: string | null;
-  identities: Identity[];
+  latestLoginAt: string | null;
-};
+  identities: Identity[];
-
+};
-const ACTOR_TYPE_LABELS: Record<ActorType, string> = {
+
-  USER: 'C 端用户',
+const ACTOR_TYPE_LABELS: Record<ActorType, string> = {
-  STORE: '门店账号',
+  USER: 'C 端用户',
-  PARTNER: '合伙人账号',
+  STORE: '门店账号',
-  HQ: 'HQ 账号',
+  PARTNER: '合伙人账号',
-};
+  HQ: 'HQ 账号',
-
+};
-const ACTOR_TYPE_COLORS: Record<ActorType, string> = {
+
-  USER: 'blue',
+const ACTOR_TYPE_COLORS: Record<ActorType, string> = {
-  STORE: 'green',
+  USER: 'blue',
-  PARTNER: 'orange',
+  STORE: 'green',
-  HQ: 'purple',
+  PARTNER: 'orange',
-};
+  HQ: 'purple',
-
+};
-function renderActorTags(types: ActorType[]) {
+
-  return types.map((t) => (
+function renderActorTags(types: ActorType[]) {
-    <Tag key={t} color={ACTOR_TYPE_COLORS[t]}>
+  return types.map((t) => (
-      {ACTOR_TYPE_LABELS[t]}
+    <Tag key={t} color={ACTOR_TYPE_COLORS[t]}>
-    </Tag>
+      {ACTOR_TYPE_LABELS[t]}
-  ));
+    </Tag>
-}
+  ));
-
+}
-export default function WechatBindingsPage() {
+
-  const [form] = Form.useForm();
+export default function WechatBindingsPage() {
-  const [filters, setFilters] = useState<Record<string, string>>({
+  const [form] = Form.useForm();
-    actorType: '',
+  const [filters, setFilters] = useState<Record<string, string>>({
-    phone: '',
+    actorType: '',
-    unionId: '',
+    phone: '',
-    openId: '',
+    unionId: '',
-  });
+    openId: '',
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<GroupRow>(
+  });
-    '/admin/wechat-bindings',
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<GroupRow>(
-    () => {
+    '/admin/wechat-bindings',
-      const qs = new URLSearchParams();
+    () => {
-      if (filters.actorType) qs.set('actorType', filters.actorType);
+      const qs = new URLSearchParams();
-      if (filters.phone) qs.set('phone', filters.phone);
+      if (filters.actorType) qs.set('actorType', filters.actorType);
-      if (filters.unionId) qs.set('unionId', filters.unionId);
+      if (filters.phone) qs.set('phone', filters.phone);
-      if (filters.openId) qs.set('openId', filters.openId);
+      if (filters.unionId) qs.set('unionId', filters.unionId);
-      return qs;
+      if (filters.openId) qs.set('openId', filters.openId);
-    },
+      return qs;
-    [filters],
+    },
-  );
+    [filters],
-  const [detail, setDetail] = useState<GroupRow | null>(null);
+  );
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detail, setDetail] = useState<GroupRow | null>(null);
-
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  useEffect(() => {
+
-    form.setFieldsValue(filters);
+  useEffect(() => {
-  }, [form, filters]);
+    form.setFieldsValue(filters);
-
+  }, [form, filters]);
-  async function openDetail(row: GroupRow) {
+
-    const res = await request<GroupRow>(`/admin/wechat-bindings/${encodeURIComponent(row.groupKey)}`);
+  async function openDetail(row: GroupRow) {
-    setDetail(res);
+    const res = await request<GroupRow>(`/admin/wechat-bindings/${encodeURIComponent(row.groupKey)}`);
-    setDrawerOpen(true);
+    setDetail(res);
-  }
+    setDrawerOpen(true);
-
+  }
-  const baseColumns: ColumnsType<GroupRow> = [
+
-    {
+  const baseColumns: ColumnsType<GroupRow> = [
-      title: 'unionId',
+    {
-      dataIndex: 'unionId',
+      title: 'unionId',
-      width: 180,
+      dataIndex: 'unionId',
-
+      width: 180,
-      render: (v) => v || <Tag>无 unionId</Tag>,
+      render: (v) => v || <Tag>无 unionId</Tag>,
-    },
+    },
-    {
+    {
-      title: '身份数',
+      title: '身份数',
-      dataIndex: 'identityCount',
+      dataIndex: 'identityCount',
-      width: 90,
+      width: 90,
-      render: (v, r) => (
+      render: (v, r) => (
-        <Space size={4}>
+        <Space size={4}>
-          <span>{v}</span>
+          <span>{v}</span>
-          {r.multiRole ? <Tag color="red">一人多角色</Tag> : null}
+          {r.multiRole ? <Tag color="red">一人多角色</Tag> : null}
-        </Space>
+        </Space>
-      ),
+      ),
-    },
+    },
-    {
+    {
-      title: '端类型',
+      title: '端类型',
-      dataIndex: 'actorTypes',
+      dataIndex: 'actorTypes',
-      width: 220,
+      width: 220,
-      render: (types: ActorType[]) => renderActorTags(types),
+      render: (types: ActorType[]) => renderActorTags(types),
-    },
+    },
-    {
+    {
-      title: '手机号',
+      title: '手机号',
-      dataIndex: 'primaryPhone',
+      dataIndex: 'primaryPhone',
-      width: 140,
+      width: 140,
-      render: (v) => maskPhone(v),
+      render: (v, row) => (
-    },
+        <AdminPrimaryLink onClick={() => void openDetail(row)}>{maskPhone(v)}</AdminPrimaryLink>
-    {
+      ),
-      title: '身份摘要',
+    },
-
+    {
-      render: (_, r) => (
+      title: '身份摘要',
-        <AdminCellLine
+      render: (_, r) => (
-          primary={r.identities.map((i) => ACTOR_TYPE_LABELS[i.actorType]).join(' / ')}
+        <AdminCellLine
-          secondary={r.identities
+          primary={r.identities.map((i) => ACTOR_TYPE_LABELS[i.actorType]).join(' / ')}
-            .map((i) => i.refLabel || i.name || (i.phone ? maskPhone(i.phone) : ''))
+          secondary={r.identities
-            .filter(Boolean)
+            .map((i) => i.refLabel || i.name || (i.phone ? maskPhone(i.phone) : ''))
-            .join(' · ')}
+            .filter(Boolean)
-        />
+            .join(' · ')}
-      ),
+        />
-    },
+      ),
-    {
+    },
-      title: '最近登录',
+    {
-      dataIndex: 'latestLoginAt',
+      title: '最近登录',
-      width: 160,
+      dataIndex: 'latestLoginAt',
-      render: fmtTime,
+      width: 160,
-    },
+      render: fmtTime,
-    {
+    },
-      title: '操作',
+    {
-      width: 80,
+      title: '操作',
-      render: (_, row) => (
+      width: 80,
-        <Button type="link" size="small" onClick={() => void openDetail(row)}>
+      render: (_, row) => (
-          详情
+        <Button type="link" size="small" onClick={() => void openDetail(row)}>
-        </Button>
+          详情
-      ),
+        </Button>
-    },
+      ),
-  ];
+    },
-
+  ];
-  const identityColumns: ColumnsType<Identity> = [
+
-    {
+  const identityColumns: ColumnsType<Identity> = [
-      title: '端类型',
+    {
-      dataIndex: 'actorType',
+      title: '端类型',
-      width: 120,
+      dataIndex: 'actorType',
-      render: (t: ActorType) => <Tag color={ACTOR_TYPE_COLORS[t]}>{ACTOR_TYPE_LABELS[t]}</Tag>,
+      width: 120,
-    },
+      render: (t: ActorType) => <Tag color={ACTOR_TYPE_COLORS[t]}>{ACTOR_TYPE_LABELS[t]}</Tag>,
-    {
+    },
-      title: '账号',
+    {
-
+      title: '账号',
-      render: (_, r) => (
+      render: (_, r) => (
-        <AdminCellLine
+        <AdminCellLine
-          primary={r.name || '—'}
+          primary={r.name || '—'}
-          secondary={[r.phone ? maskPhone(r.phone) : null, `#${r.actorId}`].filter(Boolean).join(' ')}
+          secondary={[r.phone ? maskPhone(r.phone) : null, `#${r.actorId}`].filter(Boolean).join(' ')}
-        />
+        />
-      ),
+      ),
-    },
+    },
-    {
+    {
-      title: '归属',
+      title: '归属',
-      dataIndex: 'refLabel',
+      dataIndex: 'refLabel',
-      width: 160,
+      width: 160,
-
+      render: (v, r) => (v ? `${v}${r.refId ? ` #${r.refId}` : ''}` : '—'),
-      render: (v, r) => (v ? `${v}${r.refId ? ` #${r.refId}` : ''}` : '—'),
+    },
-    },
+    {
-    {
+      title: 'wxOpenId',
-      title: 'wxOpenId',
+      dataIndex: 'wxOpenId',
-      dataIndex: 'wxOpenId',
+      width: 160,
-      width: 160,
+    },
-
+    {
-    },
+      title: '手机验证',
-    {
+      width: 90,
-      title: '手机验证',
+      render: (_, r) =>
-      width: 90,
+        r.actorType === 'USER' ? (
-      render: (_, r) =>
+          r.phoneVerified ? <Tag color="blue">已验证</Tag> : <Tag>未验证</Tag>
-        r.actorType === 'USER' ? (
+        ) : (
-          r.phoneVerified ? <Tag color="blue">已验证</Tag> : <Tag>未验证</Tag>
+          '—'
-        ) : (
+        ),
-          '—'
+    },
-        ),
+    {
-    },
+      title: '最近登录',
-    {
+      dataIndex: 'lastLoginAt',
-      title: '最近登录',
+      width: 160,
-      dataIndex: 'lastLoginAt',
+      render: fmtTime,
-      width: 160,
+    },
-      render: fmtTime,
+    {
-    },
+      title: '状态',
-    {
+      dataIndex: 'status',
-      title: '状态',
+      width: 90,
-      dataIndex: 'status',
+      render: (v) => String(v),
+    },
+  ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('wechat-bindings', baseColumns, { page, pageSize });
 
-    },
+  return (
     <div>
-
+      {settingsModal}
       <Typography.Title level={4}>微信绑定总览</Typography.Title>
-
+          {settingsButton}
-  return (
+      <Typography.Paragraph type="secondary">
-    <div>
+        按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。
-      {settingsModal}
+      </Typography.Paragraph>
-      <Typography.Title level={4}>微信绑定总览</Typography.Title>
+
-          {settingsButton}
+      <Form
-      <Typography.Paragraph type="secondary">
+        form={form}
-        按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。
+        layout="inline"
-      </Typography.Paragraph>
+        style={{ marginBottom: 16 }}
-
+        onFinish={(values) => {
-      <Form
+          setPage(1);
-        form={form}
+          setFilters({
-        layout="inline"
+            actorType: values.actorType ?? '',
-        style={{ marginBottom: 16 }}
+            phone: values.phone?.trim() ?? '',
-        onFinish={(values) => {
+            unionId: values.unionId?.trim() ?? '',
-          setPage(1);
+            openId: values.openId?.trim() ?? '',
-          setFilters({
+          });
-            actorType: values.actorType ?? '',
+        }}
-            phone: values.phone?.trim() ?? '',
+      >
-            unionId: values.unionId?.trim() ?? '',
+        <Form.Item name="actorType" label="端类型">
-            openId: values.openId?.trim() ?? '',
+          <Select
-          });
+            allowClear
-        }}
+            placeholder="全部"
-      >
+            style={{ width: 140 }}
-        <Form.Item name="actorType" label="端类型">
+            options={[
-          <Select
+              { value: 'USER', label: 'C 端用户' },
-            allowClear
+              { value: 'STORE', label: '门店账号' },
-            placeholder="全部"
+              { value: 'PARTNER', label: '合伙人账号' },
-            style={{ width: 140 }}
+              { value: 'HQ', label: 'HQ 账号' },
-            options={[
+            ]}
-              { value: 'USER', label: 'C 端用户' },
+          />
-              { value: 'STORE', label: '门店账号' },
+        </Form.Item>
-              { value: 'PARTNER', label: '合伙人账号' },
+        <Form.Item name="phone" label="手机号">
-              { value: 'HQ', label: 'HQ 账号' },
+          <Input allowClear placeholder="模糊匹配" style={{ width: 140 }} />
-            ]}
+        </Form.Item>
-          />
+        <Form.Item name="unionId" label="unionId">
-        </Form.Item>
+          <Input allowClear placeholder="精确匹配" style={{ width: 180 }} />
-        <Form.Item name="phone" label="手机号">
+        </Form.Item>
-          <Input allowClear placeholder="模糊匹配" style={{ width: 140 }} />
+        <Form.Item name="openId" label="openId">
-        </Form.Item>
+          <Input allowClear placeholder="精确匹配" style={{ width: 180 }} />
-        <Form.Item name="unionId" label="unionId">
+        </Form.Item>
-          <Input allowClear placeholder="精确匹配" style={{ width: 180 }} />
+        <Form.Item>
-        </Form.Item>
+          <Space>
-        <Form.Item name="openId" label="openId">
+            <Button type="primary" htmlType="submit">
-          <Input allowClear placeholder="精确匹配" style={{ width: 180 }} />
+              查询
-        </Form.Item>
+            </Button>
-        <Form.Item>
+            <Button
-          <Space>
+              onClick={() => {
-            <Button type="primary" htmlType="submit">
+                form.resetFields();
-              查询
+                setPage(1);
-            </Button>
+                setFilters({ actorType: '', phone: '', unionId: '', openId: '' });
-            <Button
+              }}
-              onClick={() => {
+            >
-                form.resetFields();
+              重置
-                setPage(1);
+            </Button>
-                setFilters({ actorType: '', phone: '', unionId: '', openId: '' });
+            <Button onClick={() => void reload()}>刷新</Button>
-              }}
+          </Space>
-            >
+        </Form.Item>
-              重置
+      </Form>
-            </Button>
+
-            <Button onClick={() => void reload()}>刷新</Button>
+      <Table<GroupRow>
-          </Space>
+        rowKey="groupKey"
-        </Form.Item>
+        loading={loading}
-      </Form>
+        columns={columns}
-
+        dataSource={data?.items ?? []}
-      <Table<GroupRow>
+        pagination={{
-        rowKey="groupKey"
+          current: page,
-        loading={loading}
+          pageSize,
-        columns={columns}
+          total: data?.total ?? 0,
-        dataSource={data?.items ?? []}
+          showSizeChanger: true,
-        pagination={{
+          onChange: (p, ps) => {
-          current: page,
+            setPage(p);
-          pageSize,
+            setPageSize(ps);
-          total: data?.total ?? 0,
+          },
-          showSizeChanger: true,
+        }}
-          onChange: (p, ps) => {
+      />
-            setPage(p);
+
-            setPageSize(ps);
+      <Drawer
-          },
+        title="微信绑定详情"
-        }}
+        width={960}
-      />
+        open={drawerOpen}
-
+        onClose={() => setDrawerOpen(false)}
-      <Drawer
+      >
-        title="微信绑定详情"
+        {detail ? (
-        width={960}
+          <>
-        open={drawerOpen}
+            <Descriptions column={2} size="small" bordered style={{ marginBottom: 16 }}>
-        onClose={() => setDrawerOpen(false)}
+              <Descriptions.Item label="groupKey">{detail.groupKey}</Descriptions.Item>
-      >
+              <Descriptions.Item label="unionId">{detail.unionId || '—'}</Descriptions.Item>
-        {detail ? (
+              <Descriptions.Item label="身份数">{detail.identityCount}</Descriptions.Item>
-          <>
+              <Descriptions.Item label="端类型">{renderActorTags(detail.actorTypes)}</Descriptions.Item>
-            <Descriptions column={2} size="small" bordered style={{ marginBottom: 16 }}>
+              <Descriptions.Item label="一人多角色">
-              <Descriptions.Item label="groupKey">{detail.groupKey}</Descriptions.Item>
+                {detail.multiRole ? <Tag color="red">是</Tag> : <Tag>否</Tag>}
-              <Descriptions.Item label="unionId">{detail.unionId || '—'}</Descriptions.Item>
+              </Descriptions.Item>
-              <Descriptions.Item label="身份数">{detail.identityCount}</Descriptions.Item>
+              <Descriptions.Item label="最近登录">{fmtTime(detail.latestLoginAt)}</Descriptions.Item>
-              <Descriptions.Item label="端类型">{renderActorTags(detail.actorTypes)}</Descriptions.Item>
+            </Descriptions>
-              <Descriptions.Item label="一人多角色">
+            <Table<Identity>
-                {detail.multiRole ? <Tag color="red">是</Tag> : <Tag>否</Tag>}
+              rowKey={(r) => `${r.actorType}-${r.actorId}`}
-              </Descriptions.Item>
+              size="small"
-              <Descriptions.Item label="最近登录">{fmtTime(detail.latestLoginAt)}</Descriptions.Item>
+              columns={identityColumns}
-            </Descriptions>
+              dataSource={detail.identities}
-            <Table<Identity>
+              pagination={false}
-              rowKey={(r) => `${r.actorType}-${r.actorId}`}
+            />
-              size="small"
+          </>
-              columns={identityColumns}
+        ) : null}
-              dataSource={detail.identities}
+      </Drawer>
-              pagination={false}
+    </div>
-            />
+  );
-          </>
+}

apps/admin-web/src/pages/WecomBotLogsPage.tsx

@@ -6,6 +6,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import type { WecomBotLogDto } from '@dukang/shared-types';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 export default function WecomBotLogsPage() {
@@ -28,7 +29,14 @@ export default function WecomBotLogsPage() {
 
   const baseColumns: ColumnsType<WecomBotLogDto> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-    { title: '机器人', dataIndex: 'botName', width: 120, render: (v, r) => v || r.botKey || '—' },
+    {
+      title: '机器人',
+      dataIndex: 'botName',
+      width: 120,
+      render: (v, r) => (
+        <AdminPrimaryLink onClick={() => setDetail(r)}>{v || r.botKey || ''}</AdminPrimaryLink>
+      ),
+    },
     { title: '企微用户', dataIndex: 'wecomUserId', width: 120 },
     { title: '动作', dataIndex: 'action', width: 160 },
     { title: '权限', dataIndex: 'permission', width: 140, render: (v) => v || '—' },

apps/admin-web/src/pages/WecomBotsPage.tsx

@@ -37,6 +37,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -293,7 +294,14 @@ export default function WecomBotsPage() {
         </Avatar>
       ),
     },
-    { title: '名称', dataIndex: 'name', width: 140 },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '角色',
       dataIndex: 'role',

apps/admin-web/src/pages/WecomMessagePushesPage.tsx

@@ -35,6 +35,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -202,7 +203,7 @@ function PushRoutesTab() {
       render: (name: string, row) => (
         <Space>
           <Avatar src={row.avatarUrl ?? undefined}>{name.slice(0, 1)}</Avatar>
-          <span>{name}</span>
+          <AdminPrimaryLink onClick={() => openEdit(row)}>{name}</AdminPrimaryLink>
         </Space>
       ),
     },

apps/admin-web/src/pages/WineryBillsPage.tsx

@@ -27,6 +27,7 @@ import { downloadExcelCsv } from '../lib/exportExcel';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -238,7 +239,14 @@ export default function WineryBillsPage() {
   const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.wineryAmount), 0);
 
   const baseColumns: ColumnsType<Row> = [
-    { title: '账单号', dataIndex: 'billNo', width: 170 },
+    {
+      title: '账单号',
+      dataIndex: 'billNo',
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
     {
       title: '账单日',
       dataIndex: 'billDate',

apps/admin-web/src/pages/promo/PromoCodeUsersPage.tsx

@@ -10,6 +10,7 @@ import { fmtTime } from '../../lib/constants';
 import { useAdminList } from '../../lib/useAdminList';
 import type { PromoCodeDetailContext } from './PromoCodeDetailLayout';
 import { useAdminListColumns } from '../../lib/useAdminListColumns';
+import { AdminPrimaryLink } from '../../components/AdminPrimaryLink';
 
 
 export default function PromoCodeUsersPage() {
@@ -25,7 +26,16 @@ export default function PromoCodeUsersPage() {
 
   const baseColumns: ColumnsType<PromoCodeAttributedUser> = [
     { title: '用户编号', dataIndex: 'userNo', width: 120 },
-    { title: '昵称', dataIndex: 'nickname', width: 100, render: (v) => v || '—' },
+    {
+      title: '昵称',
+      dataIndex: 'nickname',
+      width: 100,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: row.id } })}>
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
     { title: '手机', dataIndex: 'phone', width: 120, render: (v) => v || '—' },
     {
       title: '验手机',

docs/杜康好客-v3-PRD.md

@@ -28,7 +28,7 @@
 | 3.5.6 | 08-23 | HQ 任务导出；核销/财务银行信息；工单图片入任务；运营去调试；门店审核全屏 | [`v3.5.6`](./杜康好客-v3.5.6-开发文档.md) |
 | 3.5.7 | 08-23 | 门店端核销记录时间显示秒；首页「今日核销金额」文案 | [`v3.5.7`](./杜康好客-v3.5.7-开发文档.md) |
 | 3.5.8 | 08-24 | HQ 单账号追加/撤销权限；运营改客服修复；城市门店服务+城市范围 | [`v3.5.8`](./杜康好客-v3.5.8-开发文档.md) |
-| 3.5.9 | 08-25 | 门店累计核销好客权益；HQ 表格去省略号；序号列 + 列设置；用户备注 / 手机号不脱敏 | [`v3.5.9`](./杜康好客-v3.5.9-开发文档.md) |
+| 3.5.9 | 08-25 | 门店累计核销好客权益；HQ 表格去省略号；序号列 + 列设置 + 拖表头改列宽；用户备注 / 手机号不脱敏 | [`v3.5.9`](./杜康好客-v3.5.9-开发文档.md) |
 
 ---
 
@@ -137,7 +137,7 @@
 - **不**再因客户端 `validation_error` 自动创建技术支持工单。
 - 合伙人入驻提交前须展示 HQ 可配企微客服二维码，并确认已添加客服。
 - HQ 门店列表：店名完整展示、操作列右固定、表过宽可横向滚动（v3.5.9 去掉省略号）。
-- HQ 主列表：最左序号；「列设置」控制显示列与顺序，偏好挂当前 HQ 账号。
+- HQ 主列表：最左序号；「列设置」控制显示列与顺序；可拖表头分割线改列宽；主展示列下划线点击进编辑/详情；偏好挂当前 HQ 账号。
 - 门店列表展示「累计核销好客权益」（该店核销券面额合计）。
 - HQ 用户列表：昵称只读；双击「备注」离开即保存（`hq_remark`）；列表手机号不脱敏（详情仍脱敏）。
 - 详 [`v3.4.16`](./杜康好客-v3.4.16-门店联系电话与体验优化.md)、[`v3.5.9`](./杜康好客-v3.5.9-开发文档.md)。

docs/杜康好客-v3-现状对照.md

@@ -67,7 +67,7 @@
 
 | 日期 | 说明 |
 |------|------|
-| 2026-08-25 | v3.5.9：门店列表累计核销好客权益；HQ 表格去省略号；主列表序号 + 列设置存 HQ 账号；用户列表备注（不改昵称）、手机号不脱敏 |
+| 2026-08-25 | v3.5.9：门店列表累计核销好客权益；HQ 表格去省略号；主列表序号 + 列设置/列宽存 HQ 账号；用户列表备注（不改昵称）、手机号不脱敏 |
 | 2026-08-24 | v3.5.8：HQ 单账号追加/撤销权限；运营改客服；城市门店服务与城市范围；分类删除权限与概览按权限/城市裁剪 |
 | 2026-08-23 | v3.5.7：门店核销记录时间显示秒；首页「今日到账金额」→「今日核销金额」 |
 | 2026-08-23 | v3.5.6：开发计划任务导出；核销/财务银行信息与打款凭证；工单图片入任务；运营去调试；门店审核全屏 |

docs/杜康好客-v3.5.9-开发文档.md

@@ -9,7 +9,7 @@
 
 1. **门店列表**增加「累计核销好客权益」：该店历史核销券面额合计。
 2. **全 HQ 表格**去掉 `...` 截断，长文本完整展示，横向滚动。
-3. 每张 **主列表**：最左序号（跨页连续）；「列设置」弹窗控制显示列与顺序，偏好存当前 HQ 账号。
+3. 每张 **主列表**：最左序号（跨页连续）；「列设置」弹窗控制显示列与顺序；可拖表头分割线改列宽。偏好（含列宽）存当前 HQ 账号。主展示列（名称 / 单号 / 昵称等）带下划线，点击进入编辑或详情。
 4. **用户列表**：昵称只读（用户自己的）；新增「备注」列，双击编辑 HQ 标记，离开即写入 `user_user.hq_remark`；手机号列表明文，不脱敏。
 
 **不做**：C 端 / 合伙人 / 门店端；详情 Drawer 内嵌表不加列设置。
@@ -38,10 +38,11 @@
 | 序号 | `(page-1)*pageSize+index+1`，锁定最左，不可隐藏 |
 | 操作列 | 锁定最右，不可隐藏 |
 | 弹窗 | 勾选显示、拖拽/上下移排序、重置默认 |
+| 主列 | 名称/单号/昵称等下划线，点击同「编辑」或「详情」 |
 | 存储 | `hq_account.list_column_prefs` JSON，按 `listKey` |
 
 ```ts
-{ stores: { order: ["name", "cityName"], hidden: ["intro"] } }
+{ stores: { order: ["name", "cityName"], hidden: ["intro"], widths: { name: 180 } } }
 ```
 
 新列按默认位置插入且默认显示；未知 key 忽略。重置即删除该 `listKey`。
@@ -113,7 +114,17 @@
 - [ ] HQ 主表长字段不再 `...`，可横向滑完
 - [ ] 主列表最左序号跨页连续
 - [ ] 列设置可隐藏/排序；保存后刷新仍在；重置恢复默认
+- [ ] 主展示列带下划线，点击进入对应编辑或详情
 - [ ] 序号、操作列不能在弹窗关掉或拖走
 - [ ] 详情描述列表仍可省略
 - [ ] 用户列表昵称只读；双击「备注」可改，离开编辑后 `user_user.hq_remark` 已更新；C 端看不到该字段
 - [ ] 用户列表手机号完整可见（详情仍脱敏）
+- [ ] 权益券列表：用户编号、订单号可点进对应用户/订单详情；来源含商品名、规格、数量、配送方式、实付金额
+
+---
+
+## 10. 权益券列表快链与来源
+
+- **用户**、**订单**列（及券详情）用主列下划线，分别打开用户详情抽屉、订单详情抽屉。
+- **来源**：关联订单时拼 `商品名 / 规格 / 数量(瓶或箱) / 配送方式 / ¥实付`；无订单仍用 `sourceProduct`（如总部手动发放）。
+- 列表接口 `order` 增补 `productName`、`productSpec`、`quantity`、`saleUnit`、`deliveryType`、`payAmount`。

docs/杜康好客-v3编码手册.md

@@ -43,7 +43,7 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 
 **HQ 权限（v3.5.8）**：生效 =（角色 ∪ 追加）− 撤销。城市范围绑在账号上（空=全国；「城市门店服务」必须勾城）。门店 API 按 `cityIds` 强制过滤。城市门店服务可新增分类、不可删除；概览按权限与城市范围裁剪。
 
-**HQ 列表（v3.5.9）**：主表不省略号、可横滑；最左序号；列设置（显隐/顺序）存 `hq_account.list_column_prefs`。门店列表「累计核销好客权益」= 该店 `RedeemRecord.amount` 合计。用户列表昵称只读；双击「备注」离开即保存（`hq_remark`）；列表手机号不脱敏。
+**HQ 列表（v3.5.9）**：主表不省略号、可横滑；最左序号；列设置（显隐/顺序）与列宽（拖表头）存 `hq_account.list_column_prefs`。主展示列下划线，点击进编辑或详情。门店列表「累计核销好客权益」= 该店 `RedeemRecord.amount` 合计。用户列表昵称只读（点击进详情）；双击「备注」离开即保存（`hq_remark`）；列表手机号不脱敏。
 
 ## 5. 验收用例（必过）
 

docs/杜康好客-知识库.md

@@ -92,7 +92,7 @@
 | 交易 | 订单、权益券、核销记录、推广码+metrics |
 | 财务 | 门店/合伙人/酒厂/物流账单；打款确认 |
 | 工单 | 售后四类型 + 技术支持(ST) + 开发计划 |
-| 系统 | 账号权限、客户端配置、企微机器人/消息推送；列表「列设置」按账号保存 |
+| 系统 | 账号权限、客户端配置、企微机器人/消息推送；列表「列设置」与列宽按账号保存 |
 | 日志 | HQ/用户/门店/合伙人/企微 |
 
 ## 6. 商品与模板

packages/shared-types/src/hq-list-columns.ts

@@ -60,6 +60,8 @@ export function isHqListColumnKey(value: string): value is HqListColumnKey {
 export type HqListColumnPref = {
   order: string[];
   hidden: string[];
+  /** 列宽（px）；未出现的 key 用列默认 width */
+  widths?: Record<string, number>;
 };
 
 export type HqListColumnPrefsMap = Partial<Record<HqListColumnKey, HqListColumnPref>>;
@@ -68,4 +70,5 @@ export type SaveHqListColumnPrefsRequest = {
   reset?: boolean;
   order?: string[];
   hidden?: string[];
+  widths?: Record<string, number>;
 };

server/dukang-api/src/modules/iam/auth.service.ts

@@ -55,15 +55,29 @@ type UserRow = Pick<
   avatar?: { url: string } | null;
 };
 
+function parseColumnWidths(raw: unknown): Record<string, number> | undefined {
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return undefined;
+  const out: Record<string, number> = {};
+  for (const [key, value] of Object.entries(raw as Record<string, unknown>)) {
+    if (!key.trim()) continue;
+    const n = typeof value === 'number' ? value : Number(value);
+    if (!Number.isFinite(n)) continue;
+    out[key] = Math.min(960, Math.max(48, Math.round(n)));
+  }
+  return Object.keys(out).length ? out : undefined;
+}
+
 function parseListColumnPrefs(raw: unknown): HqListColumnPrefsMap {
   if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return {};
   const out: HqListColumnPrefsMap = {};
   for (const [key, value] of Object.entries(raw as Record<string, unknown>)) {
     if (!isHqListColumnKey(key) || !value || typeof value !== 'object' || Array.isArray(value)) continue;
-    const row = value as { order?: unknown; hidden?: unknown };
+    const row = value as { order?: unknown; hidden?: unknown; widths?: unknown };
+    const widths = parseColumnWidths(row.widths);
     out[key] = {
       order: Array.isArray(row.order) ? row.order.filter((v): v is string => typeof v === 'string') : [],
       hidden: Array.isArray(row.hidden) ? row.hidden.filter((v): v is string => typeof v === 'string') : [],
+      ...(widths ? { widths } : {}),
     };
   }
   return out;
@@ -1238,7 +1252,7 @@ export class AuthService {
     actorType: string,
     actorId: bigint,
     listKey: string,
-    dto: { reset?: boolean; order?: string[]; hidden?: string[] },
+    dto: { reset?: boolean; order?: string[]; hidden?: string[]; widths?: Record<string, number> },
   ) {
     if (actorType !== 'HQ') throw new ForbiddenException('仅总部账号可保存列表列设置');
     if (!isHqListColumnKey(listKey)) throw new BadRequestException('未知列表');
@@ -1251,9 +1265,19 @@ export class AuthService {
     if (dto.reset) {
       delete current[listKey];
     } else {
+      const prev = current[listKey];
+      const widths =
+        dto.widths !== undefined ? parseColumnWidths(dto.widths) : prev?.widths;
       current[listKey] = {
-        order: (dto.order ?? []).filter((k) => typeof k === 'string' && k.trim()),
+        order:
-        hidden: (dto.hidden ?? []).filter((k) => typeof k === 'string' && k.trim()),
+          dto.order !== undefined
+            ? dto.order.filter((k) => typeof k === 'string' && k.trim())
+            : (prev?.order ?? []),
+        hidden:
+          dto.hidden !== undefined
+            ? dto.hidden.filter((k) => typeof k === 'string' && k.trim())
+            : (prev?.hidden ?? []),
+        ...(widths && Object.keys(widths).length ? { widths } : {}),
       };
     }
     const updated = await this.prisma.hqAccount.update({

server/dukang-api/src/modules/iam/dto/auth.dto.ts

@@ -1,4 +1,4 @@
-import { IsArray, IsBoolean, IsIn, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import { IsArray, IsBoolean, IsIn, IsNotEmpty, IsObject, IsOptional, IsString } from 'class-validator';
 import { SmsScene } from '@dukang/shared-types';
 
 export class SendSmsDto {
@@ -144,4 +144,8 @@ export class SaveHqListColumnPrefsDto {
   @IsArray()
   @IsString({ each: true })
   hidden?: string[];
+
+  @IsOptional()
+  @IsObject()
+  widths?: Record<string, number>;
 }

server/dukang-api/src/modules/ops/admin-benefit.service.ts

@@ -33,7 +33,20 @@ export class AdminBenefitService {
         take: pageSize,
         include: {
           user: { select: { id: true, userNo: true, phone: true, nickname: true } },
-          order: { select: { id: true, orderNo: true, status: true } },
+          order: {
+            select: {
+              id: true,
+              orderNo: true,
+              status: true,
+              productName: true,
+              productSpec: true,
+              quantity: true,
+              saleUnit: true,
+              deliveryType: true,
+              payAmount: true,
+              benefitAmount: true,
+            },
+          },
         },
       }),
       this.prisma.benefitCoupon.count({ where }),
@@ -46,7 +59,20 @@ export class AdminBenefitService {
       where: { id },
       include: {
         user: { select: { id: true, userNo: true, phone: true, nickname: true } },
-        order: { select: { id: true, orderNo: true, status: true, payAmount: true } },
+        order: {
+          select: {
+            id: true,
+            orderNo: true,
+            status: true,
+            payAmount: true,
+            productName: true,
+            productSpec: true,
+            quantity: true,
+            saleUnit: true,
+            deliveryType: true,
+            benefitAmount: true,
+          },
+        },
       },
     });
     if (!coupon) throw new NotFoundException('权益券不存在');