Merge pull request '小程序版本号' (#50) from dev_jacy into dev

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

.gitignore

@@ -26,3 +26,4 @@ server/dukang-api/assets/fonts/*.ttc
 server/dukang-api/assets/fonts/*.otf
 deploy/auto-release.env
 deploy/backups/
+.playwright-mcp/

apps/admin-web/src/admin.css

@@ -46,6 +46,78 @@ 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-list-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 16px;
+}
+
+.admin-list-header-left {
+  min-width: 0;
+}
+
+.admin-list-header-desc {
+  margin-top: 4px;
+  color: rgba(0, 0, 0, 0.45);
+  line-height: 1.5;
+}
+
+.admin-list-header-right {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8px;
+  flex-shrink: 0;
+  margin-left: auto;
+}
+
+.admin-list-settings-slot {
+  display: inline-flex;
+  margin-left: auto;
+  order: 99;
+  flex-shrink: 0;
+}
+
+.admin-list-settings-btn.ant-btn {
+  color: rgba(0, 0, 0, 0.55);
+  padding-inline: 8px;
+}
+
+.admin-list-settings-btn.ant-btn:hover {
+  color: rgba(0, 0, 0, 0.88);
+}
+
 /* 操作列保持可见 */
 .admin-layout .ant-table-cell:has(.ant-btn),
 .ant-drawer .ant-table-cell:has(.ant-btn),
@@ -81,6 +153,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/AdminListHeader.tsx

@@ -0,0 +1,36 @@
+import type { ReactNode } from 'react';
+import { Space, Typography } from 'antd';
+
+/** 列表页顶栏：标题在左，主操作在右，列设置永远最右 */
+export function AdminListHeader({
+  title,
+  description,
+  actions,
+  settings,
+}: {
+  title?: ReactNode;
+  description?: ReactNode;
+  actions?: ReactNode;
+  settings?: ReactNode;
+}) {
+  return (
+    <div className="admin-list-header">
+      <div className="admin-list-header-left">
+        {title == null || title === '' ? null : typeof title === 'string' || typeof title === 'number' ? (
+          <Typography.Title level={4} style={{ margin: 0 }}>
+            {title}
+          </Typography.Title>
+        ) : (
+          title
+        )}
+        {description ? (
+          <div className="admin-list-header-desc">{description}</div>
+        ) : null}
+      </div>
+      <div className="admin-list-header-right">
+        {actions ? <Space wrap>{actions}</Space> : null}
+        {settings}
+      </div>
+    </div>
+  );
+}

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/components/AdminStorePackagesSection.tsx

@@ -11,10 +11,23 @@ import PackageImagesUpload from './PackageImagesUpload';
 type PackageRow = StorePackageItemDto;
 
 export type AdminStorePackagesHandle = {
-  /** 套餐已加载时写入；加载中则跳过，避免空数据覆盖线上套餐 */
+  /** 仅在用户改过套餐时写入；加载中或未改动则跳过，避免空表单覆盖刚审核通过的线上套餐 */
   saveIfLoaded: (opts?: { quiet?: boolean }) => Promise<{ skipped: boolean }>;
 };
 
+function mapLiveRows(live: StorePackagesResponse['live']): PackageRow[] {
+  return (live ?? []).map((p, i) => {
+    const imageUrls = normalizeStorePackageImageUrls(p);
+    return {
+      ...p,
+      price: String(p.price),
+      imageUrl: imageUrls[0] ?? '',
+      imageUrls,
+      sortOrder: i,
+    };
+  });
+}
+
 function emptyRow(index = 0): PackageRow {
   return {
     name: '',
@@ -37,6 +50,7 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
     const [pendingRequest, setPendingRequest] = useState<StorePackagesResponse['pendingRequest']>(null);
     const itemsRef = useRef(items);
     const loadingRef = useRef(loading);
+    const dirtyRef = useRef(false);
     const navigate = useNavigate();
 
     useEffect(() => {
@@ -47,36 +61,33 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
       loadingRef.current = loading;
     }, [loading]);
 
+    function applyServerPackages(data: StorePackagesResponse) {
+      dirtyRef.current = false;
+      setPendingRequest(data.pendingRequest ?? null);
+      setItems(mapLiveRows(data.live));
+    }
+
     useEffect(() => {
       setLoading(true);
       setPendingRequest(null);
+      dirtyRef.current = false;
       request<StorePackagesResponse>(`/admin/stores/${storeId}/packages`)
-        .then((data) => {
+        .then((data) => applyServerPackages(data))
-          setPendingRequest(data.pendingRequest ?? null);
-          setItems(
-            data.live?.length
-              ? data.live.map((p, i) => {
-                  const imageUrls = normalizeStorePackageImageUrls(p);
-                  return {
-                    ...p,
-                    price: String(p.price),
-                    imageUrl: imageUrls[0] ?? '',
-                    imageUrls,
-                    sortOrder: i,
-                  };
-                })
-              : [],
-          );
-        })
         .catch((e) => message.error(e instanceof Error ? e.message : '加载套餐失败'))
         .finally(() => setLoading(false));
     }, [storeId]);
 
-    // 在审核页完成审核后，自动刷新本页「有待审核套餐」提醒
+    // 审核通过/驳回后刷新提醒；用户未改套餐时同步线上结果，避免抽屉里仍显示空套餐
     useEffect(() => {
       const onChanged = () => {
         request<StorePackagesResponse>(`/admin/stores/${storeId}/packages`)
-          .then((data) => setPendingRequest(data.pendingRequest ?? null))
+          .then((data) => {
+            setPendingRequest(data.pendingRequest ?? null);
+            if (!dirtyRef.current) {
+              dirtyRef.current = false;
+              setItems(mapLiveRows(data.live));
+            }
+          })
           .catch(() => undefined);
       };
       window.addEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
@@ -108,16 +119,19 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
       ) : null;
 
     function updateAt(index: number, patch: Partial<PackageRow>) {
+      dirtyRef.current = true;
       setItems((prev) => prev.map((item, i) => (i === index ? { ...item, ...patch } : item)));
     }
 
     function addRow() {
       if (items.length >= STORE_PACKAGE_MAX_COUNT) return;
+      dirtyRef.current = true;
       setItems((prev) => [...prev, emptyRow(prev.length)]);
     }
 
     function removeAt(index: number) {
       const run = () => {
+        dirtyRef.current = true;
         setItems((prev) => {
           const next = prev.filter((_, i) => i !== index).map((item, i) => ({ ...item, sortOrder: i }));
           return next.length ? next : [];
@@ -203,20 +217,8 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
           }),
         });
         if (!opts?.quiet) message.success('套餐已保存并生效');
-        setItems(
+        dirtyRef.current = false;
-          data.live?.length
+        setItems(mapLiveRows(data.live));
-            ? data.live.map((p, i) => {
-                const imageUrls = normalizeStorePackageImageUrls(p);
-                return {
-                  ...p,
-                  price: String(p.price),
-                  imageUrl: imageUrls[0] ?? '',
-                  imageUrls,
-                  sortOrder: i,
-                };
-              })
-            : [],
-        );
       } catch (e) {
         if (!opts?.quiet) message.error(e instanceof Error ? e.message : '保存失败');
         throw e;
@@ -227,7 +229,7 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
 
     useImperativeHandle(ref, () => ({
       saveIfLoaded: async (opts) => {
-        if (loadingRef.current) return { skipped: true };
+        if (loadingRef.current || !dirtyRef.current) return { skipped: true };
         await save(opts);
         return { skipped: false };
       },

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

@@ -173,7 +173,9 @@ export default function OrderTrackDrawer({
           <Empty
             image={Empty.PRESENTED_IMAGE_SIMPLE}
             description={
-              track?.manualQueryUrl
+              track?.queryError
+                ? track.queryError
+                : track?.manualQueryUrl
                 ? '暂无实时路由节点，可使用上方物流查询链接'
                 : '暂无路由信息，请稍后刷新'
             }

apps/admin-web/src/layouts/AdminLayout.tsx

@@ -20,7 +20,11 @@ import {
   AccountBookOutlined,
   ProjectOutlined,
 } from '@ant-design/icons';
-import { hasAnySystemSettingsPermission, hasAnyStoreMenuPermission } from '@dukang/shared-types';
+import {
+  hasAnySystemSettingsPermission,
+  hasAnyStoreMenuPermission,
+  HQ_ADMIN_ROLES,
+} from '@dukang/shared-types';
 import { clearAuth, request, type HqProfile } from '../lib/api';
 import { bindAdminEllipsisTitle } from '../lib/ellipsis-title';
 import { AUDIT_NOTICE_CHANGED_EVENT, PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
@@ -28,6 +32,10 @@ import { ListColumnPrefsProvider } from '../lib/ListColumnPrefsContext';
 
 const { Header, Sider, Content } = Layout;
 
+const HQ_ROLE_LABELS: Record<string, string> = Object.fromEntries(
+  HQ_ADMIN_ROLES.map((r) => [r.value, r.label]),
+);
+
 type MenuItem = NonNullable<MenuProps['items']>[number];
 
 const MENU_ITEMS: MenuProps['items'] = [
@@ -405,7 +413,9 @@ export default function AdminLayout() {
           </Typography.Title>
           <Space>
             <span>{profile?.name || '—'}</span>
-            <span style={{ color: '#999' }}>{profile?.adminRole}</span>
+            <span style={{ color: '#999' }}>
+              {HQ_ROLE_LABELS[profile?.adminRole ?? ''] || profile?.adminRole || ''}
+            </span>
             <Button type="text" icon={<LogoutOutlined />} onClick={logout}>
               退出
             </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;
@@ -235,5 +236,7 @@ export type AdminOrderRow = {
     providerOrderNo: string | null;
     logisticsCompany?: string | null;
     manualQueryUrl?: string | null;
+    /** 当次应付物流费（按瓶当量 × 承运商计价） */
+    logisticsFee?: number | null;
   };
 };

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,42 +59,105 @@ 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)}>
+    <span className="admin-list-settings-slot">
-      列设置
+      <Button type="text" icon={<SettingOutlined />} className="admin-list-settings-btn" onClick={() => setOpen(true)}>
-    </Button>
+        列设置
+      </Button>
+    </span>
   );
 
   const settingsModal = (

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,23 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+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 +46,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 +107,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 +148,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: '操作',
@@ -162,17 +249,15 @@ export default function BenefitCouponsPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="好客权益券"
-          好客权益券
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-        <Space>
-          {settingsButton}
           <Button type="primary" onClick={() => setGrantOpen(true)}>
             手动发放
           </Button>
-        </Space>
+        }
-      </div>
+      />
 
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="couponNo" label="券号">
@@ -276,15 +361,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/BenefitLedgersPage.tsx

@@ -4,6 +4,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { LEDGER_TYPE_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type Row = {
@@ -41,8 +42,7 @@ export default function BenefitLedgersPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>权益流水</Typography.Title>
+      <AdminListHeader title="权益流水" settings={settingsButton} />
-          {settingsButton}
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="userId" label="用户ID"><Input allowClear /></Form.Item>
         <Form.Item name="couponId" label="券ID"><Input allowClear /></Form.Item>

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

@@ -14,7 +14,6 @@ import {
   Switch,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -31,6 +30,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+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 },
@@ -308,27 +316,29 @@ export default function CityWarehousesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>仓库</Typography.Title>
+        title="仓库"
-          {settingsButton}
+        settings={settingsButton}
-        <Button
+        actions={
-          type="primary"
+          <Button
-          onClick={() => {
+            type="primary"
-            createForm.resetFields();
+            onClick={() => {
-            setCreateManagerType(WarehouseManagerType.HQ);
+              createForm.resetFields();
-            setCreateCityId(undefined);
+              setCreateManagerType(WarehouseManagerType.HQ);
-            setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
+              setCreateCityId(undefined);
-            createForm.setFieldsValue({
+              setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
-              managerType: WarehouseManagerType.HQ,
+              createForm.setFieldsValue({
-              status: WarehouseStatus.ACTIVE,
+                managerType: WarehouseManagerType.HQ,
-              fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
+                status: WarehouseStatus.ACTIVE,
-            });
+                fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
-            setCreateOpen(true);
+              });
-          }}
+              setCreateOpen(true);
-        >
+            }}
-          新增仓库
+          >
-        </Button>
+            新增仓库
-      </Space>
+          </Button>
+        }
+      />
 
       <Alert
         type="info"

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

@@ -1,14 +1,43 @@
 import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
   Button, Descriptions, Drawer, Form, Input, Space, Table, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import OrderTrackDrawer from '../components/OrderTrackDrawer';
 import { request } from '../lib/api';
-import { ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
+import {
+  DELIVERY_PROVIDER_LABELS,
+  DELIVERY_TYPE_LABELS,
+  ORDER_STATUS_LABELS,
+  fmtTime,
+} from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
+type DeliveryOrder = {
+  id: string;
+  orderNo: string;
+  status: string;
+  deliveryType: string;
+  productName: string;
+  productSpec?: string | null;
+  barcode69?: string | null;
+  quantity: number;
+  saleUnit?: string;
+  bottlesPerUnit?: number;
+  payAmount?: number;
+  receiverName: string;
+  receiverPhone: string;
+  receiverAddress?: string;
+  receiverProvince?: string;
+  receiverCity?: string;
+  receiverDistrict?: string;
+  user?: { id: string; userNo: string; phone: string | null; nickname: string | null };
+  imageResource?: { url: string } | null;
+};
 
 type Row = {
   id: string;
@@ -17,17 +46,34 @@ type Row = {
   trackingNo: string | null;
   providerOrderNo: string | null;
   updatedAt: string;
-  order?: {
+  logisticsFee?: number | null;
-    id: string;
+  order?: DeliveryOrder;
-    orderNo: string;
-    status: string;
-    receiverName: string;
-    receiverPhone: string;
-    deliveryType: string;
-  };
 };
 
+function formatQty(order?: DeliveryOrder | null) {
+  if (!order || order.quantity == null) return '—';
+  const unit = order.saleUnit === 'BOX' ? '箱' : '瓶';
+  const bottles =
+    order.saleUnit === 'BOX' && order.bottlesPerUnit && order.bottlesPerUnit > 1
+      ? `（${order.quantity * order.bottlesPerUnit}瓶）`
+      : '';
+  return `${order.quantity}${unit}${bottles}`;
+}
+
+function formatAddress(order?: DeliveryOrder | null) {
+  if (!order) return '—';
+  if (order.deliveryType === 'ON_SITE_PICKUP') return '现场取货';
+  const region = [order.receiverProvince, order.receiverCity, order.receiverDistrict]
+    .filter(Boolean)
+    .join('');
+  const detail = (order.receiverAddress || '').trim();
+  if (!region) return detail || '—';
+  if (!detail || detail.startsWith(region)) return detail || region;
+  return `${region}${detail}`;
+}
+
 export default function DeliveriesPage() {
+  const navigate = useNavigate();
   const [form] = Form.useForm();
   const [editForm] = Form.useForm();
   const [filters, setFilters] = useState<Record<string, string>>({});
@@ -61,25 +107,126 @@ export default function DeliveriesPage() {
     setTrackOpen(true);
   }
 
+  async function openDetail(row: Row) {
+    const d = await request<Row>(`/admin/deliveries/${row.id}`);
+    setDetail(d);
+    editForm.setFieldsValue({
+      provider: d.provider,
+      trackingNo: d.trackingNo,
+      providerOrderNo: d.providerOrderNo,
+    });
+    setDrawerOpen(true);
+  }
+
   const baseColumns: ColumnsType<Row> = [
-    { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
+    {
-    { title: 'provider', dataIndex: 'provider', width: 90 },
+      title: '订单号',
+      dataIndex: ['order', 'orderNo'],
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
+    {
+      title: '用户',
+      key: 'user',
+      width: 140,
+      render: (_, row) => {
+        const user = row.order?.user;
+        if (!user) return '—';
+        const label = user.userNo || user.phone || '—';
+        return (
+          <div>
+            {user.id ? (
+              <AdminPrimaryLink
+                onClick={() => navigate('/users', { state: { openUserId: String(user.id) } })}
+              >
+                {label}
+              </AdminPrimaryLink>
+            ) : (
+              label
+            )}
+            {user.phone && user.userNo ? (
+              <Typography.Text type="secondary" style={{ display: 'block', fontSize: 12 }}>
+                {user.phone}
+              </Typography.Text>
+            ) : null}
+          </div>
+        );
+      },
+    },
+    {
+      title: '商品',
+      key: 'product',
+      width: 200,
+      render: (_, row) => {
+        const order = row.order;
+        if (!order?.productName) return '—';
+        return (
+          <div>
+            <span>{order.productName}</span>
+            {order.productSpec ? (
+              <Typography.Text type="secondary" style={{ display: 'block', fontSize: 12 }}>
+                {order.productSpec}
+              </Typography.Text>
+            ) : null}
+          </div>
+        );
+      },
+    },
+    {
+      title: '数量',
+      key: 'quantity',
+      width: 90,
+      render: (_, row) => formatQty(row.order),
+    },
+    {
+      title: '配送方式',
+      dataIndex: ['order', 'deliveryType'],
+      width: 90,
+      render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
+    },
+    {
+      title: '承运商',
+      dataIndex: 'provider',
+      width: 90,
+      render: (v: string) => DELIVERY_PROVIDER_LABELS[v] || v || '—',
+    },
     { title: '运单号', dataIndex: 'trackingNo', width: 140, render: (v) => v || '—' },
+    {
+      title: '运费',
+      dataIndex: 'logisticsFee',
+      width: 90,
+      render: (v: number | null | undefined) => (v == null ? '—' : `¥${Number(v).toFixed(2)}`),
+    },
     { title: '第三方单号', dataIndex: 'providerOrderNo', width: 140, render: (v) => v || '—' },
-    { title: '订单状态', dataIndex: ['order', 'status'], width: 100, render: (s) => ORDER_STATUS_LABELS[s] || s },
+    {
+      title: '订单状态',
+      dataIndex: ['order', 'status'],
+      width: 100,
+      render: (s) => ORDER_STATUS_LABELS[s] || s,
+    },
     { title: '收货人', dataIndex: ['order', 'receiverName'], width: 90 },
+    {
+      title: '收货电话',
+      dataIndex: ['order', 'receiverPhone'],
+      width: 120,
+      render: (v) => v || '—',
+    },
+    {
+      title: '配送地址',
+      key: 'address',
+      width: 280,
+      ellipsis: true,
+      render: (_, row) => formatAddress(row.order),
+    },
     { title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
     {
       title: '操作', width: 140,
       render: (_, row) => (
         <Space size={0}>
           <Button type="link" size="small" onClick={() => openTrack(row)}>路由</Button>
-          <Button type="link" size="small" onClick={async () => {
+          <Button type="link" size="small" onClick={() => void openDetail(row)}>编辑</Button>
-            const d = await request<Row>(`/admin/deliveries/${row.id}`);
-            setDetail(d);
-            editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
-            setDrawerOpen(true);
-          }}>编辑</Button>
         </Space>
       ),
     },
@@ -87,20 +234,21 @@ export default function DeliveriesPage() {
 
   const { columns, settingsButton, settingsModal } = useAdminListColumns('deliveries', baseColumns, { page, pageSize });
 
+  const order = detail?.order;
+
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>快递/配送单</Typography.Title>
+      <AdminListHeader title="快递/配送单" settings={settingsButton} />
-          {settingsButton}
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="orderNo" label="订单号"><Input allowClear /></Form.Item>
-        <Form.Item name="provider" label="provider"><Input allowClear placeholder="MOCK" /></Form.Item>
+        <Form.Item name="provider" label="承运商"><Input allowClear placeholder="XFX" /></Form.Item>
         <Form.Item name="trackingNo" label="运单号"><Input allowClear /></Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
       <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 'max-content' }}
         pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-      <Drawer title="配送单编辑" width={480} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Drawer title="配送单编辑" width={560} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={
           <Space>
             <Button onClick={() => setDrawerOpen(false)}>取消</Button>
@@ -117,11 +265,63 @@ export default function DeliveriesPage() {
         {detail && (
           <>
             <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
-              <Descriptions.Item label="订单">{detail.order?.orderNo}</Descriptions.Item>
+              <Descriptions.Item label="订单">{order?.orderNo || '—'}</Descriptions.Item>
-              <Descriptions.Item label="收货">{detail.order?.receiverName} {detail.order?.receiverPhone}</Descriptions.Item>
+              <Descriptions.Item label="用户">
+                {order?.user ? (
+                  <Space size={8} wrap>
+                    {order.user.id ? (
+                      <AdminPrimaryLink
+                        onClick={() => navigate('/users', { state: { openUserId: String(order.user!.id) } })}
+                      >
+                        {order.user.userNo}
+                      </AdminPrimaryLink>
+                    ) : (
+                      order.user.userNo || '—'
+                    )}
+                    <Typography.Text type="secondary">
+                      {[order.user.nickname, order.user.phone].filter(Boolean).join(' / ') || ''}
+                    </Typography.Text>
+                  </Space>
+                ) : '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="商品">
+                <Space align="start">
+                  {order?.imageResource?.url ? (
+                    <img
+                      src={order.imageResource.url}
+                      alt=""
+                      style={{ width: 48, height: 48, objectFit: 'cover', borderRadius: 4 }}
+                    />
+                  ) : null}
+                  <span>
+                    {order?.productName || '—'}
+                    {order?.productSpec ? (
+                      <Typography.Text type="secondary" style={{ display: 'block', fontSize: 12 }}>
+                        {order.productSpec}
+                      </Typography.Text>
+                    ) : null}
+                    {order?.barcode69 ? (
+                      <Typography.Text type="secondary" style={{ display: 'block', fontSize: 12 }}>
+                        {order.barcode69}
+                      </Typography.Text>
+                    ) : null}
+                  </span>
+                </Space>
+              </Descriptions.Item>
+              <Descriptions.Item label="数量">{formatQty(order)}</Descriptions.Item>
+              <Descriptions.Item label="配送方式">
+                {DELIVERY_TYPE_LABELS[order?.deliveryType ?? ''] || order?.deliveryType || '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="收货人">
+                {[order?.receiverName, order?.receiverPhone].filter(Boolean).join(' ') || '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="配送地址">{formatAddress(order)}</Descriptions.Item>
+              <Descriptions.Item label="运费">
+                {detail.logisticsFee == null ? '—' : `¥${Number(detail.logisticsFee).toFixed(2)}`}
+              </Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
-              <Form.Item name="provider" label="provider" rules={[{ required: true }]}><Input /></Form.Item>
+              <Form.Item name="provider" label="承运商" rules={[{ required: true }]}><Input /></Form.Item>
               <Form.Item name="providerOrderNo" label="第三方单号"><Input /></Form.Item>
               <Form.Item name="trackingNo" label="运单号"><Input /></Form.Item>
             </Form>

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

@@ -31,6 +31,8 @@ import { downloadBase64File } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
@@ -243,7 +245,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',
@@ -301,40 +310,40 @@ export default function DevPlanTasksPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="开发计划 · 任务列表"
-          开发计划 · 任务列表
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-          {settingsButton}
+          <>
-        <Space wrap>
+            <Select
-          <Select
+              value={exportFormat}
-            value={exportFormat}
+              style={{ width: 120 }}
-            style={{ width: 120 }}
+              onChange={setExportFormat}
-            onChange={setExportFormat}
+              options={[
-            options={[
+                { value: 'markdown', label: 'Markdown' },
-              { value: 'markdown', label: 'Markdown' },
+                { value: 'docx', label: 'Word' },
-              { value: 'docx', label: 'Word' },
+                { value: 'xlsx', label: 'Excel' },
-              { value: 'xlsx', label: 'Excel' },
+                { value: 'pdf', label: 'PDF' },
-              { value: 'pdf', label: 'PDF' },
+              ]}
-            ]}
+            />
-          />
+            <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
-          <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
+              导出已勾选
-            导出已勾选
+            </Button>
-          </Button>
+            <Button loading={exporting} onClick={() => void exportTasks('filter')}>
-          <Button loading={exporting} onClick={() => void exportTasks('filter')}>
+              导出全部筛选
-            导出全部筛选
+            </Button>
-          </Button>
+            <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
-          <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
+              批量编辑
-            批量编辑
+            </Button>
-          </Button>
+            <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
-          <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
+              评审
-            评审
+            </Button>
-          </Button>
+            <Button type="primary" onClick={openCreate}>
-          <Button type="primary" onClick={openCreate}>
+              新建任务
-            新建任务
+            </Button>
-          </Button>
+          </>
-        </Space>
+        }
-      </div>
+      />
 
       <Form
         layout="inline"

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

@@ -9,7 +9,6 @@ import {
   Space,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -23,6 +22,8 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+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',
@@ -165,15 +168,15 @@ export default function DevPlanVersionsPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="开发计划 · 版本列表"
-          开发计划 · 版本列表
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-          {settingsButton}
+          <Button type="primary" onClick={openCreate}>
-        <Button type="primary" onClick={openCreate}>
+            新建版本
-          新建版本
+          </Button>
-        </Button>
+        }
-      </div>
+      />
 
       <Form
         layout="inline"

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

@@ -7,11 +7,11 @@ import {
   Input,
   InputNumber,
   Modal,
+  Popconfirm,
   Select,
   Space,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -29,6 +29,8 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 const TYPE_OPTIONS = Object.entries(FULFILLMENT_PROVIDER_TYPE_LABELS).map(([value, label]) => ({
@@ -67,7 +69,10 @@ export default function FulfillmentProvidersPage() {
     setLoading(true);
     try {
       const res = await request<FulfillmentProviderDto[]>('/admin/fulfillment-providers');
-      setRows(res);
+      setRows(Array.isArray(res) ? res : []);
+    } catch (e) {
+      setRows([]);
+      message.error(e instanceof Error ? e.message : '加载承运商失败');
     } finally {
       setLoading(false);
     }
@@ -93,6 +98,7 @@ export default function FulfillmentProvidersPage() {
       extraBottleFee: DEFAULT_XFX_LOGISTICS_PRICING.extraBottleFee,
       boxBottles: DEFAULT_XFX_LOGISTICS_PRICING.boxBottles,
       boxFee: DEFAULT_XFX_LOGISTICS_PRICING.boxFee,
+      deliveryHintHtml: '',
     });
     setOpen(true);
   }
@@ -121,6 +127,7 @@ export default function FulfillmentProvidersPage() {
       extraBottleFee: pricing?.extraBottleFee ?? DEFAULT_XFX_LOGISTICS_PRICING.extraBottleFee,
       boxBottles: pricing?.boxBottles ?? DEFAULT_XFX_LOGISTICS_PRICING.boxBottles,
       boxFee: pricing?.boxFee ?? DEFAULT_XFX_LOGISTICS_PRICING.boxFee,
+      deliveryHintHtml: row.deliveryHintHtml || '',
     });
     setOpen(true);
   }
@@ -143,6 +150,7 @@ export default function FulfillmentProvidersPage() {
         boxBottles: v.boxBottles != null ? Number(v.boxBottles) : undefined,
         boxFee: v.boxFee != null ? Number(v.boxFee) : undefined,
       },
+      deliveryHintHtml: v.deliveryHintHtml?.trim() || null,
     };
 
     if (isXfxProviderCode(String(v.code)) && v.type === FulfillmentProviderType.API) {
@@ -175,9 +183,25 @@ export default function FulfillmentProvidersPage() {
     void load();
   }
 
+  async function remove(row: FulfillmentProviderDto) {
+    try {
+      await request(`/admin/fulfillment-providers/${row.id}`, { method: 'DELETE' });
+      message.success('已删除');
+      void load();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    }
+  }
+
   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',
@@ -223,11 +247,23 @@ export default function FulfillmentProvidersPage() {
     { title: '更新时间', dataIndex: 'updatedAt', width: 170, render: fmtTime },
     {
       title: '操作',
-      width: 80,
+      width: 140,
       render: (_, row) => (
-        <Button type="link" size="small" onClick={() => openEdit(row)}>
+        <Space size={0}>
-          编辑
+          <Button type="link" size="small" onClick={() => openEdit(row)}>
-        </Button>
+            编辑
+          </Button>
+          <Popconfirm
+            title={`确认删除承运商「${row.name}」？`}
+            okText="删除"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => void remove(row)}
+          >
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
       ),
     },
   ];
@@ -240,20 +276,16 @@ export default function FulfillmentProvidersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <div>
+        title="仓配管理"
-          <Typography.Title level={4} style={{ margin: 0 }}>
+        description="注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准"
-            仓配管理
+        settings={settingsButton}
-          </Typography.Title>
+        actions={
-          {settingsButton}
+          <Button type="primary" onClick={openCreate}>
-          <Typography.Text type="secondary">
+            注册承运商
-            注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准
+          </Button>
-          </Typography.Text>
+        }
-        </div>
+      />
-        <Button type="primary" onClick={openCreate}>
-          注册承运商
-        </Button>
-      </Space>
 
       <Alert
         type="info"
@@ -285,6 +317,17 @@ export default function FulfillmentProvidersPage() {
           <Form.Item name="status" label="状态" rules={[{ required: true }]}>
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
+          <Form.Item
+            name="deliveryHintHtml"
+            label="配送信息提示"
+            extra="C 端同城送展示。支持 HTML：span/p/br/b/strong/i/em/font，style 可用 color、font-weight、font-size、font-style。回车换行会原样显示。空则回退「同城配送，预计24小时内送到」。"
+          >
+            <Input.TextArea
+              rows={3}
+              maxLength={2000}
+              placeholder='<span style="color:#A61D24;font-weight:700;font-size:13px">同城配送，预计24小时内送到</span>'
+            />
+          </Form.Item>
 
           <Divider orientation="left">物流对账</Divider>
           <Form.Item name="settlementMethod" label="结算方式" rules={[{ required: true }]}>

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

@@ -8,6 +8,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -69,7 +71,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 },
     {
@@ -120,22 +146,24 @@ export default function HqAccountsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>HQ 账户</Typography.Title>
+        title="HQ 账户"
-          {settingsButton}
+        settings={settingsButton}
-        {isSuperAdmin && (
+        actions={
-          <Button
+          isSuperAdmin ? (
-            type="primary"
+            <Button
-            onClick={() => {
+              type="primary"
-              createForm.resetFields();
+              onClick={() => {
-              createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS', cityIds: [] });
+                createForm.resetFields();
-              setCreateOpen(true);
+                createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS', cityIds: [] });
-            }}
+                setCreateOpen(true);
-          >
+              }}
-            新建账户
+            >
-          </Button>
+              新建账户
-        )}
+            </Button>
-      </Space>
+          ) : null
+        }
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="phone" label="手机"><Input allowClear /></Form.Item>
         <Form.Item name="adminRole" label="角色">

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

@@ -1,204 +1,216 @@
-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 { AdminListHeader } from '../components/AdminListHeader';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-type Row = {
+
-  id: string;
+
-  hqAccountId: string | null;
+type Row = {
-  hqName: string | null;
+  id: string;
-  hqPhone: string | null;
+  hqAccountId: string | null;
-  hqRole: string | null;
+  hqName: string | null;
-  action: string | null;
+  hqPhone: string | null;
-  actionLabel: string;
+  hqRole: string | null;
-  refType: string | null;
+  action: string | null;
-  refId: string | null;
+  actionLabel: string;
-  status: string | null;
+  refType: string | null;
-  remark: string | null;
+  refId: string | null;
-  detail: Record<string, unknown> | null;
+  status: string | null;
-  createdAt: string;
+  remark: string | null;
-};
+  detail: Record<string, unknown> | null;
-
+  createdAt: string;
-export default function HqLogsPage() {
+};
-  const [searchParams, setSearchParams] = useSearchParams();
+
-  const [form] = Form.useForm();
+export default function HqLogsPage() {
-  const [filters, setFilters] = useState<Record<string, string>>(() => ({
+  const [searchParams, setSearchParams] = useSearchParams();
-    hqAccountId: searchParams.get('hqAccountId') ?? '',
+  const [form] = Form.useForm();
-    action: searchParams.get('action') ?? '',
+  const [filters, setFilters] = useState<Record<string, string>>(() => ({
-    refType: searchParams.get('refType') ?? '',
+    hqAccountId: searchParams.get('hqAccountId') ?? '',
-  }));
+    action: searchParams.get('action') ?? '',
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
+    refType: searchParams.get('refType') ?? '',
-    '/admin/logs/hq',
+  }));
-    () => {
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
-      const qs = new URLSearchParams();
+    '/admin/logs/hq',
-      if (filters.hqAccountId) qs.set('hqAccountId', filters.hqAccountId);
+    () => {
-      if (filters.action) qs.set('action', filters.action);
+      const qs = new URLSearchParams();
-      if (filters.refType) qs.set('refType', filters.refType);
+      if (filters.hqAccountId) qs.set('hqAccountId', filters.hqAccountId);
-      return qs;
+      if (filters.action) qs.set('action', filters.action);
-    },
+      if (filters.refType) qs.set('refType', filters.refType);
-    [filters],
+      return qs;
-  );
+    },
-  const [detail, setDetail] = useState<Row | null>(null);
+    [filters],
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  );
-
+  const [detail, setDetail] = useState<Row | null>(null);
-  useEffect(() => {
+  const [drawerOpen, setDrawerOpen] = useState(false);
-    form.setFieldsValue(filters);
+
-  }, [form, filters]);
+  useEffect(() => {
-
+    form.setFieldsValue(filters);
-  const baseColumns: ColumnsType<Row> = [
+  }, [form, filters]);
-    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+
-    {
+  const baseColumns: ColumnsType<Row> = [
-      title: '操作人',
+    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-      width: 200,
+    {
-
+      title: '操作人',
-      render: (_, r) => (
+      width: 200,
-        <AdminCellLine
+      render: (_, r) => (
-          primary={r.hqName}
+        <AdminCellLine
-          secondary={[r.hqPhone, r.hqAccountId ? `#${r.hqAccountId}` : ''].filter(Boolean).join(' ') || null}
+          primary={r.hqName}
-        />
+          secondary={[r.hqPhone, r.hqAccountId ? `#${r.hqAccountId}` : ''].filter(Boolean).join(' ') || null}
-      ),
+        />
-    },
+      ),
-    {
+    },
-      title: '行为',
+    {
-      dataIndex: 'actionLabel',
+      title: '行为',
-      width: 160,
+      dataIndex: 'actionLabel',
-      render: (v, r) => <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>,
+      width: 160,
-    },
+      render: (v, r) => (
-    { title: '对象类型', dataIndex: 'refType', width: 120, render: (v) => v || '—' },
+        <AdminPrimaryLink
-    { title: '对象 ID', dataIndex: 'refId', width: 100, render: (v) => v || '—' },
+          onClick={async () => {
-    {
+            const res = await request<Row>(`/admin/logs/hq/${r.id}`);
-      title: '操作',
+            setDetail(res);
-      width: 80,
+            setDrawerOpen(true);
-      render: (_, row) => (
+          }}
-        <Button
+        >
-          type="link"
+          <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>
-          size="small"
+        </AdminPrimaryLink>
-          onClick={async () => {
+      ),
-            const res = await request<Row>(`/admin/logs/hq/${row.id}`);
+    },
-            setDetail(res);
+    { title: '对象类型', dataIndex: 'refType', width: 120, render: (v) => v || '—' },
-            setDrawerOpen(true);
+    { title: '对象 ID', dataIndex: 'refId', width: 100, render: (v) => v || '—' },
-          }}
+    {
-        >
+      title: '操作',
-          详情
+      width: 80,
-        </Button>
+      render: (_, row) => (
-      ),
+        <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}
-      {settingsModal}
+      <AdminListHeader
-      <Typography.Title level={4}>HQ 操作日志</Typography.Title>
+        title="HQ 操作日志"
-          {settingsButton}
+        settings={settingsButton}
-      <Typography.Paragraph type="secondary">
+        description="记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。"
-        记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
+      />
-      </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

@@ -11,7 +11,6 @@ import {
   Space,
   Table,
   Tag,
-  Typography,
   Upload,
   message,
 } from 'antd';
@@ -31,6 +30,8 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+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,
@@ -234,32 +241,25 @@ export default function InvoicesPage() {
   return (
     <div>
       {settingsModal}
-      <div
+      <AdminListHeader
-        style={{
+        title="发票管理"
-          display: 'flex',
+        settings={settingsButton}
-          justifyContent: 'space-between',
+        actions={
-          alignItems: 'center',
+          <Button
-          marginBottom: 16,
+            type="primary"
-        }}
+            onClick={() => {
-      >
+              createForm.setFieldsValue({
-        <Typography.Title level={4} style={{ margin: 0 }}>
+                titleType: 'PERSONAL',
-          发票管理
+                invoiceKind: 'NORMAL',
-        </Typography.Title>
+                invoiceCategory: 'LIQUOR',
-          {settingsButton}
+              });
-        <Button
+              setCreateOpen(true);
-          type="primary"
+            }}
-          onClick={() => {
+          >
-            createForm.setFieldsValue({
+            创建发票申请
-              titleType: 'PERSONAL',
+          </Button>
-              invoiceKind: 'NORMAL',
+        }
-              invoiceCategory: 'LIQUOR',
+      />
-            });
-            setCreateOpen(true);
-          }}
-        >
-          创建发票申请
-        </Button>
-      </div>
       <Form
         form={filterForm}
         layout="inline"

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

@@ -26,6 +26,8 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -127,7 +129,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 },
     {
@@ -257,15 +265,11 @@ export default function KnowledgeBasesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16 }} wrap>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="知识库"
-          知识库
+        settings={settingsButton}
-        </Typography.Title>
+        description="支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索"
-          {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索
-        </Typography.Text>
-      </Space>
 
       <Form
         form={filterForm}

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

@@ -26,6 +26,8 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -156,7 +158,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',
@@ -264,15 +272,11 @@ export default function LlmConfigsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16 }} wrap>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="语言模型配置"
-          语言模型配置
+        settings={settingsButton}
-        </Typography.Title>
+        description="非超管仅可见自己创建的配置，且创建后只能改是否生效"
-          {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          非超管仅可见自己创建的配置，且创建后只能改是否生效
-        </Typography.Text>
-      </Space>
 
       <Form
         form={filterForm}

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

@@ -30,6 +30,8 @@ import { downloadExcelCsv } from '../lib/exportExcel';
 import { request } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 type BillRow = {
   id: string;
@@ -246,7 +248,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,
@@ -397,15 +406,11 @@ export default function LogisticsBillsPage() {
   return (
     <div>
       {settingsModal}
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="物流对账"
-          物流对账
+        settings={settingsButton}
-        </Typography.Title>
+        description="按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。"
-        {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。
-        </Typography.Text>
-      </Space>
 
       <Tabs
         items={[

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,13 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+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,
@@ -142,7 +145,7 @@ type OrderExportFormat = 'xlsx' | 'pdf';
 
 type OrderExportFilters = {
   orderNo?: string;
-  status?: string;
+  status?: string | string[];
   orderType?: string;
   cityId?: string;
   receiverPhone?: string;
@@ -217,6 +220,12 @@ function formatBenefitBrief(row: AdminOrderRow) {
   return '—';
 }
 
+function selectedStatuses(status: unknown): string[] {
+  if (Array.isArray(status)) return status.filter((s): s is string => Boolean(s));
+  if (typeof status === 'string' && status) return [status];
+  return [];
+}
+
 function buildExportPayload(
   scope: OrderExportScope,
   format: OrderExportFormat,
@@ -229,7 +238,8 @@ function buildExportPayload(
     return payload;
   }
   if (filters.orderNo) payload.orderNo = filters.orderNo;
-  if (filters.status) payload.status = filters.status;
+  const statuses = selectedStatuses(filters.status);
+  if (statuses.length) payload.status = statuses;
   if (filters.orderType) payload.orderType = filters.orderType;
   if (filters.cityId) payload.cityId = filters.cityId;
   if (filters.receiverPhone) payload.receiverPhone = filters.receiverPhone;
@@ -273,6 +283,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();
@@ -354,7 +365,7 @@ export default function OrdersPage() {
       const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
       if (initialOrderNo) qs.set('orderNo', initialOrderNo);
       if (values.orderNo) qs.set('orderNo', values.orderNo);
-      if (values.status) qs.set('status', values.status);
+      for (const status of selectedStatuses(values.status)) qs.append('status', status);
       if (values.orderType) qs.set('orderType', values.orderType);
       if (values.cityId) qs.set('cityId', values.cityId);
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
@@ -593,63 +604,105 @@ 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: '运费',
+      key: 'logisticsFee',
+      width: 90,
+      render: (_, row) =>
+        row.delivery?.logisticsFee == null ? '—' : `¥${Number(row.delivery.logisticsFee).toFixed(2)}`,
+    },
     {
       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: '下单时间',
@@ -695,18 +748,20 @@ export default function OrdersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
+        title="订单监控"
-        <Space size={12}>
+        settings={settingsButton}
-          {settingsButton}
+        actions={
-          <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
+          <>
-          {canProxyOrder ? (
+            <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
-            <Button type="primary" onClick={() => setProxyOpen(true)}>
+            {canProxyOrder ? (
-              代下单
+              <Button type="primary" onClick={() => setProxyOpen(true)}>
-            </Button>
+                代下单
-          ) : null}
+              </Button>
-        </Space>
+            ) : null}
-      </Space>
+          </>
+        }
+      />
 
       {!canDeleteOrders && profile ? (
         <Alert
@@ -744,10 +799,12 @@ export default function OrdersPage() {
               </Space>
             </Form.Item>
           </Col>
-          <Col xs={12} sm={6} md={5} lg={3}>
+          <Col xs={24} sm={12} md={8} lg={6}>
             <Form.Item name="status" label="状态" style={{ marginBottom: 12 }}>
               <Select
+                mode="multiple"
                 allowClear
+                maxTagCount="responsive"
                 placeholder="全部"
                 options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
               />
@@ -1108,6 +1165,11 @@ export default function OrdersPage() {
                 </Descriptions.Item>
                 <Descriptions.Item label="运单号">{detail.delivery.trackingNo || '—'}</Descriptions.Item>
                 <Descriptions.Item label="三方单号">{detail.delivery.providerOrderNo || '—'}</Descriptions.Item>
+                <Descriptions.Item label="运费">
+                  {detail.delivery.logisticsFee == null
+                    ? '—'
+                    : `¥${Number(detail.delivery.logisticsFee).toFixed(2)}`}
+                </Descriptions.Item>
                 {detail.delivery.manualQueryUrl && (
                   <Descriptions.Item label="查询链接">
                     <a href={detail.delivery.manualQueryUrl} target="_blank" rel="noreferrer">

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

@@ -5,9 +5,10 @@ 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';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type PartnerOption = { id: string; companyName: string };
@@ -176,14 +177,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 },
@@ -262,15 +262,11 @@ export default function PartnerAccountsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <div>
+        title="合伙人子账号"
-          <Typography.Title level={4} style={{ margin: 0 }}>合伙人子账号</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        description="主账号在「开城合伙人」创建；此处仅管理子账号树与权限"
-          <Typography.Text type="secondary">
+      />
-            主账号在「开城合伙人」创建；此处仅管理子账号树与权限
-          </Typography.Text>
-        </div>
-      </Space>
       <Form
         form={form}
         layout="inline"

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

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

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

@@ -1,410 +1,420 @@
-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 { AdminListHeader } from '../components/AdminListHeader';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-type Row = {
+
-  id: string;
+
-  companyName: string;
+type Row = {
-  phone: string;
+  id: string;
-  name: string;
+  companyName: string;
-  contactPhone?: string | null;
+  phone: string;
-  cityId?: string | null;
+  name: string;
-  cityName?: string | null;
+  contactPhone?: string | null;
-  scopeType?: string;
+  cityId?: string | null;
-  districtCodes?: string[] | null;
+  cityName?: string | null;
-  orderCommissionRate?: number;
+  scopeType?: string;
-  redeemCommissionRate?: number;
+  districtCodes?: string[] | null;
-  storeCount: number;
+  orderCommissionRate?: number;
-  accountCount: number;
+  redeemCommissionRate?: number;
-  createdAt: string;
+  storeCount: number;
-};
+  accountCount: number;
-
+  createdAt: string;
-type PartnerDetail = Row & {
+};
-  address?: string;
+
-  districtCodes?: string[] | null;
+type PartnerDetail = Row & {
-  bindingStatus?: string;
+  address?: string;
-  bankAccountName?: string | null;
+  districtCodes?: string[] | null;
-  bankAccountNo?: string | null;
+  bindingStatus?: string;
-  bankBranch?: string | null;
+  bankAccountName?: string | null;
-  managedWarehouseId?: string | null;
+  bankAccountNo?: string | null;
-  children?: Array<{
+  bankBranch?: string | null;
-    id: string;
+  managedWarehouseId?: string | null;
-    phone: string;
+  children?: Array<{
-    name: string;
+    id: string;
-    staffRole?: string;
+    phone: string;
-    permissions?: string[];
+    name: string;
-    status: string;
+    staffRole?: 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 };
-const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
+type WarehouseOption = { id: string; name: string };
-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 }));
-function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
+const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({ value: k, label: PARTNER_PERMISSION_LABELS[k] }));
-  if (!values?.length) return [];
+
-  if (Array.isArray(values[0])) {
+function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
-    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
+  if (!values?.length) return [];
-  }
+  if (Array.isArray(values[0])) {
-  return values as string[];
+    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
-}
+  }
-
+  return values as string[];
-export default function PartnersPage() {
+}
-  const [form] = Form.useForm();
+
-  const [editForm] = Form.useForm();
+export default function PartnersPage() {
-  const [createForm] = Form.useForm();
+  const [form] = Form.useForm();
-  const [subForm] = Form.useForm();
+  const [editForm] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [createForm] = Form.useForm();
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
+  const [subForm] = Form.useForm();
-    '/admin/partners',
+  const [filters, setFilters] = useState<Record<string, string>>({});
-    () => {
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
-      const qs = new URLSearchParams();
+    '/admin/partners',
-      if (filters.companyName) qs.set('companyName', filters.companyName);
+    () => {
-      if (filters.contactPhone) qs.set('contactPhone', filters.contactPhone);
+      const qs = new URLSearchParams();
-      return qs;
+      if (filters.companyName) qs.set('companyName', filters.companyName);
-    },
+      if (filters.contactPhone) qs.set('contactPhone', filters.contactPhone);
-    [filters],
+      return qs;
-  );
+    },
-  const [detail, setDetail] = useState<PartnerDetail | null>(null);
+    [filters],
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  );
-  const [createOpen, setCreateOpen] = useState(false);
+  const [detail, setDetail] = useState<PartnerDetail | null>(null);
-  const [subOpen, setSubOpen] = useState(false);
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [cities, setCities] = useState<CityOption[]>([]);
+  const [createOpen, setCreateOpen] = useState(false);
-  const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
+  const [subOpen, setSubOpen] = useState(false);
-  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+  const [cities, setCities] = useState<CityOption[]>([]);
-  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+  const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
-  const [createCityId, setCreateCityId] = useState<string | undefined>();
+  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-
+  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-  const createCityCode = createCityId ? cities.find((c) => c.id === createCityId)?.code : undefined;
+  const [createCityId, setCreateCityId] = useState<string | 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;
-  function formatApiError(err: unknown): string | null {
+  const editCityCode = detail?.cityId ? cities.find((c) => c.id === detail.cityId)?.code : undefined;
-    if (err && typeof err === 'object' && 'errorFields' in err) return null;
+
-    if (!(err instanceof Error)) return '操作失败';
+  function formatApiError(err: unknown): string | null {
-    return err.message.replace(/\b(\d{6})\b/g, (code) => {
+    if (err && typeof err === 'object' && 'errorFields' in err) return null;
-      const label = districtCodeLabel(code);
+    if (!(err instanceof Error)) return '操作失败';
-      return label !== code ? `${label}(${code})` : code;
+    return err.message.replace(/\b(\d{6})\b/g, (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}`);
+
-    setCities(res.items);
+  const loadCities = useCallback(async () => {
-  }, []);
+    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`);
+
-    setWarehouses(rows.map((w) => ({ id: w.id, name: (w as { name: string }).name })));
+  const loadWarehouses = useCallback(async (cityId: string) => {
-  }, []);
+    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();
+
-  }, [loadCities]);
+  useEffect(() => {
-
+    void loadCities();
-  async function openPartner(id: string) {
+  }, [loadCities]);
-    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
+
-    setDetail(d);
+  async function openPartner(id: string) {
-    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
+    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
-    if (d.cityId) await loadWarehouses(d.cityId);
+    setDetail(d);
-    editForm.setFieldsValue({
+    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
-      name: d.name,
+    if (d.cityId) await loadWarehouses(d.cityId);
-      phone: d.phone,
+    editForm.setFieldsValue({
-      companyName: d.companyName,
+      name: d.name,
-      contactPhone: d.contactPhone ?? d.phone,
+      phone: d.phone,
-      address: d.address ?? '',
+      companyName: d.companyName,
-      scopeType: d.scopeType,
+      contactPhone: d.contactPhone ?? d.phone,
-      districtCodes: d.districtCodes ?? [],
+      address: d.address ?? '',
-      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
+      scopeType: d.scopeType,
-      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
+      districtCodes: d.districtCodes ?? [],
-      bindingStatus: d.bindingStatus,
+      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
-      managedWarehouseId: d.managedWarehouseId,
+      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
-      bankAccountName: d.bankAccountName ?? '',
+      bindingStatus: d.bindingStatus,
-      bankAccountNo: d.bankAccountNo ?? '',
+      managedWarehouseId: d.managedWarehouseId,
-      bankBranch: d.bankBranch ?? '',
+      bankAccountName: d.bankAccountName ?? '',
-    });
+      bankAccountNo: d.bankAccountNo ?? '',
-    setDrawerOpen(true);
+      bankBranch: d.bankBranch ?? '',
-  }
+    });
-
+    setDrawerOpen(true);
-  async function savePartner() {
+  }
-    if (!detail) return;
+
-    try {
+  async function savePartner() {
-      const v = await editForm.validateFields();
+    if (!detail) return;
-      const body = {
+    try {
-        ...v,
+      const v = await editForm.validateFields();
-        orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+      const body = {
-        redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+        ...v,
-        districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+        orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-      };
+        redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-      await request(`/admin/partners/${detail.id}`, { method: 'PUT', body: JSON.stringify(body) });
+        districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-      message.success('已保存');
+      };
-      setDrawerOpen(false);
+      await request(`/admin/partners/${detail.id}`, { method: 'PUT', body: JSON.stringify(body) });
-      void reload();
+      message.success('已保存');
-    } catch (e) {
+      setDrawerOpen(false);
-      const msg = formatApiError(e);
+      void reload();
-      if (msg) message.error(msg);
+    } catch (e) {
-    }
+      const msg = formatApiError(e);
-  }
+      if (msg) message.error(msg);
-
+    }
-  const baseColumns: ColumnsType<Row> = [
+  }
-    { title: '城市', dataIndex: 'cityName', width: 100 },
+
-    {
+  const baseColumns: ColumnsType<Row> = [
-      title: '区县',
+    { title: '城市', dataIndex: 'cityName', width: 100 },
-      dataIndex: 'districtCodes',
+    {
-      width: 160,
+      title: '区县',
-
+      dataIndex: 'districtCodes',
-      render: (codes: string[] | null | undefined, row) =>
+      width: 160,
-        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
+      render: (codes: string[] | null | undefined, row) =>
-    },
+        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
-    { title: '公司名', dataIndex: 'companyName' },
+    },
-    { title: '主账号', dataIndex: 'phone', width: 130 },
+    {
-    {
+      title: '公司名',
-      title: '管辖',
+      dataIndex: 'companyName',
-      dataIndex: 'scopeType',
+      render: (v, row) => (
-      width: 100,
+        <AdminPrimaryLink onClick={() => void openPartner(row.id)}>{v}</AdminPrimaryLink>
-      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
+      ),
-    },
+    },
-    { title: '门店', dataIndex: 'storeCount', width: 70 },
+    { title: '主账号', dataIndex: 'phone', width: 130 },
-    { title: '子账号', dataIndex: 'accountCount', width: 80, render: (n) => Math.max(0, n - 1) },
+    {
-    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
+      title: '管辖',
-    {
+      dataIndex: 'scopeType',
-      title: '操作',
+      width: 100,
-      width: 120,
+      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
-      render: (_, row) => (
+    },
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+    { title: '门店', dataIndex: 'storeCount', width: 70 },
-          管理
+    { title: '子账号', dataIndex: 'accountCount', width: 80, render: (n) => Math.max(0, n - 1) },
-        </Button>
+    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
-      ),
+    {
-    },
+      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}
+      <AdminListHeader
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+        title="开城合伙人"
-        <Typography.Title level={4} style={{ margin: 0 }}>开城合伙人</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        actions={
-        <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>
+        }
-      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
+      />
-        <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
+      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-        <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>
+        <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
-        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
+        <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>
-      </Form>
+        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
-      <Table
+      </Form>
-        rowKey="id"
+      <Table
-        className="admin-table-nowrap"
+        rowKey="id"
-        loading={loading}
+        className="admin-table-nowrap"
-        columns={columns}
+        loading={loading}
-        dataSource={data?.items ?? []}
+        columns={columns}
-        pagination={{
+        dataSource={data?.items ?? []}
-          current: page,
+        pagination={{
-          pageSize,
+          current: page,
-          total: data?.total ?? 0,
+          pageSize,
-          showSizeChanger: true,
+          total: data?.total ?? 0,
-          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
+          showSizeChanger: true,
-        }}
+          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
-      />
+        }}
-
+      />
-      <Drawer
+
-        title="城市合伙人"
+      <Drawer
-        width={640}
+        title="城市合伙人"
-        open={drawerOpen}
+        width={640}
-        onClose={() => setDrawerOpen(false)}
+        open={drawerOpen}
-        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
+        onClose={() => setDrawerOpen(false)}
-      >
+        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
-        {detail && (
+      >
-          <Tabs
+        {detail && (
-            items={[
+          <Tabs
-              {
+            items={[
-                key: 'info',
+              {
-                label: '基本信息',
+                key: 'info',
-                children: (
+                label: '基本信息',
-                  <Form form={editForm} layout="vertical">
+                children: (
-                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+                  <Form form={editForm} layout="vertical">
-                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="contactPhone" label="业务联系电话"><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="contactPhone" label="业务联系电话"><Input /></Form.Item>
-                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
+                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-                    </Form.Item>
+                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
-                    {editScopeType === CityPartnerScopeType.DISTRICT && (
+                    </Form.Item>
-                      <Form.Item
+                    {editScopeType === CityPartnerScopeType.DISTRICT && (
-                        name="districtCodes"
+                      <Form.Item
-                        label="区县"
+                        name="districtCodes"
-                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
+                        label="区县"
-                      >
+                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
-                        <CityDistrictMultiSelect cityCode={editCityCode} />
+                      >
-                      </Form.Item>
+                        <CityDistrictMultiSelect cityCode={editCityCode} />
-                    )}
+                      </Form.Item>
-                    <Space style={{ width: '100%' }} size="large">
+                    )}
-                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                    <Space style={{ width: '100%' }} size="large">
-                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                    </Space>
+                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                    <Form.Item name="managedWarehouseId" label="管仓仓库">
+                    </Space>
-                      <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
+                    <Form.Item name="managedWarehouseId" label="管仓仓库">
-                    </Form.Item>
+                      <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
-                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
+                    </Form.Item>
-                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
+                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
-                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
+                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
-                  </Form>
+                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
-                ),
+                  </Form>
-              },
+                ),
-              {
+              },
-                key: 'staff',
+              {
-                label: '子账号',
+                key: 'staff',
-                children: (
+                label: '子账号',
-                  <>
+                children: (
-                    <Button type="primary" style={{ marginBottom: 12 }} onClick={() => { subForm.resetFields(); setSubOpen(true); }}>
+                  <>
-                      添加子账号
+                    <Button type="primary" style={{ marginBottom: 12 }} onClick={() => { subForm.resetFields(); setSubOpen(true); }}>
-                    </Button>
+                      添加子账号
-                    <Table
+                    </Button>
-                      size="small"
+                    <Table
-                      rowKey="id"
+                      size="small"
-                      pagination={false}
+                      rowKey="id"
-                      dataSource={detail.children ?? []}
+                      pagination={false}
-                      columns={[
+                      dataSource={detail.children ?? []}
-                        { title: '姓名', dataIndex: 'name' },
+                      columns={[
-                        { title: '手机', dataIndex: 'phone' },
+                        { title: '姓名', dataIndex: 'name' },
-                        { title: '状态', dataIndex: 'status', render: (s) => <Tag>{s}</Tag> },
+                        { title: '手机', dataIndex: 'phone' },
-                        {
+                        { title: '状态', dataIndex: 'status', render: (s) => <Tag>{s}</Tag> },
-                          title: '权限',
+                        {
-                          dataIndex: 'permissions',
+                          title: '权限',
-                          render: (p: string[] | undefined) => p?.map((k) => PARTNER_PERMISSION_LABELS[k as keyof typeof PARTNER_PERMISSION_LABELS] || k).join('、') || '—',
+                          dataIndex: 'permissions',
-                        },
+                          render: (p: string[] | undefined) => p?.map((k) => PARTNER_PERMISSION_LABELS[k as keyof typeof PARTNER_PERMISSION_LABELS] || k).join('、') || '—',
-                      ]}
+                        },
-                    />
+                      ]}
-                  </>
+                    />
-                ),
+                  </>
-              },
+                ),
-            ]}
+              },
-          />
+            ]}
-        )}
+          />
-      </Drawer>
+        )}
-
+      </Drawer>
-      <Modal
+
-        title="新建城市合伙人"
+      <Modal
-        open={createOpen}
+        title="新建城市合伙人"
-        width={560}
+        open={createOpen}
-        onCancel={() => setCreateOpen(false)}
+        width={560}
-        onOk={async () => {
+        onCancel={() => setCreateOpen(false)}
-          try {
+        onOk={async () => {
-            const v = await createForm.validateFields();
+          try {
-            await request('/admin/partners', {
+            const v = await createForm.validateFields();
-              method: 'POST',
+            await request('/admin/partners', {
-              body: JSON.stringify({
+              method: 'POST',
-                ...v,
+              body: JSON.stringify({
-                orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+                ...v,
-                redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+                orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-                districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+                redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-              }),
+                districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-            });
+              }),
-            message.success('已创建');
+            });
-            setCreateOpen(false);
+            message.success('已创建');
-            createForm.resetFields();
+            setCreateOpen(false);
-            void reload();
+            createForm.resetFields();
-          } catch (e) {
+            void reload();
-            const msg = formatApiError(e);
+          } catch (e) {
-            if (msg) message.error(msg);
+            const msg = formatApiError(e);
-          }
+            if (msg) message.error(msg);
-        }}
+          }
-      >
+        }}
-        <Form form={createForm} layout="vertical" initialValues={{ orderCommissionRate: 0, redeemCommissionRate: 3, scopeType: CityPartnerScopeType.CITY_WIDE }}>
+      >
-          <Form.Item name="cityId" label="开城城市" rules={[{ required: true }]}>
+        <Form form={createForm} layout="vertical" initialValues={{ orderCommissionRate: 0, redeemCommissionRate: 3, scopeType: CityPartnerScopeType.CITY_WIDE }}>
-            <Select
+          <Form.Item name="cityId" label="开城城市" rules={[{ required: true }]}>
-              options={cities.map((c) => ({ value: c.id, label: `${c.name} (${c.code})` }))}
+            <Select
-              onChange={(id) => {
+              options={cities.map((c) => ({ value: c.id, label: `${c.name} (${c.code})` }))}
-                setCreateCityId(id);
+              onChange={(id) => {
-                createForm.setFieldsValue({ districtCodes: undefined });
+                setCreateCityId(id);
-                void loadWarehouses(id);
+                createForm.setFieldsValue({ districtCodes: undefined });
-              }}
+                void loadWarehouses(id);
-            />
+              }}
-          </Form.Item>
+            />
-          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+          </Form.Item>
-          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
+          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-          </Form.Item>
+            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
-          {createScopeType === CityPartnerScopeType.DISTRICT && (
+          </Form.Item>
-            <Form.Item
+          {createScopeType === CityPartnerScopeType.DISTRICT && (
-              name="districtCodes"
+            <Form.Item
-              label="区县"
+              name="districtCodes"
-              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
+              label="区县"
-            >
+              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
-              <CityDistrictMultiSelect cityCode={createCityCode} />
+            >
-            </Form.Item>
+              <CityDistrictMultiSelect cityCode={createCityCode} />
-          )}
+            </Form.Item>
-          <Space style={{ width: '100%' }} size="large">
+          )}
-            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+          <Space style={{ width: '100%' }} size="large">
-            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-          </Space>
+            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-          {createCityId && (
+          </Space>
-            <Form.Item name="managedWarehouseId" label="管仓仓库（可选）">
+          {createCityId && (
-              <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
+            <Form.Item name="managedWarehouseId" label="管仓仓库（可选）">
-            </Form.Item>
+              <Select allowClear options={warehouses.map((w) => ({ value: w.id, label: w.name }))} />
-          )}
+            </Form.Item>
-        </Form>
+          )}
-      </Modal>
+        </Form>
-
+      </Modal>
-      <Modal
+
-        title="添加子账号"
+      <Modal
-        open={subOpen}
+        title="添加子账号"
-        onCancel={() => setSubOpen(false)}
+        open={subOpen}
-        onOk={async () => {
+        onCancel={() => setSubOpen(false)}
-          if (!detail) return;
+        onOk={async () => {
-          const v = await subForm.validateFields();
+          if (!detail) return;
-          await request('/admin/partner-accounts', {
+          const v = await subForm.validateFields();
-            method: 'POST',
+          await request('/admin/partner-accounts', {
-            body: JSON.stringify({ ...v, parentAccountId: detail.id }),
+            method: 'POST',
-          });
+            body: JSON.stringify({ ...v, parentAccountId: detail.id }),
-          message.success('已创建');
+          });
-          setSubOpen(false);
+          message.success('已创建');
-          void openPartner(detail.id);
+          setSubOpen(false);
-        }}
+          void openPartner(detail.id);
-      >
+        }}
-        <Form form={subForm} layout="vertical">
+      >
-          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
+        <Form form={subForm} layout="vertical">
-          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="permissions" label="权限">
+          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
-            <Select mode="multiple" options={PERM_OPTIONS} />
+          <Form.Item name="permissions" label="权限">
-          </Form.Item>
+            <Select mode="multiple" options={PERM_OPTIONS} />
-        </Form>
+          </Form.Item>
-      </Modal>
+        </Form>
-    </div>
+      </Modal>
-  );
+    </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 { AdminListHeader } from '../components/AdminListHeader';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-const STATUS_COLOR: Record<RedeemPendingStatus, string> = {
+
-  PENDING: 'orange',
+
-  COMPLETED: 'green',
+const STATUS_COLOR: Record<RedeemPendingStatus, string> = {
-  REJECTED: 'default',
+  PENDING: 'orange',
-};
+  COMPLETED: 'green',
-
+  REJECTED: 'default',
-export default function PendingRedeemPage() {
+};
-  const [form] = Form.useForm();
+
-  const [filters, setFilters] = useState<Record<string, string>>({});
+export default function PendingRedeemPage() {
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<RedeemPendingItem>(
+  const [form] = Form.useForm();
-    '/admin/redeem-pending',
+  const [filters, setFilters] = useState<Record<string, string>>({});
-    () => {
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<RedeemPendingItem>(
-      const qs = new URLSearchParams();
+    '/admin/redeem-pending',
-      if (filters.status) qs.set('status', filters.status);
+    () => {
-      if (filters.pendingNo) qs.set('pendingNo', filters.pendingNo);
+      const qs = new URLSearchParams();
-      if (filters.redeemToken) qs.set('redeemToken', filters.redeemToken);
+      if (filters.status) qs.set('status', filters.status);
-      if (filters.storeId) qs.set('storeId', filters.storeId);
+      if (filters.pendingNo) qs.set('pendingNo', filters.pendingNo);
-      return qs;
+      if (filters.redeemToken) qs.set('redeemToken', filters.redeemToken);
-    },
+      if (filters.storeId) qs.set('storeId', filters.storeId);
-    [filters],
+      return qs;
-  );
+    },
-  const [detail, setDetail] = useState<RedeemPendingItem | null>(null);
+    [filters],
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  );
-  const [acting, setActing] = useState(false);
+  const [detail, setDetail] = useState<RedeemPendingItem | null>(null);
-  const [rejectOpen, setRejectOpen] = useState(false);
+  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [rejectReason, setRejectReason] = useState('');
+  const [acting, setActing] = useState(false);
-
+  const [rejectOpen, setRejectOpen] = useState(false);
-  async function openDetail(id: string) {
+  const [rejectReason, setRejectReason] = useState('');
-    const res = await request<RedeemPendingItem>(`/admin/redeem-pending/${id}`);
+
-    setDetail(res);
+  async function openDetail(id: string) {
-    setDrawerOpen(true);
+    const res = await request<RedeemPendingItem>(`/admin/redeem-pending/${id}`);
-  }
+    setDetail(res);
-
+    setDrawerOpen(true);
-  async function complete() {
+  }
-    if (!detail) return;
+
-    setActing(true);
+  async function complete() {
-    try {
+    if (!detail) return;
-      await request(`/admin/redeem-pending/${detail.id}/complete`, { method: 'POST', body: '{}' });
+    setActing(true);
-      message.success('已补核销');
+    try {
-      setDrawerOpen(false);
+      await request(`/admin/redeem-pending/${detail.id}/complete`, { method: 'POST', body: '{}' });
-      void reload();
+      message.success('已补核销');
-    } catch (e) {
+      setDrawerOpen(false);
-      message.error(e instanceof Error ? e.message : '补核销失败');
+      void reload();
-    } finally {
+    } catch (e) {
-      setActing(false);
+      message.error(e instanceof Error ? e.message : '补核销失败');
-    }
+    } finally {
-  }
+      setActing(false);
-
+    }
-  async function reject() {
+  }
-    if (!detail || !rejectReason.trim()) {
+
-      message.error('请填写驳回原因');
+  async function reject() {
-      return;
+    if (!detail || !rejectReason.trim()) {
-    }
+      message.error('请填写驳回原因');
-    setActing(true);
+      return;
-    try {
+    }
-      await request(`/admin/redeem-pending/${detail.id}/reject`, {
+    setActing(true);
-        method: 'POST',
+    try {
-        body: JSON.stringify({ reason: rejectReason.trim() }),
+      await request(`/admin/redeem-pending/${detail.id}/reject`, {
-      });
+        method: 'POST',
-      message.success('已驳回');
+        body: JSON.stringify({ reason: rejectReason.trim() }),
-      setRejectOpen(false);
+      });
-      setDrawerOpen(false);
+      message.success('已驳回');
-      void reload();
+      setRejectOpen(false);
-    } catch (e) {
+      setDrawerOpen(false);
-      message.error(e instanceof Error ? e.message : '驳回失败');
+      void reload();
-    } finally {
+    } catch (e) {
-      setActing(false);
+      message.error(e instanceof Error ? e.message : '驳回失败');
-    }
+    } finally {
-  }
+      setActing(false);
-
+    }
-  const baseColumns: ColumnsType<RedeemPendingItem> = [
+  }
-    { title: '待处理单号', dataIndex: 'pendingNo', width: 170 },
+
-    {
+  const baseColumns: ColumnsType<RedeemPendingItem> = [
-      title: '核销码 ID',
+    {
-      dataIndex: 'redeemToken',
+      title: '待处理单号',
-      width: 160,
+      dataIndex: 'pendingNo',
-
+      width: 170,
-      render: (v: string) => <Typography.Text copyable={{ text: v }}>{v.slice(0, 8)}…</Typography.Text>,
+      render: (v, row) => (
-    },
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
-    { title: '门店', dataIndex: ['store', 'name'], width: 140, render: (_, row) => row.store?.name || '—' },
+      ),
-    {
+    },
-      title: '用户',
+    {
-      width: 120,
+      title: '核销码 ID',
-      render: (_, row) => row.user?.userNo || row.user?.phone || '—',
+      dataIndex: 'redeemToken',
-    },
+      width: 160,
-    { title: '金额', dataIndex: 'amount', width: 90, render: (v) => `¥${v}` },
+      render: (v: string) => <Typography.Text copyable={{ text: v }}>{v.slice(0, 8)}…</Typography.Text>,
-    { title: '失败次数', dataIndex: 'failCount', width: 90 },
+    },
-    {
+    { title: '门店', dataIndex: ['store', 'name'], width: 140, render: (_, row) => row.store?.name || '—' },
-      title: '状态',
+    {
-      dataIndex: 'status',
+      title: '用户',
-      width: 100,
+      width: 120,
-      render: (s: RedeemPendingStatus) => (
+      render: (_, row) => row.user?.userNo || row.user?.phone || '—',
-        <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: '状态',
-      title: '操作',
+      dataIndex: 'status',
-      width: 80,
+      width: 100,
-      fixed: 'right',
+      render: (s: RedeemPendingStatus) => (
-      render: (_, row) => (
+        <Tag color={STATUS_COLOR[s]}>{REDEEM_PENDING_STATUS_LABELS[s] || s}</Tag>
-        <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+      ),
-          详情
+    },
-        </Button>
+    { title: '提交时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-      ),
+    {
-    },
+      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}
-      {settingsModal}
+      <AdminListHeader title="待处理核销（弱网兜底）" settings={settingsButton} />
-      <Typography.Title level={4}>待处理核销（弱网兜底）</Typography.Title>
+      <Form
-          {settingsButton}
+        form={form}
-      <Form
+        layout="inline"
-        form={form}
+        style={{ marginBottom: 16 }}
-        layout="inline"
+        onFinish={(v) => {
-        style={{ marginBottom: 16 }}
+          setFilters(v);
-        onFinish={(v) => {
+          setPage(1);
-          setFilters(v);
+        }}
-          setPage(1);
+      >
-        }}
+        <Form.Item name="pendingNo" label="待处理单号">
-      >
+          <Input allowClear />
-        <Form.Item name="pendingNo" label="待处理单号">
+        </Form.Item>
-          <Input allowClear />
+        <Form.Item name="redeemToken" label="核销码 ID">
-        </Form.Item>
+          <Input allowClear />
-        <Form.Item name="redeemToken" label="核销码 ID">
+        </Form.Item>
-          <Input allowClear />
+        <Form.Item name="storeId" label="门店 ID">
-        </Form.Item>
+          <Input allowClear />
-        <Form.Item name="storeId" label="门店 ID">
+        </Form.Item>
-          <Input allowClear />
+        <Form.Item name="status" label="状态">
-        </Form.Item>
+          <Select
-        <Form.Item name="status" label="状态">
+            allowClear
-          <Select
+            style={{ width: 120 }}
-            allowClear
+            options={Object.entries(REDEEM_PENDING_STATUS_LABELS).map(([value, label]) => ({
-            style={{ width: 120 }}
+              value,
-            options={Object.entries(REDEEM_PENDING_STATUS_LABELS).map(([value, label]) => ({
+              label,
-              value,
+            }))}
-              label,
+          />
-            }))}
+        </Form.Item>
-          />
+        <Form.Item>
-        </Form.Item>
+          <Button type="primary" htmlType="submit">
-        <Form.Item>
+            查询
-          <Button type="primary" htmlType="submit">
+          </Button>
-            查询
+        </Form.Item>
-          </Button>
+      </Form>
-        </Form.Item>
+
-      </Form>
+      <Table
-
+        rowKey="id"
-      <Table
+        loading={loading}
-        rowKey="id"
+        columns={columns}
-        loading={loading}
+        dataSource={data?.items ?? []}
-        columns={columns}
+        scroll={{ x: 'max-content' }}
-        dataSource={data?.items ?? []}
+        pagination={{
-        scroll={{ x: 'max-content' }}
+          current: page,
-        pagination={{
+          pageSize,
-          current: page,
+          total: data?.total ?? 0,
-          pageSize,
+          showSizeChanger: true,
-          total: data?.total ?? 0,
+          onChange: (p, ps) => {
-          showSizeChanger: true,
+            setPage(p);
-          onChange: (p, ps) => {
+            setPageSize(ps);
-            setPage(p);
+          },
-            setPageSize(ps);
+        }}
-          },
+      />
-        }}
+
-      />
+      <Drawer
-
+        title="待处理核销详情"
-      <Drawer
+        width={560}
-        title="待处理核销详情"
+        open={drawerOpen}
-        width={560}
+        onClose={() => setDrawerOpen(false)}
-        open={drawerOpen}
+        extra={
-        onClose={() => setDrawerOpen(false)}
+          detail?.status === 'PENDING' && (
-        extra={
+            <Space>
-          detail?.status === 'PENDING' && (
+              <Button danger onClick={() => { setRejectReason(''); setRejectOpen(true); }}>
-            <Space>
+                驳回
-              <Button danger onClick={() => { setRejectReason(''); setRejectOpen(true); }}>
+              </Button>
-                驳回
+              <Button type="primary" loading={acting} onClick={() => void complete()}>
-              </Button>
+                人工补核销
-              <Button type="primary" loading={acting} onClick={() => void complete()}>
+              </Button>
-                人工补核销
+            </Space>
-              </Button>
+          )
-            </Space>
+        }
-          )
+      >
-        }
+        {detail && (
-      >
+          <>
-        {detail && (
+            {detail.photoUrl && (
-          <>
+              <div style={{ textAlign: 'center', marginBottom: 16 }}>
-            {detail.photoUrl && (
+                <Image src={detail.photoUrl} alt="核销码照片" style={{ maxHeight: 280 }} />
-              <div style={{ textAlign: 'center', marginBottom: 16 }}>
+              </div>
-                <Image src={detail.photoUrl} alt="核销码照片" style={{ maxHeight: 280 }} />
+            )}
-              </div>
+            <Descriptions column={1} bordered size="small">
-            )}
+              <Descriptions.Item label="待处理单号">{detail.pendingNo}</Descriptions.Item>
-            <Descriptions column={1} bordered size="small">
+              <Descriptions.Item label="核销码 ID">
-              <Descriptions.Item label="待处理单号">{detail.pendingNo}</Descriptions.Item>
+                <Typography.Text copyable>{detail.redeemToken}</Typography.Text>
-              <Descriptions.Item label="核销码 ID">
+              </Descriptions.Item>
-                <Typography.Text copyable>{detail.redeemToken}</Typography.Text>
+              <Descriptions.Item label="状态">
-              </Descriptions.Item>
+                <Tag color={STATUS_COLOR[detail.status]}>
-              <Descriptions.Item label="状态">
+                  {REDEEM_PENDING_STATUS_LABELS[detail.status]}
-                <Tag color={STATUS_COLOR[detail.status]}>
+                </Tag>
-                  {REDEEM_PENDING_STATUS_LABELS[detail.status]}
+              </Descriptions.Item>
-                </Tag>
+              <Descriptions.Item label="金额">¥{detail.amount}</Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="类型">{detail.redeemType}</Descriptions.Item>
-              <Descriptions.Item label="金额">¥{detail.amount}</Descriptions.Item>
+              <Descriptions.Item label="失败次数">{detail.failCount}</Descriptions.Item>
-              <Descriptions.Item label="类型">{detail.redeemType}</Descriptions.Item>
+              <Descriptions.Item label="门店">
-              <Descriptions.Item label="失败次数">{detail.failCount}</Descriptions.Item>
+                {detail.store?.name || '—'}（{detail.store?.id}）
-              <Descriptions.Item label="门店">
+              </Descriptions.Item>
-                {detail.store?.name || '—'}（{detail.store?.id}）
+              <Descriptions.Item label="用户">
-              </Descriptions.Item>
+                {detail.user?.userNo || '—'} / {detail.user?.phone || '无手机'}
-              <Descriptions.Item label="用户">
+              </Descriptions.Item>
-                {detail.user?.userNo || '—'} / {detail.user?.phone || '无手机'}
+              <Descriptions.Item label="关联核销单">
-              </Descriptions.Item>
+                {detail.redeemRecord?.redeemNo || '—'}
-              <Descriptions.Item label="关联核销单">
+              </Descriptions.Item>
-                {detail.redeemRecord?.redeemNo || '—'}
+              <Descriptions.Item label="驳回原因">{detail.rejectReason || '—'}</Descriptions.Item>
-              </Descriptions.Item>
+              <Descriptions.Item label="备注">{detail.remark || '—'}</Descriptions.Item>
-              <Descriptions.Item label="驳回原因">{detail.rejectReason || '—'}</Descriptions.Item>
+              <Descriptions.Item label="提交时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
-              <Descriptions.Item label="备注">{detail.remark || '—'}</Descriptions.Item>
+              <Descriptions.Item label="处理时间">
-              <Descriptions.Item label="提交时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
+                {detail.processedAt ? fmtTime(detail.processedAt) : '—'}
-              <Descriptions.Item label="处理时间">
+              </Descriptions.Item>
-                {detail.processedAt ? fmtTime(detail.processedAt) : '—'}
+            </Descriptions>
-              </Descriptions.Item>
+          </>
-            </Descriptions>
+        )}
-          </>
+      </Drawer>
-        )}
+
-      </Drawer>
+      <Modal
-
+        title="驳回待处理单"
-      <Modal
+        open={rejectOpen}
-        title="驳回待处理单"
+        okText="确认驳回"
-        open={rejectOpen}
+        okButtonProps={{ danger: true, loading: acting, disabled: !rejectReason.trim() }}
-        okText="确认驳回"
+        onOk={() => void reject()}
-        okButtonProps={{ danger: true, loading: acting, disabled: !rejectReason.trim() }}
+        onCancel={() => setRejectOpen(false)}
-        onOk={() => void reject()}
+      >
-        onCancel={() => setRejectOpen(false)}
+        <Input.TextArea
-      >
+          rows={3}
-        <Input.TextArea
+          placeholder="请填写驳回原因"
-          rows={3}
+          value={rejectReason}
-          placeholder="请填写驳回原因"
+          onChange={(e) => setRejectReason(e.target.value)}
-          value={rejectReason}
+        />
-          onChange={(e) => setRejectReason(e.target.value)}
+      </Modal>
-        />
+    </div>
-      </Modal>
+  );
-    </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,8 @@ import ProductDetailTemplatePicker from '../components/ProductDetailTemplatePick
 import ProductSpecsEditor from '../components/ProductSpecsEditor';
 import type { FormInstance } from 'antd/es/form';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type ProductDetailContentDto = {
@@ -391,7 +393,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',
@@ -502,11 +511,11 @@ export default function ProductsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>商品管理</Typography.Title>
+        title="商品管理"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>}
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="名称">
           <Input allowClear placeholder="名称 / SKU / 69 码" style={{ width: 200 }} />

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

@@ -15,6 +15,8 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = PromoCodeItem;
@@ -77,7 +79,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: '场景',
@@ -167,11 +176,11 @@ export default function PromoCodesPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>推广码管理</Typography.Title>
+        title="推广码管理"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>}
-      </div>
+      />
 
       <Form
         form={filterForm}

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

@@ -8,6 +8,8 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -84,7 +86,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 }}>
               测试
@@ -140,8 +142,7 @@ export default function RedeemRecordsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>核销记录</Typography.Title>
+      <AdminListHeader title="核销记录" settings={settingsButton} />
-          {settingsButton}
       <Form
         form={form}
         layout="inline"

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

@@ -13,6 +13,7 @@ import {
 } from '../lib/constants';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type Row = {
@@ -121,15 +122,11 @@ export default function ResourcesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="OSS 资源库"
-          OSS 资源库
+        settings={settingsButton}
-        </Typography.Title>
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>登记资源</Button>}
-          {settingsButton}
+      />
-        <Button type="primary" onClick={() => setCreateOpen(true)}>
-          登记资源
-        </Button>
-      </Space>
       <Form
         form={form}
         layout="inline"

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

@@ -7,6 +7,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type StoreBrief = { id: string; name: string; status: string; cityName?: string };
@@ -83,7 +85,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>
       ),
@@ -145,24 +154,22 @@ export default function StoreAccountsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Space direction="vertical" size={0}>
+        title="门店账户"
-          <Typography.Title level={4} style={{ margin: 0 }}>门店账户</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        description="主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店"
-          <Typography.Text type="secondary">
+        actions={
-            主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店
+          <Button
-          </Typography.Text>
+            type="primary"
-        </Space>
+            onClick={() => {
-        <Button
+              void loadStores();
-          type="primary"
+              setCreateOpen(true);
-          onClick={() => {
+            }}
-            void loadStores();
+          >
-            setCreateOpen(true);
+            新建账户
-          }}
+          </Button>
-        >
+        }
-          新建账户
+      />
-        </Button>
-      </Space>
       <Form
         form={form}
         layout="inline"

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

@@ -5,6 +5,8 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type CategoryNode = {
@@ -130,7 +132,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>
       ),
     },
@@ -178,27 +180,27 @@ export default function StoreCategoriesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Space direction="vertical" size={0}>
+        title="门店分类"
-          <Typography.Title level={4} style={{ margin: 0 }}>门店分类</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        description="两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择"
-          <Typography.Text type="secondary">两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择</Typography.Text>
+        actions={
-        </Space>
+          <>
-        <Space>
+            {canDelete ? (
-          {canDelete ? (
+              <Button
-            <Button
+                onClick={async () => {
-              onClick={async () => {
+                  await request('/admin/store-categories/ensure-defaults', { method: 'POST' });
-                await request('/admin/store-categories/ensure-defaults', { method: 'POST' });
+                  message.success('已同步默认分类');
-                message.success('已同步默认分类');
+                  void reload();
-                void reload();
+                }}
-              }}
+              >
-            >
+                同步默认分类
-              同步默认分类
+              </Button>
-            </Button>
+            ) : null}
-          ) : null}
+            <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
-          <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
+          </>
-        </Space>
+        }
-      </Space>
+      />
 
       <Table
         rowKey="id"

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

@@ -13,6 +13,8 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -103,7 +105,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,
@@ -134,11 +152,11 @@ export default function StoreLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>商户日志</Typography.Title>
+      <AdminListHeader
-          {settingsButton}
+        title="商户日志"
-      <Typography.Paragraph type="secondary" style={{ marginTop: -8 }}>
+        settings={settingsButton}
-        门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。
+        description="门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。"
-      </Typography.Paragraph>
+      />
       <Segmented
         style={{ marginBottom: 16 }}
         options={STORE_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}

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

@@ -8,6 +8,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -43,7 +45,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,
@@ -80,11 +97,11 @@ export default function StoreMediaPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>门店资源</Typography.Title>
+        title="门店资源"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>
+        actions={<Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>}
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="storeId" label="门店ID"><Input allowClear /></Form.Item>
         <Form.Item name="mediaType" label="类型">

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

@@ -33,6 +33,8 @@ import { notifyPackageAuditChanged } from '../lib/admin-events';
 import { fmtTime } from '../lib/constants';
 import StorePackageAuditPanel from '../components/StorePackageAuditPanel';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
   PENDING: '待审核',
@@ -199,7 +201,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 +481,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',
@@ -528,8 +546,7 @@ export default function StorePackageAuditsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>审核通知</Typography.Title>
+      <AdminListHeader title="审核通知" settings={settingsButton} />
-      {settingsButton}
       <Tabs
         activeKey={activeTab}
         onChange={setActiveTab}

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

@@ -6,6 +6,7 @@ import { fmtTime, ADMIN_OPTIONS_PAGE_SIZE } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { request, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type Row = {
@@ -69,10 +70,7 @@ export default function StoreRatingsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
+      <AdminListHeader title="门店评价" settings={settingsButton} />
-        门店评价
-      </Typography.Title>
-          {settingsButton}
       <Form
         form={form}
         layout="inline"

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

@@ -21,6 +21,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -156,7 +158,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>
       ),
@@ -236,10 +238,7 @@ export default function StoreWithdrawalsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
+      <AdminListHeader title="门店提现审" settings={settingsButton} />
-        门店提现审
-      </Typography.Title>
-          {settingsButton}
       {overdueSummary ? (
         <Typography.Paragraph type="secondary">
           待审 {overdueSummary.pendingCount} 笔

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

@@ -40,6 +40,8 @@ import {
 } from '../lib/storeCreate';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
 import OssUpload from '../components/OssUpload';
@@ -739,7 +741,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>
         );
@@ -872,16 +874,14 @@ export default function StoresPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Space direction="vertical" size={0}>
+        title="门店"
-          <Typography.Title level={4} style={{ margin: 0 }}>门店</Typography.Title>
+        settings={settingsButton}
-          <Typography.Text type="secondary">共 {data?.total ?? 0} 家门店（含合伙人录入）</Typography.Text>
+        description={`共 ${data?.total ?? 0} 家门店（含合伙人录入）`}
-        </Space>
+        actions={
-        <Space>
-          {settingsButton}
           <Button type="primary" onClick={openCreateModal}>新建门店</Button>
-        </Space>
+        }
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
         <Form.Item name="phone" label="电话"><Input allowClear /></Form.Item>

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,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const MOCK_KEYS = ['MOCK_SMS', 'MOCK_WECHAT', 'MOCK_PAY'] as const;
 
@@ -254,7 +256,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',
@@ -394,10 +411,7 @@ export default function TestWhitelistPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
+      <AdminListHeader title="白名单管理" settings={settingsButton} />
-        白名单管理
-      </Typography.Title>
-      {settingsButton}
 
       <Card size="small" loading={mockLoading} style={{ marginBottom: 16 }}>
         <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>

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

@@ -5,6 +5,8 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -95,7 +97,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,
@@ -122,8 +138,7 @@ export default function ThirdPartyLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>第三方日志</Typography.Title>
+      <AdminListHeader title="第三方日志" settings={settingsButton} />
-          {settingsButton}
       <Form
         layout="inline"
         style={{ marginBottom: 16 }}

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,8 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -80,7 +82,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}` : '—'),
@@ -105,8 +121,7 @@ export default function UserLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>用户日志</Typography.Title>
+      <AdminListHeader title="用户日志" settings={settingsButton} />
-          {settingsButton}
       <Segmented
         style={{ marginBottom: 16 }}
         options={USER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}

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

@@ -20,6 +20,8 @@ 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 { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 
 type UserOrderRow = {
@@ -332,7 +334,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: '备注',
@@ -478,21 +482,21 @@ export default function UsersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>用户监控</Typography.Title>
+        title="用户监控"
-        <Space>
+        settings={settingsButton}
-          {settingsButton}
+        actions={
-        {canDeleteUsers ? (
+          canDeleteUsers ? (
-          <Button
+            <Button
-            danger
+              danger
-            disabled={!selectedRowKeys.length}
+              disabled={!selectedRowKeys.length}
-            onClick={() => void openBatchDeleteModal()}
+              onClick={() => void openBatchDeleteModal()}
-          >
+            >
-            批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
+              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
-          </Button>
+            </Button>
-        ) : null}
+          ) : null
-        </Space>
+        }
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
         <Form.Item name="phone" label="手机号">
           <Input placeholder="模糊搜索" allowClear />

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

@@ -1,318 +1,322 @@
-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 { AdminListHeader } from '../components/AdminListHeader';
-
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-type ActorType = 'USER' | 'STORE' | 'PARTNER' | 'HQ';
+
-
+
-type Identity = {
+type ActorType = 'USER' | 'STORE' | 'PARTNER' | 'HQ';
-  actorType: ActorType;
+
-  actorId: string;
+type Identity = {
-  phone: string | null;
+  actorType: ActorType;
-  name: string | null;
+  actorId: string;
-  wxOpenId: string;
+  phone: string | null;
-  wxUnionId: string | null;
+  name: string | null;
-  phoneVerified?: boolean;
+  wxOpenId: string;
-  refLabel: string | null;
+  wxUnionId: string | null;
-  refId: string | null;
+  phoneVerified?: boolean;
-  lastLoginAt: string | null;
+  refLabel: string | null;
-  status: string | number;
+  refId: string | null;
-};
+  lastLoginAt: string | null;
-
+  status: string | number;
-type GroupRow = {
+};
-  groupKey: string;
+
-  unionId: string | null;
+type GroupRow = {
-  identityCount: number;
+  groupKey: string;
-  actorTypes: ActorType[];
+  unionId: string | null;
-  multiRole: boolean;
+  identityCount: number;
-  primaryPhone: string | null;
+  actorTypes: ActorType[];
-  latestLoginAt: string | null;
+  multiRole: boolean;
-  identities: Identity[];
+  primaryPhone: string | null;
-};
+  latestLoginAt: string | null;
-
+  identities: Identity[];
-const ACTOR_TYPE_LABELS: Record<ActorType, string> = {
+};
-  USER: 'C 端用户',
+
-  STORE: '门店账号',
+const ACTOR_TYPE_LABELS: Record<ActorType, string> = {
-  PARTNER: '合伙人账号',
+  USER: 'C 端用户',
-  HQ: 'HQ 账号',
+  STORE: '门店账号',
-};
+  PARTNER: '合伙人账号',
-
+  HQ: 'HQ 账号',
-const ACTOR_TYPE_COLORS: Record<ActorType, string> = {
+};
-  USER: 'blue',
+
-  STORE: 'green',
+const ACTOR_TYPE_COLORS: Record<ActorType, string> = {
-  PARTNER: 'orange',
+  USER: 'blue',
-  HQ: 'purple',
+  STORE: 'green',
-};
+  PARTNER: 'orange',
-
+  HQ: 'purple',
-function renderActorTags(types: ActorType[]) {
+};
-  return types.map((t) => (
+
-    <Tag key={t} color={ACTOR_TYPE_COLORS[t]}>
+function renderActorTags(types: ActorType[]) {
-      {ACTOR_TYPE_LABELS[t]}
+  return types.map((t) => (
-    </Tag>
+    <Tag key={t} color={ACTOR_TYPE_COLORS[t]}>
-  ));
+      {ACTOR_TYPE_LABELS[t]}
-}
+    </Tag>
-
+  ));
-export default function WechatBindingsPage() {
+}
-  const [form] = Form.useForm();
+
-  const [filters, setFilters] = useState<Record<string, string>>({
+export default function WechatBindingsPage() {
-    actorType: '',
+  const [form] = Form.useForm();
-    phone: '',
+  const [filters, setFilters] = useState<Record<string, string>>({
-    unionId: '',
+    actorType: '',
-    openId: '',
+    phone: '',
-  });
+    unionId: '',
-  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<GroupRow>(
+    openId: '',
-    '/admin/wechat-bindings',
+  });
-    () => {
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<GroupRow>(
-      const qs = new URLSearchParams();
+    '/admin/wechat-bindings',
-      if (filters.actorType) qs.set('actorType', filters.actorType);
+    () => {
-      if (filters.phone) qs.set('phone', filters.phone);
+      const qs = new URLSearchParams();
-      if (filters.unionId) qs.set('unionId', filters.unionId);
+      if (filters.actorType) qs.set('actorType', filters.actorType);
-      if (filters.openId) qs.set('openId', filters.openId);
+      if (filters.phone) qs.set('phone', filters.phone);
-      return qs;
+      if (filters.unionId) qs.set('unionId', filters.unionId);
-    },
+      if (filters.openId) qs.set('openId', filters.openId);
-    [filters],
+      return qs;
-  );
+    },
-  const [detail, setDetail] = useState<GroupRow | null>(null);
+    [filters],
-  const [drawerOpen, setDrawerOpen] = useState(false);
+  );
-
+  const [detail, setDetail] = useState<GroupRow | null>(null);
-  useEffect(() => {
+  const [drawerOpen, setDrawerOpen] = useState(false);
-    form.setFieldsValue(filters);
+
-  }, [form, filters]);
+  useEffect(() => {
-
+    form.setFieldsValue(filters);
-  async function openDetail(row: GroupRow) {
+  }, [form, filters]);
-    const res = await request<GroupRow>(`/admin/wechat-bindings/${encodeURIComponent(row.groupKey)}`);
+
-    setDetail(res);
+  async function openDetail(row: GroupRow) {
-    setDrawerOpen(true);
+    const res = await request<GroupRow>(`/admin/wechat-bindings/${encodeURIComponent(row.groupKey)}`);
-  }
+    setDetail(res);
-
+    setDrawerOpen(true);
-  const baseColumns: ColumnsType<GroupRow> = [
+  }
-    {
+
-      title: 'unionId',
+  const baseColumns: ColumnsType<GroupRow> = [
-      dataIndex: 'unionId',
+    {
-      width: 180,
+      title: 'unionId',
-
+      dataIndex: 'unionId',
-      render: (v) => v || <Tag>无 unionId</Tag>,
+      width: 180,
-    },
+      render: (v) => v || <Tag>无 unionId</Tag>,
-    {
+    },
-      title: '身份数',
+    {
-      dataIndex: 'identityCount',
+      title: '身份数',
-      width: 90,
+      dataIndex: 'identityCount',
-      render: (v, r) => (
+      width: 90,
-        <Space size={4}>
+      render: (v, r) => (
-          <span>{v}</span>
+        <Space size={4}>
-          {r.multiRole ? <Tag color="red">一人多角色</Tag> : null}
+          <span>{v}</span>
-        </Space>
+          {r.multiRole ? <Tag color="red">一人多角色</Tag> : null}
-      ),
+        </Space>
-    },
+      ),
-    {
+    },
-      title: '端类型',
+    {
-      dataIndex: 'actorTypes',
+      title: '端类型',
-      width: 220,
+      dataIndex: 'actorTypes',
-      render: (types: ActorType[]) => renderActorTags(types),
+      width: 220,
-    },
+      render: (types: ActorType[]) => renderActorTags(types),
-    {
+    },
-      title: '手机号',
+    {
-      dataIndex: 'primaryPhone',
+      title: '手机号',
-      width: 140,
+      dataIndex: 'primaryPhone',
-      render: (v) => maskPhone(v),
+      width: 140,
-    },
+      render: (v, row) => (
-    {
+        <AdminPrimaryLink onClick={() => void openDetail(row)}>{maskPhone(v)}</AdminPrimaryLink>
-      title: '身份摘要',
+      ),
-
+    },
-      render: (_, r) => (
+    {
-        <AdminCellLine
+      title: '身份摘要',
-          primary={r.identities.map((i) => ACTOR_TYPE_LABELS[i.actorType]).join(' / ')}
+      render: (_, r) => (
-          secondary={r.identities
+        <AdminCellLine
-            .map((i) => i.refLabel || i.name || (i.phone ? maskPhone(i.phone) : ''))
+          primary={r.identities.map((i) => ACTOR_TYPE_LABELS[i.actorType]).join(' / ')}
-            .filter(Boolean)
+          secondary={r.identities
-            .join(' · ')}
+            .map((i) => i.refLabel || i.name || (i.phone ? maskPhone(i.phone) : ''))
-        />
+            .filter(Boolean)
-      ),
+            .join(' · ')}
-    },
+        />
-    {
+      ),
-      title: '最近登录',
+    },
-      dataIndex: 'latestLoginAt',
+    {
-      width: 160,
+      title: '最近登录',
-      render: fmtTime,
+      dataIndex: 'latestLoginAt',
-    },
+      width: 160,
-    {
+      render: fmtTime,
-      title: '操作',
+    },
-      width: 80,
+    {
-      render: (_, row) => (
+      title: '操作',
-        <Button type="link" size="small" onClick={() => void openDetail(row)}>
+      width: 80,
-          详情
+      render: (_, row) => (
-        </Button>
+        <Button type="link" size="small" onClick={() => void openDetail(row)}>
-      ),
+          详情
-    },
+        </Button>
-  ];
+      ),
-
+    },
-  const identityColumns: ColumnsType<Identity> = [
+  ];
-    {
+
-      title: '端类型',
+  const identityColumns: ColumnsType<Identity> = [
-      dataIndex: 'actorType',
+    {
-      width: 120,
+      title: '端类型',
-      render: (t: ActorType) => <Tag color={ACTOR_TYPE_COLORS[t]}>{ACTOR_TYPE_LABELS[t]}</Tag>,
+      dataIndex: 'actorType',
-    },
+      width: 120,
-    {
+      render: (t: ActorType) => <Tag color={ACTOR_TYPE_COLORS[t]}>{ACTOR_TYPE_LABELS[t]}</Tag>,
-      title: '账号',
+    },
-
+    {
-      render: (_, r) => (
+      title: '账号',
-        <AdminCellLine
+      render: (_, r) => (
-          primary={r.name || '—'}
+        <AdminCellLine
-          secondary={[r.phone ? maskPhone(r.phone) : null, `#${r.actorId}`].filter(Boolean).join(' ')}
+          primary={r.name || '—'}
-        />
+          secondary={[r.phone ? maskPhone(r.phone) : null, `#${r.actorId}`].filter(Boolean).join(' ')}
-      ),
+        />
-    },
+      ),
-    {
+    },
-      title: '归属',
+    {
-      dataIndex: 'refLabel',
+      title: '归属',
-      width: 160,
+      dataIndex: 'refLabel',
-
+      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: '手机验证',
-      title: '手机验证',
+      width: 90,
-      width: 90,
+      render: (_, r) =>
-      render: (_, r) =>
+        r.actorType === 'USER' ? (
-        r.actorType === 'USER' ? (
+          r.phoneVerified ? <Tag color="blue">已验证</Tag> : <Tag>未验证</Tag>
-          r.phoneVerified ? <Tag color="blue">已验证</Tag> : <Tag>未验证</Tag>
+        ) : (
-        ) : (
+          '—'
-          '—'
+        ),
-        ),
+    },
-    },
+    {
-    {
+      title: '最近登录',
-      title: '最近登录',
+      dataIndex: 'lastLoginAt',
-      dataIndex: 'lastLoginAt',
+      width: 160,
-      width: 160,
+      render: fmtTime,
-      render: fmtTime,
+    },
-    },
+    {
-    {
+      title: '状态',
-      title: '状态',
+      dataIndex: 'status',
-      dataIndex: 'status',
+      width: 90,
+      render: (v) => String(v),
+    },
+  ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('wechat-bindings', baseColumns, { page, pageSize });
 
-    },
+  return (
     <div>
-
+      {settingsModal}
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('wechat-bindings', baseColumns, { page, pageSize });
+      <AdminListHeader
-
+        title="微信绑定总览"
-  return (
+        settings={settingsButton}
-    <div>
+        description="按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。"
-      {settingsModal}
+      />
-      <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,8 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import type { WecomBotLogDto } from '@dukang/shared-types';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 export default function WecomBotLogsPage() {
@@ -28,7 +30,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 || '—' },
@@ -56,11 +65,11 @@ export default function WecomBotLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>企微机器人日志</Typography.Title>
+      <AdminListHeader
-          {settingsButton}
+        title="企微机器人日志"
-      <Typography.Paragraph type="secondary">
+        settings={settingsButton}
-        记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。
+        description="记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。"
-      </Typography.Paragraph>
+      />
 
       <Form
         form={form}

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,8 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type FormValues = {
@@ -202,7 +204,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>
       ),
     },
@@ -271,9 +273,15 @@ function PushRoutesTab() {
   return (
     <>
       {settingsModal}
-      <Typography.Paragraph type="secondary">
+      <AdminListHeader
-        配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。
+        settings={settingsButton}
-      </Typography.Paragraph>
+        description="配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。"
+        actions={
+          <Button type="primary" onClick={openCreate}>
+            新建推送
+          </Button>
+        }
+      />
 
       <Form
         form={filterForm}
@@ -308,10 +316,6 @@ function PushRoutesTab() {
             >
               重置
             </Button>
-            <Button type="primary" onClick={openCreate}>
-              新建推送
-            </Button>
-            {settingsButton}
           </Space>
         </Form.Item>
       </Form>

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

@@ -27,6 +27,8 @@ import { downloadExcelCsv } from '../lib/exportExcel';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
 type Row = {
@@ -238,7 +240,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',
@@ -297,31 +306,18 @@ export default function WineryBillsPage() {
   return (
     <div>
       {settingsModal}
-      <div
+      <AdminListHeader
-        style={{
+        title="酒厂对账单"
-          display: 'flex',
+        settings={settingsButton}
-          justifyContent: 'space-between',
+        description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
-          alignItems: 'flex-start',
+        actions={
-          marginBottom: 16,
+          canEditWineryBank ? (
-          gap: 16,
+            <Button type="default" onClick={() => void openBankModal()}>
-        }}
+              酒厂银行账户信息配置
-      >
+            </Button>
-        <Space direction="vertical" size={0}>
+          ) : null
-          <Typography.Title level={4} style={{ margin: 0 }}>
+        }
-            酒厂对账单
+      />
-          </Typography.Title>
-          {settingsButton}
-          <Typography.Text type="secondary">
-            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色、应付为 0
-            无需打款（灰），可展开订单明细
-          </Typography.Text>
-        </Space>
-        {canEditWineryBank ? (
-          <Button type="default" onClick={() => void openBankModal()}>
-            酒厂银行账户信息配置
-          </Button>
-        ) : null}
-      </div>
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>

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

@@ -10,6 +10,8 @@ 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';
+import { AdminListHeader } from '../../components/AdminListHeader';
 
 
 export default function PromoCodeUsersPage() {
@@ -25,7 +27,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: '验手机',
@@ -74,20 +85,24 @@ export default function PromoCodeUsersPage() {
   const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-code-users', baseColumns, { page, pageSize });
 
   return (
-    <Table
+    <>
-      rowKey="id"
+      {settingsModal}
-      className="admin-table-nowrap"
+      <AdminListHeader settings={settingsButton} />
-      loading={loading}
+      <Table
-      columns={columns}
+        rowKey="id"
-      dataSource={data?.items ?? []}
+        className="admin-table-nowrap"
-      scroll={{ x: 'max-content' }}
+        loading={loading}
-      pagination={{
+        columns={columns}
-        current: page,
+        dataSource={data?.items ?? []}
-        pageSize,
+        scroll={{ x: 'max-content' }}
-        total: data?.total ?? 0,
+        pagination={{
-        showSizeChanger: true,
+          current: page,
-        onChange: (p, ps) => { setPage(p); setPageSize(ps); },
+          pageSize,
-      }}
+          total: data?.total ?? 0,
-    />
+          showSizeChanger: true,
+          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
+        }}
+      />
+    </>
   );
 }

apps/h5-shop/src/components/AuthGate.tsx

@@ -1,6 +1,7 @@
 import { Navigate, useLocation } from 'react-router-dom';
 import { getStoreProfile, hasShopWxSession } from '../lib/api';
 import { useStoreSession } from '../contexts/StoreSessionContext';
+import { peekShopReturnTo, rememberShopReturnPath } from '../lib/shop-redeem-return';
 
 const PUBLIC_PATHS = new Set(['/login', '/legal/user-agreement', '/legal/privacy-policy']);
 const SELECT_STORE_PATH = '/select-store';
@@ -18,14 +19,17 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
   }
 
   if (authenticated && location.pathname === '/login') {
-    return <Navigate to={needsSelectStore ? SELECT_STORE_PATH : '/'} replace />;
+    const next = needsSelectStore ? SELECT_STORE_PATH : (peekShopReturnTo() || '/');
+    return <Navigate to={next} replace />;
   }
 
   if (authenticated && needsSelectStore && location.pathname !== SELECT_STORE_PATH) {
+    rememberShopReturnPath(location);
     return <Navigate to={SELECT_STORE_PATH} replace />;
   }
 
   if (!authenticated && !PUBLIC_PATHS.has(location.pathname)) {
+    rememberShopReturnPath(location);
     const profile = getStoreProfile();
     if (profile && hasShopWxSession() && location.pathname !== '/login') {
       return <Navigate to="/login?quick=1" replace state={{ from: location }} />;

apps/h5-shop/src/lib/redeem-scan.ts

@@ -1,22 +1 @@
-/** 从微信扫码结果解析核销 token（32 位 hex 或带 token 参数的 URL） */
+export { parseRedeemTokenFromScan } from '@dukang/shared-types';
-export function parseRedeemTokenFromScan(raw: string): string | null {
-  const trimmed = raw.trim();
-  if (!trimmed) return null;
-
-  if (/^[a-f0-9]{32}$/i.test(trimmed)) {
-    return trimmed.toLowerCase();
-  }
-
-  try {
-    const url = trimmed.startsWith('http') ? new URL(trimmed) : new URL(trimmed, 'https://local.invalid');
-    const fromQuery = url.searchParams.get('token');
-    if (fromQuery && /^[a-f0-9]{32}$/i.test(fromQuery)) {
-      return fromQuery.toLowerCase();
-    }
-  } catch {
-    /* not a URL */
-  }
-
-  const hexMatch = trimmed.match(/[a-f0-9]{32}/i);
-  return hexMatch ? hexMatch[0].toLowerCase() : null;
-}

apps/h5-shop/src/lib/shop-nav.ts

@@ -0,0 +1,14 @@
+import { hardNavigateInWechat, shouldHardNavigateForJssdk } from '@dukang/weixin-sdk';
+
+/** iOS 微信内用整页跳转，避免 JSSDK 入场 URL 与 SPA 路径不一致 */
+export function goShopPath(
+  path: string,
+  navigate: (path: string, opts?: { replace?: boolean }) => void,
+  opts?: { replace?: boolean },
+): void {
+  if (shouldHardNavigateForJssdk()) {
+    hardNavigateInWechat(path);
+    return;
+  }
+  navigate(path, { replace: opts?.replace ?? true });
+}

apps/h5-shop/src/lib/shop-redeem-return.ts

@@ -0,0 +1,45 @@
+/** 扫核销码落地 /redeem?token= 后未登录或需选店，记下回跳路径（OAuth 整页跳转会丢掉 location.state） */
+export const SHOP_REDEEM_RETURN_KEY = 'shop_redeem_return';
+
+function isRedeemReturnPath(path: string): boolean {
+  if (!path.startsWith('/redeem')) return false;
+  if (path.startsWith('/redeem/')) return false;
+  try {
+    const url = new URL(path, 'https://local.invalid');
+    return !!url.searchParams.get('token')?.trim();
+  } catch {
+    return false;
+  }
+}
+
+export function rememberShopReturnTo(path: string): void {
+  if (!isRedeemReturnPath(path)) return;
+  try {
+    sessionStorage.setItem(SHOP_REDEEM_RETURN_KEY, path);
+  } catch {
+    /* ignore */
+  }
+}
+
+export function rememberShopReturnPath(location: { pathname: string; search: string }): void {
+  rememberShopReturnTo(`${location.pathname}${location.search}`);
+}
+
+export function peekShopReturnTo(): string | null {
+  try {
+    const path = sessionStorage.getItem(SHOP_REDEEM_RETURN_KEY);
+    return path && isRedeemReturnPath(path) ? path : null;
+  } catch {
+    return null;
+  }
+}
+
+export function consumeShopReturnTo(): string | null {
+  const path = peekShopReturnTo();
+  try {
+    sessionStorage.removeItem(SHOP_REDEEM_RETURN_KEY);
+  } catch {
+    /* ignore */
+  }
+  return path;
+}

apps/h5-shop/src/pages/RedeemConfirmPage.tsx

@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import WeakNetFallbackPanel from '../components/WeakNetFallbackPanel';
 import { request } from '../lib/api';
 import { reportRedeemFailure } from '../lib/redeem-failure';
+import { consumeShopReturnTo } from '../lib/shop-redeem-return';
 import { toastError } from '../lib/toast';
 import { useStorePageView } from '../lib/usePageView';
 
@@ -47,6 +48,7 @@ export default function RedeemConfirmPage() {
       navigate('/', { replace: true });
       return;
     }
+    consumeShopReturnTo();
     setToken(scanned);
   }, [searchParams, navigate]);
 

apps/h5-shop/src/pages/RedeemSuccessPage.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useMemo } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
+import { goShopPath } from '../lib/shop-nav';
 import { notifyRedeemSuccess } from '../lib/useRedeemSuccessBus';
 import { formatMoney, toMoneyNumber } from '../lib/money';
 
@@ -35,10 +36,12 @@ export default function RedeemSuccessPage() {
     });
   }, [redeemNo, amount]);
 
+  const goHome = () => goShopPath('/', navigate, { replace: true });
+
   return (
     <div className="shop-success-page">
       <header className="shop-success-header">
-        <button type="button" className="shop-redeem-back" onClick={() => navigate('/')} aria-label="返回">
+        <button type="button" className="shop-redeem-back" onClick={goHome} aria-label="返回">
           <span className="material-symbols-outlined">arrow_back</span>
         </button>
         <h1 className="app-page-title">杜康好客</h1>
@@ -85,11 +88,11 @@ export default function RedeemSuccessPage() {
       </div>
 
       <div className="shop-success-actions">
-        <button type="button" className="shop-success-primary-btn" onClick={() => navigate('/')}>
+        <button type="button" className="shop-success-primary-btn" onClick={goHome}>
           <span>继续核销</span>
           <span className="material-symbols-outlined" style={{ fontSize: 20 }}>qr_code_scanner</span>
         </button>
-        <button type="button" className="shop-success-outline-btn" onClick={() => navigate('/')}>
+        <button type="button" className="shop-success-outline-btn" onClick={goHome}>
           <span>返回首页</span>
           <span className="material-symbols-outlined" style={{ fontSize: 20 }}>home</span>
         </button>

apps/h5-shop/src/pages/SelectStorePage.tsx

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
-import { hardNavigateInWechat, shouldHardNavigateForJssdk } from '@dukang/weixin-sdk';
 import { useStoreSession } from '../contexts/StoreSessionContext';
 import {
   needsStoreSelection,
@@ -10,13 +9,11 @@ import {
   type ShopSessionPayload,
   type ShopStoreOption,
 } from '../lib/api';
+import { goShopPath } from '../lib/shop-nav';
+import { consumeShopReturnTo, peekShopReturnTo } from '../lib/shop-redeem-return';
 
-function goShopHome(navigate: (path: string, opts?: { replace?: boolean }) => void) {
+function goAfterSelectStore(navigate: (path: string, opts?: { replace?: boolean }) => void) {
-  if (shouldHardNavigateForJssdk()) {
+  goShopPath(consumeShopReturnTo() || '/', navigate);
-    hardNavigateInWechat('/');
-    return;
-  }
-  navigate('/', { replace: true });
 }
 
 export default function SelectStorePage() {
@@ -46,7 +43,7 @@ export default function SelectStorePage() {
   async function onSelect(storeId: string) {
     if (loadingId) return;
     if (storeId === currentStoreId) {
-      goShopHome(navigate);
+      goAfterSelectStore(navigate);
       return;
     }
     setLoadingId(storeId);
@@ -54,7 +51,7 @@ export default function SelectStorePage() {
     try {
       const session = await selectStore(storeId);
       applySession(session);
-      goShopHome(navigate);
+      goAfterSelectStore(navigate);
     } catch (e) {
       setMsg(e instanceof Error ? e.message : '选店失败');
     } finally {
@@ -170,16 +167,14 @@ export default function SelectStorePage() {
   );
 }
 
-/** After login/wechat: route to select-store or home */
+/** After login/wechat: route to select-store, redeem return, or home */
 export function routeAfterShopLogin(
   session: ShopSessionPayload,
   navigate: (path: string, opts?: { replace?: boolean }) => void,
 ) {
-  const path = needsStoreSelection(session) ? '/select-store' : '/';
+  if (needsStoreSelection(session)) {
-  // iOS 微信：必须整页跳转，让业务页成为 JSSDK 新入场 URL，否则扫码验签必挂
+    goShopPath('/select-store', navigate);
-  if (shouldHardNavigateForJssdk()) {
-    hardNavigateInWechat(path);
     return;
   }
-  navigate(path, { replace: true });
+  goShopPath(peekShopReturnTo() || '/', navigate);
 }

apps/mini-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dukang/mini-user",
-  "version": "3.5.4",
+  "version": "3.5.10",
   "private": true,
   "description": "杜康好客 · C 端用户微信小程序（Taro）",
   "scripts": {

apps/mini-user/src/components/ContactCsButton.tsx

@@ -1,5 +1,9 @@
+import { useEffect, useState } from 'react';
 import { Button, Text } from '@tarojs/components';
 import type { ReactNode } from 'react';
+import { toast } from '../lib/api';
+import { getBrandAssetsSync, loadBrandAssets } from '../lib/brand-assets';
+import { openWecomCustomerServiceChat } from '../lib/wecom-cs';
 
 export type ContactCsSessionContext = {
   orderId?: string;
@@ -16,7 +20,7 @@ type ContactCsButtonProps = {
 
 const isWeapp = process.env.TARO_ENV === 'weapp';
 
-/** 组装 session-from（微信限制约 1000 字符） */
+/** 组装 session-from（微信限制约 1000 字符；原生小程序客服兜底用） */
 export function buildCsSessionFrom(session?: ContactCsSessionContext): string {
   if (!session) return 'dukang|from=mini-user';
   const parts = ['dukang'];
@@ -26,16 +30,59 @@ export function buildCsSessionFrom(session?: ContactCsSessionContext): string {
   return parts.join('|');
 }
 
+function canOpenWecom(url: string, corpId: string) {
+  return !!url.trim() && !!corpId.trim();
+}
+
 /**
- * 微信小程序客服入口（open-type=contact）。
+ * C 端在线客服：
- * 非 weapp 环境不渲染，由调用方走电话等兜底。
+ * - weapp 且已配置 CorpID + kfid：调起企业微信「微信客服」
+ * - weapp 未配 CorpID：回退 open-type=contact
+ * - H5：有 kfid 则打开企微客服链接
  */
 export default function ContactCsButton({
   className = '',
   children = '联系在线客服',
   session,
 }: ContactCsButtonProps) {
-  if (!isWeapp) return null;
+  const [cs, setCs] = useState(() => getBrandAssetsSync());
+
+  useEffect(() => {
+    void loadBrandAssets().then(setCs);
+  }, []);
+
+  const wecomChatReady = canOpenWecom(cs.customerServiceWecomUrl, cs.wecomCorpId);
+  const wecomWebReady = !!cs.customerServiceWecomUrl.trim();
+
+  if (!isWeapp && !wecomWebReady) return null;
+
+  async function openWecom() {
+    try {
+      if (isWeapp && wecomChatReady) {
+        await openWecomCustomerServiceChat({
+          url: cs.customerServiceWecomUrl,
+          corpId: cs.wecomCorpId,
+          session,
+        });
+        return;
+      }
+      if (typeof window !== 'undefined' && cs.customerServiceWecomUrl) {
+        window.location.href = cs.customerServiceWecomUrl;
+        return;
+      }
+      toast('请在微信内打开后联系客服');
+    } catch (e) {
+      toast(e instanceof Error ? e.message : '无法打开客服');
+    }
+  }
+
+  if (wecomChatReady || (!isWeapp && wecomWebReady)) {
+    return (
+      <Button className={className} hoverClass="none" onClick={() => void openWecom()}>
+        {typeof children === 'string' ? <Text>{children}</Text> : children}
+      </Button>
+    );
+  }
 
   return (
     <Button

apps/mini-user/src/components/DeliveryHintHtml.tsx

@@ -0,0 +1,22 @@
+import { RichText, Text } from '@tarojs/components';
+import { deliveryHintHtmlToRichNodes } from '@dukang/shared-types';
+import { DEFAULT_LOCAL_DELIVERY_HINT } from '../lib/local-delivery';
+
+type DeliveryHintHtmlProps = {
+  html?: string | null;
+  className?: string;
+};
+
+/** 承运商配送提示：HTML 用 RichText；textarea 里的换行转成 br */
+export default function DeliveryHintHtml({
+  html,
+  className = '',
+}: DeliveryHintHtmlProps) {
+  const raw = (html || '').trim() || DEFAULT_LOCAL_DELIVERY_HINT;
+  const nodes = deliveryHintHtmlToRichNodes(raw);
+  const looksHtml = /<[a-z][\s\S]*>/i.test(nodes);
+  if (!looksHtml) {
+    return <Text className={className}>{nodes}</Text>;
+  }
+  return <RichText className={className} nodes={nodes} />;
+}

apps/mini-user/src/components/RedeemQrCode.tsx

@@ -10,10 +10,11 @@ import {
 const CANVAS_ID = 'redeem-qr-canvas';
 
 type RedeemQrCodeProps = {
-  token: string;
+  /** 二维码内容：门店 H5 落地 URL，缺省回退 token */
+  payload: string;
 };
 
-function drawOnWeappCanvas(token: string) {
+function drawOnWeappCanvas(payload: string) {
   const page = Taro.getCurrentInstance().page;
   const query = page ? Taro.createSelectorQuery().in(page) : Taro.createSelectorQuery();
   query
@@ -33,33 +34,33 @@ function drawOnWeappCanvas(token: string) {
       canvas.width = layoutW * dpr;
       canvas.height = layoutH * dpr;
       ctx.scale(dpr, dpr);
-      drawRedeemQrOnCanvas(ctx, token, drawSize);
+      drawRedeemQrOnCanvas(ctx, payload, drawSize);
     });
 }
 
-export default function RedeemQrCode({ token }: RedeemQrCodeProps) {
+export default function RedeemQrCode({ payload }: RedeemQrCodeProps) {
   const [imgSrc, setImgSrc] = useState('');
   const isWeapp = process.env.TARO_ENV === 'weapp';
 
   useEffect(() => {
-    if (!token) {
+    if (!payload) {
       setImgSrc('');
       return;
     }
 
     if (isWeapp) {
-      const timer = setTimeout(() => drawOnWeappCanvas(token), 120);
+      const timer = setTimeout(() => drawOnWeappCanvas(payload), 120);
       return () => clearTimeout(timer);
     }
 
     let cancelled = false;
-    void buildRedeemQrDataUrl(token).then((url) => {
+    void buildRedeemQrDataUrl(payload).then((url) => {
       if (!cancelled) setImgSrc(url);
     });
     return () => {
       cancelled = true;
     };
-  }, [token, isWeapp]);
+  }, [payload, isWeapp]);
 
   return (
     <View className="redeem-qr-box">

apps/mini-user/src/lib/brand-assets.ts

@@ -3,6 +3,7 @@ import {
   BRAND_LOGO_URL,
   BRAND_LOGO_WIDE_URL,
   CUSTOMER_SERVICE_PHONE,
+  CUSTOMER_SERVICE_WECOM_URL,
   QUALIFICATION_DISCLOSURE_URL,
   type ClientRuntimeConfig,
 } from '@dukang/shared-types';
@@ -14,6 +15,8 @@ export type BrandAssets = {
   brandLogoMarkUrl: string;
   qualificationDisclosureUrl: string;
   customerServicePhone: string;
+  customerServiceWecomUrl: string;
+  wecomCorpId: string;
 };
 
 const FALLBACK: BrandAssets = {
@@ -22,6 +25,8 @@ const FALLBACK: BrandAssets = {
   brandLogoMarkUrl: BRAND_LOGO_MARK_URL,
   qualificationDisclosureUrl: QUALIFICATION_DISCLOSURE_URL,
   customerServicePhone: CUSTOMER_SERVICE_PHONE,
+  customerServiceWecomUrl: CUSTOMER_SERVICE_WECOM_URL,
+  wecomCorpId: '',
 };
 
 let cached: BrandAssets | null = null;
@@ -35,6 +40,9 @@ function fromConfig(config: ClientRuntimeConfig | null | undefined): BrandAssets
     qualificationDisclosureUrl:
       config?.qualificationDisclosureUrl?.trim() || FALLBACK.qualificationDisclosureUrl,
     customerServicePhone: config?.customerServicePhone?.trim() || FALLBACK.customerServicePhone,
+    customerServiceWecomUrl:
+      config?.customerServiceWecomUrl?.trim() || FALLBACK.customerServiceWecomUrl,
+    wecomCorpId: config?.wecomCorpId?.trim() || FALLBACK.wecomCorpId,
   };
 }
 

apps/mini-user/src/lib/client-version.ts

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 import { fetchClientConfig } from './pay-wechat';
 
 /** 与 package.json version 同步，供服务端 minClientVersion 比对 */
-export const APP_VERSION = '3.5.4';
+export const APP_VERSION = '3.5.10';
 
 export const APP_VERSION_LABEL = `v${APP_VERSION}`;
 

apps/mini-user/src/lib/local-delivery.ts

@@ -0,0 +1,57 @@
+import type { LocalDeliveryDto } from '@dukang/shared-types';
+import { DEFAULT_LOCAL_DELIVERY_HINT } from '@dukang/shared-types';
+import { request } from './api';
+
+export { DEFAULT_LOCAL_DELIVERY_HINT };
+
+const CACHE_TTL_MS = 60_000;
+let cached: LocalDeliveryDto[] | null = null;
+let cachedAt = 0;
+let inflight: Promise<LocalDeliveryDto[]> | null = null;
+
+function cityAliases(name: string): string[] {
+  const raw = name.trim();
+  if (!raw) return [];
+  const noSuffix = raw.replace(/市$/, '');
+  const withSuffix = raw.endsWith('市') ? raw : `${raw}市`;
+  return [raw, noSuffix, withSuffix];
+}
+
+export async function loadLocalDeliveries(force = false): Promise<LocalDeliveryDto[]> {
+  if (!force && cached && Date.now() - cachedAt < CACHE_TTL_MS) return cached;
+  if (!force && inflight) return inflight;
+  inflight = request<LocalDeliveryDto[]>('/catalog/local-deliveries')
+    .then((list) => {
+      cached = Array.isArray(list) ? list : [];
+      cachedAt = Date.now();
+      return cached;
+    })
+    .catch(() => {
+      cached = cached ?? [];
+      return cached;
+    })
+    .finally(() => {
+      inflight = null;
+    });
+  return inflight;
+}
+
+export function matchLocalDelivery(
+  list: LocalDeliveryDto[],
+  opts: { cityCode?: string | null; cityName?: string | null },
+): LocalDeliveryDto | null {
+  const code = String(opts.cityCode || '').trim();
+  if (code) {
+    const byCode = list.find((row) => row.city.code === code);
+    if (byCode) return byCode;
+  }
+  const names = new Set(cityAliases(String(opts.cityName || '')));
+  if (!names.size) return null;
+  return list.find((row) => cityAliases(row.city.name).some((n) => names.has(n))) ?? null;
+}
+
+export function resolveLocalDeliveryHintHtml(row: LocalDeliveryDto | null): string {
+  const html = row?.hintHtml?.trim();
+  if (html) return html;
+  return DEFAULT_LOCAL_DELIVERY_HINT;
+}

apps/mini-user/src/lib/product-fulfillment.ts

@@ -1,3 +1,8 @@
+import { DEFAULT_LOCAL_DELIVERY_HINT } from '@dukang/shared-types';
+
+/** @deprecated 使用 DEFAULT_LOCAL_DELIVERY_HINT；空配置回退 */
+export const LOCAL_DELIVERY_ETA_HINT = DEFAULT_LOCAL_DELIVERY_HINT;
+
 /** 商品履约能力（与 HQ / 交易硬闸一致） */
 
 export type FulfillmentFlags = {

apps/mini-user/src/lib/redeem-qr.ts

@@ -8,13 +8,13 @@ const QR_OPTIONS = {
   color: { dark: '#1f1a17', light: '#ffffff' },
 } as const;
 
-/** 在 2d Canvas 上绘制二维码（小程序 / H5 通用） */
+/** 在 2d Canvas 上绘制二维码（小程序 / H5 通用；payload 为落地 URL 或纯 token） */
 export function drawRedeemQrOnCanvas(
   ctx: CanvasRenderingContext2D,
-  token: string,
+  payload: string,
   sizePx = QR_SIZE,
 ) {
-  const qr = QRCode.create(token, { errorCorrectionLevel: 'M' });
+  const qr = QRCode.create(payload, { errorCorrectionLevel: 'M' });
   const count = qr.modules.size;
   const cell = sizePx / count;
 
@@ -31,11 +31,11 @@ export function drawRedeemQrOnCanvas(
 }
 
 /** H5：Data URL；失败时回退到与 h5-user 相同的外部 QR 服务 */
-export async function buildRedeemQrDataUrl(token: string): Promise<string> {
+export async function buildRedeemQrDataUrl(payload: string): Promise<string> {
   try {
-    return await QRCode.toDataURL(token, QR_OPTIONS);
+    return await QRCode.toDataURL(payload, QR_OPTIONS);
   } catch {
-    return `https://api.qrserver.com/v1/create-qr-code/?size=${QR_SIZE * 2}x${QR_SIZE * 2}&data=${encodeURIComponent(token)}`;
+    return `https://api.qrserver.com/v1/create-qr-code/?size=${QR_SIZE * 2}x${QR_SIZE * 2}&data=${encodeURIComponent(payload)}`;
   }
 }
 

apps/mini-user/src/lib/wecom-cs.ts

@@ -0,0 +1,85 @@
+import Taro from '@tarojs/taro';
+
+export type WecomCsSessionContext = {
+  orderId?: string;
+  orderNo?: string;
+  from?: string;
+};
+
+type OpenCsChatOption = {
+  extInfo: { url: string };
+  corpId: string;
+  showMessageCard?: boolean;
+  sendMessageTitle?: string;
+  sendMessagePath?: string;
+};
+
+type OpenCsChatFn = (option: OpenCsChatOption) => Promise<unknown>;
+
+function getTaroOpenCsChat(): OpenCsChatFn | null {
+  const api = (Taro as unknown as { openCustomerServiceChat?: OpenCsChatFn }).openCustomerServiceChat;
+  return typeof api === 'function' ? api : null;
+}
+
+function getWxOpenCsChat(): ((option: OpenCsChatOption & {
+  success?: () => void;
+  fail?: (err: { errMsg?: string }) => void;
+}) => void) | null {
+  const wxApi = (
+    globalThis as {
+      wx?: {
+        openCustomerServiceChat?: (option: OpenCsChatOption & {
+          success?: () => void;
+          fail?: (err: { errMsg?: string }) => void;
+        }) => void;
+      };
+    }
+  ).wx?.openCustomerServiceChat;
+  return typeof wxApi === 'function' ? wxApi : null;
+}
+
+/** 小程序调起企业微信「微信客服」会话 */
+export async function openWecomCustomerServiceChat(params: {
+  url: string;
+  corpId: string;
+  session?: WecomCsSessionContext;
+}): Promise<void> {
+  const url = params.url.trim();
+  const corpId = params.corpId.trim();
+  if (!url || !corpId) {
+    throw new Error('企微客服未配置');
+  }
+
+  const option: OpenCsChatOption = {
+    extInfo: { url },
+    corpId,
+  };
+  if (params.session?.orderNo || params.session?.orderId) {
+    option.showMessageCard = true;
+    option.sendMessageTitle = params.session.orderNo
+      ? `订单 ${params.session.orderNo}`
+      : '订单咨询';
+    if (params.session.orderId) {
+      option.sendMessagePath = `pages/order-detail/index?id=${params.session.orderId}`;
+    }
+  }
+
+  const taroApi = getTaroOpenCsChat();
+  if (taroApi) {
+    await taroApi(option);
+    return;
+  }
+
+  const wxApi = getWxOpenCsChat();
+  if (!wxApi) {
+    throw new Error('当前微信版本不支持企业微信客服');
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    wxApi({
+      ...option,
+      success: () => resolve(),
+      fail: (err) => reject(new Error(err?.errMsg || '无法打开企业微信客服')),
+    });
+  });
+}

apps/mini-user/src/pages/customer-service/index.tsx

@@ -16,35 +16,43 @@ function dialPhone(phone: string) {
 }
 
 export default function CustomerServicePage() {
-  const [phone, setPhone] = useState(() => getBrandAssetsSync().customerServicePhone);
+  const [brand, setBrand] = useState(() => getBrandAssetsSync());
 
   useEffect(() => {
-    void loadBrandAssets().then((b) => setPhone(b.customerServicePhone));
+    void loadBrandAssets().then(setBrand);
   }, []);
 
+  const phone = brand.customerServicePhone;
+  const wecomReady = !!brand.customerServiceWecomUrl.trim() && !!brand.wecomCorpId.trim();
+  const wecomUrlReady = !!brand.customerServiceWecomUrl.trim();
+
+  const hint = isWeapp
+    ? wecomReady
+      ? '点击下方按钮，进入企业微信客服会话'
+      : '点击下方按钮，进入在线客服会话'
+    : wecomUrlReady
+      ? '点击下方按钮进入企业微信客服，或拨打客服电话'
+      : '请在微信小程序内打开以使用在线客服，或拨打客服电话';
+
   return (
     <PageShell variant="sub" className="cs-page">
       <SubPageHeader title="联系客服" />
       <View className="sub-page-body inset-page cs-body">
         <Text className="cs-brand">杜康好客客服</Text>
-        <Text className="cs-hint">
+        <Text className="cs-hint">{hint}</Text>
-          {isWeapp
-            ? '点击下方按钮，进入小程序在线客服会话'
-            : '请在微信小程序内打开以使用在线客服，或拨打客服电话'}
-        </Text>
         <Text className="cs-hours">工作时间：9:00 - 21:00</Text>
 
-        {isWeapp ? (
+        {isWeapp || wecomUrlReady ? (
           <ContactCsButton className="cs-online-btn" session={{ from: 'customer-service' }} />
         ) : null}
 
-        <View className={isWeapp ? 'cs-phone-link' : 'cs-call-btn'} onClick={() => dialPhone(phone)}>
+        <View className={isWeapp || wecomUrlReady ? 'cs-phone-link' : 'cs-call-btn'} onClick={() => dialPhone(phone)}>
           <Text>
-            {isWeapp ? `或拨打客服电话 ${phone}` : '拨打客服电话'}
+            {isWeapp || wecomUrlReady ? `或拨打客服电话 ${phone}` : '拨打客服电话'}
           </Text>
         </View>
 
-        {!isWeapp ? (
+        {!isWeapp && !wecomUrlReady ? (
           <Text className="cs-phone-display">{phone}</Text>
         ) : null}
       </View>

apps/mini-user/src/pages/order-confirm/index.tsx

@@ -11,7 +11,9 @@ import { maskPhone } from '../../lib/phone';
 import { ensurePayReady } from '../../lib/pay-ready';
 import { fetchUserProfile } from '../../lib/pay-wechat';
 import { request, toast } from '../../lib/api';
+import DeliveryHintHtml from '../../components/DeliveryHintHtml';
 import { canCrossCity, isCrossCityAddress } from '../../lib/product-fulfillment';
+import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
 import { getProductMainImage } from '../../lib/product-images';
 import BenefitFigure from '../../components/BenefitFigure';
 
@@ -75,6 +77,7 @@ export default function OrderConfirmPage() {
   const [addresses, setAddresses] = useState<Address[]>([]);
   const [addressId, setAddressId] = useState(checkoutCtx.addressId || '');
   const [preview, setPreview] = useState<OrderPreview | null>(null);
+  const [localHintHtml, setLocalHintHtml] = useState('');
   const [previewLoading, setPreviewLoading] = useState(false);
   const [loading, setLoading] = useState(false);
   const [msg, setMsg] = useState('');
@@ -151,6 +154,18 @@ export default function OrderConfirmPage() {
     [addresses, addressId],
   );
 
+  useEffect(() => {
+    const cityName = selectedAddress?.city;
+    if (!cityName) {
+      setLocalHintHtml('');
+      return;
+    }
+    void loadLocalDeliveries().then((list) => {
+      const row = matchLocalDelivery(list, { cityName });
+      setLocalHintHtml(row ? resolveLocalDeliveryHintHtml(row) : '');
+    });
+  }, [selectedAddress?.city]);
+
   const allowCross =
     preview?.allowCrossCityDelivery !== undefined
       ? canCrossCity({ allowCrossCityDelivery: preview.allowCrossCityDelivery })
@@ -339,6 +354,12 @@ export default function OrderConfirmPage() {
           </View>
         ) : null}
 
+        {!isCross && addressOk && addressId && localHintHtml ? (
+          <View className="order-card">
+            <DeliveryHintHtml className="u-muted" html={localHintHtml} />
+          </View>
+        ) : null}
+
         {preview ? (
           <>
             <View className="order-card">

apps/mini-user/src/pages/order-detail/index.tsx

@@ -10,6 +10,8 @@ import ContactCsButton from '../../components/ContactCsButton';
 import LogisticsRichText from '../../components/LogisticsRichText';
 import { request, toast } from '../../lib/api';
 import { buildPayUrl } from '../../lib/checkout-nav';
+import DeliveryHintHtml from '../../components/DeliveryHintHtml';
+import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
 import {
   formatEstimatedArrival,
   isLogisticsNotArrived,
@@ -83,6 +85,22 @@ const STATUS_LABELS: Record<string, string> = {
   REFUNDED: '已退款',
 };
 
+function applyLocalDeliveryHint(
+  data: OrderDetail,
+  setLocalHintHtml: (html: string) => void,
+) {
+  if (data.deliveryType !== 'LOCAL') {
+    setLocalHintHtml('');
+    return;
+  }
+  void loadLocalDeliveries().then((list) => {
+    const row = data.receiverCity
+      ? matchLocalDelivery(list, { cityName: data.receiverCity })
+      : null;
+    setLocalHintHtml(resolveLocalDeliveryHintHtml(row));
+  });
+}
+
 function fullReceiverAddress(order: OrderDetail) {
   const detail = (order.receiverAddress || '').trim();
   const region = [order.receiverProvince, order.receiverCity, order.receiverDistrict]
@@ -102,6 +120,7 @@ export default function OrderDetailPage() {
   const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
   const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
   const [trackLoading, setTrackLoading] = useState(false);
+  const [localHintHtml, setLocalHintHtml] = useState('');
 
   async function loadOrderTrack(delivery: OrderDetail['delivery'], orderStatus?: string) {
     if (!orderId || !shouldLoadOrderTrack(delivery)) {
@@ -133,6 +152,7 @@ export default function OrderDetailPage() {
       .then((data) => {
         setOrder(data);
         void loadOrderTrack(data.delivery, data.status);
+        applyLocalDeliveryHint(data, setLocalHintHtml);
       })
       .catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
   }, [orderId]);
@@ -144,6 +164,7 @@ export default function OrderDetailPage() {
       .then((data) => {
         setOrder(data);
         void loadOrderTrack(data.delivery, data.status);
+        applyLocalDeliveryHint(data, setLocalHintHtml);
       })
       .catch(() => {});
   });
@@ -361,6 +382,12 @@ export default function OrderDetailPage() {
                   {order.createdAt ? String(order.createdAt).slice(0, 19).replace('T', ' ') : '-'}
                 </Text>
               </View>
+              {order.deliveryType === 'LOCAL' && localHintHtml ? (
+                <View className="order-row">
+                  <Text className="order-row-label">配送时效</Text>
+                  <DeliveryHintHtml className="order-row-value" html={localHintHtml} />
+                </View>
+              ) : null}
             </View>
           </>
         )}

apps/mini-user/src/pages/redeem-code/index.tsx

@@ -39,6 +39,10 @@ export default function RedeemCodePage() {
   const router = useRouter();
   const token = decodeURIComponent(router.params.token ?? '');
   const amount = Number(router.params.amount ?? 0);
+  const landingUrl = router.params.landingUrl
+    ? decodeURIComponent(router.params.landingUrl)
+    : '';
+  const qrPayload = landingUrl || token;
 
   const [timerSec, setTimerSec] = useState(REDEEM_TOKEN_TTL_SECONDS);
   const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);
@@ -148,7 +152,7 @@ export default function RedeemCodePage() {
         <View className="redeem-code-panel">
           <Text className="redeem-code-head">请向收银员出示此码</Text>
           <View className="redeem-qr-wrap">
-            <RedeemQrCode token={token} />
+            <RedeemQrCode payload={qrPayload} />
           </View>
           <View className={`redeem-timer${timerSec > 0 && timerSec < REDEEM_TOKEN_TTL_SECONDS ? ' redeem-timer--active' : ''}`}>
             <Text className="redeem-timer-value">{formatTimer(timerSec)}</Text>

apps/mini-user/src/pages/redeem/index.tsx

@@ -113,12 +113,15 @@ export default function RedeemPage() {
       const body: { amount: number; couponId?: string } = { amount: value };
       if (couponId) body.couponId = couponId;
 
-      const data = await request<{ token: string; amount: number }>('/redeem/tokens', {
+      const data = await request<{ token: string; amount: number; landingUrl?: string }>('/redeem/tokens', {
         method: 'POST',
         data: body,
       });
+      const landingQs = data.landingUrl
+        ? `&landingUrl=${encodeURIComponent(data.landingUrl)}`
+        : '';
       Taro.navigateTo({
-        url: `/pages/redeem-code/index?token=${encodeURIComponent(data.token)}&amount=${data.amount}`,
+        url: `/pages/redeem-code/index?token=${encodeURIComponent(data.token)}&amount=${data.amount}${landingQs}`,
       });
     } catch (e) {
       toast(e instanceof Error ? e.message : '生成失败');

apps/mini-user/src/pages/store-detail/index.tsx

@@ -12,7 +12,6 @@ import Taro, {
 import PageShell from '../../components/PageShell';
 import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
-import ShareNavButton from '../../components/ShareNavButton';
 import StoreRedeemMarquee from '../../components/StoreRedeemMarquee';
 import WechatShareReady from '../../components/WechatShareReady';
 import { request, toast } from '../../lib/api';
@@ -356,7 +355,6 @@ export default function StoreDetailPage() {
         solid={headerSolid}
         titleVisible={headerSolid}
         onBack={goBack}
-        right={<ShareNavButton payload={sharePayload} />}
       />
 
       <View className="store-detail-hero full-bleed">
@@ -407,13 +405,11 @@ export default function StoreDetailPage() {
           </View>
         ) : null}
 
-        <View className="store-detail-tags">
+        {store.category?.name ? (
-          {store.category?.name ? (
+          <View className="store-detail-tags">
             <Text className="store-detail-tag">{store.category.name}</Text>
-          ) : null}
+          </View>
-          <Text className="store-detail-tag">可核销</Text>
+        ) : null}
-          <Text className="store-detail-tag">好客门店</Text>
-        </View>
       </View>
 
       {marqueeLines.length > 0 ? (

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

@@ -28,7 +28,8 @@
 | 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) |
+| 3.5.10 | 08-25 | C 端门店详情去掉分享按钮；同城送提示改承运商 HTML；小程序客服接通企微微信客服 | [`v3.5.10`](./杜康好客-v3.5.10-开发文档.md) |
 
 ---
 
@@ -84,7 +85,7 @@
 
 **HQ 订单导出**（`admin-web` 订单监控）：
 
-- 支持按筛选（下单日期、状态、类型、城市、配送、收货手机等）或勾选订单导出
+- 支持按筛选（下单日期、状态可多选、类型、城市、配送、收货手机等）或勾选订单导出
 - 格式：Excel（`.xlsx`）/ PDF（`.pdf`）
 - 单次上限 5000 条；按筛选且未指定日期时默认近 30 天
 - 权限：`orders`；操作审计 `ORDER_EXPORT`
@@ -137,7 +138,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

@@ -64,10 +64,12 @@
 | 3.5.7 | [`门店核销记录时间秒 + 今日核销金额文案`](./杜康好客-v3.5.7-开发文档.md) | 🔶 开发完成 |
 | 3.5.8 | [`HQ 追加/撤销权限 + 运营改客服 + 城市门店服务`](./杜康好客-v3.5.8-开发文档.md) | 🔶 开发完成 |
 | 3.5.9 | [`门店累计核销 + HQ 去截断 + 列设置`](./杜康好客-v3.5.9-开发文档.md) | 🔶 开发完成 |
+| 3.5.10 | [`门店详情去分享按钮 + 同城提示改承运商 HTML + 小程序客服接企微`](./杜康好客-v3.5.10-开发文档.md) | 🔶 开发完成 |
 
 | 日期 | 说明 |
 |------|------|
-| 2026-08-25 | v3.5.9：门店列表累计核销好客权益；HQ 表格去省略号；主列表序号 + 列设置存 HQ 账号；用户列表备注（不改昵称）、手机号不脱敏 |
+| 2026-08-25 | v3.5.10：门店详情去掉分享按钮；同城送提示改承运商 HTML（`GET /catalog/local-deliveries`）；小程序客服接通企微（需填 CorpID） |
+| 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.10-开发文档.md

@@ -0,0 +1,121 @@
+# 杜康好客 · v3.5.10 开发文档
+
+> **2026-08-25** · mini-user / API  
+> **主题**：门店详情去掉分享按钮；同城配送提示 24 小时内送到；小程序客服接通企业微信
+
+---
+
+## 1. 版本目标
+
+| # | 任务 | 类型 | 交付 |
+|---|------|------|------|
+| 1 | DPT-20260824-896 | BUG | C 端门店详情去掉顶栏「分享」按钮 |
+| 2 | DPT-20260824-601 | 优化 | 同城送提示改承运商「配送信息提示」（HTML）；C 端 `GET /catalog/local-deliveries` |
+| 3 | DPT-20260822-651 | 需求 | 小程序在线客服调起企业微信「微信客服」 |
+
+**不做**：改配送规则 / 改 SLA 计算；合伙人/门店端客服；禁用微信右上角「···」分享菜单。
+
+---
+
+## 2. 门店详情去掉分享按钮
+
+`pages/store-detail` 顶栏不再渲染 `ShareNavButton`。
+
+右上角微信原生菜单仍可分享（`enableShareAppMessage` / `WechatShareReady` 保留）。只要去掉页面上的分享按钮。
+
+---
+
+## 3. 同城送提示（承运商 HTML）
+
+不再写死文案。以用户**收货地址城市**为准：该市 `common_city.status=ACTIVE`（已开城）→ 同城，展示对应仓配承运商的「配送信息提示」；未开城 → 跨城，只展示「总部物流、运费到付」。
+
+```
+收货市 → 开城仓库（ACTIVE，优先 API_AUTO 且已绑承运商）→ 承运商.delivery_hint_html
+```
+
+空字段时 C 端回退纯文本 `同城配送，预计24小时内送到`。不改下单 / 推单 / 起购。
+
+### 3.1 承运商字段
+
+`common_fulfillment_provider.delivery_hint_html` TEXT NULL。允许 `span/p/br/b/strong/i/em/font`，style 仅 `color` / `font-weight` / `font-size` / `font-style`。保存与下发前消毒。HQ 文本框里的回车在 C 端转成换行（不必手写 `<br/>`）。
+
+HQ「仓配管理 → 承运商」多行输入，例如：
+
+```html
+<span style="color:#A61D24;font-weight:700;font-size:13px">同城配送，预计24小时内送到</span>
+```
+
+### 3.2 API
+
+`GET /catalog/local-deliveries`（公开）。可选 `cityCode` / `cityName`。
+
+每项：`city` · `warehouse` · `provider` · `hintHtml`。未开城 / 无仓 / 无承运商返回空列表或 `hintHtml=null`，不报错。
+
+### 3.3 C 端
+
+| 页面 | 何时展示 |
+|------|----------|
+| 商品详情 | 可线上购；用当前选城预览 |
+| 确认订单 | 收货市已开城且地址校验通过；`RichText` |
+| 订单详情 | `deliveryType === LOCAL`；按收货市匹配 |
+
+---
+
+---
+
+## 4. 小程序客服接通企业微信
+
+原先 `open-type=contact` 进入**小程序原生客服**。本版在已配置企微参数时改为 `wx.openCustomerServiceChat`，进入企业微信「微信客服」（与 H5 kfid 同一套）。
+
+### 配置（HQ → 系统设置 → 微信小程序配置）
+
+| 键 | 说明 |
+|----|------|
+| `CUSTOMER_SERVICE_WECOM_URL` | 微信客服 kfid 链接；缺省用代码常量 |
+| `WECOM_CORP_ID` | 企业 ID（`ww` 开头）。企微「我的企业」可查 |
+
+`GET /common/client-config` 下发 `customerServiceWecomUrl`、`wecomCorpId`。
+
+### 行为
+
+| 环境 | 条件 | 行为 |
+|------|------|------|
+| 小程序 | 链接 + CorpID 都有 | `openCustomerServiceChat`；订单详情可带订单卡片 |
+| 小程序 | 未填 CorpID | 回退 `open-type=contact` |
+| H5 | 有 kfid 链接 | 打开企微客服网页 |
+
+### 企微侧前置（运营）
+
+1. 开通企业微信「微信客服」，拿到 kfid 链接。  
+2. 把 C 端小程序关联到该企业的微信客服。  
+3. 把 CorpID 填进系统设置。未填则用户仍走小程序原生客服。
+
+---
+
+## 4.1 Prisma
+
+`common_fulfillment_provider.delivery_hint_html` TEXT NULL。脚本：[`migrate-fulfillment-delivery-hint-v3510.sql`](../server/dukang-api/prisma/migrate-fulfillment-delivery-hint-v3510.sql)。
+
+## 5. 验收清单
+
+- [ ] 门店详情顶栏没有分享按钮；返回/导航/拨打不受影响
+- [ ] HQ 承运商可编辑「配送信息提示」HTML（颜色/粗细/字号）；非法标签被去掉
+- [ ] `GET /catalog/local-deliveries` 按开城列出仓库+承运商+hintHtml；`cityName` 可筛收货市
+- [ ] 商品详情（可线上购）按当前选城展示承运商提示（空则回退「同城配送，预计24小时内送到」）
+- [ ] 确认订单：收货市已开城显示 HTML 提示；未开城只显示「总部物流、运费到付」
+- [ ] 同城订单详情「配送时效」为该市承运商提示
+- [ ] 系统设置可改客服链接与 CorpID；保存后 `client-config` 立即带出
+- [ ] 小程序已填 CorpID：联系客服进入企微微信客服（非小程序原生客服后台）
+- [ ] 未填 CorpID：小程序仍能打开原生客服，不白屏
+
+---
+
+## 6. 关键路径
+
+| 域 | 路径 |
+|----|------|
+| 门店详情 | `apps/mini-user/src/pages/store-detail/index.tsx` |
+| 同城提示 | `fulfillment-provider.service.ts` · `GET /catalog/local-deliveries` · `DeliveryHintHtml` |
+| 客服按钮 | `apps/mini-user/src/components/ContactCsButton.tsx` · `lib/wecom-cs.ts` |
+| 下发 | `client-config.controller.ts` · `packages/shared-types` `config.ts` / `wechat.ts` |
+| HQ 配置 | `system-config.registry.ts` |

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,24 @@
 - [ ] HQ 主表长字段不再 `...`，可横向滑完
 - [ ] 主列表最左序号跨页连续
 - [ ] 列设置可隐藏/排序；保存后刷新仍在；重置恢复默认
+- [ ] 主展示列带下划线，点击进入对应编辑或详情
 - [ ] 序号、操作列不能在弹窗关掉或拖走
 - [ ] 详情描述列表仍可省略
 - [ ] 用户列表昵称只读；双击「备注」可改，离开编辑后 `user_user.hq_remark` 已更新；C 端看不到该字段
 - [ ] 用户列表手机号完整可见（详情仍脱敏）
+- [ ] 权益券列表：用户编号、订单号可点进对应用户/订单详情；来源含商品名、规格、数量、配送方式、实付金额
+- [ ] 订单列表「状态」可多选；导出按所选状态过滤；不选即全部
+
+---
+
+## 10. 权益券列表快链与来源
+
+- **用户**、**订单**列（及券详情）用主列下划线，分别打开用户详情抽屉、订单详情抽屉。
+- **来源**：关联订单时拼 `商品名 / 规格 / 数量(瓶或箱) / 配送方式 / ¥实付`；无订单仍用 `sourceProduct`（如总部手动发放）。
+- 列表接口 `order` 增补 `productName`、`productSpec`、`quantity`、`saleUnit`、`deliveryType`、`payAmount`。
+
+---
+
+## 11. 订单列表状态多选
+
+`GET /admin/orders` 与 `POST /admin/orders/export` 的 `status` 支持多值（重复 query、逗号串、JSON 数组均可）。列表筛选为多选；空 = 全部。单值旧链接仍可用。

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

@@ -43,7 +43,9 @@ 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`）；列表手机号不脱敏。
+
+**C 端（v3.5.10）**：门店详情无顶栏分享按钮。同城送提示取开城仓库绑定承运商的 `delivery_hint_html`（`GET /catalog/local-deliveries`，按收货市是否开城）；空则回退「同城配送，预计24小时内送到」。在线客服优先 `wx.openCustomerServiceChat`（`CUSTOMER_SERVICE_WECOM_URL` + `WECOM_CORP_ID`）；未配 CorpID 回退小程序原生客服。
 
 ## 5. 验收用例（必过）
 

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

@@ -22,10 +22,11 @@
 
 - 四 Tab：首页/权益/门店/我的；微信登录+7天会话
 - 下单：选城→商品→地址→起购校验→微信支付→权益1:1
-- 权益：直接核销(≤总余额) / 单据核销(≤单据)；出码3分钟
+- 权益：直接核销(≤总余额) / 单据核销(≤单据)；出码3分钟。二维码内容为门店 H5 URL（`{SHOP_H5_URL}/redeem?token=`），微信扫一扫直达核销确认页
 - 门店：仅 OPEN；详情含套餐/电话(脱敏可拨打)/两段营业时间
 - 订单 Tab：待付款/已付款/已完成；物流详情(签收照/拨号/ETA)
-- 售后：客服入口；发票/四类型工单按 PRD Wave 进度
+- 售后：客服入口（小程序优先企微微信客服，未配 CorpID 回退原生客服）；发票/四类型工单按 PRD Wave 进度
+- 同城送：收货市已开城则展示承运商「配送信息提示」（HTML）；未开城走跨城到付；门店详情无顶栏分享按钮
 - 版本：`minClientVersion` 过低强制更新或退出
 - 「我的」头像昵称：`chooseAvatar` + `input type=nickname`（见下「踩坑」）
 
@@ -47,7 +48,7 @@
 
 ## 3. 门店端（h5-shop）
 
-- 登录绑定门店；首页扫码核销(微信 JSSDK)
+- 登录绑定门店；首页扫码核销(微信 JSSDK)；也可微信扫一扫用户核销码直达确认页（仍需点「确认核销」）
 - 核销记录；今日汇总；到账金额×60%展示
 - 营业状态开关；Mine 门店信息
 - 套餐：列表编辑→提交 HQ 审核（v3.4.10）
@@ -68,6 +69,7 @@
 | 规则 | 说明 |
 |------|------|
 | iOS 登录/选店后 | 用 `location.replace(path)`（`hardNavigateInWechat`），禁止仅 React Router navigate |
+| 微信扫一扫落地核销页 | 成功后须 `hardNavigateInWechat('/')` 回首页，否则入场 URL 仍是 `/redeem?token=`，下次首页扫码验签失败 |
 | iOS 签名 URL | `getJssdkSignUrl()` = 入场 URL，**保留** OAuth `code/state`；后端 `jssdk-config` 勿剔除 |
 | 已绑定微信 | 短信登录后**不要**再强制 OAuth（避免反复重置入场 URL） |
 | 扫码仍失败 | 弹窗引导「刷新页面」/「重新授权微信」，勿只提示再点一次 |
@@ -92,7 +94,7 @@
 | 交易 | 订单、权益券、核销记录、推广码+metrics |
 | 财务 | 门店/合伙人/酒厂/物流账单；打款确认 |
 | 工单 | 售后四类型 + 技术支持(ST) + 开发计划 |
-| 系统 | 账号权限、客户端配置、企微机器人/消息推送；列表「列设置」按账号保存 |
+| 系统 | 账号权限、客户端配置、企微机器人/消息推送；列表「列设置」与列宽按账号保存 |
 | 日志 | HQ/用户/门店/合伙人/企微 |
 
 ## 6. 商品与模板
@@ -150,6 +152,7 @@ HQ 账号/角色(`hq-permissions`，生效=(角色∪追加)−撤销；可绑
 | 智能机器人 | `/wecom/bots` 长连接指令 |
 | 消息推送 | `/wecom/pushes` Webhook+eventKey |
 | 日志 | `/logs/wecom-bots` |
+| C 端微信客服 | 系统设置 `CUSTOMER_SERVICE_WECOM_URL` + `WECOM_CORP_ID`；小程序须已关联该企业微信客服 |
 
 eventKey：`alert.ops` · `support_ticket.created` · `dev_plan.task_dispatch` · 支付/核销/结算告警。
 

packages/shared-types/package.json

@@ -19,9 +19,11 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
+    "test": "vitest run",
     "lint": "eslint src"
   },
   "devDependencies": {
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "vitest": "^1.6.1"
   }
 }

packages/shared-types/src/config.ts

@@ -30,11 +30,16 @@ export interface AppConfig {
   tencentLbsSecretKey: string;
   /** C 端 H5 落地页（推广码二维码链接前缀） */
   userH5Url: string;
+  /** 门店 H5 落地页（用户核销码二维码链接前缀） */
+  shopH5Url: string;
 }
 
 /** 推广码 / C 端 H5 默认落地页（系统设置 USER_H5_URL 未配时回退；HQ 可改） */
 export const DEFAULT_USER_H5_URL = 'https://user.runxian.top/user';
 
+/** 门店 H5 默认落地页（系统设置 SHOP_H5_URL 未配时回退；HQ 可改） */
+export const DEFAULT_SHOP_H5_URL = 'https://shop.dukanghaoke.com';
+
 /** 品牌 Logo OSS 根路径（默认；系统设置 BRAND_LOGO_OSS_BASE 可覆盖） */
 export const BRAND_LOGO_OSS_BASE = 'https://dukang-dev.oss-cn-beijing.aliyuncs.com/logo/';
 
@@ -58,12 +63,15 @@ export const QUALIFICATION_DISCLOSURE_URL = `${MINI_USER_STATIC_OSS_BASE}qualifi
 export const CUSTOMER_SERVICE_PHONE = '13203801799';
 
 /**
- * 企业微信「微信客服」链接（C 端「在线客服」；微信内网页点击后进入原生客服会话）
+ * 企业微信「微信客服」链接（C 端「在线客服」；微信内网页 / 小程序 openCustomerServiceChat）
- * 可在 h5-user 用 VITE_CS_WECOM_URL 覆盖
+ * 可在系统设置 CUSTOMER_SERVICE_WECOM_URL 覆盖
  */
 export const CUSTOMER_SERVICE_WECOM_URL =
   'https://work.weixin.qq.com/kfid/kfc8b88659a1dffa8cd';
 
+/** 企业微信 CorpID（小程序 wx.openCustomerServiceChat 必填；系统设置 WECOM_CORP_ID） */
+export const WECOM_CORP_ID = '';
+
 /** 从 env / 系统设置解析的 C 端品牌与客服展示配置（缺省回退常量） */
 export type ClientBrandRuntime = {
   userH5Url: string;
@@ -74,6 +82,8 @@ export type ClientBrandRuntime = {
   miniUserStaticOssBase: string;
   qualificationDisclosureUrl: string;
   customerServicePhone: string;
+  customerServiceWecomUrl: string;
+  wecomCorpId: string;
 };
 
 export function resolveClientBrandRuntime(
@@ -95,6 +105,8 @@ export function resolveClientBrandRuntime(
       (e.QUALIFICATION_DISCLOSURE_URL || '').trim() ||
       `${staticBase}qualification-disclosure.png`,
     customerServicePhone: (e.CUSTOMER_SERVICE_PHONE || CUSTOMER_SERVICE_PHONE).trim(),
+    customerServiceWecomUrl: (e.CUSTOMER_SERVICE_WECOM_URL || CUSTOMER_SERVICE_WECOM_URL).trim(),
+    wecomCorpId: (e.WECOM_CORP_ID || WECOM_CORP_ID).trim(),
   };
 }
 
@@ -265,6 +277,7 @@ export function loadAppConfig(env?: Record<string, string | undefined>): AppConf
     tencentLbsKey: e.TENCENT_LBS_KEY ?? '',
     tencentLbsSecretKey: e.TENCENT_LBS_SECRET_KEY ?? '',
     userH5Url: (e.USER_H5_URL || DEFAULT_USER_H5_URL).replace(/\/$/, ''),
+    shopH5Url: (e.SHOP_H5_URL || DEFAULT_SHOP_H5_URL).replace(/\/$/, ''),
   };
   return {
     ...base,

packages/shared-types/src/fulfillment-provider.test.ts

@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest';
+import { isXfxProviderCode } from './fulfillment-provider';
+
+describe('isXfxProviderCode', () => {
+  it('匹配标准编码与城市前缀', () => {
+    expect(isXfxProviderCode('XFX')).toBe(true);
+    expect(isXfxProviderCode('xiaofeixia')).toBe(true);
+    expect(isXfxProviderCode('ZZXFX')).toBe(true);
+    expect(isXfxProviderCode('XFX_ZZ')).toBe(true);
+  });
+
+  it('不匹配普通承运商', () => {
+    expect(isXfxProviderCode('')).toBe(false);
+    expect(isXfxProviderCode('LOGISTICS')).toBe(false);
+    expect(isXfxProviderCode('MANUAL')).toBe(false);
+    expect(isXfxProviderCode('SF')).toBe(false);
+  });
+});

packages/shared-types/src/fulfillment-provider.ts

@@ -55,6 +55,8 @@ export interface FulfillmentProviderDto {
   settlementMethod: LogisticsSettlementMethod;
   pricingRules?: LogisticsPricingRuleDto | null;
   prepaidBalance: number;
+  /** C 端同城配送提示（已消毒 HTML） */
+  deliveryHintHtml?: string | null;
   createdAt: string;
   updatedAt: string;
 }
@@ -74,6 +76,7 @@ export interface CreateFulfillmentProviderInput {
   bankAccountNo?: string | null;
   settlementMethod?: LogisticsSettlementMethod;
   pricingRules?: LogisticsPricingRuleDto | null;
+  deliveryHintHtml?: string | null;
 }
 
 export interface UpdateFulfillmentProviderInput {
@@ -89,6 +92,7 @@ export interface UpdateFulfillmentProviderInput {
   bankAccountNo?: string | null;
   settlementMethod?: LogisticsSettlementMethod;
   pricingRules?: LogisticsPricingRuleDto | null;
+  deliveryHintHtml?: string | null;
 }
 
 export { DEFAULT_XFX_LOGISTICS_PRICING };
@@ -110,6 +114,91 @@ export interface WarehouseFulfillmentConfig {
 
 export const XFX_PROVIDER_CODES = ['XFX', 'XIAOFEIXIA'] as const;
 
+/** 小飞侠承运商编码：精确 XFX/XIAOFEIXIA，以及城市前缀如 ZZXFX */
 export function isXfxProviderCode(code: string): boolean {
-  return (XFX_PROVIDER_CODES as readonly string[]).includes(code.trim().toUpperCase());
+  const c = code.trim().toUpperCase();
+  if (!c) return false;
+  if ((XFX_PROVIDER_CODES as readonly string[]).includes(c)) return true;
+  if (c.includes('XIAOFEIXIA')) return true;
+  return c.endsWith('XFX') || c.startsWith('XFX');
+}
+
+/** 承运商未配置提示时 C 端回退文案 */
+export const DEFAULT_LOCAL_DELIVERY_HINT = '同城配送，预计24小时内送到';
+
+export const LOCAL_DELIVERY_HINT_MAX_LEN = 2000;
+
+const HINT_ALLOWED_TAGS = new Set(['span', 'p', 'br', 'b', 'strong', 'i', 'em', 'font']);
+const HINT_ALLOWED_STYLES = new Set(['color', 'font-weight', 'font-size', 'font-style']);
+
+export type LocalDeliveryDto = {
+  city: { id: string; code: string; name: string };
+  warehouse: { id: string; name: string; fulfillmentMode: string } | null;
+  provider: { id: string; code: string; name: string } | null;
+  hintHtml: string | null;
+};
+
+function sanitizeHintStyle(raw: string): string {
+  return raw
+    .split(';')
+    .map((part) => part.trim())
+    .filter(Boolean)
+    .map((part) => {
+      const idx = part.indexOf(':');
+      if (idx <= 0) return '';
+      const key = part.slice(0, idx).trim().toLowerCase();
+      const value = part.slice(idx + 1).trim();
+      if (!HINT_ALLOWED_STYLES.has(key)) return '';
+      if (/url\s*\(|expression\s*\(|javascript\s*:/i.test(value)) return '';
+      return `${key}:${value}`;
+    })
+    .filter(Boolean)
+    .join(';');
+}
+
+/** 文本换行转成 br，供 C 端 RichText 使用（不改 HQ 存盘原文） */
+export function deliveryHintHtmlToRichNodes(html: string): string {
+  return html
+    .replace(/\r\n|\r|\n/g, '<br/>')
+    .replace(/(?:<br\s*\/?>){3,}/gi, '<br/><br/>');
+}
+
+/** 承运商配送提示 HTML：去掉脚本/事件，只保留字号颜色粗细 */
+export function sanitizeDeliveryHintHtml(raw?: string | null): string | null {
+  if (raw == null) return null;
+  let html = String(raw).trim();
+  if (!html) return null;
+  if (html.length > LOCAL_DELIVERY_HINT_MAX_LEN) {
+    html = html.slice(0, LOCAL_DELIVERY_HINT_MAX_LEN);
+  }
+  html = html.replace(/<script[\s\S]*?>[\s\S]*?<\/script>/gi, '');
+  html = html.replace(/on[a-z]+\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/gi, '');
+  html = html.replace(/javascript\s*:/gi, '');
+  html = html.replace(/<\/?([a-zA-Z][a-zA-Z0-9]*)\b([^>]*)>/g, (_full, tag: string, attrs: string) => {
+    const name = String(tag).toLowerCase();
+    const closing = String(_full).startsWith('</');
+    if (!HINT_ALLOWED_TAGS.has(name)) return '';
+    if (name === 'br') return closing ? '' : '<br/>';
+    if (closing) return `</${name}>`;
+    let style = '';
+    const styleMatch = String(attrs).match(/\sstyle\s*=\s*("([^"]*)"|'([^']*)')/i);
+    if (styleMatch) {
+      style = sanitizeHintStyle(styleMatch[2] ?? styleMatch[3] ?? '');
+    }
+    let color = '';
+    let size = '';
+    if (name === 'font') {
+      const colorMatch = String(attrs).match(/\scolor\s*=\s*("([^"]*)"|'([^']*)'|([^\s>]+))/i);
+      if (colorMatch) color = (colorMatch[2] ?? colorMatch[3] ?? colorMatch[4] ?? '').trim();
+      const sizeMatch = String(attrs).match(/\ssize\s*=\s*("([^"]*)"|'([^']*)'|([^\s>]+))/i);
+      if (sizeMatch) size = (sizeMatch[2] ?? sizeMatch[3] ?? sizeMatch[4] ?? '').trim();
+    }
+    const extra: string[] = [];
+    if (style) extra.push(`style="${style}"`);
+    if (color) extra.push(`color="${color.replace(/"/g, '')}"`);
+    if (size) extra.push(`size="${size.replace(/"/g, '')}"`);
+    return extra.length ? `<${name} ${extra.join(' ')}>` : `<${name}>`;
+  });
+  const cleaned = html.replace(/&nbsp;/g, ' ').trim();
+  return cleaned || null;
 }

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>;
 };

packages/shared-types/src/ops.ts

@@ -3,6 +3,21 @@ export interface AdminListQuery {
   pageSize?: number;
 }
 
+/** HQ 订单列表 / 导出筛选。`status` 可多选（单值仍兼容） */
+export interface AdminOrdersListQuery extends AdminListQuery {
+  orderNo?: string;
+  status?: string | string[];
+  orderType?: string;
+  userId?: string;
+  cityId?: string;
+  receiverPhone?: string;
+  fulfillmentHold?: string | boolean;
+  createdFrom?: string;
+  createdTo?: string;
+  excludeTest?: boolean;
+  deliveryType?: string;
+}
+
 export interface UpdateAdminUserRequest {
   hqRemark: string;
 }

packages/shared-types/src/redeem.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+import { buildShopRedeemLandingUrl, parseRedeemTokenFromScan } from './redeem';
+
+const TOKEN = 'a1b2c3d4e5f6789012345678901234ab';
+
+describe('buildShopRedeemLandingUrl', () => {
+  it('joins shop H5 origin with /redeem?token=', () => {
+    expect(buildShopRedeemLandingUrl('https://shop.dukanghaoke.com', TOKEN)).toBe(
+      `https://shop.dukanghaoke.com/redeem?token=${TOKEN}`,
+    );
+  });
+
+  it('strips trailing slash on the base', () => {
+    expect(buildShopRedeemLandingUrl('https://shop-test.dukanghaoke.com/', TOKEN)).toBe(
+      `https://shop-test.dukanghaoke.com/redeem?token=${TOKEN}`,
+    );
+  });
+});
+
+describe('parseRedeemTokenFromScan', () => {
+  it('accepts a raw 32-hex token', () => {
+    expect(parseRedeemTokenFromScan(TOKEN.toUpperCase())).toBe(TOKEN);
+  });
+
+  it('extracts token from shop landing URL', () => {
+    const url = buildShopRedeemLandingUrl('https://shop.dukanghaoke.com', TOKEN);
+    expect(parseRedeemTokenFromScan(url)).toBe(TOKEN);
+  });
+
+  it('strips WeChat QR_CODE prefix before parsing URL', () => {
+    const url = buildShopRedeemLandingUrl('https://shop.dukanghaoke.com', TOKEN);
+    expect(parseRedeemTokenFromScan(`QR_CODE,${url}`)).toBe(TOKEN);
+  });
+
+  it('returns null for empty or unrelated content', () => {
+    expect(parseRedeemTokenFromScan('')).toBeNull();
+    expect(parseRedeemTokenFromScan('https://shop.dukanghaoke.com/records')).toBeNull();
+  });
+});

packages/shared-types/src/redeem.ts

@@ -9,6 +9,48 @@ export interface RedeemTokenResult {
   expireAt: string;
   amount: number;
   boundStoreId?: string | null;
+  /** 门店 H5 核销确认页落地 URL（写入二维码，微信扫一扫可直达） */
+  landingUrl?: string;
+}
+
+const REDEEM_TOKEN_HEX = /^[a-f0-9]{32}$/i;
+
+/** 门店核销确认页落地 URL，供用户端核销码使用 */
+export function buildShopRedeemLandingUrl(shopH5Url: string, token: string): string {
+  const base = shopH5Url.replace(/\/$/, '');
+  return `${base}/redeem?token=${encodeURIComponent(token)}`;
+}
+
+/** 微信扫码偶发 `QR_CODE,payload` 前缀 */
+function stripScanTypePrefix(raw: string): string {
+  const comma = raw.indexOf(',');
+  if (comma > 0 && comma < 24 && /^[A-Z0-9_]+$/.test(raw.slice(0, comma))) {
+    return raw.slice(comma + 1).trim();
+  }
+  return raw;
+}
+
+/** 从微信扫码结果解析核销 token（32 位 hex 或带 token 参数的 URL） */
+export function parseRedeemTokenFromScan(raw: string): string | null {
+  const trimmed = stripScanTypePrefix(raw.trim());
+  if (!trimmed) return null;
+
+  if (REDEEM_TOKEN_HEX.test(trimmed)) {
+    return trimmed.toLowerCase();
+  }
+
+  try {
+    const url = trimmed.startsWith('http') ? new URL(trimmed) : new URL(trimmed, 'https://local.invalid');
+    const fromQuery = url.searchParams.get('token');
+    if (fromQuery && REDEEM_TOKEN_HEX.test(fromQuery)) {
+      return fromQuery.toLowerCase();
+    }
+  } catch {
+    /* not a URL */
+  }
+
+  const hexMatch = trimmed.match(/[a-f0-9]{32}/i);
+  return hexMatch ? hexMatch[0].toLowerCase() : null;
 }
 
 export interface RedeemPreviewDto {

packages/shared-types/src/trade.ts

@@ -95,6 +95,8 @@ export interface OrderTrackDto {
   provider?: string;
   trackingNo?: string | null;
   logisticsCompany?: string | null;
+  /** 承运商查询失败原因（有则 HQ/C 端应展示，避免空白「暂无路由」） */
+  queryError?: string | null;
 }
 
 /** 大单拦截原因：≥10 箱不自动推小飞侠 */

packages/shared-types/src/wechat.ts

@@ -64,6 +64,10 @@ export type ClientRuntimeConfig = {
   qualificationDisclosureUrl?: string;
   /** 总部客服电话 */
   customerServicePhone?: string;
+  /** 企业微信「微信客服」链接（kfid） */
+  customerServiceWecomUrl?: string;
+  /** 企业微信 CorpID（小程序调起企微客服） */
+  wecomCorpId?: string;
   /** 合伙人入驻：企微客服二维码图片 URL */
   partnerOnboardCsQrUrl?: string | null;
   /** 合伙人入驻：企微客服提示文案 */