merge(dev): 补承运商删除操作常量

merge(dev_jacy): 补承运商删除操作常量
fix(ops): 补承运商删除操作常量以便生产构建
2026-08-25 14:32:32 +08:00 · 2026-08-25 14:32:27 +08:00 · 2026-08-25 14:32:08 +08:00 · 2026-08-25 14:30:43 +08:00 · 2026-08-25 14:30:10 +08:00 · 2026-08-25 14:29:48 +08:00
130 changed files with 5847 additions and 1863 deletions
@@ -16,37 +16,109 @@ body,
 }

 /*
- * 后台内容行：不换行 + 超出省略
- * 覆盖主内容区、Drawer、Modal 内的表格与描述列表
+ * 后台表格：不换行、完整展示（v3.5.9 去掉省略号）
+ * 描述列表仍省略，避免详情抽屉被长字段撑破
 */
 .admin-layout .ant-table-cell,
 .ant-drawer .ant-table-cell,
-.ant-modal .ant-table-cell,
+.ant-modal .ant-table-cell {
+  white-space: nowrap;
+  overflow: visible;
+  text-overflow: clip;
+  max-width: none;
+}
+
 .admin-layout .ant-descriptions-item-content,
 .ant-drawer .ant-descriptions-item-content,
 .ant-modal .ant-descriptions-item-content {
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
-  max-width: 0;
-}
-
-.admin-layout .ant-descriptions-item-content,
-.ant-drawer .ant-descriptions-item-content,
-.ant-modal .ant-descriptions-item-content {
  max-width: 100%;
 }

-/* 表头同样不换行 */
+/* 表头不换行 */
 .admin-layout .ant-table-thead > tr > th,
 .ant-drawer .ant-table-thead > tr > th,
 .ant-modal .ant-table-thead > tr > th {
  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  overflow: visible;
+  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),
 .ant-modal .ant-table-cell:has(.ant-btn),
@@ -71,10 +143,9 @@ body,
  max-width: none;
 }

-/* 表格单元格双行信息合并为单行省略 */
+/* 表格单元格主/副信息同一行 */
 .admin-cell-line {
-  display: block;
-  max-width: 100%;
+  display: inline;
 }

 .admin-cell-line-secondary {
@@ -82,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;
@@ -1,12 +1,10 @@
-import { Typography } from 'antd';
-
 type AdminCellLineProps = {
  primary?: string | null;
  secondary?: string | null;
  separator?: string;
 };

-/** 表格单元格：主/副信息同一行展示，超出省略，hover 显示全文 */
+/** 表格单元格：主/副信息同一行完整展示 */
 export function AdminCellLine({
  primary,
  secondary,
@@ -14,14 +12,9 @@ export function AdminCellLine({
 }: AdminCellLineProps) {
  const main = primary?.trim() || '—';
  const sub = secondary?.trim();
-  const full = sub ? `${main}${separator}${sub}` : main;

  return (
-    <Typography.Text
-      className="admin-cell-line"
-      ellipsis={{ tooltip: full }}
-      style={{ maxWidth: '100%' }}
-    >
+    <span className="admin-cell-line">
      {main}
      {sub ? (
        <span className="admin-cell-line-secondary">
@@ -29,6 +22,6 @@ export function AdminCellLine({
          {sub}
        </span>
      ) : null}
-    </Typography.Text>
+    </span>
  );
 }
@@ -0,0 +1,102 @@
+import { useEffect, useState } from 'react';
+import { Button, Checkbox, Modal, Space, Typography } from 'antd';
+import { HolderOutlined } from '@ant-design/icons';
+import type { ListColumnSettingItem } from '../lib/list-column-prefs';
+
+type Props = {
+  open: boolean;
+  items: ListColumnSettingItem[];
+  saving?: boolean;
+  onCancel: () => void;
+  onReset: () => void;
+  onSave: (items: ListColumnSettingItem[]) => void;
+};
+
+export function AdminListColumnsModal({ open, items, saving, onCancel, onReset, onSave }: Props) {
+  const [draft, setDraft] = useState<ListColumnSettingItem[]>(items);
+  const [dragKey, setDragKey] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (open) setDraft(items);
+  }, [open, items]);
+
+  function move(from: number, to: number) {
+    if (to < 0 || to >= draft.length) return;
+    const next = [...draft];
+    const [row] = next.splice(from, 1);
+    next.splice(to, 0, row);
+    setDraft(next);
+  }
+
+  return (
+    <Modal
+      title="列设置"
+      open={open}
+      onCancel={onCancel}
+      footer={
+        <Space style={{ width: '100%', justifyContent: 'space-between' }}>
+          <Button onClick={onReset}>重置默认</Button>
+          <Space>
+            <Button onClick={onCancel}>取消</Button>
+            <Button type="primary" loading={saving} onClick={() => onSave(draft)}>
+              保存
+            </Button>
+          </Space>
+        </Space>
+      }
+    >
+      <Typography.Paragraph type="secondary" style={{ marginTop: 0 }}>
+        勾选显示列，拖拽或上下箭头调整顺序。序号与操作列固定，不在此列表中。
+      </Typography.Paragraph>
+      <div>
+        {draft.map((item, index) => (
+          <div
+            key={item.key}
+            draggable
+            onDragStart={() => setDragKey(item.key)}
+            onDragOver={(e) => e.preventDefault()}
+            onDrop={() => {
+              if (!dragKey || dragKey === item.key) return;
+              const from = draft.findIndex((r) => r.key === dragKey);
+              if (from >= 0) move(from, index);
+              setDragKey(null);
+            }}
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: 8,
+              padding: '6px 0',
+              borderBottom: '1px solid #f0f0f0',
+              cursor: 'move',
+            }}
+          >
+            <HolderOutlined style={{ color: '#999' }} />
+            <Checkbox
+              checked={item.visible}
+              onChange={(e) => {
+                const next = [...draft];
+                next[index] = { ...item, visible: e.target.checked };
+                setDraft(next);
+              }}
+            >
+              {item.title}
+            </Checkbox>
+            <span style={{ marginLeft: 'auto' }}>
+              <Button type="link" size="small" disabled={index === 0} onClick={() => move(index, index - 1)}>
+                上移
+              </Button>
+              <Button
+                type="link"
+                size="small"
+                disabled={index === draft.length - 1}
+                onClick={() => move(index, index + 1)}
+              >
+                下移
+              </Button>
+            </span>
+          </div>
+        ))}
+      </div>
+    </Modal>
+  );
+}
@@ -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>
+  );
+}
@@ -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>
+  );
+}
@@ -1,459 +1,458 @@
-import { useCallback, useEffect, useState } from 'react';
-import {
-  Button,
-  Checkbox,
-  Drawer,
-  Form,
-  Input,
-  InputNumber,
-  Modal,
-  Select,
-  Space,
-  Table,
-  Tabs,
-  Typography,
-  message,
-} from 'antd';
-import type { ColumnsType } from 'antd/es/table';
-import {
-  CITY_PARTNER_SCOPE_LABELS,
-  CITY_PARTNER_STATUS_LABELS,
-  CityPartnerScopeType,
-  CityPartnerStatus,
-  PARTNER_PERMISSION_KEYS,
-  PARTNER_PERMISSION_LABELS,
-  PARTNER_STAFF_ROLE_LABELS,
-  type PartnerPermissionKey,
-} from '@dukang/shared-types';
-import { request, type Paginated } from '../lib/api';
-import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
-import { fmtTime } from '../lib/constants';
-import CityDistrictMultiSelect from './CityDistrictMultiSelect';
-import PartnerSubAccountList from './PartnerSubAccountList';
-
-type PartnerRow = {
-  id: string;
-  companyName: string;
-  phone: string;
-  name: string;
-  scopeType?: string;
-  districtCodes?: string[] | null;
-  orderCommissionRate?: number;
-  redeemCommissionRate?: number;
-  accountCount: number;
-  createdAt: string;
-};
-
-type PartnerDetail = PartnerRow & {
-  address?: string;
-  districtCodes?: string[] | null;
-  bindingStatus?: string;
-  bankAccountName?: string | null;
-  bankAccountNo?: string | null;
-  bankBranch?: string | null;
-  managedWarehouseId?: string | null;
-  managedWarehouseName?: string | null;
-  contactPhone?: string | null;
-  children?: Array<{
-    id: string;
-    phone: string;
-    name: string;
-    staffRole?: string;
-    permissions?: string[];
-    status: string;
-  }>;
-};
-
-type Props = {
-  cityId: string;
-  cityCode?: string;
-  maxPartnerCommissionRate?: number;
-  onChanged?: () => void;
-};
-
-const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
-const BINDING_OPTIONS = Object.entries(CITY_PARTNER_STATUS_LABELS).map(([value, label]) => ({ value, label }));
-const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({
-  value: k,
-  label: PARTNER_PERMISSION_LABELS[k],
-}));
-const STAFF_ROLE_OPTIONS = Object.entries(PARTNER_STAFF_ROLE_LABELS)
-  .filter(([value]) => value !== 'PARTNER')
-  .map(([value, label]) => ({ value, label }));
-
-function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
-  if (!values?.length) return [];
-  if (Array.isArray(values[0])) {
-    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
-  }
-  return values as string[];
-}
-
-function commissionSumError(
-  orderPercent: number,
-  redeemPercent: number,
-  maxRate: number,
-): string | null {
-  // API 可能把 Prisma Decimal 序列化为字符串；`"0.05" + 1e-9` 会变成字符串拼接导致误判超限
-  const max = Number(maxRate);
-  const sum = Number(orderPercent) / 100 + Number(redeemPercent) / 100;
-  if (!Number.isFinite(max) || !Number.isFinite(sum)) return '佣金比例无效';
-  if (sum > max + 1e-9) {
-    return `订单佣金与核销佣金合计不得超过 ${(max * 100).toFixed(2)}%（当前 ${(sum * 100).toFixed(2)}%）`;
-  }
-  return null;
-}
-
-function formatApiError(err: unknown): string | null {
-  if (err && typeof err === 'object' && 'errorFields' in err) return null;
-  if (!(err instanceof Error)) return '操作失败';
-  return err.message.replace(/\b(\d{6})\b/g, (code) => {
-    const label = districtCodeLabel(code);
-    return label !== code ? `${label}(${code})` : code;
-  });
-}
-
-export default function CityPartnersPanel({
-  cityId,
-  cityCode,
-  maxPartnerCommissionRate = 0.05,
-  onChanged,
-}: Props) {
-  const [editForm] = Form.useForm();
-  const [createForm] = Form.useForm();
-  const [subForm] = Form.useForm();
-  const [subEditForm] = Form.useForm();
-  const [partners, setPartners] = useState<PartnerRow[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [detail, setDetail] = useState<PartnerDetail | null>(null);
-  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [createOpen, setCreateOpen] = useState(false);
-  const [subOpen, setSubOpen] = useState(false);
-  const [subEditOpen, setSubEditOpen] = useState(false);
-  const [subEditId, setSubEditId] = useState<string | null>(null);
-  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-
-  const loadPartners = useCallback(async () => {
-    setLoading(true);
-    try {
-      const res = await request<Paginated<PartnerRow>>(`/admin/partners?cityId=${cityId}&pageSize=100`);
-      setPartners(res.items);
-    } finally {
-      setLoading(false);
-    }
-  }, [cityId]);
-
-  useEffect(() => {
-    void loadPartners();
-  }, [loadPartners]);
-
-  async function openPartner(id: string) {
-    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
-    setDetail(d);
-    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
-    editForm.setFieldsValue({
-      name: d.name,
-      phone: d.phone,
-      companyName: d.companyName,
-      contactPhone: d.contactPhone ?? d.phone,
-      address: d.address ?? '',
-      scopeType: d.scopeType,
-      districtCodes: d.districtCodes ?? [],
-      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
-      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
-      bindingStatus: d.bindingStatus ?? CityPartnerStatus.ACTIVE,
-      bankAccountName: d.bankAccountName ?? '',
-      bankAccountNo: d.bankAccountNo ?? '',
-      bankBranch: d.bankBranch ?? '',
-    });
-    setDrawerOpen(true);
-  }
-
-  async function savePartner() {
-    if (!detail) return;
-    try {
-      const v = await editForm.validateFields();
-      const err = commissionSumError(
-        Number(v.orderCommissionRate ?? 0),
-        Number(v.redeemCommissionRate ?? 0),
-        maxPartnerCommissionRate,
-      );
-      if (err) {
-        message.error(err);
-        return;
-      }
-      await request(`/admin/partners/${detail.id}`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          ...v,
-          orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-          redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-          districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-        }),
-      });
-      message.success('已保存');
-      setDrawerOpen(false);
-      void loadPartners();
-      onChanged?.();
-    } catch (e) {
-      const msg = formatApiError(e);
-      if (msg) message.error(msg);
-    }
-  }
-
-  async function deleteSubAccount(subId: string) {
-    await request(`/admin/partner-accounts/${subId}`, { method: 'DELETE' });
-    message.success('子账号已删除');
-    if (detail) void openPartner(detail.id);
-    void loadPartners();
-    onChanged?.();
-  }
-
-  const columns: ColumnsType<PartnerRow> = [
-    {
-      title: '区县',
-      dataIndex: 'districtCodes',
-      width: 160,
-      ellipsis: true,
-      render: (codes: string[] | null | undefined, row) =>
-        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
-    },
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
-    { title: '主账号', dataIndex: 'phone', width: 120 },
-    {
-      title: '管辖',
-      dataIndex: 'scopeType',
-      width: 100,
-      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
-    },
-    {
-      title: '佣金',
-      width: 120,
-      render: (_, row) => `${Math.round((row.orderCommissionRate ?? 0) * 100)}% / ${Math.round((row.redeemCommissionRate ?? 0.03) * 100)}%`,
-    },
-    { title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
-    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
-    {
-      title: '操作',
-      width: 80,
-      render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
-          管理
-        </Button>
-      ),
-    },
-  ];
-
-  return (
-    <>
-      <Button
-        type="primary"
-        style={{ marginBottom: 12 }}
-        onClick={() => {
-          createForm.resetFields();
-          createForm.setFieldsValue({
-            cityId,
-            orderCommissionRate: 0,
-            redeemCommissionRate: 3,
-            scopeType: CityPartnerScopeType.CITY_WIDE,
-          });
-          setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
-          setCreateOpen(true);
-        }}
-      >
-        新建合伙人
-      </Button>
-      <Table rowKey="id" size="small" loading={loading} columns={columns} dataSource={partners} pagination={false} />
-
-      <Drawer
-        title="城市合伙人"
-        width={640}
-        open={drawerOpen}
-        onClose={() => setDrawerOpen(false)}
-        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
-      >
-        {detail && (
-          <Tabs
-            items={[
-              {
-                key: 'info',
-                label: '主账号',
-                children: (
-                  <Form form={editForm} layout="vertical">
-                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="contactPhone" label="业务联系电话"><Input /></Form.Item>
-                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="bindingStatus" label="绑定状态" rules={[{ required: true }]}>
-                      <Select options={BINDING_OPTIONS} />
-                    </Form.Item>
-                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
-                    </Form.Item>
-                    {editScopeType === CityPartnerScopeType.DISTRICT && (
-                      <Form.Item
-                        name="districtCodes"
-                        label="区县"
-                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
-                      >
-                        <CityDistrictMultiSelect cityCode={cityCode} />
-                      </Form.Item>
-                    )}
-                    <Space style={{ width: '100%' }} size="large">
-                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                    </Space>
-                    <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
-                      订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%（可在城市基本信息中调整）
-                    </Typography.Text>
-                    <Form.Item label="管仓仓库">
-                      <Input
-                        disabled
-                        value={detail.managedWarehouseName ?? '未分配（请在仓库管理中设置）'}
-                      />
-                    </Form.Item>
-                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
-                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
-                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
-                  </Form>
-                ),
-              },
-              {
-                key: 'staff',
-                label: `子账号 (${Math.max(0, (detail.accountCount ?? 1) - 1)})`,
-                children: (
-                  <PartnerSubAccountList
-                    subs={detail.children ?? []}
-                    onAdd={() => {
-                      subForm.resetFields();
-                      subForm.setFieldsValue({ staffRole: 'INTERNAL', permissions: ['store:create', 'store:manage'] });
-                      setSubOpen(true);
-                    }}
-                    onEdit={(row) => {
-                      setSubEditId(row.id);
-                      subEditForm.setFieldsValue({
-                        name: row.name,
-                        phone: row.phone,
-                        staffRole: row.staffRole ?? 'INTERNAL',
-                        permissions: row.permissions ?? [],
-                        status: row.status,
-                      });
-                      setSubEditOpen(true);
-                    }}
-                    onDelete={(subId) => void deleteSubAccount(subId)}
-                  />
-                ),
-              },
-            ]}
-          />
-        )}
-      </Drawer>
-
-      <Modal title="新建城市合伙人" open={createOpen} width={560} onCancel={() => setCreateOpen(false)} onOk={async () => {
-        try {
-          const v = await createForm.validateFields();
-          const err = commissionSumError(
-            Number(v.orderCommissionRate ?? 0),
-            Number(v.redeemCommissionRate ?? 3),
-            maxPartnerCommissionRate,
-          );
-          if (err) {
-            message.error(err);
-            return;
-          }
-          await request('/admin/partners', {
-            method: 'POST',
-            body: JSON.stringify({
-              ...v,
-              cityId,
-              orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-              redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-              districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-            }),
-          });
-          message.success('已创建');
-          setCreateOpen(false);
-          void loadPartners();
-          onChanged?.();
-        } catch (e) {
-          const msg = formatApiError(e);
-          if (msg) message.error(msg);
-        }
-      }}>
-        <Form form={createForm} layout="vertical">
-          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
-          </Form.Item>
-          {createScopeType === CityPartnerScopeType.DISTRICT && (
-            <Form.Item
-              name="districtCodes"
-              label="区县"
-              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
-            >
-              <CityDistrictMultiSelect cityCode={cityCode} />
-            </Form.Item>
-          )}
-          <Space style={{ width: '100%' }} size="large">
-            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-          </Space>
-          <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
-            订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%
-          </Typography.Text>
-        </Form>
-      </Modal>
-
-      <Modal title="添加子账号" open={subOpen} onCancel={() => setSubOpen(false)} onOk={async () => {
-        if (!detail) return;
-        const v = await subForm.validateFields();
-        await request('/admin/partner-accounts', {
-          method: 'POST',
-          body: JSON.stringify({ ...v, parentAccountId: detail.id }),
-        });
-        message.success('已创建');
-        setSubOpen(false);
-        void openPartner(detail.id);
-        void loadPartners();
-        onChanged?.();
-      }}>
-        <Form form={subForm} layout="vertical">
-          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="staffRole" label="角色" initialValue="INTERNAL">
-            <Select options={STAFF_ROLE_OPTIONS} />
-          </Form.Item>
-          <Form.Item name="permissions" label="权限">
-            <Checkbox.Group options={PERM_OPTIONS} />
-          </Form.Item>
-        </Form>
-      </Modal>
-
-      <Modal title="编辑子账号" open={subEditOpen} onCancel={() => setSubEditOpen(false)} onOk={async () => {
-        if (!subEditId || !detail) return;
-        const v = await subEditForm.validateFields();
-        await request(`/admin/partner-accounts/${subEditId}`, { method: 'PUT', body: JSON.stringify(v) });
-        message.success('已更新');
-        setSubEditOpen(false);
-        void openPartner(detail.id);
-      }}>
-        <Form form={subEditForm} layout="vertical">
-          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="staffRole" label="角色"><Select options={STAFF_ROLE_OPTIONS} /></Form.Item>
-          <Form.Item name="status" label="状态">
-            <Select options={[{ value: 'ACTIVE', label: '启用' }, { value: 'DISABLED', label: '停用' }]} />
-          </Form.Item>
-          <Form.Item name="permissions" label="权限">
-            <Checkbox.Group options={PERM_OPTIONS} />
-          </Form.Item>
-        </Form>
-      </Modal>
-    </>
-  );
-}
+import { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Checkbox,
+  Drawer,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  Select,
+  Space,
+  Table,
+  Tabs,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  CITY_PARTNER_SCOPE_LABELS,
+  CITY_PARTNER_STATUS_LABELS,
+  CityPartnerScopeType,
+  CityPartnerStatus,
+  PARTNER_PERMISSION_KEYS,
+  PARTNER_PERMISSION_LABELS,
+  PARTNER_STAFF_ROLE_LABELS,
+  type PartnerPermissionKey,
+} from '@dukang/shared-types';
+import { request, type Paginated } from '../lib/api';
+import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
+import { fmtTime } from '../lib/constants';
+import CityDistrictMultiSelect from './CityDistrictMultiSelect';
+import PartnerSubAccountList from './PartnerSubAccountList';
+
+type PartnerRow = {
+  id: string;
+  companyName: string;
+  phone: string;
+  name: string;
+  scopeType?: string;
+  districtCodes?: string[] | null;
+  orderCommissionRate?: number;
+  redeemCommissionRate?: number;
+  accountCount: number;
+  createdAt: string;
+};
+
+type PartnerDetail = PartnerRow & {
+  address?: string;
+  districtCodes?: string[] | null;
+  bindingStatus?: string;
+  bankAccountName?: string | null;
+  bankAccountNo?: string | null;
+  bankBranch?: string | null;
+  managedWarehouseId?: string | null;
+  managedWarehouseName?: string | null;
+  contactPhone?: string | null;
+  children?: Array<{
+    id: string;
+    phone: string;
+    name: string;
+    staffRole?: string;
+    permissions?: string[];
+    status: string;
+  }>;
+};
+
+type Props = {
+  cityId: string;
+  cityCode?: string;
+  maxPartnerCommissionRate?: number;
+  onChanged?: () => void;
+};
+
+const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
+const BINDING_OPTIONS = Object.entries(CITY_PARTNER_STATUS_LABELS).map(([value, label]) => ({ value, label }));
+const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({
+  value: k,
+  label: PARTNER_PERMISSION_LABELS[k],
+}));
+const STAFF_ROLE_OPTIONS = Object.entries(PARTNER_STAFF_ROLE_LABELS)
+  .filter(([value]) => value !== 'PARTNER')
+  .map(([value, label]) => ({ value, label }));
+
+function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
+  if (!values?.length) return [];
+  if (Array.isArray(values[0])) {
+    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
+  }
+  return values as string[];
+}
+
+function commissionSumError(
+  orderPercent: number,
+  redeemPercent: number,
+  maxRate: number,
+): string | null {
+  // API 可能把 Prisma Decimal 序列化为字符串；`"0.05" + 1e-9` 会变成字符串拼接导致误判超限
+  const max = Number(maxRate);
+  const sum = Number(orderPercent) / 100 + Number(redeemPercent) / 100;
+  if (!Number.isFinite(max) || !Number.isFinite(sum)) return '佣金比例无效';
+  if (sum > max + 1e-9) {
+    return `订单佣金与核销佣金合计不得超过 ${(max * 100).toFixed(2)}%（当前 ${(sum * 100).toFixed(2)}%）`;
+  }
+  return null;
+}
+
+function formatApiError(err: unknown): string | null {
+  if (err && typeof err === 'object' && 'errorFields' in err) return null;
+  if (!(err instanceof Error)) return '操作失败';
+  return err.message.replace(/\b(\d{6})\b/g, (code) => {
+    const label = districtCodeLabel(code);
+    return label !== code ? `${label}(${code})` : code;
+  });
+}
+
+export default function CityPartnersPanel({
+  cityId,
+  cityCode,
+  maxPartnerCommissionRate = 0.05,
+  onChanged,
+}: Props) {
+  const [editForm] = Form.useForm();
+  const [createForm] = Form.useForm();
+  const [subForm] = Form.useForm();
+  const [subEditForm] = Form.useForm();
+  const [partners, setPartners] = useState<PartnerRow[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [detail, setDetail] = useState<PartnerDetail | null>(null);
+  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [createOpen, setCreateOpen] = useState(false);
+  const [subOpen, setSubOpen] = useState(false);
+  const [subEditOpen, setSubEditOpen] = useState(false);
+  const [subEditId, setSubEditId] = useState<string | null>(null);
+  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+
+  const loadPartners = useCallback(async () => {
+    setLoading(true);
+    try {
+      const res = await request<Paginated<PartnerRow>>(`/admin/partners?cityId=${cityId}&pageSize=100`);
+      setPartners(res.items);
+    } finally {
+      setLoading(false);
+    }
+  }, [cityId]);
+
+  useEffect(() => {
+    void loadPartners();
+  }, [loadPartners]);
+
+  async function openPartner(id: string) {
+    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
+    setDetail(d);
+    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
+    editForm.setFieldsValue({
+      name: d.name,
+      phone: d.phone,
+      companyName: d.companyName,
+      contactPhone: d.contactPhone ?? d.phone,
+      address: d.address ?? '',
+      scopeType: d.scopeType,
+      districtCodes: d.districtCodes ?? [],
+      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
+      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
+      bindingStatus: d.bindingStatus ?? CityPartnerStatus.ACTIVE,
+      bankAccountName: d.bankAccountName ?? '',
+      bankAccountNo: d.bankAccountNo ?? '',
+      bankBranch: d.bankBranch ?? '',
+    });
+    setDrawerOpen(true);
+  }
+
+  async function savePartner() {
+    if (!detail) return;
+    try {
+      const v = await editForm.validateFields();
+      const err = commissionSumError(
+        Number(v.orderCommissionRate ?? 0),
+        Number(v.redeemCommissionRate ?? 0),
+        maxPartnerCommissionRate,
+      );
+      if (err) {
+        message.error(err);
+        return;
+      }
+      await request(`/admin/partners/${detail.id}`, {
+        method: 'PUT',
+        body: JSON.stringify({
+          ...v,
+          orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+          redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+          districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+        }),
+      });
+      message.success('已保存');
+      setDrawerOpen(false);
+      void loadPartners();
+      onChanged?.();
+    } catch (e) {
+      const msg = formatApiError(e);
+      if (msg) message.error(msg);
+    }
+  }
+
+  async function deleteSubAccount(subId: string) {
+    await request(`/admin/partner-accounts/${subId}`, { method: 'DELETE' });
+    message.success('子账号已删除');
+    if (detail) void openPartner(detail.id);
+    void loadPartners();
+    onChanged?.();
+  }
+
+  const columns: ColumnsType<PartnerRow> = [
+    {
+      title: '区县',
+      dataIndex: 'districtCodes',
+      width: 160,
+
+      render: (codes: string[] | null | undefined, row) =>
+        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
+    },
+    { title: '公司名', dataIndex: 'companyName' },
+    { title: '主账号', dataIndex: 'phone', width: 120 },
+    {
+      title: '管辖',
+      dataIndex: 'scopeType',
+      width: 100,
+      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
+    },
+    {
+      title: '佣金',
+      width: 120,
+      render: (_, row) => `${Math.round((row.orderCommissionRate ?? 0) * 100)}% / ${Math.round((row.redeemCommissionRate ?? 0.03) * 100)}%`,
+    },
+    { title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
+    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
+    {
+      title: '操作',
+      width: 80,
+      render: (_, row) => (
+        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+          管理
+        </Button>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Button
+        type="primary"
+        style={{ marginBottom: 12 }}
+        onClick={() => {
+          createForm.resetFields();
+          createForm.setFieldsValue({
+            cityId,
+            orderCommissionRate: 0,
+            redeemCommissionRate: 3,
+            scopeType: CityPartnerScopeType.CITY_WIDE,
+          });
+          setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
+          setCreateOpen(true);
+        }}
+      >
+        新建合伙人
+      </Button>
+      <Table rowKey="id" size="small" loading={loading} columns={columns} dataSource={partners} pagination={false} />
+
+      <Drawer
+        title="城市合伙人"
+        width={640}
+        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
+        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
+      >
+        {detail && (
+          <Tabs
+            items={[
+              {
+                key: 'info',
+                label: '主账号',
+                children: (
+                  <Form form={editForm} layout="vertical">
+                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="contactPhone" label="业务联系电话"><Input /></Form.Item>
+                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+                    <Form.Item name="bindingStatus" label="绑定状态" rules={[{ required: true }]}>
+                      <Select options={BINDING_OPTIONS} />
+                    </Form.Item>
+                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
+                    </Form.Item>
+                    {editScopeType === CityPartnerScopeType.DISTRICT && (
+                      <Form.Item
+                        name="districtCodes"
+                        label="区县"
+                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
+                      >
+                        <CityDistrictMultiSelect cityCode={cityCode} />
+                      </Form.Item>
+                    )}
+                    <Space style={{ width: '100%' }} size="large">
+                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                    </Space>
+                    <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
+                      订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%（可在城市基本信息中调整）
+                    </Typography.Text>
+                    <Form.Item label="管仓仓库">
+                      <Input
+                        disabled
+                        value={detail.managedWarehouseName ?? '未分配（请在仓库管理中设置）'}
+                      />
+                    </Form.Item>
+                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
+                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
+                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
+                  </Form>
+                ),
+              },
+              {
+                key: 'staff',
+                label: `子账号 (${Math.max(0, (detail.accountCount ?? 1) - 1)})`,
+                children: (
+                  <PartnerSubAccountList
+                    subs={detail.children ?? []}
+                    onAdd={() => {
+                      subForm.resetFields();
+                      subForm.setFieldsValue({ staffRole: 'INTERNAL', permissions: ['store:create', 'store:manage'] });
+                      setSubOpen(true);
+                    }}
+                    onEdit={(row) => {
+                      setSubEditId(row.id);
+                      subEditForm.setFieldsValue({
+                        name: row.name,
+                        phone: row.phone,
+                        staffRole: row.staffRole ?? 'INTERNAL',
+                        permissions: row.permissions ?? [],
+                        status: row.status,
+                      });
+                      setSubEditOpen(true);
+                    }}
+                    onDelete={(subId) => void deleteSubAccount(subId)}
+                  />
+                ),
+              },
+            ]}
+          />
+        )}
+      </Drawer>
+
+      <Modal title="新建城市合伙人" open={createOpen} width={560} onCancel={() => setCreateOpen(false)} onOk={async () => {
+        try {
+          const v = await createForm.validateFields();
+          const err = commissionSumError(
+            Number(v.orderCommissionRate ?? 0),
+            Number(v.redeemCommissionRate ?? 3),
+            maxPartnerCommissionRate,
+          );
+          if (err) {
+            message.error(err);
+            return;
+          }
+          await request('/admin/partners', {
+            method: 'POST',
+            body: JSON.stringify({
+              ...v,
+              cityId,
+              orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+              redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+              districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+            }),
+          });
+          message.success('已创建');
+          setCreateOpen(false);
+          void loadPartners();
+          onChanged?.();
+        } catch (e) {
+          const msg = formatApiError(e);
+          if (msg) message.error(msg);
+        }
+      }}>
+        <Form form={createForm} layout="vertical">
+          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
+          </Form.Item>
+          {createScopeType === CityPartnerScopeType.DISTRICT && (
+            <Form.Item
+              name="districtCodes"
+              label="区县"
+              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
+            >
+              <CityDistrictMultiSelect cityCode={cityCode} />
+            </Form.Item>
+          )}
+          <Space style={{ width: '100%' }} size="large">
+            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+          </Space>
+          <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
+            订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%
+          </Typography.Text>
+        </Form>
+      </Modal>
+
+      <Modal title="添加子账号" open={subOpen} onCancel={() => setSubOpen(false)} onOk={async () => {
+        if (!detail) return;
+        const v = await subForm.validateFields();
+        await request('/admin/partner-accounts', {
+          method: 'POST',
+          body: JSON.stringify({ ...v, parentAccountId: detail.id }),
+        });
+        message.success('已创建');
+        setSubOpen(false);
+        void openPartner(detail.id);
+        void loadPartners();
+        onChanged?.();
+      }}>
+        <Form form={subForm} layout="vertical">
+          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="staffRole" label="角色" initialValue="INTERNAL">
+            <Select options={STAFF_ROLE_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="permissions" label="权限">
+            <Checkbox.Group options={PERM_OPTIONS} />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Modal title="编辑子账号" open={subEditOpen} onCancel={() => setSubEditOpen(false)} onOk={async () => {
+        if (!subEditId || !detail) return;
+        const v = await subEditForm.validateFields();
+        await request(`/admin/partner-accounts/${subEditId}`, { method: 'PUT', body: JSON.stringify(v) });
+        message.success('已更新');
+        setSubEditOpen(false);
+        void openPartner(detail.id);
+      }}>
+        <Form form={subEditForm} layout="vertical">
+          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="staffRole" label="角色"><Select options={STAFF_ROLE_OPTIONS} /></Form.Item>
+          <Form.Item name="status" label="状态">
+            <Select options={[{ value: 'ACTIVE', label: '启用' }, { value: 'DISABLED', label: '停用' }]} />
+          </Form.Item>
+          <Form.Item name="permissions" label="权限">
+            <Checkbox.Group options={PERM_OPTIONS} />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
@@ -1,92 +1,91 @@
-import { Button, Popconfirm, Space, Table, Tag, Typography } from 'antd';
-import type { ColumnsType } from 'antd/es/table';
-import {
-  PARTNER_PERMISSION_LABELS,
-  PARTNER_STAFF_ROLE_LABELS,
-  type PartnerPermissionKey,
-} from '@dukang/shared-types';
-
-export type PartnerSubAccountRow = {
-  id: string;
-  phone: string;
-  name: string;
-  staffRole?: string;
-  permissions?: string[];
-  status: string;
-};
-
-function formatPermissions(permissions?: string[]) {
-  return permissions?.map((k) => PARTNER_PERMISSION_LABELS[k as PartnerPermissionKey] || k).join('、') || '—';
-}
-
-type Props = {
-  subs: PartnerSubAccountRow[];
-  onAdd: () => void;
-  onEdit: (sub: PartnerSubAccountRow) => void;
-  onDelete: (subId: string) => void;
-};
-
-export default function PartnerSubAccountList({ subs, onAdd, onEdit, onDelete }: Props) {
-  const columns: ColumnsType<PartnerSubAccountRow> = [
-    { title: '姓名', dataIndex: 'name', width: 100 },
-    { title: '手机', dataIndex: 'phone', width: 120 },
-    {
-      title: '角色',
-      dataIndex: 'staffRole',
-      width: 90,
-      render: (v) =>
-        v ? PARTNER_STAFF_ROLE_LABELS[v as keyof typeof PARTNER_STAFF_ROLE_LABELS] || v : '—',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 80,
-      render: (s) => (
-        <Tag color={s === 'ACTIVE' ? 'green' : 'default'}>{s === 'ACTIVE' ? '启用' : '停用'}</Tag>
-      ),
-    },
-    {
-      title: '权限',
-      dataIndex: 'permissions',
-      ellipsis: true,
-      render: (p: string[] | undefined) => formatPermissions(p),
-    },
-    {
-      title: '操作',
-      width: 120,
-      render: (_, row) => (
-        <Space size={0}>
-          <Button type="link" size="small" onClick={() => onEdit(row)}>
-            编辑
-          </Button>
-          <Popconfirm title="确定删除该子账号？" onConfirm={() => onDelete(row.id)}>
-            <Button type="link" size="small" danger>
-              删除
-            </Button>
-          </Popconfirm>
-        </Space>
-      ),
-    },
-  ];
-
-  return (
-    <>
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8 }}>
-        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-          子账号（{subs.length}）· 仅主账号可添加，不可多级
-        </Typography.Text>
-        <Button size="small" type="primary" onClick={onAdd}>
-          添加子账号
-        </Button>
-      </div>
-      <Table
-        size="small"
-        rowKey="id"
-        pagination={false}
-        columns={columns}
-        dataSource={subs}
-        locale={{ emptyText: '暂无子账号' }}
-      />
-    </>
-  );
-}
+import { Button, Popconfirm, Space, Table, Tag, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  PARTNER_PERMISSION_LABELS,
+  PARTNER_STAFF_ROLE_LABELS,
+  type PartnerPermissionKey,
+} from '@dukang/shared-types';
+
+export type PartnerSubAccountRow = {
+  id: string;
+  phone: string;
+  name: string;
+  staffRole?: string;
+  permissions?: string[];
+  status: string;
+};
+
+function formatPermissions(permissions?: string[]) {
+  return permissions?.map((k) => PARTNER_PERMISSION_LABELS[k as PartnerPermissionKey] || k).join('、') || '—';
+}
+
+type Props = {
+  subs: PartnerSubAccountRow[];
+  onAdd: () => void;
+  onEdit: (sub: PartnerSubAccountRow) => void;
+  onDelete: (subId: string) => void;
+};
+
+export default function PartnerSubAccountList({ subs, onAdd, onEdit, onDelete }: Props) {
+  const columns: ColumnsType<PartnerSubAccountRow> = [
+    { title: '姓名', dataIndex: 'name', width: 100 },
+    { title: '手机', dataIndex: 'phone', width: 120 },
+    {
+      title: '角色',
+      dataIndex: 'staffRole',
+      width: 90,
+      render: (v) =>
+        v ? PARTNER_STAFF_ROLE_LABELS[v as keyof typeof PARTNER_STAFF_ROLE_LABELS] || v : '—',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 80,
+      render: (s) => (
+        <Tag color={s === 'ACTIVE' ? 'green' : 'default'}>{s === 'ACTIVE' ? '启用' : '停用'}</Tag>
+      ),
+    },
+    {
+      title: '权限',
+      dataIndex: 'permissions',
+
+      render: (p: string[] | undefined) => formatPermissions(p),
+    },
+    {
+      title: '操作',
+      width: 120,
+      render: (_, row) => (
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => onEdit(row)}>
+            编辑
+          </Button>
+          <Popconfirm title="确定删除该子账号？" onConfirm={() => onDelete(row.id)}>
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8 }}>
+        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+          子账号（{subs.length}）· 仅主账号可添加，不可多级
+        </Typography.Text>
+        <Button size="small" type="primary" onClick={onAdd}>
+          添加子账号
+        </Button>
+      </div>
+      <Table
+        size="small"
+        rowKey="id"
+        pagination={false}
+        columns={columns}
+        dataSource={subs}
+        locale={{ emptyText: '暂无子账号' }}
+      />
+    </>
+  );
@@ -20,10 +20,11 @@ import {
  AccountBookOutlined,
  ProjectOutlined,
 } from '@ant-design/icons';
-import { hasAnySystemSettingsPermission } from '@dukang/shared-types';
+import { hasAnySystemSettingsPermission, hasAnyStoreMenuPermission } 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';
+import { ListColumnPrefsProvider } from '../lib/ListColumnPrefsContext';

 const { Header, Sider, Content } = Layout;

@@ -156,6 +157,9 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
  if (key === 'tickets-group') {
    return permissionKeys.includes('tickets') || permissionKeys.includes('tech_support');
  }
+  if (key === 'stores-group') {
+    return hasAnyStoreMenuPermission(permissionKeys);
+  }
  if (key === 'dev-plan-group') {
    return permissionKeys.includes('dev_plan');
  }
@@ -175,11 +179,11 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
    '/knowledge-bases': 'knowledge_bases',
    'stores-group': 'stores',
    '/stores': 'stores',
-    '/store-package-audits': 'stores',
-    '/store-ratings': 'stores',
-    '/store-categories': 'stores',
-    '/store-accounts': 'stores',
-    '/store-media': 'stores',
+    '/store-package-audits': 'store_audits',
+    '/store-ratings': 'store_ratings',
+    '/store-categories': 'store_categories',
+    '/store-accounts': 'store_accounts',
+    '/store-media': 'store_media',
    'partners-group': 'partners',
    '/cities': 'partners',
    '/city-partners': 'partners',
@@ -413,7 +417,9 @@ export default function AdminLayout() {
          style={{ flex: 1, minHeight: 0, overflow: 'auto' }}
        >
          <Content style={{ margin: 24 }}>
-            <Outlet />
+            <ListColumnPrefsProvider initial={profile?.listColumnPrefs}>
+              <Outlet />
+            </ListColumnPrefsProvider>
          </Content>
        </div>
      </Layout>
@@ -0,0 +1,54 @@
+import { createContext, useCallback, useContext, useEffect, useMemo, useState, type ReactNode } from 'react';
+import type { HqListColumnKey, HqListColumnPref, HqListColumnPrefsMap } from '@dukang/shared-types';
+import { request } from './api';
+
+type Ctx = {
+  prefs: HqListColumnPrefsMap;
+  ready: boolean;
+  setPrefs: (next: HqListColumnPrefsMap) => void;
+  save: (listKey: HqListColumnKey, next: HqListColumnPref | null) => Promise<void>;
+};
+
+const ListColumnPrefsContext = createContext<Ctx>({
+  prefs: {},
+  ready: false,
+  setPrefs: () => {},
+  save: async () => {},
+});
+
+export function ListColumnPrefsProvider({
+  initial,
+  children,
+}: {
+  initial?: HqListColumnPrefsMap;
+  children: ReactNode;
+}) {
+  const [prefs, setPrefs] = useState<HqListColumnPrefsMap>(initial ?? {});
+  const [ready] = useState(true);
+
+  useEffect(() => {
+    if (initial) setPrefs(initial);
+  }, [initial]);
+
+  const save = useCallback(async (listKey: HqListColumnKey, next: HqListColumnPref | null) => {
+    const res = await request<{ listColumnPrefs: HqListColumnPrefsMap }>(
+      `/admin/me/list-columns/${listKey}`,
+      {
+        method: 'PUT',
+        body: JSON.stringify(
+          next
+            ? { order: next.order, hidden: next.hidden, widths: next.widths }
+            : { reset: true },
+        ),
+      },
+    );
+    setPrefs(res.listColumnPrefs ?? {});
+  }, []);
+
+  const value = useMemo(() => ({ prefs, ready, setPrefs, save }), [prefs, ready, save]);
+  return <ListColumnPrefsContext.Provider value={value}>{children}</ListColumnPrefsContext.Provider>;
+}
+
+export function useListColumnPrefs() {
+  return useContext(ListColumnPrefsContext);
+}
@@ -1,3 +1,5 @@
+import type { HqListColumnPrefsMap } from '@dukang/shared-types';
+
 export const apiBase = '/api/v1';
 export const CLIENT_APP = 'HQ_WEB';

@@ -8,6 +10,9 @@ export type HqProfile = {
  adminRole: string;
  status: string;
  permissionKeys?: string[];
+  cityIds?: string[];
+  cityScoped?: boolean;
+  listColumnPrefs?: HqListColumnPrefsMap;
 };

 export function getToken() {
@@ -87,6 +92,9 @@ export type DashboardStats = {
  openTickets?: number;
  pendingStoreWithdrawals?: number;
  overdueStoreWithdrawals?: number;
+  pendingStoreOnboard?: number;
+  pendingStorePackageAudits?: number;
+  pendingStoreInfoChanges?: number;
  ordersByStatus: Array<{ status: string; count: number }>;
 };

@@ -161,6 +169,7 @@ export type AdminUserRow = {
  wxOpenId: string | null;
  wechatVerified: boolean;
  nickname: string | null;
+  hqRemark: string | null;
  status: number;
  sourceType: string;
  sourceRefId: string | null;
@@ -193,6 +202,7 @@ export type AdminOrderRow = {
  productName?: string;
  productSpec?: string;
  quantity?: number;
+  saleUnit?: string;
  receiverName: string;
  receiverPhone: string;
  receiverProvince?: string;
@@ -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}
+    </>
+  );
+}
@@ -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: '待发货',
@@ -0,0 +1,97 @@
+import type { ColumnType } from 'antd/es/table';
+import type { HqListColumnKey, HqListColumnPref } from '@dukang/shared-types';
+
+export const SERIAL_COLUMN_KEY = '__serial';
+export const ACTIONS_COLUMN_KEY = '__actions';
+
+export function columnKey<T>(col: ColumnType<T>, index: number): string {
+  if (col.key != null && String(col.key).length) return String(col.key);
+  const dataIndex = col.dataIndex;
+  if (typeof dataIndex === 'string' && dataIndex) return dataIndex;
+  if (Array.isArray(dataIndex) && dataIndex.length) return dataIndex.map(String).join('.');
+  if (typeof col.title === 'string' && col.title) return col.title;
+  return `col-${index}`;
+}
+
+export function isActionsColumn<T>(col: ColumnType<T>, key: string): boolean {
+  if (key === ACTIONS_COLUMN_KEY || key === 'actions' || key === 'action') return true;
+  return col.title === '操作';
+}
+
+export function mergeColumnOrder(defaultKeys: string[], pref?: HqListColumnPref): string[] {
+  const known = new Set(defaultKeys);
+  const ordered = (pref?.order ?? []).filter((k) => known.has(k));
+  for (const key of defaultKeys) {
+    if (ordered.includes(key)) continue;
+    const defaultIdx = defaultKeys.indexOf(key);
+    let insertAt = ordered.length;
+    for (let i = 0; i < ordered.length; i += 1) {
+      if (defaultKeys.indexOf(ordered[i]) > defaultIdx) {
+        insertAt = i;
+        break;
+      }
+    }
+    ordered.splice(insertAt, 0, key);
+  }
+  return ordered;
+}
+
+export function visibleColumnKeys(defaultKeys: string[], pref?: HqListColumnPref): string[] {
+  const hidden = new Set(pref?.hidden ?? []);
+  return mergeColumnOrder(defaultKeys, pref).filter((k) => !hidden.has(k));
+}
+
+export function applyColumnPrefs<T>(
+  columns: ColumnType<T>[],
+  pref: HqListColumnPref | undefined,
+): ColumnType<T>[] {
+  const keyed = columns.map((col, i) => {
+    const key = columnKey(col, i);
+    return { col: { ...col, key }, key, actions: isActionsColumn(col, key) };
+  });
+  const configurable = keyed.filter((c) => !c.actions);
+  const actions = keyed.filter((c) => c.actions);
+  const defaultKeys = configurable.map((c) => c.key);
+  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) => {
+        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 = {
+  key: string;
+  title: string;
+  visible: boolean;
+};
+
+export function settingItems<T>(
+  columns: ColumnType<T>[],
+  pref?: HqListColumnPref,
+): ListColumnSettingItem[] {
+  const keyed = columns
+    .map((col, i) => ({ col, key: columnKey(col, i) }))
+    .filter(({ col, key }) => !isActionsColumn(col, key));
+  const hidden = new Set(pref?.hidden ?? []);
+  const order = mergeColumnOrder(keyed.map((c) => c.key), pref);
+  const byKey = new Map(keyed.map((c) => [c.key, c.col]));
+  return order.map((key) => {
+    const col = byKey.get(key);
+    const title = typeof col?.title === 'string' ? col.title : key;
+    return { key, title, visible: !hidden.has(key) };
+  });
+}
+
+export type { HqListColumnKey };
@@ -0,0 +1,175 @@
+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';
+import type { HqListColumnKey } from '@dukang/shared-types';
+import { AdminListColumnsModal } from '../components/AdminListColumnsModal';
+import { useListColumnPrefs } from './ListColumnPrefsContext';
+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;
+  pageSize?: number;
+};
+
+export function useAdminListColumns<T>(
+  listKey: HqListColumnKey,
+  allColumns: ColumnsType<T>,
+  options: Options = {},
+) {
+  const { page = 1, pageSize = 20 } = options;
+  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),
+    [allColumns, pref],
+  );
+
+  const items = useMemo(
+    () => settingItems(allColumns as ColumnType<T>[], pref),
+    [allColumns, pref],
+  );
+  itemsRef.current = items;
+
+  const serialCol: ColumnType<T> = useMemo(
+    () => ({
+      key: SERIAL_COLUMN_KEY,
+      title: '序号',
+      width: 64,
+      fixed: 'left' as const,
+      render: (_: unknown, __: T, index: number) => (page - 1) * pageSize + index + 1,
+    }),
+    [page, pageSize],
+  );
+
+  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,
+      ),
+    ];
+    const widths = { ...(pref?.widths ?? {}), ...localWidths };
+    return merged.map((col, i) => {
+      const key = columnKey(col, i);
+      const width = widths[key] ?? (typeof col.width === 'number' ? col.width : undefined);
+      const prevHeader = col.onHeaderCell;
+      return {
+        ...col,
+        key,
+        width,
+        title: withResizeTitle(col.title, (e) => {
+          const th = (e.currentTarget as HTMLElement).closest('th');
+          const startWidth = width ?? th?.getBoundingClientRect().width ?? 120;
+          beginColumnResize(
+            e,
+            startWidth,
+            (next) => setLocalWidths((prev) => ({ ...prev, [key]: next })),
+            (next) => void persistWidth(key, next),
+          );
+        }),
+        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 = (
+    <span className="admin-list-settings-slot">
+      <Button type="text" icon={<SettingOutlined />} className="admin-list-settings-btn" onClick={() => setOpen(true)}>
+        列设置
+      </Button>
+    </span>
+  );
+
+  const settingsModal = (
+    <AdminListColumnsModal
+      open={open}
+      items={items}
+      saving={saving}
+      onCancel={() => setOpen(false)}
+      onReset={() => void persist(null)}
+      onSave={(draft) => void persist(draft)}
+    />
+  );
+
+  return { columns, settingsButton, settingsModal };
+}
@@ -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,9 +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;
@@ -30,10 +46,43 @@ type Row = {
  status: string;
  sourceProduct: string;
  createdAt: string;
-  user?: { userNo: string; phone: string | null };
-  order?: { orderNo: string } | null;
+  user?: { id?: string; userNo: string; phone: 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;
@@ -58,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>>({});
@@ -99,21 +147,62 @@ export default function BenefitCouponsPage() {
    }
  }

-  const columns: ColumnsType<Row> = [
-    { title: '券号', dataIndex: 'couponNo', width: 200, ellipsis: false },
-    { title: '用户', dataIndex: ['user', 'userNo'], width: 120, ellipsis: false },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      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', ellipsis: true },
+    {
+      title: '来源',
+      dataIndex: 'sourceProduct',
+      width: 360,
+      ellipsis: false,
+      render: (_: string, row) => formatCouponSource(row),
+    },
    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '操作',
@@ -155,16 +244,20 @@ export default function BenefitCouponsPage() {
    }
  }

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('benefit-coupons', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          好客权益券
-        </Typography.Title>
-        <Button type="primary" onClick={() => setGrantOpen(true)}>
-          手动发放
-        </Button>
-      </div>
+      {settingsModal}
+      <AdminListHeader
+        title="好客权益券"
+        settings={settingsButton}
+        actions={
+          <Button type="primary" onClick={() => setGrantOpen(true)}>
+            手动发放
+          </Button>
+        }
+      />

      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
        <Form.Item name="couponNo" label="券号">
@@ -190,7 +283,7 @@ export default function BenefitCouponsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -268,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 }}>
@@ -316,7 +431,7 @@ export default function BenefitCouponsPage() {
                  locale={{ emptyText: '暂无关联核销单' }}
                  dataSource={detail.redeemRecords ?? []}
                  columns={[
-                    { title: '核销号', dataIndex: 'redeemNo', ellipsis: true },
+                    { title: '核销号', dataIndex: 'redeemNo' },
                    {
                      title: '角色',
                      dataIndex: 'role',
@@ -327,7 +442,7 @@ export default function BenefitCouponsPage() {
                    {
                      title: '门店',
                      dataIndex: ['store', 'name'],
-                      ellipsis: true,
+
                      render: (v: string | undefined, row: CouponRedeemRecord) =>
                        v ? `${v}${row.store?.cityName ? `（${row.store.cityName}）` : ''}` : '—',
                    },
@@ -3,6 +3,9 @@ import { Form, Input, Select, Button, Table, Tag, Typography } from 'antd';
 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 = {
  id: string; type: string; amount: number; balanceAfter: number; remark: string | null; createdAt: string;
@@ -24,19 +27,22 @@ export default function BenefitLedgersPage() {
    [filters],
  );

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '类型', dataIndex: 'type', width: 90, render: (t) => <Tag>{LEDGER_TYPE_LABELS[t] || t}</Tag> },
    { title: '用户', dataIndex: ['user', 'userNo'], width: 120, ellipsis: false },
    { title: '券号', dataIndex: ['coupon', 'couponNo'], width: 200, ellipsis: false },
    { title: '变动', dataIndex: 'amount', width: 90, render: (v) => `${v >= 0 ? '+' : ''}${v}` },
    { title: '余额后', dataIndex: 'balanceAfter', width: 90 },
-    { title: '备注', dataIndex: 'remark', ellipsis: true },
+    { title: '备注', dataIndex: 'remark' },
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('benefit-ledgers', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>权益流水</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="权益流水" settings={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>
@@ -45,7 +51,7 @@ export default function BenefitLedgersPage() {
        </Form.Item>
        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
      </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1000 }}
+      <Table rowKey="id" className="admin-table-nowrap" 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); } }} />
    </div>
  );
@@ -24,6 +24,10 @@ import { ADMIN_OPTIONS_PAGE_SIZE, CITY_STATUS_LABELS, fmtTime } from '../lib/con
 import { useAdminList } from '../lib/useAdminList';
 import CityPartnersPanel from '../components/CityPartnersPanel';
 import ChinaProvinceCityCascader from '../components/ChinaProvinceCityCascader';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+

 type WarehouseRow = {
  id: string;
@@ -223,9 +227,16 @@ export default function CitiesPage() {
    }
  };

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '编码', dataIndex: 'code', width: 90 },
-    { title: '城市', dataIndex: 'name', width: 100 },
+    {
+      title: '城市',
+      dataIndex: 'name',
+      width: 100,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
    { title: '省份', dataIndex: 'province', width: 90 },
    { title: '状态', dataIndex: 'status', width: 90, render: (s) => <Tag>{CITY_STATUS_LABELS[s] || s}</Tag> },
    { title: '合伙人', dataIndex: 'partnerBindingCount', width: 90 },
@@ -261,7 +272,7 @@ export default function CitiesPage() {

  const warehouseColumns: ColumnsType<WarehouseRow> = [
    { title: '仓库名', dataIndex: 'name' },
-    { title: '地址', dataIndex: 'address', ellipsis: true },
+    { title: '地址', dataIndex: 'address' },
    { title: '联系人', dataIndex: 'contactName', width: 90 },
    { title: '电话', dataIndex: 'contactPhone', width: 120 },
    {
@@ -270,7 +281,7 @@ export default function CitiesPage() {
      width: 100,
      render: (v: WarehouseManagerType) => WAREHOUSE_MANAGER_LABELS[v] || v,
    },
-    { title: '合伙人', dataIndex: 'partnerCompanyName', ellipsis: true, render: (v) => v || '—' },
+    { title: '合伙人', dataIndex: 'partnerCompanyName', render: (v) => v || '—' },
    { title: '状态', dataIndex: 'status', width: 80, render: (s) => <Tag>{s}</Tag> },
    {
      title: '操作',
@@ -311,12 +322,16 @@ export default function CitiesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('cities', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>城市</Typography.Title>
-        <Button type="primary" onClick={openCreateModal}>新建城市</Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="城市"
+        settings={settingsButton}
+        actions={<Button type="primary" onClick={openCreateModal}>新建城市</Button>}
+      />
      <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="code" label="编码"><Input allowClear /></Form.Item>
@@ -325,7 +340,7 @@ export default function CitiesPage() {
        </Form.Item>
        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
      </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []}
+      <Table scroll={{ x: 'max-content' }} rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []}
        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />

      <Drawer title="城市管理" width={720} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
@@ -623,9 +638,9 @@ export default function CitiesPage() {
                )}
                columns={[
                  { title: '类型', dataIndex: 'kind', width: 80 },
-                  { title: '名称', dataIndex: 'name', ellipsis: true },
+                  { title: '名称', dataIndex: 'name' },
                  { title: '手机号', dataIndex: 'phone', width: 120 },
-                  { title: '归属', dataIndex: 'parent', ellipsis: true },
+                  { title: '归属', dataIndex: 'parent' },
                ]}
              />
            </div>
@@ -640,13 +655,12 @@ export default function CitiesPage() {
                locale={{ emptyText: '无门店' }}
                dataSource={deletePreview.stores}
                columns={[
-                  { title: '门店名', dataIndex: 'name', ellipsis: true },
+                  { title: '门店名', dataIndex: 'name' },
                  { title: '电话', dataIndex: 'phone', width: 120 },
                  { title: '状态', dataIndex: 'status', width: 90 },
                  {
                    title: '合伙人',
                    width: 140,
-                    ellipsis: true,
                    render: (_, r) => r.partnerAccount?.companyName || r.partnerAccount?.phone || '—',
                  },
                ]}
@@ -36,6 +36,10 @@ import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import PartnerSubAccountList, { type PartnerSubAccountRow } from '../components/PartnerSubAccountList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+

 type SubRow = PartnerSubAccountRow;

@@ -261,22 +265,27 @@ export default function CityPartnersPage() {
    setCreateMaxRate(Number(cityRes.maxPartnerCommissionRate ?? 0.05));
  }

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '城市', dataIndex: 'cityName', width: 90 },
    {
      title: '区县',
      dataIndex: 'districtCodes',
      width: 160,
-      ellipsis: true,
      render: (codes: string[] | null | undefined, row) =>
        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
    },
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
+    {
+      title: '公司名',
+      dataIndex: 'companyName',
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openPartner(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '主账号姓名',
      dataIndex: 'name',
      width: 120,
-      ellipsis: true,
      render: (v, row) => (
        <Space size={4}>
          <span>{v}</span>
@@ -311,7 +320,6 @@ export default function CityPartnersPage() {
      title: '管仓仓库',
      dataIndex: 'managedWarehouseName',
      width: 110,
-      ellipsis: true,
      render: (v) => v || '—',
    },
    {
@@ -338,30 +346,34 @@ export default function CityPartnersPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('city-partners', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          城市合伙人
-        </Typography.Title>
-        <Button
-          type="primary"
-          onClick={() => {
-            createForm.resetFields();
-            createForm.setFieldsValue({
-              orderCommissionRate: 0,
-              redeemCommissionRate: 3,
-              scopeType: CityPartnerScopeType.CITY_WIDE,
-            });
-            setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
-            setCreateMaxRate(0.05);
-            setCreateCityCode(undefined);
-            setCreateOpen(true);
-          }}
-        >
-          新建合伙人
-        </Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="城市合伙人"
+        settings={settingsButton}
+        actions={
+          <Button
+            type="primary"
+            onClick={() => {
+              createForm.resetFields();
+              createForm.setFieldsValue({
+                orderCommissionRate: 0,
+                redeemCommissionRate: 3,
+                scopeType: CityPartnerScopeType.CITY_WIDE,
+              });
+              setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
+              setCreateMaxRate(0.05);
+              setCreateCityCode(undefined);
+              setCreateOpen(true);
+            }}
+          >
+            新建合伙人
+          </Button>
+        }
+      />

      <Alert
        type="info"
@@ -427,7 +439,7 @@ export default function CityPartnersPage() {
        loading={loading}
        columns={columns}
        dataSource={toTableRows(data?.items ?? [])}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        childrenColumnName="__noTreeChildren__"
        expandable={{
          expandedRowRender: (record) => (
@@ -14,7 +14,6 @@ import {
  Switch,
  Table,
  Tag,
-  Typography,
  message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -30,6 +29,10 @@ import {
 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 = {
  id: string;
@@ -70,6 +73,7 @@ function FulfillmentFields({
  onModeChange: (mode: WarehouseFulfillmentMode) => void;
 }) {
  const autoShip = mode === WarehouseFulfillmentMode.API_AUTO;
+
  return (
    <>
      <Form.Item
@@ -219,7 +223,7 @@ export default function CityWarehousesPage() {
    }
  }

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    {
      title: '城市',
      width: 100,
@@ -229,8 +233,15 @@ export default function CityWarehousesPage() {
        </span>
      ),
    },
-    { title: '仓库', dataIndex: 'name', width: 140, ellipsis: true },
-    { title: '地址', dataIndex: 'address', width: 180, ellipsis: true },
+    {
+      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 },
    {
@@ -242,7 +253,6 @@ export default function CityWarehousesPage() {
      title: '合伙人',
      dataIndex: 'partnerCompanyName',
      width: 120,
-      ellipsis: true,
      render: (v, row) =>
        v && row.partnerAccountId ? (
          <Link to="/city-partners">{v}</Link>
@@ -298,28 +308,37 @@ export default function CityWarehousesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('city-warehouses', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>仓库</Typography.Title>
-        <Button
-          type="primary"
-          onClick={() => {
-            createForm.resetFields();
-            setCreateManagerType(WarehouseManagerType.HQ);
-            setCreateCityId(undefined);
-            setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
-            createForm.setFieldsValue({
-              managerType: WarehouseManagerType.HQ,
-              status: WarehouseStatus.ACTIVE,
-              fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
-            });
-            setCreateOpen(true);
-          }}
-        >
-          新增仓库
-        </Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="仓库"
+        settings={settingsButton}
+        actions={
+          <Button
+            type="primary"
+            onClick={() => {
+              createForm.resetFields();
+              setCreateManagerType(WarehouseManagerType.HQ);
+              setCreateCityId(undefined);
+              setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
+              createForm.setFieldsValue({
+                managerType: WarehouseManagerType.HQ,
+                status: WarehouseStatus.ACTIVE,
+                fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
+              });
+              setCreateOpen(true);
+            }}
+          >
+            新增仓库
+          </Button>
+        }
+      />

      <Alert
        type="info"
@@ -367,7 +386,7 @@ export default function CityWarehousesPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1400 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -64,6 +64,20 @@ export default function DashboardPage() {
  const [profile, setProfile] = useState<HqProfile | null>(null);
  const [deploying, setDeploying] = useState(false);
  const isSuperAdmin = profile?.adminRole === 'SUPER_ADMIN';
+  const keys = profile?.permissionKeys ?? [];
+  const has = (k: string) => keys.includes(k);
+  const cityScoped = !!profile?.cityScoped;
+  const canUsers = has('users');
+  const canOrders = has('orders');
+  const canStores = has('stores');
+  const canStoreAudits = has('store_audits');
+  const canPartners = has('partners');
+  const canPromo = has('promo_codes');
+  const canFinance = has('finance');
+  const canBenefit = has('benefit');
+  const canDeliveries = has('deliveries');
+  const canTickets = has('tickets');
+  const permsReady = profile !== null;

  const [filterForm] = Form.useForm<{
    range: [Dayjs, Dayjs];
@@ -115,18 +129,26 @@ export default function DashboardPage() {
      .catch(() => {
        setVersionLoading(false);
      });
+  }, [loadVersion]);
+
+  useEffect(() => {
+    if (!profile) return;
    void request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
      .then((res) => setCities(res.items ?? []))
      .catch(() => setCities([]));
-    void request<Paginated<PromoOption>>(`/admin/promo-codes?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
-      .then((res) => setPromos(res.items ?? []))
-      .catch(() => setPromos([]));
-    void request<Paginated<{ id: string; companyName?: string | null; name: string }>>(
-      `/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
-    )
-      .then((res) => setPartners(res.items ?? []))
-      .catch(() => setPartners([]));
-  }, [loadVersion]);
+    if ((profile.permissionKeys ?? []).includes('promo_codes')) {
+      void request<Paginated<PromoOption>>(`/admin/promo-codes?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+        .then((res) => setPromos(res.items ?? []))
+        .catch(() => setPromos([]));
+    }
+    if ((profile.permissionKeys ?? []).includes('partners')) {
+      void request<Paginated<{ id: string; companyName?: string | null; name: string }>>(
+        `/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
+      )
+        .then((res) => setPartners(res.items ?? []))
+        .catch(() => setPartners([]));
+    }
+  }, [profile]);

  useEffect(() => {
    void loadAnalytics(filters);
@@ -206,9 +228,19 @@ export default function DashboardPage() {

  const byDateOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byDate ?? [];
+    const legend: string[] = [];
+    const series: EChartsOption['series'] = [];
+    if (canUsers) {
+      legend.push('新增用户');
+      series.push({ name: '新增用户', type: 'line', smooth: true, data: rows.map((r) => r.users) });
+    }
+    if (canOrders) {
+      legend.push('订单数');
+      series.push({ name: '订单数', type: 'line', smooth: true, data: rows.map((r) => r.orders) });
+    }
    return {
      tooltip: { trigger: 'axis' },
-      legend: { data: ['新增用户', '订单数'] },
+      legend: { data: legend },
      grid: { left: 40, right: 20, top: 40, bottom: 40 },
      xAxis: {
        type: 'category',
@@ -216,18 +248,25 @@ export default function DashboardPage() {
        axisLabel: { rotate: rows.length > 14 ? 45 : 0 },
      },
      yAxis: { type: 'value', minInterval: 1 },
-      series: [
-        { name: '新增用户', type: 'line', smooth: true, data: rows.map((r) => r.users) },
-        { name: '订单数', type: 'line', smooth: true, data: rows.map((r) => r.orders) },
-      ],
+      series,
    };
-  }, [analytics]);
+  }, [analytics, canUsers, canOrders]);

  const byCityOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byCity ?? [];
+    const legend: string[] = [];
+    const series: EChartsOption['series'] = [];
+    if (canUsers) {
+      legend.push('用户');
+      series.push({ name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 });
+    }
+    if (canOrders) {
+      legend.push('订单');
+      series.push({ name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 });
+    }
    return {
      tooltip: { trigger: 'axis' },
-      legend: { data: ['用户', '订单'] },
+      legend: { data: legend },
      grid: { left: 48, right: 20, top: 40, bottom: 48 },
      xAxis: {
        type: 'category',
@@ -235,18 +274,25 @@ export default function DashboardPage() {
        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
      },
      yAxis: { type: 'value', minInterval: 1 },
-      series: [
-        { name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 },
-        { name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 },
-      ],
+      series,
    };
-  }, [analytics]);
+  }, [analytics, canUsers, canOrders]);

  const byPromoOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byPromo ?? [];
+    const legend: string[] = [];
+    const series: EChartsOption['series'] = [];
+    if (canUsers) {
+      legend.push('用户');
+      series.push({ name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 });
+    }
+    if (canOrders) {
+      legend.push('订单');
+      series.push({ name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 });
+    }
    return {
      tooltip: { trigger: 'axis' },
-      legend: { data: ['用户', '订单'] },
+      legend: { data: legend },
      grid: { left: 48, right: 20, top: 40, bottom: 64 },
      xAxis: {
        type: 'category',
@@ -254,18 +300,36 @@ export default function DashboardPage() {
        axisLabel: { interval: 0, rotate: rows.length > 3 ? 30 : 0 },
      },
      yAxis: { type: 'value', minInterval: 1 },
-      series: [
-        { name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 },
-        { name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 },
-      ],
+      series,
    };
-  }, [analytics]);
+  }, [analytics, canUsers, canOrders]);

  const opsByDateOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byDate ?? [];
+    const legend: string[] = [];
+    const series: NonNullable<EChartsOption['series']> = [];
+    if (canPartners) {
+      legend.push('新增合伙人');
+      series.push({ name: '新增合伙人', type: 'line', smooth: true, data: rows.map((r) => r.partners) });
+    }
+    if (canStores) {
+      legend.push('新签门店');
+      series.push({ name: '新签门店', type: 'line', smooth: true, data: rows.map((r) => r.stores) });
+    }
+    if (canBenefit) {
+      legend.push('核销笔数', '核销金额');
+      series.push({ name: '核销笔数', type: 'line', smooth: true, data: rows.map((r) => r.redeems) });
+      series.push({
+        name: '核销金额',
+        type: 'line',
+        smooth: true,
+        yAxisIndex: 1,
+        data: rows.map((r) => r.redeemAmount),
+      });
+    }
    return {
      tooltip: { trigger: 'axis' },
-      legend: { data: ['新增合伙人', '新签门店', '核销笔数', '核销金额'] },
+      legend: { data: legend },
      grid: { left: 48, right: 48, top: 48, bottom: 40 },
      xAxis: {
        type: 'category',
@@ -276,26 +340,29 @@ export default function DashboardPage() {
        { type: 'value', name: '数量', minInterval: 1 },
        { type: 'value', name: '金额', minInterval: 1 },
      ],
-      series: [
-        { name: '新增合伙人', type: 'line', smooth: true, data: rows.map((r) => r.partners) },
-        { name: '新签门店', type: 'line', smooth: true, data: rows.map((r) => r.stores) },
-        { name: '核销笔数', type: 'line', smooth: true, data: rows.map((r) => r.redeems) },
-        {
-          name: '核销金额',
-          type: 'line',
-          smooth: true,
-          yAxisIndex: 1,
-          data: rows.map((r) => r.redeemAmount),
-        },
-      ],
+      series,
    };
-  }, [analytics]);
+  }, [analytics, canPartners, canStores, canBenefit]);

  const opsByCityOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byCity ?? [];
+    const legend: string[] = [];
+    const series: EChartsOption['series'] = [];
+    if (canPartners) {
+      legend.push('合伙人');
+      series.push({ name: '合伙人', type: 'bar', data: rows.map((r) => r.partners), barMaxWidth: 28 });
+    }
+    if (canStores) {
+      legend.push('门店');
+      series.push({ name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 });
+    }
+    if (canBenefit) {
+      legend.push('核销笔数');
+      series.push({ name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 });
+    }
    return {
      tooltip: { trigger: 'axis' },
-      legend: { data: ['合伙人', '门店', '核销笔数'] },
+      legend: { data: legend },
      grid: { left: 48, right: 20, top: 40, bottom: 48 },
      xAxis: {
        type: 'category',
@@ -303,19 +370,31 @@ export default function DashboardPage() {
        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
      },
      yAxis: { type: 'value', minInterval: 1 },
-      series: [
-        { name: '合伙人', type: 'bar', data: rows.map((r) => r.partners), barMaxWidth: 28 },
-        { name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 },
-        { name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 },
-      ],
+      series,
    };
-  }, [analytics]);
+  }, [analytics, canPartners, canStores, canBenefit]);

  const opsByPartnerOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byPartner ?? [];
+    const legend: string[] = [];
+    const series: NonNullable<EChartsOption['series']> = [];
+    if (canStores) {
+      legend.push('门店');
+      series.push({ name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 });
+    }
+    if (canBenefit) {
+      legend.push('核销笔数', '核销金额');
+      series.push({ name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 });
+      series.push({
+        name: '核销金额',
+        type: 'line',
+        yAxisIndex: 1,
+        data: rows.map((r) => r.redeemAmount),
+      });
+    }
    return {
      tooltip: { trigger: 'axis' },
-      legend: { data: ['门店', '核销笔数', '核销金额'] },
+      legend: { data: legend },
      grid: { left: 48, right: 48, top: 40, bottom: 64 },
      xAxis: {
        type: 'category',
@@ -326,18 +405,9 @@ export default function DashboardPage() {
        { type: 'value', name: '数量', minInterval: 1 },
        { type: 'value', name: '金额' },
      ],
-      series: [
-        { name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 },
-        { name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 },
-        {
-          name: '核销金额',
-          type: 'line',
-          yAxisIndex: 1,
-          data: rows.map((r) => r.redeemAmount),
-        },
-      ],
+      series,
    };
-  }, [analytics]);
+  }, [analytics, canStores, canBenefit]);

  const redeemByCityOption = useMemo<EChartsOption>(() => {
    const rows = analytics?.byCity ?? [];
@@ -368,7 +438,9 @@ export default function DashboardPage() {

  return (
    <div>
-      <Typography.Title level={4}>数据概览</Typography.Title>
+      <Typography.Title level={4}>
+        {cityScoped ? '数据概览（负责城市）' : '数据概览'}
+      </Typography.Title>

      {isSuperAdmin ? (
      <Card
@@ -411,46 +483,94 @@ export default function DashboardPage() {
      ) : null}

      <Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="有效用户" value={stats?.usersTotal ?? 0} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="访客（未验手机）" value={stats?.guestUsers ?? 0} valueStyle={{ color: '#faad14' }} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="已验手机" value={stats?.verifiedUsers ?? 0} valueStyle={{ color: '#52c41a' }} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="今日下单" value={stats?.ordersToday ?? 0} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="门店" value={stats?.storesTotal ?? 0} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="合伙人" value={stats?.partnersTotal ?? 0} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="今日核销" value={stats?.redeemToday ?? 0} />
-          </Card>
-        </Col>
-        <Col xs={24} sm={12} lg={6}>
-          <Card loading={loading}>
-            <Statistic title="配送单" value={stats?.deliveriesTotal ?? 0} />
-          </Card>
-        </Col>
+        {!permsReady ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading />
+          </Col>
+        ) : null}
+        {permsReady && canUsers ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="有效用户" value={stats?.usersTotal ?? 0} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canUsers ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="访客（未验手机）" value={stats?.guestUsers ?? 0} valueStyle={{ color: '#faad14' }} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canUsers ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="已验手机" value={stats?.verifiedUsers ?? 0} valueStyle={{ color: '#52c41a' }} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canOrders ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="今日下单" value={stats?.ordersToday ?? 0} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canStores ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="门店" value={stats?.storesTotal ?? 0} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canStores ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading} extra={<Link to="/stores?auditStatus=PENDING">去处理</Link>}>
+              <Statistic
+                title="待入驻审核"
+                value={stats?.pendingStoreOnboard ?? 0}
+                valueStyle={{ color: (stats?.pendingStoreOnboard ?? 0) > 0 ? '#fa8c16' : undefined }}
+              />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canStoreAudits ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading} extra={<Link to="/store-package-audits">去处理</Link>}>
+              <Statistic
+                title="待套餐/信息审核"
+                value={(stats?.pendingStorePackageAudits ?? 0) + (stats?.pendingStoreInfoChanges ?? 0)}
+                valueStyle={{
+                  color:
+                    (stats?.pendingStorePackageAudits ?? 0) + (stats?.pendingStoreInfoChanges ?? 0) > 0
+                      ? '#fa8c16'
+                      : undefined,
+                }}
+              />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canPartners ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="合伙人" value={stats?.partnersTotal ?? 0} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canBenefit ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="今日核销" value={stats?.redeemToday ?? 0} />
+            </Card>
+          </Col>
+        ) : null}
+        {permsReady && canDeliveries ? (
+          <Col xs={24} sm={12} lg={6}>
+            <Card loading={loading}>
+              <Statistic title="配送单" value={stats?.deliveriesTotal ?? 0} />
+            </Card>
+          </Col>
+        ) : null}
      </Row>

      <Card
@@ -478,62 +598,73 @@ export default function DashboardPage() {
          <Form.Item name="cityId" label="城市">
            <Select
              allowClear
-              placeholder="全部开城"
+              placeholder={cityScoped ? '全部负责城市' : '全部开城'}
              style={{ width: 160 }}
              options={[
-                { value: 'none', label: '未选城' },
+                ...(cityScoped ? [] : [{ value: 'none', label: '未选城' }]),
                ...cities.map((c) => ({ value: c.id, label: c.name })),
              ]}
            />
          </Form.Item>
-          <Form.Item name="promoCodeId" label="推广码">
-            <Select
-              allowClear
-              placeholder="全部来源"
-              style={{ width: 200 }}
-              options={[
-                { value: 'none', label: '自然量 / 无推广码' },
-                ...promos.map((p) => ({ value: p.id, label: `${p.name}（${p.code}）` })),
-              ]}
-            />
-          </Form.Item>
-          <Form.Item name="partnerAccountId" label="合伙人">
-            <Select
-              allowClear
-              placeholder="全部合伙人"
-              style={{ width: 200 }}
-              options={partners.map((p) => ({
-                value: p.id,
-                label: p.companyName || p.name,
-              }))}
-            />
-          </Form.Item>
+          {canPromo ? (
+            <Form.Item name="promoCodeId" label="推广码">
+              <Select
+                allowClear
+                placeholder="全部来源"
+                style={{ width: 200 }}
+                options={[
+                  { value: 'none', label: '自然量 / 无推广码' },
+                  ...promos.map((p) => ({ value: p.id, label: `${p.name}（${p.code}）` })),
+                ]}
+              />
+            </Form.Item>
+          ) : null}
+          {canPartners ? (
+            <Form.Item name="partnerAccountId" label="合伙人">
+              <Select
+                allowClear
+                placeholder="全部合伙人"
+                style={{ width: 200 }}
+                options={partners.map((p) => ({
+                  value: p.id,
+                  label: p.companyName || p.name,
+                }))}
+              />
+            </Form.Item>
+          ) : null}
          <Form.Item>
            <Button type="primary" htmlType="submit">查询</Button>
          </Form.Item>
        </Form>
      </Card>

+      {canUsers || canOrders ? (
      <Card
-        title="用户 / 订单统计"
+        title={canUsers && canOrders ? '用户 / 订单统计' : canUsers ? '用户统计' : '订单统计'}
        style={{ marginBottom: 24 }}
        extra={
          <Space>
-            <Link to={`/orders?${ordersDrillQs}`}>查看订单</Link>
-            <Link to="/users">查看用户</Link>
+            {canOrders ? <Link to={`/orders?${ordersDrillQs}`}>查看订单</Link> : null}
+            {canUsers ? <Link to="/users">查看用户</Link> : null}
          </Space>
        }
      >
        <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
-          <Col xs={24} sm={8}>
-            <Statistic title="区间新增用户" value={analytics?.summary.users ?? 0} />
-          </Col>
-          <Col xs={24} sm={8}>
-            <Statistic title="区间订单数" value={analytics?.summary.orders ?? 0} />
-          </Col>
-          <Col xs={24} sm={8}>
-            <Statistic title="区间付费用户" value={analytics?.summary.payingUsers ?? 0} />
-          </Col>
+          {canUsers ? (
+            <Col xs={24} sm={8}>
+              <Statistic title="区间新增用户" value={analytics?.summary.users ?? 0} />
+            </Col>
+          ) : null}
+          {canOrders ? (
+            <Col xs={24} sm={8}>
+              <Statistic title="区间订单数" value={analytics?.summary.orders ?? 0} />
+            </Col>
+          ) : null}
+          {canOrders ? (
+            <Col xs={24} sm={8}>
+              <Statistic title="区间付费用户" value={analytics?.summary.payingUsers ?? 0} />
+            </Col>
+          ) : null}
        </Row>

        <Row gutter={[16, 16]}>
@@ -542,7 +673,7 @@ export default function DashboardPage() {
              <ReactECharts option={byDateOption} style={{ height: 320 }} notMerge />
            </Card>
          </Col>
-          <Col xs={24} lg={12}>
+          <Col xs={24} lg={canPromo ? 12 : 24}>
            <Card
              type="inner"
              title="按城市（点击柱联动筛选）"
@@ -562,6 +693,7 @@ export default function DashboardPage() {
              />
            </Card>
          </Col>
+          {canPromo ? (
          <Col xs={24} lg={12}>
            <Card
              type="inner"
@@ -584,42 +716,53 @@ export default function DashboardPage() {
              />
            </Card>
          </Col>
+          ) : null}
        </Row>
      </Card>
+      ) : null}

+      {canPartners || canStores || canBenefit ? (
      <Card
-        title="合伙人 / 门店 / 核销统计"
+        title={[canPartners && '合伙人', canStores && '门店', canBenefit && '核销'].filter(Boolean).join(' / ') + '统计'}
        style={{ marginBottom: 24 }}
        extra={
          <Space>
-            <Link to="/city-partners">查看合伙人</Link>
-            <Link to="/stores">查看门店</Link>
-            <Link to="/redeem-records">查看核销</Link>
+            {canPartners ? <Link to="/city-partners">查看合伙人</Link> : null}
+            {canStores ? <Link to="/stores">查看门店</Link> : null}
+            {canBenefit ? <Link to="/redeem-records">查看核销</Link> : null}
          </Space>
        }
      >
        <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
-          <Col xs={24} sm={6}>
-            <Statistic title="区间新增合伙人" value={analytics?.summary.partners ?? 0} />
-          </Col>
-          <Col xs={24} sm={6}>
-            <Statistic title="区间新签门店" value={analytics?.summary.stores ?? 0} />
-          </Col>
-          <Col xs={24} sm={6}>
-            <Statistic title="区间核销笔数" value={analytics?.summary.redeems ?? 0} />
-          </Col>
-          <Col xs={24} sm={6}>
-            <Statistic title="区间核销金额" value={analytics?.summary.redeemAmount ?? 0} precision={2} />
-          </Col>
+          {canPartners ? (
+            <Col xs={24} sm={6}>
+              <Statistic title="区间新增合伙人" value={analytics?.summary.partners ?? 0} />
+            </Col>
+          ) : null}
+          {canStores ? (
+            <Col xs={24} sm={6}>
+              <Statistic title="区间新签门店" value={analytics?.summary.stores ?? 0} />
+            </Col>
+          ) : null}
+          {canBenefit ? (
+            <Col xs={24} sm={6}>
+              <Statistic title="区间核销笔数" value={analytics?.summary.redeems ?? 0} />
+            </Col>
+          ) : null}
+          {canBenefit ? (
+            <Col xs={24} sm={6}>
+              <Statistic title="区间核销金额" value={analytics?.summary.redeemAmount ?? 0} precision={2} />
+            </Col>
+          ) : null}
        </Row>

        <Row gutter={[16, 16]}>
          <Col xs={24}>
-            <Card type="inner" title="按日趋势（合伙人 / 门店 / 核销）" loading={analyticsLoading} size="small">
+            <Card type="inner" title="按日趋势" loading={analyticsLoading} size="small">
              <ReactECharts option={opsByDateOption} style={{ height: 320 }} notMerge />
            </Card>
          </Col>
-          <Col xs={24} lg={12}>
+          <Col xs={24} lg={canBenefit ? 12 : 24}>
            <Card
              type="inner"
              title="按城市（点击柱联动筛选）"
@@ -639,6 +782,7 @@ export default function DashboardPage() {
              />
            </Card>
          </Col>
+          {canBenefit ? (
          <Col xs={24} lg={12}>
            <Card
              type="inner"
@@ -659,6 +803,8 @@ export default function DashboardPage() {
              />
            </Card>
          </Col>
+          ) : null}
+          {canPartners && (canStores || canBenefit) ? (
          <Col xs={24}>
            <Card
              type="inner"
@@ -681,10 +827,14 @@ export default function DashboardPage() {
              />
            </Card>
          </Col>
+          ) : null}
        </Row>
      </Card>
+      ) : null}

+      {canFinance || canTickets ? (
      <Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
+        {canFinance ? (
        <Col xs={24} sm={12} lg={8}>
          <Card
            loading={loading}
@@ -704,6 +854,8 @@ export default function DashboardPage() {
            </Typography.Text>
          </Card>
        </Col>
+        ) : null}
+        {canFinance ? (
        <Col xs={24} sm={12} lg={8}>
          <Card
            loading={loading}
@@ -717,6 +869,8 @@ export default function DashboardPage() {
            />
          </Card>
        </Col>
+        ) : null}
+        {canFinance ? (
        <Col xs={24} sm={12} lg={8}>
          <Card
            loading={loading}
@@ -737,20 +891,28 @@ export default function DashboardPage() {
            </Typography.Text>
          </Card>
        </Col>
+        ) : null}
+        {canTickets ? (
        <Col xs={24} sm={12} lg={8}>
          <Card loading={loading} title="待处理工单">
            <Statistic value={stats?.openTickets ?? 0} suffix="个" />
          </Card>
        </Col>
+        ) : null}
      </Row>
+      ) : null}

+      {canUsers || canOrders ? (
      <Row gutter={[16, 16]}>
-        <Col xs={24} lg={12}>
+        {canUsers ? (
+        <Col xs={24} lg={canOrders ? 12 : 24}>
          <Card title="已合并访客账号" loading={loading}>
            <Statistic value={stats?.mergedUsers ?? 0} suffix="个" />
          </Card>
        </Col>
-        <Col xs={24} lg={12}>
+        ) : null}
+        {canOrders ? (
+        <Col xs={24} lg={canUsers ? 12 : 24}>
          <Card title="订单状态分布" loading={loading}>
            <Table
              size="small"
@@ -768,7 +930,9 @@ export default function DashboardPage() {
            />
          </Card>
        </Col>
+        ) : null}
      </Row>
+      ) : null}
    </div>
  );
 }
@@ -7,6 +7,10 @@ import OrderTrackDrawer from '../components/OrderTrackDrawer';
 import { request } from '../lib/api';
 import { 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 Row = {
  id: string;
@@ -15,6 +19,8 @@ type Row = {
  trackingNo: string | null;
  providerOrderNo: string | null;
  updatedAt: string;
+  /** 当次应付物流费 */
+  logisticsFee?: number | null;
  order?: {
    id: string;
    orderNo: string;
@@ -59,10 +65,32 @@ export default function DeliveriesPage() {
    setTrackOpen(true);
  }

-  const columns: ColumnsType<Row> = [
-    { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      title: '订单号',
+      dataIndex: ['order', 'orderNo'],
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            const d = await request<Row>(`/admin/deliveries/${row.id}`);
+            setDetail(d);
+            editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
    { title: 'provider', dataIndex: 'provider', width: 90 },
    { title: '运单号', dataIndex: 'trackingNo', width: 140, render: (v) => v || '—' },
+    {
+      title: '运费',
+      dataIndex: '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', 'receiverName'], width: 90 },
@@ -83,16 +111,19 @@ export default function DeliveriesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('deliveries', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>快递/配送单</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="快递/配送单" settings={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="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: 1100 }}
+      <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)}
        extra={
@@ -113,6 +144,9 @@ export default function DeliveriesPage() {
            <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
              <Descriptions.Item label="订单">{detail.order?.orderNo}</Descriptions.Item>
              <Descriptions.Item label="收货">{detail.order?.receiverName} {detail.order?.receiverPhone}</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>
@@ -30,6 +30,10 @@ import { fmtTime } from '../lib/constants';
 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) => ({
  value: v,
@@ -240,8 +244,15 @@ export default function DevPlanTasksPage() {
    }
  }

-  const columns: ColumnsType<DevPlanTaskDto> = [
-    { title: '任务号', dataIndex: 'taskNo', width: 160 },
+  const baseColumns: ColumnsType<DevPlanTaskDto> = [
+    {
+      title: '任务号',
+      dataIndex: 'taskNo',
+      width: 160,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '类型',
      dataIndex: 'type',
@@ -256,7 +267,7 @@ export default function DevPlanTasksPage() {
        <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_TASK_STATUS_LABELS[s]}</Tag>
      ),
    },
-    { title: '内容', dataIndex: 'content', ellipsis: true },
+    { title: '内容', dataIndex: 'content' },
    {
      title: '附件',
      width: 100,
@@ -294,41 +305,45 @@ export default function DevPlanTasksPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('dev-plan-tasks', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          开发计划 · 任务列表
-        </Typography.Title>
-        <Space wrap>
-          <Select
-            value={exportFormat}
-            style={{ width: 120 }}
-            onChange={setExportFormat}
-            options={[
-              { value: 'markdown', label: 'Markdown' },
-              { value: 'docx', label: 'Word' },
-              { value: 'xlsx', label: 'Excel' },
-              { value: 'pdf', label: 'PDF' },
-            ]}
-          />
-          <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
-            导出已勾选
-          </Button>
-          <Button loading={exporting} onClick={() => void exportTasks('filter')}>
-            导出全部筛选
-          </Button>
-          <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
-            批量编辑
-          </Button>
-          <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
-            评审
-          </Button>
-          <Button type="primary" onClick={openCreate}>
-            新建任务
-          </Button>
-        </Space>
-      </div>
+      {settingsModal}
+      <AdminListHeader
+        title="开发计划 · 任务列表"
+        settings={settingsButton}
+        actions={
+          <>
+            <Select
+              value={exportFormat}
+              style={{ width: 120 }}
+              onChange={setExportFormat}
+              options={[
+                { value: 'markdown', label: 'Markdown' },
+                { value: 'docx', label: 'Word' },
+                { value: 'xlsx', label: 'Excel' },
+                { value: 'pdf', label: 'PDF' },
+              ]}
+            />
+            <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
+              导出已勾选
+            </Button>
+            <Button loading={exporting} onClick={() => void exportTasks('filter')}>
+              导出全部筛选
+            </Button>
+            <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
+              批量编辑
+            </Button>
+            <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
+              评审
+            </Button>
+            <Button type="primary" onClick={openCreate}>
+              新建任务
+            </Button>
+          </>
+        }
+      />

      <Form
        layout="inline"
@@ -361,7 +376,7 @@ export default function DevPlanTasksPage() {
          selectedRowKeys,
          onChange: (keys) => setSelectedRowKeys(keys as string[]),
        }}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -9,7 +9,6 @@ import {
  Space,
  Table,
  Tag,
-  Typography,
  message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -22,6 +21,10 @@ import {
 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';
+


 const STATUS_OPTIONS = (Object.keys(DEV_PLAN_VERSION_STATUS_LABELS) as DevPlanVersionStatusDto[]).map(
@@ -119,8 +122,10 @@ export default function DevPlanVersionsPage() {
    }
  }

-  const columns: ColumnsType<DevPlanVersionDto> = [
-    { title: '版本号', dataIndex: 'versionNo', width: 120 },
+  const baseColumns: ColumnsType<DevPlanVersionDto> = [
+    { title: '版本号', dataIndex: 'versionNo', width: 120, render: (v, row) => (
+      <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
+    ) },
    {
      title: '状态',
      dataIndex: 'status',
@@ -129,7 +134,7 @@ export default function DevPlanVersionsPage() {
        <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_VERSION_STATUS_LABELS[s]}</Tag>
      ),
    },
-    { title: '内容', dataIndex: 'content', ellipsis: true, render: (v) => v || '—' },
+    { title: '内容', dataIndex: 'content', render: (v) => v || '—' },
    { title: '开发起始', dataIndex: 'devStartedAt', width: 160, render: (v) => (v ? fmtTime(v) : '—') },
    { title: '开发完成', dataIndex: 'devCompletedAt', width: 160, render: (v) => (v ? fmtTime(v) : '—') },
    { title: '上线时间', dataIndex: 'releasedAt', width: 160, render: (v) => (v ? fmtTime(v) : '—') },
@@ -158,16 +163,20 @@ export default function DevPlanVersionsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('dev-plan-versions', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          开发计划 · 版本列表
-        </Typography.Title>
-        <Button type="primary" onClick={openCreate}>
-          新建版本
-        </Button>
-      </div>
+      {settingsModal}
+      <AdminListHeader
+        title="开发计划 · 版本列表"
+        settings={settingsButton}
+        actions={
+          <Button type="primary" onClick={openCreate}>
+            新建版本
+          </Button>
+        }
+      />

      <Form
        layout="inline"
@@ -190,7 +199,7 @@ export default function DevPlanVersionsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -4,6 +4,9 @@ import { Card, Descriptions, Drawer, Select, Space, Table, Tag } from 'antd';
 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 = {
  id: string;
@@ -55,9 +58,22 @@ export default function DomainEventsPage() {
    load();
  }, [load]);

-  const columns: ColumnsType<Row> = [
+  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 || '—' },
@@ -76,8 +92,13 @@ export default function DomainEventsPage() {
    },
  ];

+  const page = Number(params.get('page') ?? 1);
+  const pageSize = data?.pageSize ?? 20;
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-domain-events', baseColumns, { page, pageSize });
+
  return (
-    <Card title="领域事件">
+    <Card title="领域事件" extra={settingsButton}>
+      {settingsModal}
      <Space wrap style={{ marginBottom: 16 }}>
        <Select
          style={{ width: 180 }}
@@ -7,11 +7,11 @@ import {
  Input,
  InputNumber,
  Modal,
+  Popconfirm,
  Select,
  Space,
  Table,
  Tag,
-  Typography,
  message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -28,6 +28,10 @@ import {
 } from '@dukang/shared-types';
 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]) => ({
  value,
@@ -65,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);
    }
@@ -91,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);
  }
@@ -119,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);
  }
@@ -141,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) {
@@ -173,9 +183,25 @@ export default function FulfillmentProvidersPage() {
    void load();
  }

-  const columns: ColumnsType<FulfillmentProviderDto> = [
+  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',
@@ -221,30 +247,45 @@ 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)}>
-          编辑
-        </Button>
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => openEdit(row)}>
+            编辑
+          </Button>
+          <Popconfirm
+            title={`确认删除承运商「${row.name}」？`}
+            okText="删除"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => void remove(row)}
+          >
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
      ),
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('fulfillment-providers', baseColumns, {
+    page: 1,
+    pageSize: rows.length || 20,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <div>
-          <Typography.Title level={4} style={{ margin: 0 }}>
-            仓配管理
-          </Typography.Title>
-          <Typography.Text type="secondary">
-            注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准
-          </Typography.Text>
-        </div>
-        <Button type="primary" onClick={openCreate}>
-          注册承运商
-        </Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="仓配管理"
+        description="注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准"
+        settings={settingsButton}
+        actions={
+          <Button type="primary" onClick={openCreate}>
+            注册承运商
+          </Button>
+        }
+      />

      <Alert
        type="info"
@@ -253,7 +294,7 @@ export default function FulfillmentProvidersPage() {
        message="小飞侠默认计价：2瓶6元，加一瓶+2元，6瓶一箱14元。财务对账见「财务 → 物流对账」。"
      />

-      <Table rowKey="id" loading={loading} columns={columns} dataSource={rows} pagination={false} />
+      <Table scroll={{ x: 'max-content' }} rowKey="id" loading={loading} columns={columns} dataSource={rows} pagination={false} />

      <Modal
        title={editRow ? '编辑承运商' : '注册承运商'}
@@ -276,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 }]}>
@@ -3,9 +3,14 @@ import {
  Button, Drawer, Form, Input, Modal, Radio, Select, Space, Table, Tag, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { request, type HqProfile } from '../lib/api';
-import { ACCOUNT_STATUS_LABELS, fmtTime } from '../lib/constants';
+import { HQ_ADMIN_ROLES } from '@dukang/shared-types';
+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 = {
  id: string;
@@ -17,14 +22,13 @@ type Row = {
  status: string;
  lastLoginAt: string | null;
  createdAt: string;
+  cityIds?: string[];
 };

-const ROLE_LABELS: Record<string, string> = {
-  SUPER_ADMIN: '超级管理员',
-  OPS: '运营',
-  FINANCE: '财务',
-  CUSTOMER_SERVICE: '客服',
-};
+type CityOption = { id: string; name: string };
+
+const ROLE_OPTIONS = HQ_ADMIN_ROLES.map((r) => ({ value: r.value, label: r.label }));
+const ROLE_LABELS = Object.fromEntries(HQ_ADMIN_ROLES.map((r) => [r.value, r.label]));

 export default function HqAccountsPage() {
  const [profile, setProfile] = useState<HqProfile | null>(null);
@@ -46,15 +50,52 @@ export default function HqAccountsPage() {
  const [detail, setDetail] = useState<Row | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
  const [createOpen, setCreateOpen] = useState(false);
+  const [saving, setSaving] = useState(false);
+  const [cities, setCities] = useState<CityOption[]>([]);
  const credentialType = Form.useWatch('credentialType', createForm) ?? 'phone';
+  const editRole = Form.useWatch('adminRole', editForm);
+  const createRole = Form.useWatch('adminRole', createForm);
  const isSuperAdmin = profile?.adminRole === 'SUPER_ADMIN';

  useEffect(() => {
    request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
  }, []);

-  const columns: ColumnsType<Row> = [
-    { title: '姓名', dataIndex: 'name' },
+  useEffect(() => {
+    if (!isSuperAdmin) return;
+    request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setCities(res.items))
+      .catch(() => {});
+  }, [isSuperAdmin]);
+
+  const cityOptions = cities.map((c) => ({ value: c.id, label: c.name }));
+
+  const baseColumns: ColumnsType<Row> = [
+    {
+      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 },
    {
@@ -67,7 +108,18 @@ export default function HqAccountsPage() {
        </Space>
      ),
    },
-    { title: '角色', dataIndex: 'adminRole', width: 110, render: (r) => ROLE_LABELS[r] || r },
+    { title: '角色', dataIndex: 'adminRole', width: 130, render: (r) => ROLE_LABELS[r] || r },
+    {
+      title: '城市',
+      width: 160,
+      render: (_, r) => {
+        if (!r.cityIds?.length) return <Typography.Text type="secondary">全国</Typography.Text>;
+        const names = r.cityIds
+          .map((id) => cities.find((c) => c.id === id)?.name || id)
+          .join('、');
+        return names;
+      },
+    },
    { title: '状态', dataIndex: 'status', width: 90, render: (s) => <Tag>{ACCOUNT_STATUS_LABELS[s] || s}</Tag> },
    { title: '最后登录', dataIndex: 'lastLoginAt', width: 160, render: fmtTime },
    {
@@ -81,6 +133,7 @@ export default function HqAccountsPage() {
            loginName: row.loginName,
            adminRole: row.adminRole,
            status: row.status,
+            cityIds: row.cityIds ?? [],
          });
          setDrawerOpen(true);
        }}>编辑</Button>
@@ -88,43 +141,57 @@ export default function HqAccountsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('hq-accounts', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>HQ 账户</Typography.Title>
-        {isSuperAdmin && (
-          <Button
-            type="primary"
-            onClick={() => {
-              createForm.resetFields();
-              createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS' });
-              setCreateOpen(true);
-            }}
-          >
-            新建账户
-          </Button>
-        )}
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="HQ 账户"
+        settings={settingsButton}
+        actions={
+          isSuperAdmin ? (
+            <Button
+              type="primary"
+              onClick={() => {
+                createForm.resetFields();
+                createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS', cityIds: [] });
+                setCreateOpen(true);
+              }}
+            >
+              新建账户
+            </Button>
+          ) : 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="角色">
-          <Select allowClear style={{ width: 120 }} options={Object.entries(ROLE_LABELS).map(([value, label]) => ({ value, label }))} />
+          <Select allowClear style={{ width: 160 }} options={ROLE_OPTIONS} />
        </Form.Item>
        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
      </Form>
-      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []}
+      <Table scroll={{ x: 'max-content' }} rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []}
        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-      <Drawer title="编辑 HQ 账户" width={420} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Drawer title="编辑 HQ 账户" width={460} open={drawerOpen} onClose={() => setDrawerOpen(false)}
        extra={
-          <Button type="primary" onClick={async () => {
+          <Button type="primary" loading={saving} onClick={async () => {
            if (!detail) return;
-            const v = await editForm.validateFields();
-            const payload = { ...v };
-            if (!payload.password) delete payload.password;
-            await request(`/admin/hq-accounts/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
-            message.success('已保存');
-            setDrawerOpen(false);
-            void reload();
+            try {
+              const v = await editForm.validateFields();
+              const payload: Record<string, unknown> = { ...v };
+              if (!payload.password) delete payload.password;
+              if (!String(payload.loginName ?? '').trim()) delete payload.loginName;
+              setSaving(true);
+              await request(`/admin/hq-accounts/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
+              message.success('已保存');
+              setDrawerOpen(false);
+              void reload();
+            } catch (e) {
+              if (e instanceof Error && e.message) message.error(e.message);
+            } finally {
+              setSaving(false);
+            }
          }}>保存</Button>
        }>
        <Form form={editForm} layout="vertical">
@@ -144,7 +211,15 @@ export default function HqAccountsPage() {
            <Input.Password placeholder="至少 6 位" />
          </Form.Item>
          <Form.Item name="adminRole" label="角色">
-            <Select options={Object.entries(ROLE_LABELS).map(([value, label]) => ({ value, label }))} />
+            <Select options={ROLE_OPTIONS} />
+          </Form.Item>
+          <Form.Item
+            name="cityIds"
+            label="负责城市"
+            extra={editRole === 'CITY_STORE_SERVICE' ? '城市门店服务必须至少选一个城市' : '不选表示全国可见'}
+            rules={editRole === 'CITY_STORE_SERVICE' ? [{ required: true, type: 'array', min: 1, message: '请至少勾选一个城市' }] : []}
+          >
+            <Select mode="multiple" allowClear showSearch optionFilterProp="label" placeholder="不选=全国" options={cityOptions} />
          </Form.Item>
          <Form.Item name="status" label="状态">
            <Select options={Object.entries(ACCOUNT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
@@ -156,15 +231,19 @@ export default function HqAccountsPage() {
        open={createOpen}
        onCancel={() => setCreateOpen(false)}
        onOk={async () => {
-          const v = await createForm.validateFields();
-          await request('/admin/hq-accounts', { method: 'POST', body: JSON.stringify(v) });
-          message.success('已创建');
-          setCreateOpen(false);
-          createForm.resetFields();
-          void reload();
+          try {
+            const v = await createForm.validateFields();
+            await request('/admin/hq-accounts', { method: 'POST', body: JSON.stringify(v) });
+            message.success('已创建');
+            setCreateOpen(false);
+            createForm.resetFields();
+            void reload();
+          } catch (e) {
+            if (e instanceof Error && e.message) message.error(e.message);
+          }
        }}
      >
-        <Form form={createForm} layout="vertical" initialValues={{ credentialType: 'phone', adminRole: 'OPS' }}>
+        <Form form={createForm} layout="vertical" initialValues={{ credentialType: 'phone', adminRole: 'OPS', cityIds: [] }}>
          <Form.Item name="credentialType" label="创建方式">
            <Radio.Group>
              <Radio value="phone">手机号账户（短信登录）</Radio>
@@ -173,7 +252,15 @@ export default function HqAccountsPage() {
          </Form.Item>
          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
          <Form.Item name="adminRole" label="角色">
-            <Select options={Object.entries(ROLE_LABELS).map(([value, label]) => ({ value, label }))} />
+            <Select options={ROLE_OPTIONS} />
+          </Form.Item>
+          <Form.Item
+            name="cityIds"
+            label="负责城市"
+            extra={createRole === 'CITY_STORE_SERVICE' ? '城市门店服务必须至少选一个城市' : '不选表示全国可见'}
+            rules={createRole === 'CITY_STORE_SERVICE' ? [{ required: true, type: 'array', min: 1, message: '请至少勾选一个城市' }] : []}
+          >
+            <Select mode="multiple" allowClear showSearch optionFilterProp="label" placeholder="不选=全国" options={cityOptions} />
          </Form.Item>
          {credentialType === 'phone' ? (
            <Form.Item name="phone" label="手机号" rules={[{ required: true, message: '请输入手机号' }]}>
@@ -9,6 +9,10 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 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;
@@ -52,12 +56,11 @@ export default function HqLogsPage() {
    form.setFieldsValue(filters);
  }, [form, filters]);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '操作人',
      width: 200,
-      ellipsis: true,
      render: (_, r) => (
        <AdminCellLine
          primary={r.hqName}
@@ -69,7 +72,17 @@ export default function HqLogsPage() {
      title: '行为',
      dataIndex: 'actionLabel',
      width: 160,
-      render: (v, r) => <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>,
+      render: (v, r) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            const res = await request<Row>(`/admin/logs/hq/${r.id}`);
+            setDetail(res);
+            setDrawerOpen(true);
+          }}
+        >
+          <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>
+        </AdminPrimaryLink>
+      ),
    },
    { title: '对象类型', dataIndex: 'refType', width: 120, render: (v) => v || '—' },
    { title: '对象 ID', dataIndex: 'refId', width: 100, render: (v) => v || '—' },
@@ -92,12 +105,16 @@ export default function HqLogsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-hq', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>HQ 操作日志</Typography.Title>
-      <Typography.Paragraph type="secondary">
-        记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
-      </Typography.Paragraph>
+      {settingsModal}
+      <AdminListHeader
+        title="HQ 操作日志"
+        settings={settingsButton}
+        description="记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。"
+      />

      <Form
        form={form}
@@ -150,7 +167,7 @@ export default function HqLogsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -17,6 +17,7 @@ import {
 import {
  HQ_ADMIN_ROLES,
  HQ_PERMISSION_CATALOG,
+  computeHqEffectivePermissionKeys,
  type HqPermissionKey,
 } from '@dukang/shared-types';
 import { request, type HqProfile } from '../lib/api';
@@ -27,6 +28,8 @@ type AccountPermRes = {
  account: AccountOption;
  permissionKeys: string[];
  rolePermissionKeys: string[];
+  grantKeys?: string[];
+  denyKeys?: string[];
  userPermissionKeys: string[];
  effectivePermissionKeys: string[];
 };
@@ -46,11 +49,17 @@ function PermissionChecklist({
  value,
  onChange,
  disabled,
+  roleKeys,
+  grantKeys,
 }: {
  value: string[];
  onChange: (keys: string[]) => void;
  disabled?: boolean;
+  roleKeys?: string[];
+  grantKeys?: string[];
 }) {
+  const roleSet = new Set(roleKeys ?? []);
+  const grantSet = new Set(grantKeys ?? []);
  return (
    <Checkbox.Group
      style={{ width: '100%' }}
@@ -81,6 +90,13 @@ function PermissionChecklist({
                {items.map((item) => (
                  <Checkbox key={item.key} value={item.key}>
                    {item.label}
+                    {roleSet.has(item.key) && !value.includes(item.key) ? (
+                      <Tag style={{ marginLeft: 6 }} color="red">已撤销</Tag>
+                    ) : grantSet.has(item.key) ? (
+                      <Tag style={{ marginLeft: 6 }} color="orange">追加</Tag>
+                    ) : roleSet.has(item.key) ? (
+                      <Tag style={{ marginLeft: 6 }} color="blue">角色</Tag>
+                    ) : null}
                  </Checkbox>
                ))}
              </Space>
@@ -88,7 +104,16 @@ function PermissionChecklist({
              <Row gutter={[12, 10]}>
                {items.map((item) => (
                  <Col key={item.key} xs={24} sm={12} md={span}>
-                    <Checkbox value={item.key}>{item.label}</Checkbox>
+                    <Checkbox value={item.key}>
+                      {item.label}
+                      {roleSet.has(item.key) && !value.includes(item.key) ? (
+                        <Tag style={{ marginLeft: 6 }} color="red">已撤销</Tag>
+                      ) : grantSet.has(item.key) ? (
+                        <Tag style={{ marginLeft: 6 }} color="orange">追加</Tag>
+                      ) : roleSet.has(item.key) ? (
+                        <Tag style={{ marginLeft: 6 }} color="blue">角色</Tag>
+                      ) : null}
+                    </Checkbox>
                  </Col>
                ))}
              </Row>
@@ -100,6 +125,14 @@ function PermissionChecklist({
  );
 }

+function splitAccountOverrides(roleKeys: string[], effectiveKeys: string[]) {
+  const roleSet = new Set(roleKeys);
+  const effectiveSet = new Set(effectiveKeys);
+  const grantKeys = effectiveKeys.filter((k) => !roleSet.has(k));
+  const denyKeys = roleKeys.filter((k) => !effectiveSet.has(k));
+  return { grantKeys, denyKeys };
+}
+
 export default function HqPermissionsPage() {
  const [profile, setProfile] = useState<HqProfile | null>(null);
  const [role, setRole] = useState<string>('OPS');
@@ -111,6 +144,8 @@ export default function HqPermissionsPage() {
  const [accountId, setAccountId] = useState<string>();
  const [accountKeys, setAccountKeys] = useState<string[]>([]);
  const [roleInheritedKeys, setRoleInheritedKeys] = useState<string[]>([]);
+  const [grantKeys, setGrantKeys] = useState<string[]>([]);
+  const [denyKeys, setDenyKeys] = useState<string[]>([]);
  const [accountLoading, setAccountLoading] = useState(false);
  const [accountSaving, setAccountSaving] = useState(false);

@@ -121,8 +156,8 @@ export default function HqPermissionsPage() {
  const selectedIsSuperAdmin = selectedAccount?.adminRole === 'SUPER_ADMIN';

  const previewEffectiveKeys = useMemo(
-    () => [...new Set([...roleInheritedKeys, ...accountKeys])],
-    [roleInheritedKeys, accountKeys],
+    () => computeHqEffectivePermissionKeys(roleInheritedKeys, grantKeys, denyKeys),
+    [roleInheritedKeys, grantKeys, denyKeys],
  );

  const isSuperAdmin = profile?.adminRole === 'SUPER_ADMIN';
@@ -151,8 +186,10 @@ export default function HqPermissionsPage() {
    setAccountLoading(true);
    request<AccountPermRes>(`/admin/hq-permissions/accounts/${accountId}`)
      .then((res) => {
-        setAccountKeys(res.userPermissionKeys);
+        setGrantKeys(res.grantKeys ?? res.userPermissionKeys ?? []);
+        setDenyKeys(res.denyKeys ?? []);
        setRoleInheritedKeys(res.rolePermissionKeys);
+        setAccountKeys(res.effectivePermissionKeys);
      })
      .finally(() => setAccountLoading(false));
  }, [isSuperAdmin, accountId]);
@@ -179,10 +216,12 @@ export default function HqPermissionsPage() {
    try {
      const res = await request<AccountPermRes>(`/admin/hq-permissions/accounts/${accountId}`, {
        method: 'PUT',
-        body: JSON.stringify({ permissionKeys: accountKeys }),
+        body: JSON.stringify({ grantKeys, denyKeys }),
      });
-      setAccountKeys(res.userPermissionKeys);
+      setGrantKeys(res.grantKeys ?? res.userPermissionKeys ?? []);
+      setDenyKeys(res.denyKeys ?? []);
      setRoleInheritedKeys(res.rolePermissionKeys);
+      setAccountKeys(res.effectivePermissionKeys);
      message.success('用户权限已保存');
    } catch (e) {
      message.error(e instanceof Error ? e.message : '保存失败');
@@ -204,8 +243,9 @@ export default function HqPermissionsPage() {
    <div>
      <Typography.Title level={4}>权限分配</Typography.Title>
      <Typography.Paragraph type="secondary">
-        按角色配置基础权限；按用户可追加专属权限。最终生效权限 = 角色权限 ∪ 用户权限。
+        按角色配置基础权限；按用户可追加或撤销。最终生效权限 =（角色权限 ∪ 追加）− 撤销。
        超级管理员默认拥有除「危险操作」外的全部权限；删除用户/订单/城市需在「按用户分配」中单独勾选（默认均无）。
+        运营/财务默认可删除门店分类；城市门店服务可新增分类，不可删除。
        「系统设置」已拆分为各配置分组；「财务」对应门店/合伙人/酒厂账单。
      </Typography.Paragraph>

@@ -275,59 +315,51 @@ export default function HqPermissionsPage() {
                  <Alert type="info" showIcon message="请先选择要配置的 HQ 账户" />
                ) : (
                  <>
-                    <div style={{ marginBottom: 12 }}>
-                      <span style={{ marginRight: 8 }}>角色继承：</span>
-                      {selectedIsSuperAdmin ? (
-                        <Tag color="blue">超级管理员基础权限（不含危险操作）</Tag>
-                      ) : (
-                        <Space wrap size={[4, 4]}>
-                          {roleInheritedKeys.map((key) => {
-                            const item = HQ_PERMISSION_CATALOG.find((p) => p.key === key);
-                            return (
-                              <Tag key={key} color="blue">
-                                {item?.label || key}
-                              </Tag>
-                            );
-                          })}
-                          {!roleInheritedKeys.length ? (
-                            <Typography.Text type="secondary">无</Typography.Text>
-                          ) : null}
-                        </Space>
-                      )}
-                    </div>
                    <Typography.Paragraph type="secondary">
-                      下方勾选为用户专属追加权限（保存后与角色权限合并生效）。危险操作（删除用户/订单/城市）默认不授予，需在此勾选。
+                      勾选表示该账号最终拥有该权限。取消角色已有项即为撤销；勾选角色没有的项即为追加。
+                      切换角色会清空账号级追加/撤销。
                    </Typography.Paragraph>
-                    <PermissionChecklist value={accountKeys} onChange={setAccountKeys} />
+                    <PermissionChecklist
+                      value={accountKeys}
+                      roleKeys={roleInheritedKeys}
+                      grantKeys={grantKeys}
+                      disabled={selectedIsSuperAdmin}
+                      onChange={(nextEffective) => {
+                        if (selectedIsSuperAdmin) return;
+                        const next = splitAccountOverrides(roleInheritedKeys, nextEffective);
+                        setGrantKeys(next.grantKeys);
+                        setDenyKeys(next.denyKeys);
+                        setAccountKeys(nextEffective);
+                      }}
+                    />
+                    {selectedIsSuperAdmin ? (
+                      <Alert
+                        type="info"
+                        showIcon
+                        style={{ marginTop: 12 }}
+                        message="超级管理员基础权限不可撤销。危险操作请到下方以外的方式：当前勾选仅展示生效权限。"
+                      />
+                    ) : null}
                    <div style={{ marginTop: 12 }}>
                      <span style={{ marginRight: 8 }}>合并生效：</span>
-                      {selectedIsSuperAdmin ? (
-                        <Space wrap size={[4, 4]}>
-                          <Tag>基础权限（全部）</Tag>
-                          {accountKeys.map((key) => {
-                            const item = HQ_PERMISSION_CATALOG.find((p) => p.key === (key as HqPermissionKey));
-                            return (
-                              <Tag key={key} color="orange">
-                                {item?.label || key}
-                              </Tag>
-                            );
-                          })}
-                        </Space>
-                      ) : (
-                        <Space wrap size={[4, 4]}>
-                          {previewEffectiveKeys.map((key) => {
-                            const item = HQ_PERMISSION_CATALOG.find((p) => p.key === (key as HqPermissionKey));
-                            return (
-                              <Tag key={key}>
-                                {item?.label || key}
-                              </Tag>
-                            );
-                          })}
-                        </Space>
-                      )}
+                      <Space wrap size={[4, 4]}>
+                        {previewEffectiveKeys.map((key) => {
+                          const item = HQ_PERMISSION_CATALOG.find((p) => p.key === (key as HqPermissionKey));
+                          return (
+                            <Tag key={key}>
+                              {item?.label || key}
+                            </Tag>
+                          );
+                        })}
+                      </Space>
                    </div>
                    <div style={{ marginTop: 16 }}>
-                      <Button type="primary" loading={accountSaving} onClick={() => void saveAccountPermissions()}>
+                      <Button
+                        type="primary"
+                        loading={accountSaving}
+                        disabled={selectedIsSuperAdmin}
+                        onClick={() => void saveAccountPermissions()}
+                      >
                        保存用户权限
                      </Button>
                    </div>
@@ -11,7 +11,6 @@ import {
  Space,
  Table,
  Tag,
-  Typography,
  Upload,
  message,
 } from 'antd';
@@ -30,6 +29,10 @@ import { request } from '../lib/api';
 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 = {
  id: string;
@@ -181,7 +184,7 @@ export default function InvoicesPage() {
    }
  }

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '申请单号', dataIndex: 'invoiceNo', width: 180 },
    { title: '订单号', dataIndex: 'orderNo', width: 160 },
    {
@@ -202,7 +205,13 @@ export default function InvoicesPage() {
          ? INVOICE_CATEGORY_LABELS[r.invoiceCategory] ?? r.invoiceCategory
          : '—',
    },
-    { title: '名称', dataIndex: 'titleName', ellipsis: true },
+    {
+      title: '名称',
+      dataIndex: 'titleName',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '状态',
      width: 110,
@@ -227,33 +236,30 @@ export default function InvoicesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('invoices', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-          marginBottom: 16,
-        }}
-      >
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          发票管理
-        </Typography.Title>
-        <Button
-          type="primary"
-          onClick={() => {
-            createForm.setFieldsValue({
-              titleType: 'PERSONAL',
-              invoiceKind: 'NORMAL',
-              invoiceCategory: 'LIQUOR',
-            });
-            setCreateOpen(true);
-          }}
-        >
-          创建发票申请
-        </Button>
-      </div>
+      {settingsModal}
+      <AdminListHeader
+        title="发票管理"
+        settings={settingsButton}
+        actions={
+          <Button
+            type="primary"
+            onClick={() => {
+              createForm.setFieldsValue({
+                titleType: 'PERSONAL',
+                invoiceKind: 'NORMAL',
+                invoiceCategory: 'LIQUOR',
+              });
+              setCreateOpen(true);
+            }}
+          >
+            创建发票申请
+          </Button>
+        }
+      />
      <Form
        form={filterForm}
        layout="inline"
@@ -286,7 +292,7 @@ export default function InvoicesPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1000 }}
+        scroll={{ x: 'max-content' }}
        rowClassName={(r) => (r.overdue ? 'ant-table-row-overdue' : '')}
        pagination={{
          current: page,
@@ -25,6 +25,10 @@ import { request } from '../lib/api';
 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 = {
  name: string;
@@ -124,9 +128,15 @@ export default function KnowledgeBasesPage() {
    }
  };

-  const columns: ColumnsType<KnowledgeBaseDto> = [
-    { title: '名称', dataIndex: 'name' },
-    { title: '说明', dataIndex: 'description', ellipsis: true },
+  const baseColumns: ColumnsType<KnowledgeBaseDto> = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
+    { title: '说明', dataIndex: 'description' },
    { title: '文档数', dataIndex: 'documentCount', width: 90 },
    {
      title: '启用',
@@ -184,7 +194,7 @@ export default function KnowledgeBasesPage() {

  const docColumns: ColumnsType<KnowledgeDocumentDto> = [
    { title: '标题', dataIndex: 'title' },
-    { title: '文件', dataIndex: 'fileName', ellipsis: true },
+    { title: '文件', dataIndex: 'fileName' },
    {
      title: '状态',
      dataIndex: 'status',
@@ -250,16 +260,16 @@ export default function KnowledgeBasesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('knowledge-bases', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16 }} wrap>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          知识库
-        </Typography.Title>
-        <Typography.Text type="secondary">
-          支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索
-        </Typography.Text>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="知识库"
+        settings={settingsButton}
+        description="支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索"
+      />

      <Form
        form={filterForm}
@@ -25,6 +25,10 @@ import {
 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 = {
  name: string;
@@ -153,15 +157,21 @@ export default function LlmConfigsPage() {
    }
  };

-  const columns: ColumnsType<LlmApiConfigDto> = [
-    { title: '名称', dataIndex: 'name' },
+  const baseColumns: ColumnsType<LlmApiConfigDto> = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '提供商',
      dataIndex: 'provider',
      width: 120,
      render: (p: LlmProvider) => LLM_PROVIDER_LABELS[p] || p,
    },
-    { title: '模型', dataIndex: 'modelName', ellipsis: true },
+    { title: '模型', dataIndex: 'modelName' },
    {
      title: 'Key',
      dataIndex: 'apiKeyConfigured',
@@ -257,16 +267,16 @@ export default function LlmConfigsPage() {

  const fullEdit = !editing || editing.canEditFull;

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('llm-configs', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16 }} wrap>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          语言模型配置
-        </Typography.Title>
-        <Typography.Text type="secondary">
-          非超管仅可见自己创建的配置，且创建后只能改是否生效
-        </Typography.Text>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="语言模型配置"
+        settings={settingsButton}
+        description="非超管仅可见自己创建的配置，且创建后只能改是否生效"
+      />

      <Form
        form={filterForm}
@@ -29,6 +29,9 @@ import { fmtTime } from '../lib/constants';
 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;
@@ -245,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, ellipsis: true },
+    {
+      title: '账单号',
+      dataIndex: 'billNo',
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '承运商',
      width: 140,
@@ -275,13 +285,11 @@ export default function LogisticsBillsPage() {
    {
      title: '收款户名',
      width: 100,
-      ellipsis: true,
      render: (_, r) => providerBank(r)?.bankAccountName || '—',
    },
    {
      title: '收款账号',
      width: 140,
-      ellipsis: true,
      render: (_, r) => providerBank(r)?.bankAccountNo || '—',
    },
    {
@@ -339,7 +347,6 @@ export default function LogisticsBillsPage() {
    {
      title: '银行账户',
      width: 180,
-      ellipsis: true,
      render: (_, r) =>
        r.bankAccountName
          ? `${r.bankAccountName} / ${r.bankName || ''} ${r.bankAccountNo || ''}`
@@ -391,16 +398,19 @@ export default function LogisticsBillsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-logistics-bills', billColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          物流对账
-        </Typography.Title>
-        <Typography.Text type="secondary">
-          按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。
-        </Typography.Text>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="物流对账"
+        settings={settingsButton}
+        description="按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。"
+      />

      <Tabs
        items={[
@@ -537,7 +547,7 @@ export default function LogisticsBillsPage() {
                <Table
                  rowKey="id"
                  loading={loading}
-                  columns={billColumns}
+                  columns={columns}
                  dataSource={data?.items ?? []}
                  rowSelection={{
                    selectedRowKeys: selectedKeys,
@@ -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,
@@ -26,10 +26,14 @@ import type { ColumnsType } from 'antd/es/table';
 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,
@@ -141,7 +145,7 @@ type OrderExportFormat = 'xlsx' | 'pdf';

 type OrderExportFilters = {
  orderNo?: string;
-  status?: string;
+  status?: string | string[];
  orderType?: string;
  cityId?: string;
  receiverPhone?: string;
@@ -216,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,
@@ -228,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;
@@ -272,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();
@@ -353,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);
@@ -590,65 +602,100 @@ export default function OrdersPage() {
    }
  }

-  const columns: ColumnsType<AdminOrderRow> = [
+  const baseColumns: ColumnsType<AdminOrderRow> = [
    {
-      title: '商品',
-      width: 240,
-      render: (_, row) => (
-        <div>
-          <Space size={4} wrap>
-            <span>{row.productName || '—'}</span>
-            {row.isTest ? <Tag color="orange">测试</Tag> : null}
-            {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
-            {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: '订单号',
+      dataIndex: 'orderNo',
+      width: 180,
+      render: (v, row) => (
+        <Space size={4}>
+          <AdminPrimaryLink onClick={() => openDetail(row.id)}>{v}</AdminPrimaryLink>
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
+        </Space>
      ),
    },
    {
-      title: '状态 / 实付',
-      width: 130,
+      title: '用户',
+      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>
-          <Tag color={ORDER_STATUS_COLORS[row.status] || 'default'}>
-            {ORDER_STATUS_LABELS[row.status] || row.status}
-          </Tag>
-          <div>¥{row.payAmount}</div>
-        </div>
+        <Space size={4} wrap>
+          <span>{row.productName || '—'}</span>
+          {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
+          {row.orderType === 'PROXY' || row.isProxyOrder ? (
+            <Tag color="purple">代下单</Tag>
+          ) : null}
+        </Space>
      ),
    },
+    {
+      title: '规格',
+      dataIndex: 'productSpec',
+      width: 140,
+      render: (v: string | undefined) => v || '—',
+    },
+    {
+      title: '数量',
+      dataIndex: 'quantity',
+      width: 80,
+      render: (v: number | undefined, row) =>
+        v == null ? '—' : `${v}${row.saleUnit === 'BOX' ? '箱' : '瓶'}`,
+    },
+    {
+      title: '配送方式',
+      dataIndex: 'deliveryType',
+      width: 100,
+      render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 100,
+      render: (s: string) => (
+        <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
+      ),
+    },
+    {
+      title: '实付',
+      dataIndex: 'payAmount',
+      width: 90,
+      render: (v: number) => `¥${v}`,
+    },
    {
      title: '好客权益',
      width: 200,
      render: (_, row) => formatBenefitBrief(row),
    },
    {
-      title: '收货信息',
-      width: 240,
-      render: (_, row) => {
-        const address = formatReceiverAddress(row);
-        return (
-          <div>
-            <div>
-              {row.receiverName || '—'} {row.receiverPhone || ''}
-            </div>
-            {address ? (
-              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-                {address}
-              </Typography.Text>
-            ) : null}
-          </div>
-        );
-      },
+      title: '收货人',
+      dataIndex: 'receiverName',
+      width: 90,
+      render: (v: string | undefined) => v || '—',
+    },
+    {
+      title: '电话',
+      dataIndex: 'receiverPhone',
+      width: 120,
+      render: (v: string | undefined) => v || '—',
+    },
+    {
+      title: '地址',
+      key: 'receiverAddress',
+      width: 260,
+      render: (_, row) => formatReceiverAddress(row) || '—',
    },
    {
      title: '下单时间',
@@ -686,19 +733,28 @@ export default function OrdersPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
-        <Space size={12}>
-          <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
-          {canProxyOrder ? (
-            <Button type="primary" onClick={() => setProxyOpen(true)}>
-              代下单
-            </Button>
-          ) : null}
-        </Space>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="订单监控"
+        settings={settingsButton}
+        actions={
+          <>
+            <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
+            {canProxyOrder ? (
+              <Button type="primary" onClick={() => setProxyOpen(true)}>
+                代下单
+              </Button>
+            ) : null}
+          </>
+        }
+      />

      {!canDeleteOrders && profile ? (
        <Alert
@@ -736,10 +792,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 }))}
              />
@@ -830,7 +888,7 @@ export default function OrdersPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        rowSelection={{
          selectedRowKeys,
          preserveSelectedRowKeys: true,
@@ -1014,7 +1072,7 @@ export default function OrdersPage() {
                  locale={{ emptyText: '暂无关联核销单' }}
                  dataSource={detail.redeemRecords ?? []}
                  columns={[
-                    { title: '核销号', dataIndex: 'redeemNo', width: 160, ellipsis: true },
+                    { title: '核销号', dataIndex: 'redeemNo', width: 160 },
                    {
                      title: '角色',
                      dataIndex: 'role',
@@ -1025,7 +1083,6 @@ export default function OrdersPage() {
                    {
                      title: '门店',
                      dataIndex: ['store', 'name'],
-                      ellipsis: true,
                      render: (v: string | undefined, row) =>
                        v ? `${v}${row.store?.cityName ? `（${row.store.cityName}）` : ''}` : '—',
                    },
@@ -1141,7 +1198,6 @@ export default function OrdersPage() {
                    {
                      title: '备注',
                      dataIndex: 'remark',
-                      ellipsis: true,
                      render: (v) => v || '—',
                    },
                    {
@@ -1436,7 +1492,6 @@ export default function OrdersPage() {
            {
              title: '商品',
              width: 160,
-              ellipsis: true,
              render: (_, row) =>
                row.productName
                  ? `${row.productName}${row.quantity != null ? ` ×${row.quantity}` : ''}`
@@ -5,8 +5,11 @@ 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 };
 type ParentAccount = { id: string; name: string; phone: string };
@@ -169,27 +172,24 @@ export default function PartnerAccountsPage() {
    return keys;
  }

-  const columns: ColumnsType<AccountTreeRow> = [
+  const baseColumns: ColumnsType<AccountTreeRow> = [
    {
      title: '姓名 / 类型',
      width: 200,
-      ellipsis: true,
      render: (_, row) => (
-        <AdminCellLine
-          primary={row.name}
-          secondary={
-            row.parentAccountId
-              ? `子账号 · ${staffRoleLabel(row.staffRole)}`
-              : '主账号'
-          }
-        />
+        <span className="admin-cell-line">
+          <AdminPrimaryLink onClick={() => void openAccount(row.id)}>{row.name}</AdminPrimaryLink>
+          <span className="admin-cell-line-secondary">
+            {' · '}
+            {row.parentAccountId ? `子账号 · ${staffRoleLabel(row.staffRole)}` : '主账号'}
+          </span>
+        </span>
      ),
    },
    { title: '手机', dataIndex: 'phone', width: 120 },
    {
      title: '开城合伙人',
      width: 140,
-      ellipsis: true,
      render: (_, row) => row.companyName || row.parent?.name || '—',
    },
    {
@@ -254,16 +254,19 @@ export default function PartnerAccountsPage() {
    { title: '下单', dataIndex: 'createdAt', width: 160, render: fmtTime },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('partner-accounts', baseColumns, {
+    page: 1,
+    pageSize: treeData.length || 20,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <div>
-          <Typography.Title level={4} style={{ margin: 0 }}>合伙人子账号</Typography.Title>
-          <Typography.Text type="secondary">
-            主账号在「开城合伙人」创建；此处仅管理子账号树与权限
-          </Typography.Text>
-        </div>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="合伙人子账号"
+        settings={settingsButton}
+        description="主账号在「开城合伙人」创建；此处仅管理子账号树与权限"
+      />
      <Form
        form={form}
        layout="inline"
@@ -305,7 +308,7 @@ export default function PartnerAccountsPage() {
        loading={loading}
        columns={columns}
        dataSource={treeData}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        pagination={false}
        expandable={{
          expandedRowKeys,
@@ -399,7 +402,7 @@ export default function PartnerAccountsPage() {
              label: `账单 (${detail.bills?.length ?? 0})`,
              children: (
                <Table rowKey="id" className="admin-table-nowrap" size="small" columns={billColumns}
-                  dataSource={detail.bills ?? []} pagination={false} scroll={{ x: 700 }} />
+                  dataSource={detail.bills ?? []} pagination={false} scroll={{ x: 'max-content' }} />
              ),
            },
            {
@@ -407,7 +410,7 @@ export default function PartnerAccountsPage() {
              label: `名下订单 (${detail.orders?.length ?? 0})`,
              children: (
                <Table rowKey="id" className="admin-table-nowrap" size="small" columns={orderColumns}
-                  dataSource={detail.orders ?? []} pagination={false} scroll={{ x: 650 }} />
+                  dataSource={detail.orders ?? []} pagination={false} scroll={{ x: 'max-content' }} />
              ),
            },
          ]} />
@@ -22,6 +22,10 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+

 type Row = {
  id: string;
@@ -244,12 +248,18 @@ export default function PartnerBillsPage() {
  const canPay = selectedRows.filter((r) => r.status === 'UNPAID');
  const payAmount = canPay.reduce((s, r) => s + Number(r.totalAmount), 0);

-  const columns: ColumnsType<Row> = [
-    { title: '账单号', dataIndex: 'billNo', width: 180, ellipsis: true },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      title: '账单号',
+      dataIndex: 'billNo',
+      width: 180,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '合伙人',
      width: 160,
-      ellipsis: true,
      render: (_, r) => partnerName(r),
    },
    {
@@ -279,13 +289,11 @@ export default function PartnerBillsPage() {
    {
      title: '收款户名',
      width: 100,
-      ellipsis: true,
      render: (_, r) => partnerBank(r)?.bankAccountName || '—',
    },
    {
      title: '收款账号',
      width: 140,
-      ellipsis: true,
      render: (_, r) => partnerBank(r)?.bankAccountNo || '—',
    },
    {
@@ -337,16 +345,16 @@ export default function PartnerBillsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          合伙人账单
-        </Typography.Title>
-        <Typography.Text type="secondary">
-          每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款
-        </Typography.Text>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="合伙人账单"
+        settings={settingsButton}
+        description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
+      />

      {summary && (
        <Card size="small" style={{ marginBottom: 16 }}>
@@ -448,7 +456,7 @@ export default function PartnerBillsPage() {
          selectedRowKeys: selectedKeys,
          onChange: setSelectedKeys,
        }}
-        scroll={{ x: 1280 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -14,6 +14,10 @@ import { request } from '../lib/api';
 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 = {
  id: string;
@@ -71,12 +75,11 @@ export default function PartnerLogsPage() {
    form.setFieldsValue(filters);
  }, [form, filters]);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '合伙人',
      width: 180,
-      ellipsis: true,
      render: (_, r) => (
        r.isSubAccount ? (
          <Tag color="blue">子账号</Tag>
@@ -88,7 +91,6 @@ export default function PartnerLogsPage() {
    {
      title: '账号',
      width: 150,
-      ellipsis: true,
      render: (_, r) => (
        <AdminCellLine
          primary={r.accountName}
@@ -108,7 +110,21 @@ export default function PartnerLogsPage() {
        <Tag>{PARTNER_LOG_CATEGORY_LABELS[v ?? ''] || resolvePartnerLogCategory(r.eventName) || '其他'}</Tag>
      ),
    },
-    { title: '事件', dataIndex: 'eventName', width: 180 },
+    {
+      title: '事件',
+      dataIndex: 'eventName',
+      width: 180,
+      render: (v, row) => (
+        <AdminPrimaryLink
+          onClick={async () => {
+            setDetail(await request(`/admin/logs/partners/${row.id}`));
+            setDrawerOpen(true);
+          }}
+        >
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
    {
      title: '关联',
      width: 120,
@@ -116,7 +132,6 @@ export default function PartnerLogsPage() {
    },
    {
      title: '摘要',
-      ellipsis: true,
      render: (_, r) => summarizeExtra(r.extraJson),
    },
    {
@@ -137,11 +152,12 @@ export default function PartnerLogsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-partners', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4} style={{ marginBottom: 16 }}>
-        合伙人日志
-      </Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="合伙人日志" settings={settingsButton} />
      <Segmented
        options={PARTNER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
        value={category}
@@ -216,7 +232,7 @@ export default function PartnerLogsPage() {
            setPageSize(ps);
          },
        }}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
      />
      <Drawer title="日志详情" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={520}>
        {detail && (
@@ -27,6 +27,10 @@ import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 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;
@@ -173,17 +177,22 @@ export default function PartnersPage() {
    }
  }

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '城市', dataIndex: 'cityName', width: 100 },
    {
      title: '区县',
      dataIndex: 'districtCodes',
      width: 160,
-      ellipsis: true,
      render: (codes: string[] | null | undefined, row) =>
        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
    },
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
+    {
+      title: '公司名',
+      dataIndex: 'companyName',
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openPartner(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    { title: '主账号', dataIndex: 'phone', width: 130 },
    {
      title: '管辖',
@@ -205,14 +214,20 @@ export default function PartnersPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('partners', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>开城合伙人</Typography.Title>
-        <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
-          新建城市合伙人
-        </Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="开城合伙人"
+        settings={settingsButton}
+        actions={
+          <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
+            新建城市合伙人
+          </Button>
+        }
+      />
      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
        <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
        <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>
@@ -23,6 +23,10 @@ import {
 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';
+

 const STATUS_COLOR: Record<RedeemPendingStatus, string> = {
  PENDING: 'orange',
@@ -94,13 +98,19 @@ export default function PendingRedeemPage() {
    }
  }

-  const columns: ColumnsType<RedeemPendingItem> = [
-    { title: '待处理单号', dataIndex: 'pendingNo', width: 170 },
+  const baseColumns: ColumnsType<RedeemPendingItem> = [
+    {
+      title: '待处理单号',
+      dataIndex: 'pendingNo',
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '核销码 ID',
      dataIndex: 'redeemToken',
      width: 160,
-      ellipsis: true,
      render: (v: string) => <Typography.Text copyable={{ text: v }}>{v.slice(0, 8)}…</Typography.Text>,
    },
    { title: '门店', dataIndex: ['store', 'name'], width: 140, render: (_, row) => row.store?.name || '—' },
@@ -132,9 +142,12 @@ export default function PendingRedeemPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('redeem-pending', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>待处理核销（弱网兜底）</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="待处理核销（弱网兜底）" settings={settingsButton} />
      <Form
        form={form}
        layout="inline"
@@ -175,7 +188,7 @@ export default function PendingRedeemPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -13,6 +13,9 @@ import { useAdminList } from '../lib/useAdminList';
 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;

@@ -136,10 +139,26 @@ export default function ProductDetailTemplatesPage() {
  const [drawerOpen, setDrawerOpen] = useState(false);
  const [createOpen, setCreateOpen] = useState(false);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '编码', dataIndex: 'code', width: 120 },
-    { title: '名称', dataIndex: 'name', width: 120 },
-    { title: '说明', dataIndex: 'description', width: 200, ellipsis: true },
+    {
+      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 },
    { title: '排序', dataIndex: 'sortOrder', width: 60 },
@@ -158,10 +177,17 @@ export default function ProductDetailTemplatesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('product-detail-templates', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
+      {settingsModal}
      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
        <Typography.Title level={4} style={{ margin: 0 }}>商品详情模板</Typography.Title>
+          {settingsButton}
        <Button type="primary" onClick={() => setCreateOpen(true)}>新建模板</Button>
      </Space>
      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
@@ -175,7 +201,7 @@ export default function ProductDetailTemplatesPage() {
        </Form.Item>
        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
      </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1100 }}
+      <Table rowKey="id" className="admin-table-nowrap" 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={640} open={drawerOpen} onClose={() => setDrawerOpen(false)}
        extra={detail && (
@@ -14,6 +14,10 @@ import DetailImageUrlList from '../components/DetailImageUrlList';
 import ProductDetailTemplatePicker from '../components/ProductDetailTemplatePicker';
 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 = {
  storyTitle?: string;
@@ -387,9 +391,16 @@ export default function ProductsPage() {
    }
  }

-  const columns: ColumnsType<Row> = useMemo(() => [
+  const baseColumns: ColumnsType<Row> = useMemo(() => [
    { title: '香型', dataIndex: 'aromaType', width: 80, render: (v) => AROMA_TYPE_LABELS[v] || v },
-    { title: '品名', dataIndex: 'name', width: 200, ellipsis: true },
+    { 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',
@@ -458,7 +469,6 @@ export default function ProductsPage() {
      title: '规格',
      dataIndex: 'specText',
      width: 140,
-      ellipsis: true,
      render: (v: string, row) => (
        <Space size={4}>
          <span>{v || '默认'}</span>
@@ -468,7 +478,7 @@ export default function ProductsPage() {
      ),
    },
    { title: 'SKU', dataIndex: 'skuCode', width: 110 },
-    { title: '69码', dataIndex: 'barcode69', width: 160, ellipsis: true },
+    { title: '69码', dataIndex: 'barcode69', width: 160 },
    { title: '售价', dataIndex: 'price', width: 90, render: (v) => `¥${v}` },
    { title: '权益额', dataIndex: 'benefitAmount', width: 90, render: (v) => `¥${v}` },
    {
@@ -493,12 +503,19 @@ export default function ProductsPage() {
    },
  ], []);

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('products', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>商品管理</Typography.Title>
-        <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="商品管理"
+        settings={settingsButton}
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>}
+      />
      <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 }} />
@@ -517,7 +534,7 @@ export default function ProductsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1080 }}
+        scroll={{ x: 'max-content' }}
        expandable={{
          rowExpandable: () => true,
          expandedRowRender: (row) => (
@@ -528,7 +545,7 @@ export default function ProductsPage() {
                pagination={false}
                columns={skuColumns}
                dataSource={row.skus ?? []}
-                scroll={{ x: 980 }}
+                scroll={{ x: 'max-content' }}
                style={{ background: 'transparent' }}
              />
            </div>
@@ -14,6 +14,10 @@ import {
 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;

@@ -74,8 +78,15 @@ export default function PromoCodesPage() {
    void loadScenes();
  }, []);

-  const columns: ColumnsType<Row> = [
-    { title: '名称', dataIndex: 'name', width: 160, ellipsis: true },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 160,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => navigate(`/promo-codes/${row.id}`)}>{v}</AdminPrimaryLink>
+      ),
+    },
    { title: '码值', dataIndex: 'code', width: 110 },
    {
      title: '场景',
@@ -160,12 +171,16 @@ export default function PromoCodesPage() {
    }
  }

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-codes', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>推广码管理</Typography.Title>
-        <Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>
-      </div>
+      {settingsModal}
+      <AdminListHeader
+        title="推广码管理"
+        settings={settingsButton}
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>}
+      />

      <Form
        form={filterForm}
@@ -194,7 +209,7 @@ export default function PromoCodesPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -7,6 +7,10 @@ import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDesc
 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 = {
  id: string;
@@ -75,14 +79,14 @@ export default function RedeemRecordsPage() {
    }
  }, [data, initialRedeemNo, loading]);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    {
      title: '核销号',
      dataIndex: 'redeemNo',
      width: 200,
      render: (v, row) => (
        <span>
-          {v}
+          <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
          {row.isTest ? (
            <Tag color="orange" style={{ marginLeft: 6 }}>
              测试
@@ -133,9 +137,12 @@ export default function RedeemRecordsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('redeem-records', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>核销记录</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="核销记录" settings={settingsButton} />
      <Form
        form={form}
        layout="inline"
@@ -175,7 +182,7 @@ export default function RedeemRecordsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1300 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -12,6 +12,9 @@ import {
  fmtTime,
 } from '../lib/constants';
 import OssUpload from '../components/OssUpload';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+

 type Row = {
  id: string;
@@ -58,7 +61,7 @@ export default function ResourcesPage() {
    void reload();
  }, []);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: 'ID', dataIndex: 'id', width: 80 },
    {
      title: '归属',
@@ -84,8 +87,8 @@ export default function ResourcesPage() {
          </a>
        ),
    },
-    { title: 'URL', dataIndex: 'url', ellipsis: true },
-    { title: 'OSS Key', dataIndex: 'ossKey', ellipsis: true, width: 160 },
+    { title: 'URL', dataIndex: 'url' },
+    { title: 'OSS Key', dataIndex: 'ossKey', width: 160 },
    { title: '排序', dataIndex: 'sortOrder', width: 60 },
    {
      title: '状态',
@@ -114,16 +117,16 @@ export default function ResourcesPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('resources', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          OSS 资源库
-        </Typography.Title>
-        <Button type="primary" onClick={() => setCreateOpen(true)}>
-          登记资源
-        </Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="OSS 资源库"
+        settings={settingsButton}
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>登记资源</Button>}
+      />
      <Form
        form={form}
        layout="inline"
@@ -170,7 +173,7 @@ export default function ResourcesPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -6,6 +6,10 @@ import type { ColumnsType } from 'antd/es/table';
 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 };

@@ -74,14 +78,21 @@ export default function StoreAccountsPage() {
    }
  }

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    {
      title: '姓名',
      dataIndex: 'name',
      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>
      ),
@@ -138,25 +149,27 @@ export default function StoreAccountsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-accounts', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Space direction="vertical" size={0}>
-          <Typography.Title level={4} style={{ margin: 0 }}>门店账户</Typography.Title>
-          <Typography.Text type="secondary">
-            主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店
-          </Typography.Text>
-        </Space>
-        <Button
-          type="primary"
-          onClick={() => {
-            void loadStores();
-            setCreateOpen(true);
-          }}
-        >
-          新建账户
-        </Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="门店账户"
+        settings={settingsButton}
+        description="主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店"
+        actions={
+          <Button
+            type="primary"
+            onClick={() => {
+              void loadStores();
+              setCreateOpen(true);
+            }}
+          >
+            新建账户
+          </Button>
+        }
+      />
      <Form
        form={form}
        layout="inline"
@@ -185,7 +198,7 @@ export default function StoreAccountsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -30,6 +30,10 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+

 type Row = {
  kind: StoreSettlementKind;
@@ -267,7 +271,7 @@ export default function StoreBillsPage() {
  );
  const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.amount), 0);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    {
      title: '类型',
      dataIndex: 'kind',
@@ -282,10 +286,9 @@ export default function StoreBillsPage() {
      title: '单号',
      dataIndex: 'billNo',
      width: 180,
-      ellipsis: true,
      render: (v, row) => (
        <Space>
-          <span>{v}</span>
+          <AdminPrimaryLink onClick={() => void openDetail(row)}>{v}</AdminPrimaryLink>
          {row.overdue ? <Tag color="magenta">超时</Tag> : null}
        </Space>
      ),
@@ -296,20 +299,18 @@ export default function StoreBillsPage() {
      width: 160,
      render: (v, row) => (row.kind === 'T1_BILL' ? String(v || '').slice(0, 10) : fmtTime(v)),
    },
-    { title: '门店', dataIndex: ['store', 'name'], width: 140, ellipsis: true },
+    { title: '门店', dataIndex: ['store', 'name'], width: 140 },
    { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
    { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
    {
      title: '收款户名',
      width: 100,
-      ellipsis: true,
      render: (_, row) =>
        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
    },
    {
      title: '收款账号',
      width: 140,
-      ellipsis: true,
      render: (_, row) =>
        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
    },
@@ -376,22 +377,28 @@ export default function StoreBillsPage() {
      }
    | undefined;

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          门店账单
-        </Typography.Title>
-        <Typography.Text type="secondary">
-          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
-          「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
-        </Typography.Text>
-        {overdueSummary && overdueSummary.overdueCount > 0 ? (
-          <Typography.Text type="danger">
-            手动提现超时未审 {overdueSummary.overdueCount} 笔（待审共 {overdueSummary.pendingCount}）
-          </Typography.Text>
-        ) : null}
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="门店账单"
+        settings={settingsButton}
+        description={
+          <>
+            含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
+            「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
+            {overdueSummary && overdueSummary.overdueCount > 0 ? (
+              <div>
+                <Typography.Text type="danger">
+                  手动提现超时未审 {overdueSummary.overdueCount} 笔（待审共 {overdueSummary.pendingCount}）
+                </Typography.Text>
+              </div>
+            ) : null}
+          </>
+        }
+      />

      {summary && (
        <Card size="small" style={{ marginBottom: 16 }}>
@@ -513,7 +520,7 @@ export default function StoreBillsPage() {
            disabled: !(r.kind === 'T1_BILL' && r.status === 'UNPAID'),
          }),
        }}
-        scroll={{ x: 1300 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -3,7 +3,11 @@ import {
  Button, Form, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { request } from '../lib/api';
+import { request, type HqProfile } from '../lib/api';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
+import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+

 type CategoryNode = {
  id: string;
@@ -38,7 +42,9 @@ export default function StoreCategoriesPage() {
  const [loading, setLoading] = useState(false);
  const [modalOpen, setModalOpen] = useState(false);
  const [editing, setEditing] = useState<FlatRow | null>(null);
+  const [profile, setProfile] = useState<HqProfile | null>(null);
  const [form] = Form.useForm();
+  const canDelete = (profile?.permissionKeys ?? []).includes('store_categories_delete');

  const rows = useMemo(() => flattenTree(tree), [tree]);
  const rootOptions = useMemo(
@@ -60,6 +66,7 @@ export default function StoreCategoriesPage() {

  useEffect(() => {
    void reload();
+    request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
  }, []);

  function openCreate(parentId?: string) {
@@ -112,7 +119,7 @@ export default function StoreCategoriesPage() {
    void reload();
  }

-  const columns: ColumnsType<FlatRow> = [
+  const baseColumns: ColumnsType<FlatRow> = [
    {
      title: '层级',
      dataIndex: 'level',
@@ -125,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>
      ),
    },
@@ -141,48 +148,59 @@ export default function StoreCategoriesPage() {
    },
    {
      title: '操作',
-      width: 220,
+      width: canDelete ? 220 : 160,
      render: (_, row) => (
        <Space wrap>
          <Button type="link" size="small" onClick={() => openEdit(row)}>编辑</Button>
          {row.level === 1 ? (
            <Button type="link" size="small" onClick={() => openCreate(row.id)}>加二级</Button>
          ) : null}
-          <Popconfirm
-            title={row.level === 1 ? '删除一级分类？若有门店占用将改为停用' : '删除该分类？若有门店占用将改为停用'}
-            onConfirm={async () => {
-              await request(`/admin/store-categories/${row.id}`, { method: 'DELETE' });
-              message.success('已处理');
-              void reload();
-            }}
-          >
-            <Button type="link" size="small" danger>删除</Button>
-          </Popconfirm>
+          {canDelete ? (
+            <Popconfirm
+              title={row.level === 1 ? '删除一级分类？若有门店占用将改为停用' : '删除该分类？若有门店占用将改为停用'}
+              onConfirm={async () => {
+                await request(`/admin/store-categories/${row.id}`, { method: 'DELETE' });
+                message.success('已处理');
+                void reload();
+              }}
+            >
+              <Button type="link" size="small" danger>删除</Button>
+            </Popconfirm>
+          ) : null}
        </Space>
      ),
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-categories', baseColumns, {
+    page: 1,
+    pageSize: rows.length || 20,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Space direction="vertical" size={0}>
-          <Typography.Title level={4} style={{ margin: 0 }}>门店分类</Typography.Title>
-          <Typography.Text type="secondary">两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择</Typography.Text>
-        </Space>
-        <Space>
-          <Button
-            onClick={async () => {
-              await request('/admin/store-categories/ensure-defaults', { method: 'POST' });
-              message.success('已同步默认分类');
-              void reload();
-            }}
-          >
-            同步默认分类
-          </Button>
-          <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
-        </Space>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="门店分类"
+        settings={settingsButton}
+        description="两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择"
+        actions={
+          <>
+            {canDelete ? (
+              <Button
+                onClick={async () => {
+                  await request('/admin/store-categories/ensure-defaults', { method: 'POST' });
+                  message.success('已同步默认分类');
+                  void reload();
+                }}
+              >
+                同步默认分类
+              </Button>
+            ) : null}
+            <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
+          </>
+        }
+      />

      <Table
        rowKey="id"
@@ -12,6 +12,10 @@ import { request } from '../lib/api';
 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 = {
  id: string;
@@ -80,14 +84,14 @@ export default function StoreLogsPage() {
    form.setFieldsValue(filters);
  }, [form, filters]);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
-      title: '门店', width: 180, ellipsis: true,
+      title: '门店', width: 180,
      render: (_, r) => <AdminCellLine primary={r.storeName} secondary={r.storeId} />,
    },
    {
-      title: '账号', width: 150, ellipsis: true,
+      title: '账号', width: 150,
      render: (_, r) => (
        <AdminCellLine
          primary={r.accountName}
@@ -101,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,
@@ -111,7 +131,7 @@ export default function StoreLogsPage() {
      render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
    },
    {
-      title: '摘要', ellipsis: true,
+      title: '摘要',
      render: (_, r) => summarizeExtra(r.extraJson),
    },
    {
@@ -127,12 +147,16 @@ export default function StoreLogsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-stores', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>商户日志</Typography.Title>
-      <Typography.Paragraph type="secondary" style={{ marginTop: -8 }}>
-        门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。
-      </Typography.Paragraph>
+      {settingsModal}
+      <AdminListHeader
+        title="商户日志"
+        settings={settingsButton}
+        description="门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。"
+      />
      <Segmented
        style={{ marginBottom: 16 }}
        options={STORE_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
@@ -164,7 +188,7 @@ export default function StoreLogsPage() {
        <Form.Item><Button type="primary" htmlType="submit">筛选</Button></Form.Item>
        <Form.Item><Button onClick={() => { form.resetFields(); setFilters({}); setCategory(''); setSearchParams({}); setPage(1); }}>重置</Button></Form.Item>
      </Form>
-      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1200 }}
+      <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={560} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
        {detail && (
@@ -7,6 +7,10 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, MEDIA_TYPE_LABELS, 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 Row = {
  id: string; mediaType: string; url: string; sortOrder: number; createdAt: string;
@@ -40,8 +44,23 @@ export default function StoreMediaPage() {
    setStores(res.items);
  }

-  const columns: ColumnsType<Row> = [
-    { title: '门店', dataIndex: ['store', 'name'], width: 140 },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      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,
@@ -49,7 +68,7 @@ export default function StoreMediaPage() {
        ? <Image src={url} width={60} height={40} style={{ objectFit: 'cover' }} />
        : <a href={url} target="_blank" rel="noreferrer">视频</a>,
    },
-    { title: 'URL', dataIndex: 'url', ellipsis: true },
+    { title: 'URL', dataIndex: 'url' },
    { title: '排序', dataIndex: 'sortOrder', width: 70 },
    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
@@ -73,12 +92,16 @@ export default function StoreMediaPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-media', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>门店资源</Typography.Title>
-        <Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="门店资源"
+        settings={settingsButton}
+        actions={<Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>}
+      />
      <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="类型">
@@ -86,7 +109,7 @@ export default function StoreMediaPage() {
        </Form.Item>
        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
      </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 900 }}
+      <Table rowKey="id" className="admin-table-nowrap" 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); } }} />
      <Modal title="新增门店资源" open={createOpen} onCancel={() => setCreateOpen(false)} onOk={async () => {
        const v = await createForm.validateFields();
@@ -32,6 +32,9 @@ import { request, type Paginated } from '../lib/api';
 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: '待审核',
@@ -198,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',
@@ -469,8 +480,16 @@ export default function StorePackageAuditsPage() {
    }
  }

-  const columns: ColumnsType<StorePackageChangeRequestDto> = [
-    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
+  const baseColumns: ColumnsType<StorePackageChangeRequestDto> = [
+    {
+      title: '门店',
+      dataIndex: 'storeName',
+      render: (_, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>
+          {row.storeName || row.storeId}
+        </AdminPrimaryLink>
+      ),
+    },
    {
      title: '状态',
      dataIndex: 'status',
@@ -519,9 +538,15 @@ export default function StorePackageAuditsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-package-audits', baseColumns, {
+    page,
+    pageSize: 20,
+  });
+
  return (
    <div>
-      <Typography.Title level={4}>审核通知</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="审核通知" settings={settingsButton} />
      <Tabs
        activeKey={activeTab}
        onChange={setActiveTab}
@@ -1,9 +1,13 @@
-import { useState } from 'react';
-import { Button, Form, Input, Table, Typography } from 'antd';
+import { useEffect, useState } from 'react';
+import { Button, Form, Input, Select, Table, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { useSearchParams } from 'react-router-dom';
-import { fmtTime } from '../lib/constants';
+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 = {
  id: string;
@@ -20,22 +24,30 @@ export default function StoreRatingsPage() {
  const [searchParams] = useSearchParams();
  const initialStoreId = searchParams.get('storeId') || '';
  const [form] = Form.useForm();
+  const [cities, setCities] = useState<{ id: string; name: string }[]>([]);
  const [filters, setFilters] = useState<Record<string, string>>({
    ...(initialStoreId ? { storeId: initialStoreId } : {}),
  });

+  useEffect(() => {
+    request<Paginated<{ id: string; name: string }>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setCities(res.items))
+      .catch(() => {});
+  }, []);
+
  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
    '/admin/store-ratings',
    () => {
      const qs = new URLSearchParams();
      if (filters.storeId) qs.set('storeId', filters.storeId);
+      if (filters.cityId) qs.set('cityId', filters.cityId);
      if (filters.redeemNo) qs.set('redeemNo', filters.redeemNo);
      return qs;
    },
    [filters],
  );

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '核销号', dataIndex: 'redeemNo', width: 180 },
    {
      title: '门店',
@@ -53,11 +65,12 @@ export default function StoreRatingsPage() {
    { title: '评价时间', dataIndex: 'createdAt', width: 170, render: fmtTime },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-ratings', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
-        门店评价
-      </Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="门店评价" settings={settingsButton} />
      <Form
        form={form}
        layout="inline"
@@ -66,11 +79,22 @@ export default function StoreRatingsPage() {
        onFinish={(v) => {
          setFilters({
            storeId: v.storeId || '',
+            cityId: v.cityId || '',
            redeemNo: v.redeemNo || '',
          });
          setPage(1);
        }}
      >
+        <Form.Item name="cityId" label="城市">
+          <Select
+            allowClear
+            showSearch
+            optionFilterProp="label"
+            style={{ width: 140 }}
+            placeholder="全部"
+            options={cities.map((c) => ({ value: c.id, label: c.name }))}
+          />
+        </Form.Item>
        <Form.Item name="storeId" label="门店ID">
          <Input allowClear placeholder="storeId" />
        </Form.Item>
@@ -20,6 +20,10 @@ import { STORE_WITHDRAW_STATUS_LABELS, type StoreWithdrawStatus } from '@dukang/
 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 = {
  id: string;
@@ -147,14 +151,14 @@ export default function StoreWithdrawalsPage() {
    });
  }

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    {
      title: '提现单号',
      dataIndex: 'withdrawNo',
      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>
      ),
@@ -229,11 +233,12 @@ export default function StoreWithdrawalsPage() {
      }
    | undefined;

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-withdrawals', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
-        门店提现审
-      </Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="门店提现审" settings={settingsButton} />
      {overdueSummary ? (
        <Typography.Paragraph type="secondary">
          待审 {overdueSummary.pendingCount} 笔
@@ -299,7 +304,7 @@ export default function StoreWithdrawalsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        rowClassName={(row) => (row.overdue ? 'ant-table-row-selected' : '')}
        pagination={{
          current: page,
@@ -39,6 +39,9 @@ import {
  type StoreCreateForm,
 } 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';
@@ -198,6 +201,9 @@ type StoreRow = {
  pendingPackageAuditId?: string | null;
  /** 该门店当前待审核信息变更的 requestId（无则为空） */
  pendingInfoChangeId?: string | null;
+  /** 累计核销好客权益（券面额合计） */
+  totalRedeemedBenefitAmount?: number;
+  contactPhone?: string | null;
  isTest?: boolean;
  cityRef?: { name: string; code: string };
  partner?: { id?: string; companyName?: string | null; name?: string | null; phone?: string | null };
@@ -720,47 +726,60 @@ export default function StoresPage() {
    }
  }

-  const columns: ColumnsType<StoreRow> = [
+  const baseColumns: ColumnsType<StoreRow> = [
    {
+      key: 'coverUrl',
      title: '封面', dataIndex: 'coverUrl', width: 72,
      render: (url) => url ? <Image src={url} width={48} height={48} style={{ objectFit: 'cover', borderRadius: 4 }} /> : '—',
    },
    {
+      key: 'name',
      title: '门店名',
      dataIndex: 'name',
      width: 180,
-      ellipsis: { showTitle: false },
      render: (v: string, row) => {
        const name = v || '—';
        return (
-          <Space size={4} style={{ maxWidth: '100%' }} wrap={false}>
-            <Typography.Text ellipsis={{ tooltip: name }} style={{ maxWidth: row.isTest ? 110 : 160 }}>
-              {name}
-            </Typography.Text>
+          <Space size={4} wrap={false}>
+            <AdminPrimaryLink onClick={() => void openStoreDetail(row)}>{name === '—' ? '' : name}</AdminPrimaryLink>
            {row.isTest ? <Tag color="orange">测试</Tag> : null}
          </Space>
        );
      },
    },
    {
+      key: 'category',
      title: '分类',
      width: 100,
-      ellipsis: true,
      render: (_, row) => row.category?.name || '—',
    },
-    { title: '城市', dataIndex: 'cityName', width: 80, ellipsis: true },
-    { title: '登录号', dataIndex: 'phone', width: 120 },
+    { key: 'cityName', title: '城市', dataIndex: 'cityName', width: 80 },
+    { key: 'phone', title: '登录号', dataIndex: 'phone', width: 120 },
    {
+      key: 'contactPhone',
      title: '联系电话',
      dataIndex: 'contactPhone',
      width: 120,
      render: (v: string | null | undefined, row) => v || row.phone,
    },
    {
+      key: 'status',
      title: '营业状态', dataIndex: 'status', width: 90,
      render: (s) => <Tag>{STORE_STATUS_LABELS[s] || s}</Tag>,
    },
    {
+      key: 'totalRedeemedBenefitAmount',
+      title: '累计核销好客权益',
+      dataIndex: 'totalRedeemedBenefitAmount',
+      width: 150,
+      align: 'right',
+      render: (v: number | undefined) => {
+        const n = Number(v ?? 0);
+        return n > 0 ? `¥${n.toFixed(2)}` : '—';
+      },
+    },
+    {
+      key: 'auditStatus',
      title: '审核', dataIndex: 'auditStatus', width: 100,
      render: (s, row) => {
        const status = s || 'APPROVED';
@@ -769,7 +788,7 @@ export default function StoresPage() {
          <Space direction="vertical" size={0} style={{ maxWidth: '100%' }}>
            <Tag color={color}>{STORE_AUDIT_STATUS_LABELS[status] || status}</Tag>
            {status === 'REJECTED' && row.rejectReason ? (
-              <Typography.Text type="secondary" style={{ fontSize: 12, maxWidth: 88 }} ellipsis={{ tooltip: row.rejectReason }}>
+              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
                {row.rejectReason}
              </Typography.Text>
            ) : null}
@@ -778,32 +797,29 @@ export default function StoresPage() {
      },
    },
    {
+      key: 'partner',
      title: '开城合伙人',
      dataIndex: 'partner',
      width: 140,
-      ellipsis: { showTitle: false },
      render: (partner: StoreRow['partner']) => {
        if (!partner) return '—';
-        const label = partnerOptionLabel({ id: partner.id ?? '', ...partner });
-        return (
-          <Typography.Text ellipsis={{ tooltip: label }} style={{ maxWidth: 124 }}>
-            {label}
-          </Typography.Text>
-        );
+        return partnerOptionLabel({ id: partner.id ?? '', ...partner });
      },
    },
    {
+      key: 'visibilityWhitelistEnabled',
      title: '可见',
      dataIndex: 'visibilityWhitelistEnabled',
      width: 90,
      render: (v) =>
        v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
    },
-    { title: '介绍', dataIndex: 'intro', width: 160, ellipsis: true, render: (v) => v || '—' },
-    { title: '排序', dataIndex: 'sortOrder', width: 70 },
-    { title: '店长', dataIndex: ['account', 'name'], width: 90, ellipsis: true, render: (v) => v || '—' },
-    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
+    { key: 'intro', title: '介绍', dataIndex: 'intro', width: 160, render: (v) => v || '—' },
+    { key: 'sortOrder', title: '排序', dataIndex: 'sortOrder', width: 70 },
+    { key: 'accountName', title: '店长', dataIndex: ['account', 'name'], width: 90, render: (v) => v || '—' },
+    { key: 'createdAt', title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
+      key: 'actions',
      title: '操作',
      width: 280,
      fixed: 'right',
@@ -850,15 +866,22 @@ export default function StoresPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('stores', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Space direction="vertical" size={0}>
-          <Typography.Title level={4} style={{ margin: 0 }}>门店</Typography.Title>
-          <Typography.Text type="secondary">共 {data?.total ?? 0} 家门店（含合伙人录入）</Typography.Text>
-        </Space>
-        <Button type="primary" onClick={openCreateModal}>新建门店</Button>
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="门店"
+        settings={settingsButton}
+        description={`共 ${data?.total ?? 0} 家门店（含合伙人录入）`}
+        actions={
+          <Button type="primary" onClick={openCreateModal}>新建门店</Button>
+        }
+      />
      <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>
@@ -918,7 +941,7 @@ export default function StoresPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1720 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -46,6 +46,9 @@ import { request, type HqProfile } from '../lib/api';
 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';
 const DEFAULT_DISPATCH_SUPPLEMENT = '请按以下任务进入开发流程';
@@ -470,7 +473,7 @@ export default function SupportTicketsPage() {
    }
  }

-  const columns: ColumnsType<TicketRow> = [
+  const baseColumns: ColumnsType<TicketRow> = [
    { title: '工单号', dataIndex: 'ticketNo', width: 180 },
    {
      title: '类型',
@@ -503,7 +506,13 @@ export default function SupportTicketsPage() {
        </Space>
      ),
    },
-    { title: '标题', dataIndex: 'title', ellipsis: true },
+    {
+      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 },
    {
@@ -546,8 +555,11 @@ export default function SupportTicketsPage() {
    return null;
  })();

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('support-tickets', baseColumns, { page, pageSize });
+
  return (
    <div>
+      {settingsModal}
      <div
        style={{
          display: 'flex',
@@ -559,6 +571,7 @@ export default function SupportTicketsPage() {
        <Typography.Title level={4} style={{ margin: 0 }}>
          技术支持
        </Typography.Title>
+          {settingsButton}
        <Space>
          {isSuperAdmin ? (
            <>
@@ -619,7 +632,7 @@ export default function SupportTicketsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
        rowSelection={
          isSuperAdmin
            ? {
@@ -20,6 +20,9 @@ import {
 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;

@@ -253,11 +256,25 @@ 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',
-      ellipsis: true,
      render: (v) => v || '—',
    },
    {
@@ -334,7 +351,7 @@ export default function TestWhitelistPage() {
    if (accountType === 'partner') {
      return [
        { title: '姓名', dataIndex: 'name', width: 100 },
-        { title: '公司', dataIndex: 'companyName', ellipsis: true, render: (v) => (v as string) || '—' },
+        { title: '公司', dataIndex: 'companyName', render: (v) => (v as string) || '—' },
        { title: '手机', dataIndex: 'phone', width: 120 },
        {
          title: '标记',
@@ -347,7 +364,7 @@ export default function TestWhitelistPage() {
    }
    if (accountType === 'store') {
      return [
-        { title: '门店名', dataIndex: 'name', width: 160, ellipsis: true },
+        { title: '门店名', dataIndex: 'name', width: 160 },
        { title: '城市', dataIndex: 'cityName', width: 90 },
        { title: '电话', dataIndex: 'phone', width: 120 },
        { title: '状态', dataIndex: 'status', width: 90 },
@@ -386,11 +403,15 @@ export default function TestWhitelistPage() {
    ];
  }

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('test-whitelist', phoneColumns, {
+    page: phonePage,
+    pageSize: phonePageSize,
+  });
+
  return (
    <div>
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
-        白名单管理
-      </Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="白名单管理" settings={settingsButton} />

      <Card size="small" loading={mockLoading} style={{ marginBottom: 16 }}>
        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
@@ -472,7 +493,7 @@ export default function TestWhitelistPage() {
                <Table
                  rowKey="id"
                  loading={phonesLoading}
-                  columns={phoneColumns}
+                  columns={columns}
                  dataSource={phones?.items ?? []}
                  pagination={{
                    current: phonePage,
@@ -4,6 +4,10 @@ import type { ColumnsType } from 'antd/es/table';
 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 = {
  id: string;
@@ -69,7 +73,7 @@ export default function ThirdPartyLogsPage() {
  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    { title: 'Provider', dataIndex: 'provider', width: 120 },
    { title: '场景', dataIndex: 'scene', width: 120 },
@@ -87,15 +91,27 @@ export default function ThirdPartyLogsPage() {
    {
      title: '错误信息',
      dataIndex: 'errorMessage',
-      ellipsis: true,
      render: (v: string | null | undefined) => v || '—',
    },
    {
      title: '请求摘要',
-      ellipsis: true,
      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,
@@ -114,9 +130,15 @@ export default function ThirdPartyLogsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-third-party', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Typography.Title level={4}>第三方日志</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="第三方日志" settings={settingsButton} />
      <Form
        layout="inline"
        style={{ marginBottom: 16 }}
@@ -143,7 +165,7 @@ export default function ThirdPartyLogsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -25,6 +25,9 @@ import {
 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 = {
  id: string;
@@ -115,8 +118,22 @@ export default function TicketsPage() {
    }
  }

-  const columns: ColumnsType<Row> = [
-    { title: '工单号', dataIndex: 'ticketNo', width: 180 },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      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',
@@ -132,7 +149,7 @@ export default function TicketsPage() {
      ),
    },
    { title: '关联', width: 140, render: (_, r) => `${r.refType}#${r.refId}` },
-    { title: '备注', dataIndex: 'remark', ellipsis: true },
+    { title: '备注', dataIndex: 'remark' },
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '操作',
@@ -154,8 +171,11 @@ export default function TicketsPage() {

  const evidenceUrls = detail?.extraJson?.evidenceUrls ?? [];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('tickets', baseColumns, { page, pageSize });
+
  return (
    <div>
+      {settingsModal}
      <div
        style={{
          display: 'flex',
@@ -167,6 +187,7 @@ export default function TicketsPage() {
        <Typography.Title level={4} style={{ margin: 0 }}>
          工单中心
        </Typography.Title>
+          {settingsButton}
        <Button type="primary" onClick={() => setCreateOpen(true)}>
          创建工单
        </Button>
@@ -205,7 +226,7 @@ export default function TicketsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -7,6 +7,10 @@ import { request } from '../lib/api';
 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 = {
  id: string;
@@ -61,10 +65,10 @@ export default function UserLogsPage() {
    form.setFieldsValue(filters);
  }, [form, filters]);

-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
-      title: '用户', width: 180, ellipsis: true,
+      title: '用户', width: 180,
      render: (_, r) => (
        <AdminCellLine
          primary={r.nickname || r.userNo}
@@ -78,13 +82,27 @@ 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}` : '—'),
    },
    {
-      title: '摘要', ellipsis: true,
+      title: '摘要',
      render: (_, r) => summarizeExtra(r.extraJson),
    },
    {
@@ -98,9 +116,12 @@ export default function UserLogsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-users', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>用户日志</Typography.Title>
+      {settingsModal}
+      <AdminListHeader title="用户日志" settings={settingsButton} />
      <Segmented
        style={{ marginBottom: 16 }}
        options={USER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
@@ -131,7 +152,7 @@ export default function UserLogsPage() {
        <Form.Item><Button type="primary" htmlType="submit">筛选</Button></Form.Item>
        <Form.Item><Button onClick={() => { form.resetFields(); setFilters({}); setCategory(''); setSearchParams({}); setPage(1); }}>重置</Button></Form.Item>
      </Form>
-      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1000 }}
+      <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={520} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
        {detail && (
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
 import {
  Alert,
@@ -19,6 +19,9 @@ import {
 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 = {
@@ -30,6 +33,77 @@ type UserOrderRow = {
  createdAt: string;
 };

+function HqRemarkCell({
+  id,
+  hqRemark,
+  onSaved,
+}: {
+  id: string;
+  hqRemark: string | null;
+  onSaved: (id: string, hqRemark: string | null) => void;
+}) {
+  const [editing, setEditing] = useState(false);
+  const [value, setValue] = useState(hqRemark ?? '');
+  const savingRef = useRef(false);
+
+  useEffect(() => {
+    if (!editing) setValue(hqRemark ?? '');
+  }, [hqRemark, editing]);
+
+  async function commit() {
+    if (savingRef.current) return;
+    const next = value.trim() || null;
+    const prev = hqRemark?.trim() || null;
+    setEditing(false);
+    if (next === prev) return;
+    savingRef.current = true;
+    try {
+      const res = await request<{ id: string; hqRemark: string | null }>(`/admin/users/${id}`, {
+        method: 'PUT',
+        body: JSON.stringify({ hqRemark: next ?? '' }),
+      });
+      onSaved(id, res.hqRemark);
+      message.success('备注已保存');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+      setValue(hqRemark ?? '');
+    } finally {
+      savingRef.current = false;
+    }
+  }
+
+  if (editing) {
+    return (
+      <Input
+        size="small"
+        autoFocus
+        maxLength={128}
+        value={value}
+        onChange={(e) => setValue(e.target.value)}
+        onBlur={() => void commit()}
+        onPressEnter={() => void commit()}
+        onKeyDown={(e) => {
+          if (e.key === 'Escape') void commit();
+        }}
+        onClick={(e) => e.stopPropagation()}
+      />
+    );
+  }
+
+  return (
+    <span
+      title="双击修改备注，离开后保存"
+      onDoubleClick={(e) => {
+        e.stopPropagation();
+        setEditing(true);
+      }}
+      style={{ cursor: 'text', display: 'inline-block', minWidth: 48 }}
+    >
+      {hqRemark || '—'}
+    </span>
+  );
+}
+
 /** 好客权益金额展示：0 与空值统一显示占位，避免整列都是 ¥0.00 干扰 */
 function fmtBenefit(v: number | null | undefined) {
  const n = Number(v ?? 0);
@@ -244,7 +318,7 @@ export default function UsersPage() {
    { title: '下单时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
  ];

-  const columns: ColumnsType<AdminUserRow> = [
+  const baseColumns: ColumnsType<AdminUserRow> = [
    {
      title: '用户编号',
      dataIndex: 'userNo',
@@ -256,12 +330,38 @@ export default function UsersPage() {
        </Space>
      ),
    },
-    { title: '昵称', dataIndex: 'nickname', width: 100 },
+    {
+      title: '昵称',
+      dataIndex: 'nickname',
+      width: 140,
+      render: (v: string | null, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
+    {
+      title: '备注',
+      dataIndex: 'hqRemark',
+      width: 160,
+      render: (v: string | null, row) => (
+        <HqRemarkCell
+          id={row.id}
+          hqRemark={v}
+          onSaved={(id, hqRemark) => {
+            setData((prev) =>
+              prev
+                ? { ...prev, items: prev.items.map((u) => (u.id === id ? { ...u, hqRemark } : u)) }
+                : prev,
+            );
+            setDetail((d) => (d && d.id === id ? { ...d, hqRemark } : d));
+          }}
+        />
+      ),
+    },
    {
      title: '手机',
      dataIndex: 'phone',
      width: 120,
-      render: (v) => maskPhone(v),
+      render: (v) => v || '—',
    },
    {
      title: '验手机',
@@ -289,7 +389,6 @@ export default function UsersPage() {
      title: '来源 ID',
      dataIndex: 'sourceRefId',
      width: 100,
-      ellipsis: true,
      render: (v, row) => {
        if (!v) return '—';
        if (row.sourceType === 'PROMO_CODE') {
@@ -306,13 +405,11 @@ export default function UsersPage() {
      title: '来源标签',
      dataIndex: 'sourceLabel',
      width: 120,
-      ellipsis: true,
      render: (v) => v || '—',
    },
    {
      title: 'deviceKey',
      dataIndex: 'deviceKey',
-      ellipsis: true,
      render: (v) => v || '—',
    },
    {
@@ -377,20 +474,29 @@ export default function UsersPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('users', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>用户监控</Typography.Title>
-        {canDeleteUsers ? (
-          <Button
-            danger
-            disabled={!selectedRowKeys.length}
-            onClick={() => void openBatchDeleteModal()}
-          >
-            批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
-          </Button>
-        ) : null}
-      </Space>
+      {settingsModal}
+      <AdminListHeader
+        title="用户监控"
+        settings={settingsButton}
+        actions={
+          canDeleteUsers ? (
+            <Button
+              danger
+              disabled={!selectedRowKeys.length}
+              onClick={() => void openBatchDeleteModal()}
+            >
+              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
+            </Button>
+          ) : null
+        }
+      />
      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
        <Form.Item name="phone" label="手机号">
          <Input placeholder="模糊搜索" allowClear />
@@ -429,7 +535,7 @@ export default function UsersPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1830 }}
+        scroll={{ x: 'max-content' }}
        rowSelection={canDeleteUsers ? {
          selectedRowKeys,
          preserveSelectedRowKeys: true,
@@ -462,6 +568,7 @@ export default function UsersPage() {
              <Descriptions.Item label="ID">{detail.id}</Descriptions.Item>
              <Descriptions.Item label="用户编号">{detail.userNo}</Descriptions.Item>
              <Descriptions.Item label="昵称">{detail.nickname || '—'}</Descriptions.Item>
+              <Descriptions.Item label="备注">{detail.hqRemark || '—'}</Descriptions.Item>
              <Descriptions.Item label="手机号">{maskPhone(detail.phone)}</Descriptions.Item>
              <Descriptions.Item label="验手机时间">
                {detail.phoneVerifiedAt ? new Date(detail.phoneVerifiedAt).toLocaleString('zh-CN') : '未验证'}
@@ -7,6 +7,10 @@ import { request } from '../lib/api';
 import { AdminCellLine } from '../components/AdminCellLine';
 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';

@@ -90,12 +94,11 @@ export default function WechatBindingsPage() {
    setDrawerOpen(true);
  }

-  const columns: ColumnsType<GroupRow> = [
+  const baseColumns: ColumnsType<GroupRow> = [
    {
      title: 'unionId',
      dataIndex: 'unionId',
      width: 180,
-      ellipsis: true,
      render: (v) => v || <Tag>无 unionId</Tag>,
    },
    {
@@ -119,11 +122,12 @@ export default function WechatBindingsPage() {
      title: '手机号',
      dataIndex: 'primaryPhone',
      width: 140,
-      render: (v) => maskPhone(v),
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row)}>{maskPhone(v)}</AdminPrimaryLink>
+      ),
    },
    {
      title: '身份摘要',
-      ellipsis: true,
      render: (_, r) => (
        <AdminCellLine
          primary={r.identities.map((i) => ACTOR_TYPE_LABELS[i.actorType]).join(' / ')}
@@ -160,7 +164,6 @@ export default function WechatBindingsPage() {
    },
    {
      title: '账号',
-      ellipsis: true,
      render: (_, r) => (
        <AdminCellLine
          primary={r.name || '—'}
@@ -172,14 +175,12 @@ export default function WechatBindingsPage() {
      title: '归属',
      dataIndex: 'refLabel',
      width: 160,
-      ellipsis: true,
      render: (v, r) => (v ? `${v}${r.refId ? ` #${r.refId}` : ''}` : '—'),
    },
    {
      title: 'wxOpenId',
      dataIndex: 'wxOpenId',
      width: 160,
-      ellipsis: true,
    },
    {
      title: '手机验证',
@@ -205,12 +206,16 @@ export default function WechatBindingsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('wechat-bindings', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>微信绑定总览</Typography.Title>
-      <Typography.Paragraph type="secondary">
-        按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。
-      </Typography.Paragraph>
+      {settingsModal}
+      <AdminListHeader
+        title="微信绑定总览"
+        settings={settingsButton}
+        description="按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。"
+      />

      <Form
        form={form}
@@ -5,6 +5,10 @@ import { useAdminList } from '../lib/useAdminList';
 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() {
  const [form] = Form.useForm();
@@ -24,12 +28,19 @@ export default function WecomBotLogsPage() {
    [filters],
  );

-  const columns: ColumnsType<WecomBotLogDto> = [
+  const baseColumns: ColumnsType<WecomBotLogDto> = [
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-    { title: '机器人', dataIndex: 'botName', width: 120, ellipsis: true, render: (v, r) => v || r.botKey || '—' },
-    { title: '企微用户', dataIndex: 'wecomUserId', width: 120, ellipsis: true },
-    { title: '动作', dataIndex: 'action', width: 160, ellipsis: true },
-    { title: '权限', dataIndex: 'permission', width: 140, ellipsis: true, render: (v) => v || '—' },
+    {
+      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 || '—' },
    {
      title: '结果',
      dataIndex: 'success',
@@ -37,7 +48,7 @@ export default function WecomBotLogsPage() {
      render: (v: boolean) => <Tag color={v ? 'green' : 'red'}>{v ? '成功' : '失败'}</Tag>,
    },
    { title: '耗时(ms)', dataIndex: 'latencyMs', width: 90, render: (v) => v ?? '—' },
-    { title: '输入摘要', dataIndex: 'inputSummary', ellipsis: true },
+    { title: '输入摘要', dataIndex: 'inputSummary' },
    {
      title: '操作',
      width: 80,
@@ -49,12 +60,16 @@ export default function WecomBotLogsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-wecom-bots', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <Typography.Title level={4}>企微机器人日志</Typography.Title>
-      <Typography.Paragraph type="secondary">
-        记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。
-      </Typography.Paragraph>
+      {settingsModal}
+      <AdminListHeader
+        title="企微机器人日志"
+        settings={settingsButton}
+        description="记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。"
+      />

      <Form
        form={form}
@@ -96,7 +111,7 @@ export default function WecomBotLogsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -36,6 +36,9 @@ import { request } from '../lib/api';
 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 = {
  name: string;
@@ -280,7 +283,7 @@ export default function WecomBotsPage() {

  const runtimeMap = new Map((runtime?.bots ?? []).map((b) => [b.id, b]));

-  const columns: ColumnsType<WecomBotDto> = [
+  const baseColumns: ColumnsType<WecomBotDto> = [
    {
      title: '头像',
      dataIndex: 'avatarUrl',
@@ -291,18 +294,24 @@ export default function WecomBotsPage() {
        </Avatar>
      ),
    },
-    { title: '名称', dataIndex: 'name', width: 140, ellipsis: true },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 140,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '角色',
      dataIndex: 'role',
      width: 120,
      render: (r: WecomBotRole) => WECOM_BOT_ROLE_LABELS[r] || r,
    },
-    { title: 'BotID', dataIndex: 'botId', width: 160, ellipsis: true },
+    { title: 'BotID', dataIndex: 'botId', width: 160 },
    {
      title: '权限',
      dataIndex: 'permissions',
-      ellipsis: true,
      render: (perms: WecomBotPermission[]) =>
        perms.map((p) => (
          <Tag key={p} style={{ marginBottom: 2 }}>
@@ -367,13 +376,20 @@ export default function WecomBotsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('wecom-bots', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <div>
+      {settingsModal}
      <Space style={{ width: '100%', justifyContent: 'space-between', marginBottom: 16 }} wrap>
        <div>
          <Typography.Title level={4} style={{ margin: 0 }}>
            企微机器人
          </Typography.Title>
+          {settingsButton}
          <Typography.Text type="secondary">
            并列创建多个智能机器人，配置 BotID / Secret / 权限 / 角色 / 头像。总开关在「系统设置 → 功能开关」。
            {runtime ? ` 当前总开关：${runtime.masterEnabled ? '开' : '关'}` : ''}
@@ -428,7 +444,7 @@ export default function WecomBotsPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -34,6 +34,10 @@ import { request } from '../lib/api';
 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 = {
  name: string;
@@ -193,21 +197,20 @@ function PushRoutesTab() {
    }
  }

-  const columns: ColumnsType<WecomMessagePushDto> = [
+  const baseColumns: ColumnsType<WecomMessagePushDto> = [
    {
      title: '名称',
      dataIndex: 'name',
      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>
      ),
    },
    {
      title: 'Webhook',
      dataIndex: 'webhookUrlMasked',
-      ellipsis: true,
    },
    {
      title: '推送条件',
@@ -262,11 +265,23 @@ function PushRoutesTab() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('wecom-pushes', baseColumns, {
+    page,
+    pageSize,
+  });
+
  return (
    <>
-      <Typography.Paragraph type="secondary">
-        配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。
-      </Typography.Paragraph>
+      {settingsModal}
+      <AdminListHeader
+        settings={settingsButton}
+        description="配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。"
+        actions={
+          <Button type="primary" onClick={openCreate}>
+            新建推送
+          </Button>
+        }
+      />

      <Form
        form={filterForm}
@@ -301,9 +316,6 @@ function PushRoutesTab() {
            >
              重置
            </Button>
-            <Button type="primary" onClick={openCreate}>
-              新建推送
-            </Button>
          </Space>
        </Form.Item>
      </Form>
@@ -26,6 +26,10 @@ import { fmtTime } from '../lib/constants';
 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 = {
  id: string;
@@ -235,8 +239,15 @@ export default function WineryBillsPage() {
  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
  const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.wineryAmount), 0);

-  const columns: ColumnsType<Row> = [
-    { title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
+  const baseColumns: ColumnsType<Row> = [
+    {
+      title: '账单号',
+      dataIndex: 'billNo',
+      width: 170,
+      render: (v, row) => (
+        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+      ),
+    },
    {
      title: '账单日',
      dataIndex: 'billDate',
@@ -290,32 +301,23 @@ export default function WineryBillsPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
+
  return (
    <div>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'flex-start',
-          marginBottom: 16,
-          gap: 16,
-        }}
-      >
-        <Space direction="vertical" size={0}>
-          <Typography.Title level={4} style={{ margin: 0 }}>
-            酒厂对账单
-          </Typography.Title>
-          <Typography.Text type="secondary">
-            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色、应付为 0
-            无需打款（灰），可展开订单明细
-          </Typography.Text>
-        </Space>
-        {canEditWineryBank ? (
-          <Button type="default" onClick={() => void openBankModal()}>
-            酒厂银行账户信息配置
-          </Button>
-        ) : null}
-      </div>
+      {settingsModal}
+      <AdminListHeader
+        title="酒厂对账单"
+        settings={settingsButton}
+        description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
+        actions={
+          canEditWineryBank ? (
+            <Button type="default" onClick={() => void openBankModal()}>
+              酒厂银行账户信息配置
+            </Button>
+          ) : null
+        }
+      />

      {summary && (
        <Card size="small" style={{ marginBottom: 16 }}>
@@ -398,7 +400,7 @@ export default function WineryBillsPage() {
          onChange: setSelectedKeys,
          getCheckboxProps: (r) => ({ disabled: !canConfirmWineryPay(r) }),
        }}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
@@ -456,7 +458,7 @@ export default function WineryBillsPage() {
              pagination={false}
              dataSource={detail.items ?? []}
              columns={[
-                { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
+                { title: '订单号', dataIndex: 'orderNo' },
                {
                  title: '配送',
                  dataIndex: 'deliveryType',
@@ -9,6 +9,10 @@ import {
 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() {
  const { id = '' } = useParams();
@@ -21,9 +25,18 @@ export default function PromoCodeUsersPage() {
    [id],
  );

-  const columns: ColumnsType<PromoCodeAttributedUser> = [
+  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: '验手机',
@@ -69,21 +82,27 @@ export default function PromoCodeUsersPage() {
    },
  ];

+  const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-code-users', baseColumns, { page, pageSize });
+
  return (
-    <Table
-      rowKey="id"
-      className="admin-table-nowrap"
-      loading={loading}
-      columns={columns}
-      dataSource={data?.items ?? []}
-      scroll={{ x: 1100 }}
-      pagination={{
-        current: page,
-        pageSize,
-        total: data?.total ?? 0,
-        showSizeChanger: true,
-        onChange: (p, ps) => { setPage(p); setPageSize(ps); },
-      }}
-    />
+    <>
+      {settingsModal}
+      <AdminListHeader settings={settingsButton} />
+      <Table
+        rowKey="id"
+        className="admin-table-nowrap"
+        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); },
+        }}
+      />
+    </>
  );
 }
@@ -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）。
- * 非 weapp 环境不渲染，由调用方走电话等兜底。
+ * C 端在线客服：
+ * - 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
@@ -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} />;
+}
@@ -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;
+}
@@ -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 = {
@@ -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 || '无法打开企业微信客服')),
+    });
+  });
+}
@@ -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">
-          {isWeapp
-            ? '点击下方按钮，进入小程序在线客服会话'
-            : '请在微信小程序内打开以使用在线客服，或拨打客服电话'}
-        </Text>
+        <Text className="cs-hint">{hint}</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>
@@ -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">
@@ -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>
          </>
        )}
@@ -14,6 +14,7 @@ import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
 import WechatShareReady from '../../components/WechatShareReady';
 import BenefitFigure from '../../components/BenefitFigure';
+import DeliveryHintHtml from '../../components/DeliveryHintHtml';
 import { goLogin } from '../../lib/auth-nav';
 import { ensurePayReady } from '../../lib/pay-ready';
 import { isLoggedIn, request, toast } from '../../lib/api';
@@ -28,6 +29,8 @@ import {
  canPickupOnSite,
  normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
+import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
+import { getCityCodeForCatalog, resolveUserCity } from '../../lib/user-location';
 import {
  buildSceneSharePayload,
  toWeappShareMessage,
@@ -90,6 +93,7 @@ export default function ProductDetailPage() {
  const [product, setProduct] = useState<Product | null>(null);
  const [headerSolid, setHeaderSolid] = useState(false);
  const [selected, setSelected] = useState<Record<string, string>>({});
+  const [localHintHtml, setLocalHintHtml] = useState('');

  usePageScroll(({ scrollTop }) => {
    setHeaderSolid(scrollTop > 100);
@@ -136,6 +140,17 @@ export default function ProductDetailPage() {

  useDidShow(() => {
    loadProduct();
+    void resolveUserCity()
+      .then((city) =>
+        loadLocalDeliveries().then((list) => {
+          const row = matchLocalDelivery(list, {
+            cityCode: getCityCodeForCatalog(city),
+            cityName: city.cityName || city.displayCity || city.city,
+          });
+          setLocalHintHtml(resolveLocalDeliveryHintHtml(row));
+        }),
+      )
+      .catch(() => setLocalHintHtml(resolveLocalDeliveryHintHtml(null)));
  });

  const attrs = product?.specAttrs ?? [];
@@ -317,6 +332,10 @@ export default function ProductDetailPage() {
            </View>
          ) : null}

+          {allowOnline && localHintHtml ? (
+            <DeliveryHintHtml className="product-detail-fulfillment" html={localHintHtml} />
+          ) : null}
+
          <View className="product-detail-promo">
            <View className="product-detail-promo-glow" />
            <View className="product-detail-promo-head">
@@ -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">
@@ -128,6 +128,14 @@
  margin-bottom: 24px;
 }

+.product-detail-fulfillment {
+  display: block;
+  margin: 0 0 16px;
+  font-size: 13px;
+  line-height: 20px;
+  color: var(--color-on-surface-variant);
+}
+
 .product-detail-promo {
  position: relative;
  margin-top: 8px;
@@ -27,6 +27,9 @@
 | 3.5.5 | 08-23 | HQ 订单监控导出 Excel/PDF + 列表页布局优化 | [`v3.5.5`](./杜康好客-v3.5.5-开发文档.md) |
 | 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.10 | 08-25 | C 端门店详情去掉分享按钮；同城送提示改承运商 HTML；小程序客服接通企微微信客服 | [`v3.5.10`](./杜康好客-v3.5.10-开发文档.md) |

 ---

@@ -60,6 +63,14 @@

 **权限**：合伙人平级隔离；推广员仅拓店+看自己店；手机号脱敏（门店/合伙人中间4位）。

+**HQ WebAdmin 权限（v3.5.8）**：
+
+- 分组：超级管理员 / 运营 / 财务 / 客服 / **城市门店服务**
+- 生效权限 =（角色权限 ∪ 账号追加）− 账号撤销
+- 任意 HQ 账号可勾选负责城市；未勾选 = 全国。城市门店服务必须 ≥1 城，且只能看勾选城市的门店（列表、入驻审核、套餐/信息变更审核、评价、账户、资源）。分类为全国字典。
+- 城市门店服务默认：概览、门店列表、审核通知、评价、分类（不含账户/资源）。分类可新增/编辑，不可删除。概览按权限裁剪，且只看负责城市。
+- 超管始终全权限、全国可见
+
 ---

 ## 3. 核心规则
@@ -74,7 +85,7 @@

 **HQ 订单导出**（`admin-web` 订单监控）：

- 支持按筛选（下单日期、状态、类型、城市、配送、收货手机等）或勾选订单导出
+- 支持按筛选（下单日期、状态可多选、类型、城市、配送、收货手机等）或勾选订单导出
 - 格式：Excel（`.xlsx`）/ PDF（`.pdf`）
 - 单次上限 5000 条；按筛选且未指定日期时默认近 30 天
 - 权限：`orders`；操作审计 `ORDER_EXPORT`
@@ -126,8 +137,11 @@
 - 未填联系电话时，对外展示回退登录手机号（兼容旧数据）。
 - **不**再因客户端 `validation_error` 自动创建技术支持工单。
 - 合伙人入驻提交前须展示 HQ 可配企微客服二维码，并确认已添加客服。
- HQ 门店列表：长店名截断、操作列右固定、表过宽可横向滚动。
- 详 [`v3.4.16`](./杜康好客-v3.4.16-门店联系电话与体验优化.md)。
+- HQ 门店列表：店名完整展示、操作列右固定、表过宽可横向滚动（v3.5.9 去掉省略号）。
+- HQ 主列表：最左序号；「列设置」控制显示列与顺序；可拖表头分割线改列宽；主展示列下划线点击进编辑/详情；偏好挂当前 HQ 账号。
+- 门店列表展示「累计核销好客权益」（该店核销券面额合计）。
+- HQ 用户列表：昵称只读；双击「备注」离开即保存（`hq_remark`）；列表手机号不脱敏（详情仍脱敏）。
+- 详 [`v3.4.16`](./杜康好客-v3.4.16-门店联系电话与体验优化.md)、[`v3.5.9`](./杜康好客-v3.5.9-开发文档.md)。

 ---

@@ -62,9 +62,15 @@
 | 3.5.5 | [`HQ 订单导出 + 订单监控页优化`](./杜康好客-v3.5.5-开发文档.md) | 🔶 开发完成，待发版 |
 | 3.5.6 | [`HQ 任务导出/财务银行信息/工单图片/运营去调试/审核全屏`](./杜康好客-v3.5.6-开发文档.md) | ✅ 已交付 |
 | 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.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：开发计划任务导出；核销/财务银行信息与打款凭证；工单图片入任务；运营去调试；门店审核全屏 |
 | 2026-08-23 | HQ 订单监控：筛选/勾选导出 Excel（xlsx）与 PDF；`POST /admin/orders/export` |
@@ -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` |
@@ -0,0 +1,132 @@
+# 杜康好客 · v3.5.8 开发文档
+
+> **2026-08-24** · admin-web / API  
+> **主题**：HQ 单账号追加/撤销权限、运营改客服修复、城市门店服务角色与城市范围
+
+---
+
+## 1. 版本目标
+
+1. **单账号权限** 在角色基础上可追加，也可撤销某项功能。
+2. **运营 → 客服** 可保存成功，且生效权限跟随新角色（清空账号级追加/撤销）。
+3. **新分组「城市门店服务」**：默认门店列表、审核通知、评价、分类；按账号勾选城市，非勾选城市的门店不可见。
+4. 任意 HQ 账号都可绑城市；**未勾选 = 全国**。该新角色 **必须至少 1 个城市**。
+5. 超管始终全权限、全国可见，不受撤销/城市限制。
+
+**不做**：C 端 / 合伙人 / 门店端；按区分权；小程序版本号。
+
+---
+
+## 2. 权限模型
+
+公式：`生效权限 = (角色权限 ∪ 账号追加) − 账号撤销`
+
+| 层 | 存储 | 说明 |
+|----|------|------|
+| 角色 | `hq_role_permission` | 分组默认能力，超管基础权限固定 |
+| 账号追加 | `hq_account_permission.effect=GRANT` | 在角色之上加点权限 |
+| 账号撤销 | `hq_account_permission.effect=DENY` | 去掉角色已有的某项 |
+
+同一账号同一权限键只能 GRANT 或 DENY。切换角色时清空该账号 GRANT/DENY。
+
+### 2.1 角色
+
+| 值 | 标签 | 默认 |
+|----|------|------|
+| SUPER_ADMIN | 超级管理员 | 目录全部（含调试；危险操作需按用户勾选） |
+| OPS | 运营 | 与现网一致，且含拆分后的门店子权限 |
+| FINANCE | 财务 | 同上（含门店子权限） |
+| CUSTOMER_SERVICE | 客服 | dashboard / users / orders / tickets / tech_support / invoices / logs |
+| CITY_STORE_SERVICE | 城市门店服务 | dashboard、stores、store_audits、store_ratings、store_categories（**无** store_categories_delete） |
+
+### 2.2 门店权限拆分
+
+| 键 | 菜单 |
+|----|------|
+| `stores` | 门店列表（含入驻审核） |
+| `store_audits` | 审核通知（套餐变更 / 信息变更） |
+| `store_ratings` | 门店评价 |
+| `store_categories` | 门店分类（全国字典，不按城过滤；可新增/编辑） |
+| `store_categories_delete` | 删除门店分类 / 同步默认分类（危险操作；运营/财务默认有，城市门店服务无） |
+| `store_accounts` | 门店账户 |
+| `store_media` | 门店资源 |
+
+存量角色/账号若已有 `stores`，迁移一次性补齐后 5 键（行为与拆分前一致）。新角色不补账户/资源。删除分类键另按「非城市门店服务 + 已有分类权限」补齐。
+
+---
+
+## 3. 城市范围
+
+- 表 `hq_account_city`；空列表且非「城市门店服务」= 全国。
+- 「城市门店服务」保存时必须 ≥1 城；若数据异常无城市，则看不到任何门店。
+- 有范围时：列表/详情/审核/评价/账户/资源均 `Store.cityId IN (...)`；越权 403「无权访问该城市的门店」。
+- 概览 `GET /admin/dashboard/stats|analytics`：按生效权限裁剪指标；有城市范围时只统计负责城市（无「未选城」）。
+- `GET /admin/auth/me` 返回 `cityIds`、`cityScoped`。
+
+---
+
+## 4. 运营改客服修复
+
+1. 短信账号 `loginName` 为空时，编辑提交空字符串不再报「用户名不能为空」（视为不改）。
+2. 切换角色清空账号级权限，避免运营追加的门店等权限带到客服。
+3. 改为「城市门店服务」时若未绑城市则拒绝。
+
+---
+
+## 5. Prisma / SQL
+
+- `HqAdminRole` 增加 `CITY_STORE_SERVICE`
+- `HqPermissionEffect`：`GRANT` / `DENY`；`hq_account_permission.effect`
+- `hq_account_city`
+
+脚本：[`server/dukang-api/prisma/migrate-hq-permissions-v358.sql`](../server/dukang-api/prisma/migrate-hq-permissions-v358.sql)  
+已跑过主脚本的库补删除分类键：[`migrate-hq-permissions-v358-categories-delete.sql`](../server/dukang-api/prisma/migrate-hq-permissions-v358-categories-delete.sql)
+
+---
+
+## 6. API
+
+| 方法 | 路径 | 说明 |
+|------|------|------|
+| GET/PUT | `/admin/hq-permissions/accounts/:id` | 返回/保存 `grantKeys`、`denyKeys` |
+| PUT | `/admin/hq-accounts/:id` | 可传 `cityIds`；空 loginName 忽略 |
+| GET | `/admin/auth/me` | `permissionKeys` + `cityIds` + `cityScoped` |
+
+门店相关 HQ 接口加 `HqPermissionGuard` 对应键。
+
+---
+
+## 7. 发版步骤
+
+| 步骤 | 动作 |
+|------|------|
+| 1 | 执行 `migrate-hq-permissions-v358.sql` 或 `prisma db push` |
+| 2 | `pnpm build`（shared-types + API + admin-web） |
+| 3 | 发 `dukang-api` + `admin-web` |
+
+---
+
+## 8. 关键路径
+
+| 域 | 路径 |
+|----|------|
+| 权限目录/公式 | `packages/shared-types/src/hq-permissions.ts` |
+| 生效解析 | `hq-permission.guard.ts` |
+| 账号/城市 | `admin-hq-accounts.service.ts` |
+| 权限页 | `HqPermissionsPage.tsx` |
+| 账户页 | `HqAccountsPage.tsx` |
+| 菜单 | `AdminLayout.tsx` |
+| 门店范围 | `admin-stores.service.ts`、套餐/信息变更审核、评价 |
+
+---
+
+## 9. 验收清单
+
+- [ ] 按用户分配：可追加非角色权限，可取消角色已有权限（撤销后菜单与 API 均不可用）
+- [ ] 短信登录的运营账号改为客服：保存成功；刷新后无运营菜单
+- [ ] 新建「城市门店服务」不选城市无法保存；选城后仅见这些城市的门店/审核/评价
+- [ ] 直链其他城市门店详情/审核 403
+- [ ] 该角色默认无「门店账户」「门店资源」；运营原菜单不变
+- [ ] 超管仍全国、全权限
+- [ ] 分类页可见但不按城过滤；城市门店服务可新增/编辑，无删除与「同步默认分类」
+- [ ] 概览只显示有权限的卡片；城市范围账号仅统计负责城市
@@ -0,0 +1,137 @@
+# 杜康好客 · v3.5.9 开发文档
+
+> **2026-08-25** · admin-web / API  
+> **主题**：门店累计核销好客权益、HQ 表格去省略号、序号列与列设置；用户备注 / 手机号不脱敏
+
+---
+
+## 1. 版本目标
+
+1. **门店列表**增加「累计核销好客权益」：该店历史核销券面额合计。
+2. **全 HQ 表格**去掉 `...` 截断，长文本完整展示，横向滚动。
+3. 每张 **主列表**：最左序号（跨页连续）；「列设置」弹窗控制显示列与顺序；可拖表头分割线改列宽。偏好（含列宽）存当前 HQ 账号。主展示列（名称 / 单号 / 昵称等）带下划线，点击进入编辑或详情。
+4. **用户列表**：昵称只读（用户自己的）；新增「备注」列，双击编辑 HQ 标记，离开即写入 `user_user.hq_remark`；手机号列表明文，不脱敏。
+
+**不做**：C 端 / 合伙人 / 门店端；详情 Drawer 内嵌表不加列设置。
+
+---
+
+## 2. 累计核销好客权益
+
+口径：当前页每家店 `SUM(user_redeem_record.amount)`，含测试核销；无记录为 `—`。不是结算额 `settleAmount`。
+
+`GET /admin/stores` 行字段 `totalRedeemedBenefitAmount`（数字）。详情/导出不加。
+
+---
+
+## 3. 表格展示
+
+- 全局单元格：`nowrap` + 不省略；描述列表仍省略。
+- 列级 `ellipsis` 去掉；操作列仍可 `fixed: 'right'`。
+
+---
+
+## 4. 序号与列设置
+
+| 项 | 规则 |
+|----|------|
+| 序号 | `(page-1)*pageSize+index+1`，锁定最左，不可隐藏 |
+| 操作列 | 锁定最右，不可隐藏 |
+| 弹窗 | 勾选显示、拖拽/上下移排序、重置默认 |
+| 主列 | 名称/单号/昵称等下划线，点击同「编辑」或「详情」 |
+| 存储 | `hq_account.list_column_prefs` JSON，按 `listKey` |
+
+```ts
+{ stores: { order: ["name", "cityName"], hidden: ["intro"], widths: { name: 180 } } }
+```
+
+新列按默认位置插入且默认显示；未知 key 忽略。重置即删除该 `listKey`。
+
+### API
+
+| 方法 | 路径 | 说明 |
+|------|------|------|
+| GET | `/admin/auth/me` | `listColumnPrefs` |
+| PUT | `/admin/me/list-columns/:listKey` | `{ order, hidden }` 或 `{ reset: true }`；只改当前账号 |
+| PUT | `/admin/users/:id` | `{ hqRemark }`，空串存 `null`；不改 nickname |
+
+`listKey` 白名单见 `packages/shared-types/src/hq-list-columns.ts`。无新权限键。
+
+---
+
+## 5. 用户列表：备注 / 手机号不脱敏
+
+| 项 | 行为 |
+|----|------|
+| 昵称 | 只读，来自用户自己的 `nickname`，HQ 不可改 |
+| 备注 | 双击单元格进入输入；失焦、回车或 Esc 退出编辑即 `PUT /admin/users/:id` `{ hqRemark }`（空串写成 `null`）；最长 128；C 端不展示 |
+| 手机号 | 列表列明文 `phone`，不再 `maskPhone`。详情抽屉仍脱敏 |
+
+审计：`USER_UPDATE`（修改用户备注）。无新权限键，已登录 HQ 即可（与用户列表同入口）。
+
+---
+
+## 6. Prisma / SQL
+
+`hq_account.list_column_prefs` JSON NULL。
+
+`user_user.hq_remark` VARCHAR(128) NULL。
+
+脚本：
+
+- [`migrate-hq-list-column-prefs-v359.sql`](../server/dukang-api/prisma/migrate-hq-list-column-prefs-v359.sql)
+- [`migrate-user-hq-remark-v359.sql`](../server/dukang-api/prisma/migrate-user-hq-remark-v359.sql)
+
+---
+
+## 7. 发版步骤
+
+| 步骤 | 动作 |
+|------|------|
+| 1 | 执行 `migrate-hq-list-column-prefs-v359.sql`、`migrate-user-hq-remark-v359.sql` 或 `prisma db push` |
+| 2 | `pnpm build`（shared-types + API + admin-web） |
+| 3 | 发 `dukang-api` + `admin-web` |
+
+---
+
+## 8. 关键路径
+
+| 域 | 路径 |
+|----|------|
+| 门店聚合 | `admin-stores.service.ts` |
+| 列偏好 | `auth.service.ts` · `admin-me.controller.ts` |
+| 类型 | `packages/shared-types/src/hq-list-columns.ts` |
+| 表格 hook | `apps/admin-web/src/lib/useAdminListColumns.tsx` |
+| 弹窗 | `AdminListColumnsModal.tsx` |
+| 样式 | `admin.css` |
+| 备注 | `admin-users.service.ts` · `UsersPage.tsx` |
+
+---
+
+## 9. 验收清单
+
+- [ ] 门店列表「累计核销好客权益」= 该店核销记录金额合计；无核销为 `—`
+- [ ] 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 数组均可）。列表筛选为多选；空 = 全部。单值旧链接仍可用。
@@ -41,6 +41,12 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 | 合伙人 | 拓店三步→HQ审核→辖区订单/账单 |
 | HQ | 开城/商品/审核/订单/权益/核销/结算/工单 |

+**HQ 权限（v3.5.8）**：生效 =（角色 ∪ 追加）− 撤销。城市范围绑在账号上（空=全国；「城市门店服务」必须勾城）。门店 API 按 `cityIds` 强制过滤。城市门店服务可新增分类、不可删除；概览按权限与城市范围裁剪。
+
+**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. 验收用例（必过）

 **主链路 15 项**：登录、4 SKU、起购、支付+权益、双通道核销、payout、关店不可见、拓店审核、配送完成、退款、T+1/T+30…  
@@ -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） |
 | 扫码仍失败 | 弹窗引导「刷新页面」/「重新授权微信」，勿只提示再点一次 |
@@ -87,11 +89,12 @@
 |--------|------|
 | 开城 | 城市、合伙人(全城/区域+佣金)、仓库 |
 | 商品 | SKU、上下架、详情模板 |
-| 门店 | 审核、套餐 Tab 直存/审核、合伙人列 |
+| 门店 | 审核、套餐 Tab 直存/审核、合伙人列、累计核销好客权益 |
+| 用户 | 列表手机号明文；备注双击离开即保存（不改昵称） |
 | 交易 | 订单、权益券、核销记录、推广码+metrics |
 | 财务 | 门店/合伙人/酒厂/物流账单；打款确认 |
 | 工单 | 售后四类型 + 技术支持(ST) + 开发计划 |
-| 系统 | 账号权限、客户端配置、企微机器人/消息推送 |
+| 系统 | 账号权限、客户端配置、企微机器人/消息推送；列表「列设置」与列宽按账号保存 |
 | 日志 | HQ/用户/门店/合伙人/企微 |

 ## 6. 商品与模板
@@ -140,7 +143,7 @@ HQ 推广码：场景/合伙人绑定/上下线；touch 归因；metrics 四指

 ## 16. 系统设置

-HQ 账号/角色(`hq-permissions`) · 客户端 `minClientVersion` · 运营告警走企微消息推送(DB Webhook)。
+HQ 账号/角色(`hq-permissions`，生效=(角色∪追加)−撤销；可绑城市；城市门店服务可增分类不可删，概览按权限/城市) · 客户端 `minClientVersion` · 运营告警走企微消息推送(DB Webhook)。

 ## 17. 企业微信

@@ -149,6 +152,7 @@ HQ 账号/角色(`hq-permissions`) · 客户端 `minClientVersion` · 运营告
 | 智能机器人 | `/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` · 支付/核销/结算告警。

@@ -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 端「在线客服」；微信内网页点击后进入原生客服会话）
- * 可在 h5-user 用 VITE_CS_WECOM_URL 覆盖
+ * 企业微信「微信客服」链接（C 端「在线客服」；微信内网页 / 小程序 openCustomerServiceChat）
+ * 可在系统设置 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,
@@ -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 };
@@ -113,3 +117,83 @@ export const XFX_PROVIDER_CODES = ['XFX', 'XIAOFEIXIA'] as const;
 export function isXfxProviderCode(code: string): boolean {
  return (XFX_PROVIDER_CODES as readonly string[]).includes(code.trim().toUpperCase());
 }
+
+/** 承运商未配置提示时 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;
+}
@@ -0,0 +1,74 @@
+/** HQ 主列表列偏好（按账号存储） */
+
+export const HQ_LIST_COLUMN_KEYS = [
+  'users',
+  'wechat-bindings',
+  'products',
+  'product-detail-templates',
+  'orders',
+  'promo-codes',
+  'promo-code-users',
+  'wecom-bots',
+  'wecom-pushes',
+  'llm-configs',
+  'knowledge-bases',
+  'stores',
+  'store-package-audits',
+  'store-ratings',
+  'store-categories',
+  'store-accounts',
+  'store-media',
+  'cities',
+  'city-partners',
+  'city-warehouses',
+  'fulfillment-providers',
+  'partners',
+  'partner-accounts',
+  'finance-store-bills',
+  'finance-partner-bills',
+  'finance-winery-bills',
+  'finance-logistics-bills',
+  'finance-store-withdrawals',
+  'benefit-coupons',
+  'benefit-ledgers',
+  'redeem-records',
+  'redeem-pending',
+  'deliveries',
+  'tickets',
+  'support-tickets',
+  'dev-plan-versions',
+  'dev-plan-tasks',
+  'invoices',
+  'resources',
+  'logs-users',
+  'logs-stores',
+  'logs-partners',
+  'logs-hq',
+  'logs-third-party',
+  'logs-domain-events',
+  'logs-wecom-bots',
+  'hq-accounts',
+  'test-whitelist',
+] as const;
+
+export type HqListColumnKey = (typeof HQ_LIST_COLUMN_KEYS)[number];
+
+export function isHqListColumnKey(value: string): value is HqListColumnKey {
+  return (HQ_LIST_COLUMN_KEYS as readonly string[]).includes(value);
+}
+
+export type HqListColumnPref = {
+  order: string[];
+  hidden: string[];
+  /** 列宽（px）；未出现的 key 用列默认 width */
+  widths?: Record<string, number>;
+};
+
+export type HqListColumnPrefsMap = Partial<Record<HqListColumnKey, HqListColumnPref>>;
+
+export type SaveHqListColumnPrefsRequest = {
+  reset?: boolean;
+  order?: string[];
+  hidden?: string[];
+  widths?: Record<string, number>;
+};
@@ -6,7 +6,12 @@ export const HQ_PERMISSION_CATALOG = [
  { key: 'products', label: '商品管理', group: '业务' },
  { key: 'orders', label: '订单管理', group: '业务' },
  { key: 'promo_codes', label: '推广码', group: '业务' },
-  { key: 'stores', label: '门店管理', group: '业务' },
+  { key: 'stores', label: '门店列表', group: '业务' },
+  { key: 'store_audits', label: '门店审核', group: '业务' },
+  { key: 'store_ratings', label: '门店评价', group: '业务' },
+  { key: 'store_categories', label: '门店分类', group: '业务' },
+  { key: 'store_accounts', label: '门店账户', group: '业务' },
+  { key: 'store_media', label: '门店资源', group: '业务' },
  { key: 'partners', label: '开城管理', group: '业务' },
  { key: 'finance', label: '财务', group: '业务' },
  { key: 'benefit', label: '好客权益', group: '业务' },
@@ -26,6 +31,7 @@ export const HQ_PERMISSION_CATALOG = [
  { key: 'users_delete', label: '删除用户', group: '危险操作' },
  { key: 'orders_delete', label: '删除订单', group: '危险操作' },
  { key: 'cities_delete', label: '删除城市', group: '危险操作' },
+  { key: 'store_categories_delete', label: '删除门店分类', group: '危险操作' },
  { key: 'hq_permissions', label: '权限分配', group: '管理' },
  { key: 'hq_accounts', label: 'HQ 账户', group: '管理' },
  { key: 'system_settings_feature', label: '功能开关', group: '系统设置' },
@@ -42,6 +48,20 @@ export const HQ_PERMISSION_CATALOG = [

 export type HqPermissionKey = (typeof HQ_PERMISSION_CATALOG)[number]['key'];

+/** 由原 `stores` 拆出的子权限；存量数据迁移时补齐 */
+export const HQ_STORE_SUB_PERMISSION_KEYS = [
+  'store_audits',
+  'store_ratings',
+  'store_categories',
+  'store_accounts',
+  'store_media',
+] as const satisfies readonly HqPermissionKey[];
+
+export const HQ_STORE_MENU_PERMISSION_KEYS = [
+  'stores',
+  ...HQ_STORE_SUB_PERMISSION_KEYS,
+] as const satisfies readonly HqPermissionKey[];
+
 /** 危险操作：非超管角色默认不含，需在权限分配中显式勾选；超管默认拥有 */
 export const HQ_DEBUG_PERMISSION_KEYS = [
  'benefit_debug',
@@ -52,6 +72,7 @@ export const HQ_DANGEROUS_PERMISSION_KEYS = [
  'users_delete',
  'orders_delete',
  'cities_delete',
+  'store_categories_delete',
 ] as const satisfies readonly HqPermissionKey[];

 export function isHqDangerousPermission(key: string): boolean {
@@ -100,19 +121,53 @@ export function expandHqPermissionKeys(keys: string[]): HqPermissionKey[] {
  );
 }

+/** 生效 = (角色 ∪ 追加) − 撤销 */
+export function computeHqEffectivePermissionKeys(
+  roleKeys: string[],
+  grantKeys: string[],
+  denyKeys: string[] = [],
+): HqPermissionKey[] {
+  const denied = new Set(denyKeys);
+  return expandHqPermissionKeys([...roleKeys, ...grantKeys]).filter((k) => !denied.has(k));
+}
+
 export function hasAnySystemSettingsPermission(keys: string[]): boolean {
  const expanded = expandHqPermissionKeys(keys);
  return SYSTEM_SETTINGS_PERMISSION_KEYS.some((k) => expanded.includes(k));
 }

-export const HQ_ADMIN_ROLES = [
+export function hasAnyStoreMenuPermission(keys: string[]): boolean {
+  return HQ_STORE_MENU_PERMISSION_KEYS.some((k) => keys.includes(k));
+}
+
+export const HQ_ADMIN_ROLE_VALUES = [
+  'SUPER_ADMIN',
+  'OPS',
+  'FINANCE',
+  'CUSTOMER_SERVICE',
+  'CITY_STORE_SERVICE',
+] as const;
+
+export type HqAdminRoleValue = (typeof HQ_ADMIN_ROLE_VALUES)[number];
+
+export const HQ_ADMIN_ROLES: { value: HqAdminRoleValue; label: string }[] = [
  { value: 'SUPER_ADMIN', label: '超级管理员' },
  { value: 'OPS', label: '运营' },
  { value: 'FINANCE', label: '财务' },
  { value: 'CUSTOMER_SERVICE', label: '客服' },
-] as const;
+  { value: 'CITY_STORE_SERVICE', label: '城市门店服务' },
+];

-export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
+const OPS_STORE_KEYS: HqPermissionKey[] = [
+  'stores',
+  'store_audits',
+  'store_ratings',
+  'store_categories',
+  'store_accounts',
+  'store_media',
+];
+
+export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<HqAdminRoleValue, HqPermissionKey[]> = {
  SUPER_ADMIN: [...hqBasePermissionKeys(), ...HQ_DEBUG_PERMISSION_KEYS],
  OPS: [
    'dashboard',
@@ -121,7 +176,8 @@ export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
    'products',
    'orders',
    'promo_codes',
-    'stores',
+    ...OPS_STORE_KEYS,
+    'store_categories_delete',
    'partners',
    'benefit',
    'deliveries',
@@ -141,7 +197,8 @@ export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
  FINANCE: [
    'dashboard',
    'orders',
-    'stores',
+    ...OPS_STORE_KEYS,
+    'store_categories_delete',
    'partners',
    'finance',
    'benefit',
@@ -160,4 +217,11 @@ export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
    'invoices',
    'logs',
  ],
+  CITY_STORE_SERVICE: [
+    'dashboard',
+    'stores',
+    'store_audits',
+    'store_ratings',
+    'store_categories',
+  ],
 };
@@ -19,6 +19,7 @@ export * from './store-info-change';
 export * from './partner-log';
 export * from './promo';
 export * from './hq-permissions';
+export * from './hq-list-columns';
 export * from './partner';
 export * from './shop';
 export * from './city-partner';
@@ -3,6 +3,25 @@ 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;
+}
+
 export interface AdminPageResult<T> {
  items: T[];
  total: number;
@@ -64,6 +64,10 @@ export type ClientRuntimeConfig = {
  qualificationDisclosureUrl?: string;
  /** 总部客服电话 */
  customerServicePhone?: string;
+  /** 企业微信「微信客服」链接（kfid） */
+  customerServiceWecomUrl?: string;
+  /** 企业微信 CorpID（小程序调起企微客服） */
+  wecomCorpId?: string;
  /** 合伙人入驻：企微客服二维码图片 URL */
  partnerOnboardCsQrUrl?: string | null;
  /** 合伙人入驻：企微客服提示文案 */
@@ -0,0 +1,3 @@
+-- v3.5.10：承运商「配送信息提示」（C 端同城送 HTML）
+ALTER TABLE `common_fulfillment_provider`
+  ADD COLUMN `delivery_hint_html` TEXT NULL AFTER `prepaid_balance`;
@@ -0,0 +1,3 @@
+-- v3.5.9: HQ 账号列表显示列 / 顺序偏好
+ALTER TABLE `hq_account`
+  ADD COLUMN `list_column_prefs` JSON NULL;
@@ -0,0 +1,15 @@
+-- v3.5.8 补丁：删除门店分类权限（可对已执行过 migrate-hq-permissions-v358.sql 的库单独跑）
+-- 城市门店服务可新增分类，不可删除
+
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_categories_delete', NOW(3)
+FROM `hq_role_permission`
+WHERE `permission_key` = 'store_categories'
+  AND `admin_role` <> 'CITY_STORE_SERVICE';
+
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT p.`hq_account_id`, 'store_categories_delete', p.`effect`, NOW(3)
+FROM `hq_account_permission` p
+INNER JOIN `hq_account` a ON a.`id` = p.`hq_account_id`
+WHERE p.`permission_key` = 'store_categories'
+  AND a.`admin_role` <> 'CITY_STORE_SERVICE';
@@ -0,0 +1,71 @@
+-- v3.5.8: HQ 权限追加/撤销、城市门店服务、账号城市范围
+
+ALTER TABLE `hq_account`
+  MODIFY COLUMN `admin_role` ENUM(
+    'SUPER_ADMIN',
+    'OPS',
+    'FINANCE',
+    'CUSTOMER_SERVICE',
+    'CITY_STORE_SERVICE'
+  ) NOT NULL DEFAULT 'OPS';
+
+ALTER TABLE `hq_role_permission`
+  MODIFY COLUMN `admin_role` ENUM(
+    'SUPER_ADMIN',
+    'OPS',
+    'FINANCE',
+    'CUSTOMER_SERVICE',
+    'CITY_STORE_SERVICE'
+  ) NOT NULL;
+
+ALTER TABLE `hq_account_permission`
+  ADD COLUMN `effect` ENUM('GRANT', 'DENY') NOT NULL DEFAULT 'GRANT' AFTER `permission_key`;
+
+CREATE TABLE IF NOT EXISTS `hq_account_city` (
+  `hq_account_id` BIGINT UNSIGNED NOT NULL,
+  `city_id` BIGINT UNSIGNED NOT NULL,
+  `created_at` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  PRIMARY KEY (`hq_account_id`, `city_id`),
+  INDEX `hq_account_city_city_id_idx` (`city_id`),
+  CONSTRAINT `hq_account_city_hq_account_id_fkey`
+    FOREIGN KEY (`hq_account_id`) REFERENCES `hq_account` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `hq_account_city_city_id_fkey`
+    FOREIGN KEY (`city_id`) REFERENCES `common_city` (`id`) ON DELETE CASCADE
+) DEFAULT CHARSET = utf8mb4;
+
+-- 存量 stores 拆键：补齐审核/评价/分类/账户/资源，保持与拆分前菜单一致
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_audits', NOW(3) FROM `hq_role_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_ratings', NOW(3) FROM `hq_role_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_categories', NOW(3) FROM `hq_role_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_accounts', NOW(3) FROM `hq_role_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_media', NOW(3) FROM `hq_role_permission` WHERE `permission_key` = 'stores';
+
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT `hq_account_id`, 'store_audits', `effect`, NOW(3) FROM `hq_account_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT `hq_account_id`, 'store_ratings', `effect`, NOW(3) FROM `hq_account_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT `hq_account_id`, 'store_categories', `effect`, NOW(3) FROM `hq_account_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT `hq_account_id`, 'store_accounts', `effect`, NOW(3) FROM `hq_account_permission` WHERE `permission_key` = 'stores';
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT `hq_account_id`, 'store_media', `effect`, NOW(3) FROM `hq_account_permission` WHERE `permission_key` = 'stores';
+
+-- 删除分类：有分类权限的角色/账号补齐，城市门店服务除外（可新增、不可删除）
+INSERT IGNORE INTO `hq_role_permission` (`admin_role`, `permission_key`, `created_at`)
+SELECT `admin_role`, 'store_categories_delete', NOW(3)
+FROM `hq_role_permission`
+WHERE `permission_key` = 'store_categories'
+  AND `admin_role` <> 'CITY_STORE_SERVICE';
+
+INSERT IGNORE INTO `hq_account_permission` (`hq_account_id`, `permission_key`, `effect`, `created_at`)
+SELECT p.`hq_account_id`, 'store_categories_delete', p.`effect`, NOW(3)
+FROM `hq_account_permission` p
+INNER JOIN `hq_account` a ON a.`id` = p.`hq_account_id`
+WHERE p.`permission_key` = 'store_categories'
+  AND a.`admin_role` <> 'CITY_STORE_SERVICE';
@@ -0,0 +1,3 @@
+-- v3.5.9 补丁：HQ 管理员对用户的备注（不改 nickname）
+ALTER TABLE `user_user`
+  ADD COLUMN `hq_remark` VARCHAR(128) NULL AFTER `nickname`;
@@ -263,6 +263,12 @@ enum HqAdminRole {
  OPS
  FINANCE
  CUSTOMER_SERVICE
+  CITY_STORE_SERVICE
+}
+
+enum HqPermissionEffect {
+  GRANT
+  DENY
 }

 enum PartnerBillStatus {
@@ -1031,6 +1037,7 @@ model CommonCity {
  partnerAccounts  PartnerAccount[] @relation("PartnerAccountCity")
  stores           Store[]
  orders           Order[]
+  hqAccountCities  HqAccountCity[]

  @@map("common_city")
 }
@@ -1050,6 +1057,8 @@ model FulfillmentProvider {
  settlementMethod LogisticsSettlementMethod  @default(PREPAID) @map("settlement_method")
  pricingRulesJson String?                    @map("pricing_rules_json") @db.Text
  prepaidBalance   Decimal                    @default(0) @map("prepaid_balance") @db.Decimal(12, 2)
+  /// C 端同城配送提示（HTML，消毒后下发）
+  deliveryHintHtml String?                    @map("delivery_hint_html") @db.Text
  createdAt        DateTime                   @default(now()) @map("created_at") @db.DateTime(3)
  updatedAt        DateTime                   @updatedAt @map("updated_at") @db.DateTime(3)

@@ -1244,10 +1253,13 @@ model HqAccount {
  wxUnionId   String?       @map("wx_union_id") @db.VarChar(64)
  status      AccountStatus @default(ACTIVE)
  lastLoginAt DateTime?     @map("last_login_at") @db.DateTime(3)
+  /// HQ 各列表的显示列与顺序（按 listKey）
+  listColumnPrefs Json?     @map("list_column_prefs")
  createdAt   DateTime      @default(now()) @map("created_at") @db.DateTime(3)
  updatedAt   DateTime      @updatedAt @map("updated_at") @db.DateTime(3)

  permissions HqAccountPermission[]
+  cities      HqAccountCity[]
  testWhitelistPhones CommonTestWhitelistPhone[] @relation("TestWhitelistCreatedBy")

  @@map("hq_account")
@@ -1263,9 +1275,10 @@ model HqRolePermission {
 }

 model HqAccountPermission {
-  hqAccountId   BigInt   @map("hq_account_id") @db.UnsignedBigInt
-  permissionKey String   @map("permission_key") @db.VarChar(64)
-  createdAt     DateTime @default(now()) @map("created_at") @db.DateTime(3)
+  hqAccountId   BigInt              @map("hq_account_id") @db.UnsignedBigInt
+  permissionKey String              @map("permission_key") @db.VarChar(64)
+  effect        HqPermissionEffect  @default(GRANT)
+  createdAt     DateTime            @default(now()) @map("created_at") @db.DateTime(3)

  hqAccount HqAccount @relation(fields: [hqAccountId], references: [id], onDelete: Cascade)

@@ -1273,6 +1286,19 @@ model HqAccountPermission {
  @@map("hq_account_permission")
 }

+model HqAccountCity {
+  hqAccountId BigInt   @map("hq_account_id") @db.UnsignedBigInt
+  cityId      BigInt   @map("city_id") @db.UnsignedBigInt
+  createdAt   DateTime @default(now()) @map("created_at") @db.DateTime(3)
+
+  hqAccount HqAccount  @relation(fields: [hqAccountId], references: [id], onDelete: Cascade)
+  city      CommonCity @relation(fields: [cityId], references: [id], onDelete: Cascade)
+
+  @@id([hqAccountId, cityId])
+  @@index([cityId])
+  @@map("hq_account_city")
+}
+
 // ─── USER ─────────────────────────────────────────────

 model User {
@@ -1285,6 +1311,8 @@ model User {
  wxOpenId         String?        @map("wx_open_id") @db.VarChar(64)
  wxUnionId        String?        @map("wx_union_id") @db.VarChar(64)
  nickname         String?        @db.VarChar(64)
+  /// HQ 管理员备注（C 端不展示、不可改）
+  hqRemark         String?        @map("hq_remark") @db.VarChar(128)
  avatarResourceId BigInt?        @map("avatar_resource_id") @db.UnsignedBigInt
  status           Int            @default(1) @db.TinyInt
  /// 测试账号：命中全局测试白名单手机号
@@ -3,16 +3,20 @@ import {
  ExecutionContext,
  ForbiddenException,
  Injectable,
+  NotFoundException,
  SetMetadata,
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import {
  HQ_PERMISSION_CATALOG,
  HQ_ROLE_DEFAULT_PERMISSIONS,
+  computeHqEffectivePermissionKeys,
  expandHqPermissionKeys,
  hasAnySystemSettingsPermission,
+  type HqAdminRoleValue,
  type HqPermissionKey,
 } from '@dukang/shared-types';
+import { Prisma } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.module';
 import type { AuthUser } from './jwt-auth.guard';

@@ -23,6 +27,37 @@ export const RequireHqPermissions = (...keys: string[]) =>
 export const RequireAnySystemSettings = () =>
  SetMetadata(HQ_PERMISSIONS_KEY, ['__any_system_settings__']);

+/** null = 全国；[] = 无可见城市 */
+export type HqCityScope = bigint[] | null;
+
+export function hqStoreCityWhere(scope: HqCityScope): Prisma.StoreWhereInput | undefined {
+  if (scope === null) return undefined;
+  if (!scope.length) return { id: { equals: BigInt(0) } };
+  return { cityId: { in: scope } };
+}
+
+export function mergeHqStoreCityWhere(
+  where: Prisma.StoreWhereInput,
+  scope: HqCityScope,
+  requestedCityId?: string,
+): Prisma.StoreWhereInput {
+  if (requestedCityId) {
+    const cityId = BigInt(requestedCityId);
+    assertHqCityInScope(scope, cityId);
+    return { AND: [where, { cityId }] };
+  }
+  const scoped = hqStoreCityWhere(scope);
+  if (!scoped) return where;
+  return { AND: [where, scoped] };
+}
+
+export function assertHqCityInScope(scope: HqCityScope, cityId: bigint) {
+  if (scope === null) return;
+  if (!scope.some((id) => id === cityId)) {
+    throw new ForbiddenException('无权访问该城市的门店');
+  }
+}
+
@Injectable()
 export class HqPermissionsResolver {
  constructor(private readonly prisma: PrismaService) {}
@@ -41,39 +76,45 @@ export class HqPermissionsResolver {
  async resolveAccess(actorId: bigint): Promise<{
    keys: HqPermissionKey[];
    isSuperAdmin: boolean;
+    adminRole: HqAdminRoleValue;
  }> {
    const account = await this.loadActiveAccount(actorId);
+    const adminRole = account.adminRole as HqAdminRoleValue;

    const userRows = await this.prisma.hqAccountPermission.findMany({
      where: { hqAccountId: actorId },
-      select: { permissionKey: true },
+      select: { permissionKey: true, effect: true },
    });
-    const userKeys = userRows.map((r) => r.permissionKey);
+    const grantKeys = userRows
+      .filter((r) => r.effect !== 'DENY')
+      .map((r) => r.permissionKey);
+    const denyKeys = userRows.filter((r) => r.effect === 'DENY').map((r) => r.permissionKey);

-    if (account.adminRole === 'SUPER_ADMIN') {
-      // 超管拥有权限目录内全部项（含后续新增），另含危险操作与用户级附加项
+    if (adminRole === 'SUPER_ADMIN') {
      return {
        isSuperAdmin: true,
+        adminRole,
        keys: expandHqPermissionKeys([
          ...HQ_PERMISSION_CATALOG.map((p) => p.key),
-          ...userKeys,
+          ...grantKeys,
        ]),
      };
    }

    const roleRows = await this.prisma.hqRolePermission.findMany({
-      where: { adminRole: account.adminRole },
+      where: { adminRole },
      select: { permissionKey: true },
    });

    const roleKeys =
      roleRows.length > 0
        ? roleRows.map((r) => r.permissionKey)
-        : [...(HQ_ROLE_DEFAULT_PERMISSIONS[account.adminRole] ?? [])];
+        : [...(HQ_ROLE_DEFAULT_PERMISSIONS[adminRole] ?? [])];

    return {
      isSuperAdmin: false,
-      keys: expandHqPermissionKeys([...roleKeys, ...userKeys]),
+      adminRole,
+      keys: computeHqEffectivePermissionKeys(roleKeys, grantKeys, denyKeys),
    };
  }

@@ -81,6 +122,35 @@ export class HqPermissionsResolver {
    const { keys } = await this.resolveAccess(actorId);
    return keys;
  }
+
+  async resolveCityScope(actorId: bigint): Promise<HqCityScope> {
+    const account = await this.loadActiveAccount(actorId);
+    if (account.adminRole === 'SUPER_ADMIN') return null;
+    const rows = await this.prisma.hqAccountCity.findMany({
+      where: { hqAccountId: actorId },
+      select: { cityId: true },
+    });
+    if (!rows.length) {
+      return account.adminRole === 'CITY_STORE_SERVICE' ? [] : null;
+    }
+    return rows.map((r) => r.cityId);
+  }
+
+  async assertStoreCityInScope(actorId: bigint, cityId: bigint) {
+    const scope = await this.resolveCityScope(actorId);
+    assertHqCityInScope(scope, cityId);
+  }
+
+  async assertStoreIdInScope(actorId: bigint, storeId: bigint) {
+    const store = await this.prisma.store.findUnique({
+      where: { id: storeId },
+      select: { cityId: true },
+    });
+    if (!store) {
+      throw new NotFoundException('门店不存在');
+    }
+    await this.assertStoreCityInScope(actorId, store.cityId);
+  }
 }

@Injectable()
@@ -17,6 +17,7 @@ export const HqOperationAction = {
  HQ_ACCOUNT_CREATE: 'HQ_ACCOUNT_CREATE',
  HQ_ACCOUNT_UPDATE: 'HQ_ACCOUNT_UPDATE',
  HQ_PERMISSION_UPDATE: 'HQ_PERMISSION_UPDATE',
+  USER_UPDATE: 'USER_UPDATE',
  USER_DELETE: 'USER_DELETE',
  USER_BATCH_DELETE: 'USER_BATCH_DELETE',
  ORDER_SHIP: 'ORDER_SHIP',
@@ -76,6 +77,7 @@ export const HqOperationAction = {
  LOGISTICS_BILL_CONFIRM: 'LOGISTICS_BILL_CONFIRM',
  LOGISTICS_BILL_BATCH_CONFIRM: 'LOGISTICS_BILL_BATCH_CONFIRM',
  LOGISTICS_PROVIDER_RECHARGE: 'LOGISTICS_PROVIDER_RECHARGE',
+  LOGISTICS_PROVIDER_DELETE: 'LOGISTICS_PROVIDER_DELETE',
  REDEEM_DEBUG_CREATE_TOKEN: 'REDEEM_DEBUG_CREATE_TOKEN',
  REDEEM_DEBUG_CONFIRM: 'REDEEM_DEBUG_CONFIRM',
  PROMO_CODE_CREATE: 'PROMO_CODE_CREATE',
@@ -141,6 +143,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
  [HqOperationAction.HQ_ACCOUNT_CREATE]: '新增 HQ 管理员',
  [HqOperationAction.HQ_ACCOUNT_UPDATE]: '编辑 HQ 管理员',
  [HqOperationAction.HQ_PERMISSION_UPDATE]: '配置 HQ 权限',
+  [HqOperationAction.USER_UPDATE]: '修改用户备注',
  [HqOperationAction.USER_DELETE]: '删除用户',
  [HqOperationAction.USER_BATCH_DELETE]: '批量删除用户',
  [HqOperationAction.ORDER_SHIP]: '订单发货',
@@ -200,6 +203,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
  [HqOperationAction.LOGISTICS_BILL_CONFIRM]: '物流对账单确认结算',
  [HqOperationAction.LOGISTICS_BILL_BATCH_CONFIRM]: '批量物流对账单结算',
  [HqOperationAction.LOGISTICS_PROVIDER_RECHARGE]: '物流承运商充值',
+  [HqOperationAction.LOGISTICS_PROVIDER_DELETE]: '删除物流承运商',
  [HqOperationAction.REDEEM_DEBUG_CREATE_TOKEN]: '核销调试-生成码',
  [HqOperationAction.REDEEM_DEBUG_CONFIRM]: '核销调试-确认核销',
  [HqOperationAction.PROMO_CODE_CREATE]: '创建推广码',
@@ -5,6 +5,7 @@ import {
  BRAND_LOGO_URL,
  BRAND_LOGO_WIDE_URL,
  CUSTOMER_SERVICE_PHONE,
+  CUSTOMER_SERVICE_WECOM_URL,
  DEFAULT_SHARE_BENEFIT_TITLE,
  DEFAULT_SHARE_DESC,
  DEFAULT_SHARE_HINT,
@@ -12,6 +13,7 @@ import {
  DEFAULT_SHARE_ORDER_TITLE,
  DEFAULT_SHARE_STORES_TITLE,
  DEFAULT_SHARE_TITLE,
+  DEFAULT_SHOP_H5_URL,
  DEFAULT_USER_H5_URL,
  MINI_USER_STATIC_OSS_BASE,
  MOCK_SMS_FIXED_CODE,
@@ -154,6 +156,15 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
    placeholder: 'https://user.example.com/user',
    description: '推广码二维码 / 未配置时的默认落地页前缀（无末尾斜杠）',
  },
+  {
+    key: 'SHOP_H5_URL',
+    label: '门店 H5 落地页',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: 'https://shop.dukanghaoke.com',
+    description: '用户核销码二维码链接前缀；扫码直达门店核销确认页（无末尾斜杠）',
+  },
  {
    key: 'BRAND_LOGO_OSS_BASE',
    label: '品牌 Logo OSS 根路径',
@@ -213,6 +224,24 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
    placeholder: '13203801799',
    description: 'C 端联系客服拨号号码',
  },
+  {
+    key: 'CUSTOMER_SERVICE_WECOM_URL',
+    label: '企微微信客服链接',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: 'https://work.weixin.qq.com/kfid/kfc…',
+    description: 'C 端在线客服 kfid 链接；小程序需同时配置下方企业 ID',
+  },
+  {
+    key: 'WECOM_CORP_ID',
+    label: '企微企业 ID（CorpID）',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: 'wwxxxxxxxxxxxx',
+    description: '企业微信「我的企业」企业 ID。小程序须已关联该企业的微信客服；未填则回退小程序原生客服',
+  },
  {
    key: 'PARTNER_ONBOARD_CS_QR_URL',
    label: '合伙人入驻 · 企微客服二维码',
@@ -584,6 +613,7 @@ export const SYSTEM_CONFIG_KEY_SET = new Set(SYSTEM_CONFIG_FIELDS.map((f) => f.k
 /** 表单空值时展示 / 启动补种的默认值（与 shared-types 常量对齐） */
 export const SYSTEM_CONFIG_DEFAULTS: Record<string, string> = {
  USER_H5_URL: DEFAULT_USER_H5_URL.replace(/\/$/, ''),
+  SHOP_H5_URL: DEFAULT_SHOP_H5_URL.replace(/\/$/, ''),
  BRAND_LOGO_OSS_BASE: BRAND_LOGO_OSS_BASE,
  BRAND_LOGO_URL: BRAND_LOGO_URL,
  BRAND_LOGO_WIDE_URL: BRAND_LOGO_WIDE_URL,
@@ -591,6 +621,7 @@ export const SYSTEM_CONFIG_DEFAULTS: Record<string, string> = {
  MINI_USER_STATIC_OSS_BASE: MINI_USER_STATIC_OSS_BASE,
  QUALIFICATION_DISCLOSURE_URL: QUALIFICATION_DISCLOSURE_URL,
  CUSTOMER_SERVICE_PHONE: CUSTOMER_SERVICE_PHONE,
+  CUSTOMER_SERVICE_WECOM_URL: CUSTOMER_SERVICE_WECOM_URL,
  MOCK_SMS_FIXED_CODE: MOCK_SMS_FIXED_CODE,
  SHARE_HINT: DEFAULT_SHARE_HINT,
  SHARE_DEFAULT_TITLE: DEFAULT_SHARE_TITLE,
@@ -87,7 +87,9 @@ export const WECOM_HANDBOOK_ENTRIES: HandbookEntry[] = [
      '运营：商品/开城/门店/订单/配送/权益。',
      '财务：门店/合伙人/酒厂账单与打款、发票、酒厂账户。',
      '客服：用户/订单、售后工单、发票协助。',
+      '城市门店服务：门店列表/审核/评价/分类（可新增不可删除），且限制负责城市；概览只显示有权限的数据和负责城市。',
      '超管：权限分配、技术支持评审、系统设置。',
+      '单账号可在角色之上追加或撤销权限；切换角色会清空账号级权限。',
    ].join('\n'),
  },
  {
@@ -37,6 +37,8 @@ export class ClientConfigController {
      brandLogoMarkUrl: brand.brandLogoMarkUrl,
      qualificationDisclosureUrl: brand.qualificationDisclosureUrl,
      customerServicePhone: brand.customerServicePhone,
+      customerServiceWecomUrl: brand.customerServiceWecomUrl || null,
+      wecomCorpId: brand.wecomCorpId || null,
      partnerOnboardCsQrUrl: (env.PARTNER_ONBOARD_CS_QR_URL ?? '').trim() || null,
      partnerOnboardCsHint:
        (env.PARTNER_ONBOARD_CS_HINT ?? '').trim() ||
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jacy	8f2ebbfef4	merge(dev): 补承运商删除操作常量 CI / verify (push) Waiting to run Details	2026-08-25 14:32:32 +08:00
jacy	ee1a3f4b6c	merge(dev_jacy): 补承运商删除操作常量	2026-08-25 14:32:27 +08:00
jacy	52a7d3789d	fix(ops): 补承运商删除操作常量以便生产构建 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-25 14:32:08 +08:00
jacy	f2fbf95c53	merge(dev): v3.5.10 同城配送提示与企微客服 CI / verify (push) Waiting to run Details	2026-08-25 14:30:43 +08:00
jacy	98d52ff173	merge(dev_jacy): v3.5.10 同城配送提示与企微客服	2026-08-25 14:30:10 +08:00
jacy	797b20979d	feat(mini-user): v3.5.10 同城配送提示可配置并支持换行承运商 HTML 按收货市下发；textarea 回车在 C 端转成换行。含门店去掉分享按钮与小程序企微客服。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-25 14:29:48 +08:00
jacy	43de361e61	merge(dev): 列设置靠右与订单状态多选 CI / verify (push) Waiting to run Details	2026-08-25 14:20:39 +08:00
jacy	b1511ecb92	merge(dev_jacy): 列设置靠右与订单状态多选	2026-08-25 14:20:13 +08:00
jacy	fed8ff3d3a	fix(admin): 列设置靠右并支持订单状态多选 HQ 列表主操作居右、列设置贴最右侧；订单筛选状态可多选，导出同步过滤。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-25 14:19:49 +08:00
jacy	0b548a2764	Merge pull request 'Dev' (#49 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/49	2026-08-25 12:39:52 +08:00
jacy	30f8d649cb	Merge pull request 'v3.5.9版本迭代列表优化' (#48 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/48	2026-08-25 12:39:30 +08:00
jacy	f4da71e952	v3.5.9版本迭代列表优化 CI / verify (pull_request) Waiting to run Details	2026-08-25 12:38:21 +08:00
jacy	40e8a12596	Merge pull request 'Dev' (#47 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/47	2026-08-25 10:10:20 +08:00
jacy	d7241d54b1	Merge pull request '给用户增加“备注”列' (#46 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/46	2026-08-25 10:10:07 +08:00
jacy	282da24bc4	给用户增加“备注”列 CI / verify (pull_request) Waiting to run Details	2026-08-25 10:09:05 +08:00
jacy	3d819dc10b	Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#45 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/45	2026-08-25 09:23:12 +08:00
jacy	5e0691ab35	Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#44 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/44	2026-08-25 09:22:48 +08:00
jacy	5935024ea8	v3.5.8和v3.5.9版本更新 CI / verify (pull_request) Waiting to run Details	2026-08-25 09:20:32 +08:00
jacy	8984465893	Merge pull request 'Dev' (#43 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/43	2026-08-23 19:27:28 +08:00
jacy	b90a4e9f8f	Merge pull request 'v3.5.7版本迭代' (#42 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/42	2026-08-23 19:27:14 +08:00
jacy	3f208d27a9	Merge pull request 'Dev' (#41 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/41	2026-08-23 17:34:40 +08:00
jacy	6973e3d7f5	Merge pull request '修改订单导出时间错误' (#40 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/40	2026-08-23 17:34:21 +08:00
jacy	fa69ced448	Merge pull request 'Dev v3.5.6' (#39 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39	2026-08-23 16:43:51 +08:00
jacy	a144a35c3d	Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38	2026-08-23 16:43:07 +08:00
jacy	18c5abea79	Merge pull request 'v3.5.5版本合并' (#37 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/37	2026-08-23 12:30:04 +08:00
jacy	012626f6bd	Merge pull request 'v3.5.5版本上传' (#36 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36	2026-08-23 12:29:33 +08:00
jacy	5d4ed566de	merge(dev): HQ product list as SPU with expandable SKUs CI / verify (push) Has been cancelled Details	2026-08-21 23:52:41 +08:00
jacy	3004a65b35	Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev	2026-08-21 23:52:37 +08:00
jacy	5fdddae41c	merge(dev): v3.5.4 规格主图与门店使用规则 CI / verify (push) Has been cancelled Details	2026-08-21 17:37:20 +08:00
jacy	7d2e4ef57e	merge(dev_jacy): v3.5.4 规格主图与门店使用规则	2026-08-21 17:37:09 +08:00
jacy	22c0b03a47	Merge pull request 'Dev' (#35 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/35	2026-08-21 16:24:07 +08:00
jacy	73fd27bdf6	Merge pull request 'v3.5.4版本提交，修改api' (#34 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/34	2026-08-21 16:23:54 +08:00
jacy	f2d03e2595	Merge pull request 'v3.5.4' (#33 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/33	2026-08-21 15:50:30 +08:00
jacy	cd9696bc1c	Merge pull request 'v3.5.4版本提交' (#32 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/32	2026-08-21 15:50:07 +08:00
jacy	0c28c204b2	Merge pull request 'Dev' (#31 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/31	2026-08-20 20:23:20 +08:00
jacy	b5d4f8b27c	Merge pull request 'v3.5.3版本更新2' (#30 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/30	2026-08-20 20:23:03 +08:00
jacy	9a80f0f8d6	Merge pull request 'v3.5.3版本更新1' (#29 ) from dev_jacy into dev Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/29	2026-08-20 18:55:43 +08:00
jacy	e7f49a9639	Merge pull request 'v3.5.3版本更新1' (#28 ) from dev_jacy into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/28	2026-08-20 18:55:18 +08:00
jacy	f941dcf072	Merge pull request 'Dev' (#27 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/27	2026-08-20 15:06:24 +08:00
jacy	e8b585e623	Merge pull request '增加音效逻辑' (#26 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/26	2026-08-20 15:06:07 +08:00
jacy	5702266276	Merge pull request 'Dev jacy' (#25 ) from dev_jacy into dev Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/25	2026-08-20 13:43:29 +08:00
jacy	3382d36a6c	Merge pull request 'Dev jacy 大屏优化' (#24 ) from dev_jacy into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/24	2026-08-20 13:43:06 +08:00
jacy	9b8e3f1347	Merge pull request 'v3.5.2 大屏调整' (#23 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/23	2026-08-20 12:01:21 +08:00
jacy	a8a37fbc4a	Merge pull request 'v3.5.2 大屏调整' (#22 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/22	2026-08-20 12:00:57 +08:00
jacy	1440a59fc8	Merge pull request 'Dev' (#21 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/21	2026-08-20 00:54:54 +08:00
jacy	e34416a9b3	Merge pull request 'Dev jacy mock 支付调整' (#20 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/20	2026-08-20 00:54:17 +08:00
jacy	11659484c6	Merge pull request 'v3.5.1 版本更新' (#19 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/19	2026-08-19 16:01:31 +08:00
jacy	6c44e9c56f	Merge pull request 'v3.5.1 版本更新' (#18 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/18	2026-08-19 16:00:56 +08:00
jacy	0fb7ab7abb	Merge pull request 'v3.4.18' (#17 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/17	2026-08-17 23:45:19 +08:00
jacy	905e145af3	Merge pull request 'v3.4.18' (#16 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/16	2026-08-17 23:45:00 +08:00