v3.5.8和v3.5.9版本更新

apps/admin-web/src/admin.css

@@ -16,37 +16,37 @@ 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-cell:has(.ant-btn),
 .ant-drawer .ant-table-cell:has(.ant-btn),
 .ant-modal .ant-table-cell:has(.ant-btn),
@@ -71,10 +71,9 @@ body,
   max-width: none;
 }
 
-/* 表格单元格双行信息合并为单行省略 */
+/* 表格单元格主/副信息同一行 */
 .admin-cell-line {
-  display: block;
-  max-width: 100%;
+  display: inline;
 }
 
 .admin-cell-line-secondary {

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

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

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

@@ -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>
+  );
+}

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

@@ -215,11 +215,10 @@ export default function CityPartnersPanel({
       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' },
     { title: '主账号', dataIndex: 'phone', width: 120 },
     {

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

@@ -48,7 +48,6 @@ export default function PartnerSubAccountList({ subs, onAdd, onEdit, onDelete }:
     {
       title: '权限',
       dataIndex: 'permissions',
-      ellipsis: true,
 
       render: (p: string[] | undefined) => formatPermissions(p),
     },

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

@@ -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>

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

@@ -0,0 +1,50 @@
+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 } : { 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);
+}

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

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

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

@@ -0,0 +1,84 @@
+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) => byKey.get(k)!).filter(Boolean), ...actions.map((c) => 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 };

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

@@ -0,0 +1,103 @@
+import { useMemo, 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,
+  settingItems,
+  type ListColumnSettingItem,
+} from './list-column-prefs';
+
+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 pref = prefs[listKey];
+
+  const configured = useMemo(
+    () => applyColumnPrefs(allColumns as ColumnType<T>[], pref),
+    [allColumns, pref],
+  );
+
+  const items = useMemo(
+    () => settingItems(allColumns as ColumnType<T>[], pref),
+    [allColumns, pref],
+  );
+
+  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 columns = useMemo<ColumnsType<T>>(
+    () => [
+      serialCol,
+      ...configured.map((col) =>
+        col.title === '操作' || col.key === ACTIONS_COLUMN_KEY || col.key === 'actions'
+          ? { ...col, key: col.key ?? ACTIONS_COLUMN_KEY }
+          : col,
+      ),
+    ],
+    [configured, serialCol],
+  );
+
+  async function persist(next: ListColumnSettingItem[] | null) {
+    setSaving(true);
+    try {
+      if (!next) {
+        await save(listKey, null);
+      } else {
+        await save(listKey, {
+          order: next.map((i) => i.key),
+          hidden: next.filter((i) => !i.visible).map((i) => i.key),
+        });
+      }
+      setOpen(false);
+      message.success(next ? '列设置已保存' : '已恢复默认列');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  const settingsButton = (
+    <Button icon={<SettingOutlined />} onClick={() => setOpen(true)}>
+      列设置
+    </Button>
+  );
+
+  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 };
+}

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

@@ -20,6 +20,8 @@ import { request } from '../lib/api';
 import { COUPON_STATUS_LABELS, fmtTime } from '../lib/constants';
 import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 type Row = {
   id: string;
@@ -99,7 +101,7 @@ export default function BenefitCouponsPage() {
     }
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     { title: '券号', dataIndex: 'couponNo', width: 200, ellipsis: false },
     { title: '用户', dataIndex: ['user', 'userNo'], width: 120, ellipsis: false },
     { title: '手机号', dataIndex: ['user', 'phone'], width: 120, render: (v) => v || '—' },
@@ -113,7 +115,7 @@ export default function BenefitCouponsPage() {
     { 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' },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作',
@@ -155,15 +157,21 @@ export default function BenefitCouponsPage() {
     }
   }
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('benefit-coupons', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <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>
+        <Space>
+          {settingsButton}
+          <Button type="primary" onClick={() => setGrantOpen(true)}>
+            手动发放
+          </Button>
+        </Space>
       </div>
 
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
@@ -190,7 +198,7 @@ export default function BenefitCouponsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,
@@ -316,7 +324,7 @@ export default function BenefitCouponsPage() {
                   locale={{ emptyText: '暂无关联核销单' }}
                   dataSource={detail.redeemRecords ?? []}
                   columns={[
-                    { title: '核销号', dataIndex: 'redeemNo', ellipsis: true },
+                    { title: '核销号', dataIndex: 'redeemNo' },
                     {
                       title: '角色',
                       dataIndex: 'role',
@@ -327,7 +335,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}）` : ''}` : '—',
                     },

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

@@ -3,6 +3,8 @@ 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';
+
 
 type Row = {
   id: string; type: string; amount: number; balanceAfter: number; remark: string | null; createdAt: string;
@@ -24,19 +26,23 @@ 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>
+      {settingsModal}
       <Typography.Title level={4}>权益流水</Typography.Title>
+          {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>
   );

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

@@ -24,6 +24,8 @@ 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';
+
 
 type WarehouseRow = {
   id: string;
@@ -223,7 +225,7 @@ export default function CitiesPage() {
     }
   };
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     { title: '编码', dataIndex: 'code', width: 90 },
     { title: '城市', dataIndex: 'name', width: 100 },
     { title: '省份', dataIndex: 'province', width: 90 },
@@ -261,7 +263,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 +272,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,10 +313,14 @@ export default function CitiesPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('cities', 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={openCreateModal}>新建城市</Button>
       </Space>
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
@@ -325,7 +331,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 +629,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 +646,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 || '—',
                   },

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

@@ -36,6 +36,8 @@ 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';
+
 
 type SubRow = PartnerSubAccountRow;
 
@@ -261,22 +263,20 @@ 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 },
     {
       title: '主账号姓名',
       dataIndex: 'name',
-      ellipsis: true,
       width: 120,
 
       render: (v, row) => (
@@ -311,7 +311,6 @@ export default function CityPartnersPage() {
     },
     {
       title: '管仓仓库',
-      ellipsis: true,
       dataIndex: 'managedWarehouseName',
       width: 110,
 
@@ -338,12 +337,16 @@ export default function CityPartnersPage() {
           管理
         </Button>
       ),
+    },
+  ];
 
   const { columns, settingsButton, settingsModal } = useAdminListColumns('city-partners', 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}
@@ -427,7 +430,7 @@ export default function CityPartnersPage() {
       <Table
         rowKey="id"
         className="admin-table-nowrap"
-        scroll={{ x: 1200 }}
+        loading={loading}
         columns={columns}
         dataSource={toTableRows(data?.items ?? [])}
         scroll={{ x: 'max-content' }}

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

@@ -30,6 +30,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -70,6 +72,7 @@ function FulfillmentFields({
   onModeChange: (mode: WarehouseFulfillmentMode) => void;
 }) {
   const autoShip = mode === WarehouseFulfillmentMode.API_AUTO;
+
   return (
     <>
       <Form.Item
@@ -219,7 +222,7 @@ export default function CityWarehousesPage() {
     }
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     {
       title: '城市',
       width: 100,
@@ -229,8 +232,8 @@ export default function CityWarehousesPage() {
         </span>
       ),
     },
-    { title: '仓库', dataIndex: 'name', width: 140, ellipsis: true },
-    { title: '地址', dataIndex: 'address', width: 180, ellipsis: true },
+    { title: '仓库', dataIndex: 'name', width: 140 },
+    { title: '地址', dataIndex: 'address', width: 180 },
     { title: '联系人', dataIndex: 'contactName', width: 90 },
     { title: '电话', dataIndex: 'contactPhone', width: 120 },
     {
@@ -242,7 +245,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,10 +300,17 @@ export default function CityWarehousesPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('city-warehouses', 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={() => {
@@ -367,7 +376,7 @@ export default function CityWarehousesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1400 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

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

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

@@ -7,6 +7,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -59,7 +61,7 @@ export default function DeliveriesPage() {
     setTrackOpen(true);
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
     { title: 'provider', dataIndex: 'provider', width: 90 },
     { title: '运单号', dataIndex: 'trackingNo', width: 140, render: (v) => v || '—' },
@@ -83,16 +85,20 @@ export default function DeliveriesPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('deliveries', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>快递/配送单</Typography.Title>
+          {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={

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

@@ -30,6 +30,8 @@ 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';
+
 
 const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
   value: v,
@@ -240,7 +242,7 @@ export default function DevPlanTasksPage() {
     }
   }
 
-  const columns: ColumnsType<DevPlanTaskDto> = [
+  const baseColumns: ColumnsType<DevPlanTaskDto> = [
     { title: '任务号', dataIndex: 'taskNo', width: 160 },
     {
       title: '类型',
@@ -256,7 +258,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,12 +296,16 @@ export default function DevPlanTasksPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('dev-plan-tasks', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
         <Typography.Title level={4} style={{ margin: 0 }}>
           开发计划 · 任务列表
         </Typography.Title>
+          {settingsButton}
         <Space wrap>
           <Select
             value={exportFormat}
@@ -361,7 +367,7 @@ export default function DevPlanTasksPage() {
           selectedRowKeys,
           onChange: (keys) => setSelectedRowKeys(keys as string[]),
         }}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -22,6 +22,8 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 
 const STATUS_OPTIONS = (Object.keys(DEV_PLAN_VERSION_STATUS_LABELS) as DevPlanVersionStatusDto[]).map(
@@ -119,7 +121,7 @@ export default function DevPlanVersionsPage() {
     }
   }
 
-  const columns: ColumnsType<DevPlanVersionDto> = [
+  const baseColumns: ColumnsType<DevPlanVersionDto> = [
     { title: '版本号', dataIndex: 'versionNo', width: 120 },
     {
       title: '状态',
@@ -129,7 +131,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,12 +160,16 @@ export default function DevPlanVersionsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('dev-plan-versions', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
         <Typography.Title level={4} style={{ margin: 0 }}>
           开发计划 · 版本列表
         </Typography.Title>
+          {settingsButton}
         <Button type="primary" onClick={openCreate}>
           新建版本
         </Button>
@@ -190,7 +196,7 @@ export default function DevPlanVersionsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -4,6 +4,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -55,7 +57,7 @@ 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: '关联', render: (_, r) => `${r.refType} #${r.refId}` },
@@ -76,8 +78,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 }}

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

@@ -28,6 +28,8 @@ import {
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 const TYPE_OPTIONS = Object.entries(FULFILLMENT_PROVIDER_TYPE_LABELS).map(([value, label]) => ({
   value,
@@ -173,7 +175,7 @@ export default function FulfillmentProvidersPage() {
     void load();
   }
 
-  const columns: ColumnsType<FulfillmentProviderDto> = [
+  const baseColumns: ColumnsType<FulfillmentProviderDto> = [
     { title: '编码', dataIndex: 'code', width: 100 },
     { title: '名称', dataIndex: 'name' },
     {
@@ -230,13 +232,20 @@ export default function FulfillmentProvidersPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('fulfillment-providers', baseColumns, {
+    page: 1,
+    pageSize: rows.length || 20,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <div>
           <Typography.Title level={4} style={{ margin: 0 }}>
             仓配管理
           </Typography.Title>
+          {settingsButton}
           <Typography.Text type="secondary">
             注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准
           </Typography.Text>
@@ -253,7 +262,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 ? '编辑承运商' : '注册承运商'}

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

@@ -3,9 +3,12 @@ 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';
+
 
 type Row = {
   id: string;
@@ -17,14 +20,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,14 +48,27 @@ 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> = [
+  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' },
     { title: '用户名', dataIndex: 'loginName', width: 120, render: (v) => v || '—' },
     { title: '手机', dataIndex: 'phone', width: 130 },
@@ -67,7 +82,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 +107,7 @@ export default function HqAccountsPage() {
             loginName: row.loginName,
             adminRole: row.adminRole,
             status: row.status,
+            cityIds: row.cityIds ?? [],
           });
           setDrawerOpen(true);
         }}>编辑</Button>
@@ -88,16 +115,20 @@ export default function HqAccountsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('hq-accounts', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>HQ 账户</Typography.Title>
+          {settingsButton}
         {isSuperAdmin && (
           <Button
             type="primary"
             onClick={() => {
               createForm.resetFields();
-              createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS' });
+              createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS', cityIds: [] });
               setCreateOpen(true);
             }}
           >
@@ -108,23 +139,31 @@ export default function HqAccountsPage() {
       <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 +183,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 +203,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 +224,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: '请输入手机号' }]}>

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

@@ -9,6 +9,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -52,12 +54,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
@@ -92,9 +93,13 @@ export default function HqLogsPage() {
       ),
     },
   ];
+
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-hq', baseColumns, { page, pageSize });
 
   return (
+    <div>
       {settingsModal}
+      <Typography.Title level={4}>HQ 操作日志</Typography.Title>
           {settingsButton}
       <Typography.Paragraph type="secondary">
         记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
@@ -150,7 +155,7 @@ export default function HqLogsPage() {
         rowKey="id"
         loading={loading}
         columns={columns}
-        scroll={{ x: 900 }}
+        dataSource={data?.items ?? []}
         scroll={{ x: 'max-content' }}
         pagination={{
           current: page,

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

@@ -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>

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

@@ -30,6 +30,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -181,7 +183,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 +204,7 @@ export default function InvoicesPage() {
           ? INVOICE_CATEGORY_LABELS[r.invoiceCategory] ?? r.invoiceCategory
           : '—',
     },
-    { title: '名称', dataIndex: 'titleName', ellipsis: true },
+    { title: '名称', dataIndex: 'titleName' },
     {
       title: '状态',
       width: 110,
@@ -227,8 +229,11 @@ export default function InvoicesPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('invoices', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <div
         style={{
           display: 'flex',
@@ -240,6 +245,7 @@ export default function InvoicesPage() {
         <Typography.Title level={4} style={{ margin: 0 }}>
           发票管理
         </Typography.Title>
+          {settingsButton}
         <Button
           type="primary"
           onClick={() => {
@@ -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,

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

@@ -25,6 +25,8 @@ 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';
+
 
 type FormValues = {
   name: string;
@@ -124,9 +126,9 @@ export default function KnowledgeBasesPage() {
     }
   };
 
-  const columns: ColumnsType<KnowledgeBaseDto> = [
+  const baseColumns: ColumnsType<KnowledgeBaseDto> = [
     { title: '名称', dataIndex: 'name' },
-    { title: '说明', dataIndex: 'description', ellipsis: true },
+    { title: '说明', dataIndex: 'description' },
     { title: '文档数', dataIndex: 'documentCount', width: 90 },
     {
       title: '启用',
@@ -184,7 +186,7 @@ export default function KnowledgeBasesPage() {
 
   const docColumns: ColumnsType<KnowledgeDocumentDto> = [
     { title: '标题', dataIndex: 'title' },
-    { title: '文件', dataIndex: 'fileName', ellipsis: true },
+    { title: '文件', dataIndex: 'fileName' },
     {
       title: '状态',
       dataIndex: 'status',
@@ -250,12 +252,16 @@ export default function KnowledgeBasesPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('knowledge-bases', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16 }} wrap>
         <Typography.Title level={4} style={{ margin: 0 }}>
           知识库
         </Typography.Title>
+          {settingsButton}
         <Typography.Text type="secondary">
           支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索
         </Typography.Text>

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

@@ -25,6 +25,8 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 type FormValues = {
   name: string;
@@ -153,7 +155,7 @@ export default function LlmConfigsPage() {
     }
   };
 
-  const columns: ColumnsType<LlmApiConfigDto> = [
+  const baseColumns: ColumnsType<LlmApiConfigDto> = [
     { title: '名称', dataIndex: 'name' },
     {
       title: '提供商',
@@ -161,7 +163,7 @@ export default function LlmConfigsPage() {
       width: 120,
       render: (p: LlmProvider) => LLM_PROVIDER_LABELS[p] || p,
     },
-    { title: '模型', dataIndex: 'modelName', ellipsis: true },
+    { title: '模型', dataIndex: 'modelName' },
     {
       title: 'Key',
       dataIndex: 'apiKeyConfigured',
@@ -257,12 +259,16 @@ export default function LlmConfigsPage() {
 
   const fullEdit = !editing || editing.canEditFull;
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('llm-configs', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16 }} wrap>
         <Typography.Title level={4} style={{ margin: 0 }}>
           语言模型配置
         </Typography.Title>
+          {settingsButton}
         <Typography.Text type="secondary">
           非超管仅可见自己创建的配置，且创建后只能改是否生效
         </Typography.Text>

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

@@ -29,6 +29,7 @@ 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';
 
 type BillRow = {
   id: string;
@@ -245,7 +246,7 @@ 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 },
     {
       title: '承运商',
       width: 140,
@@ -275,13 +276,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 +338,6 @@ export default function LogisticsBillsPage() {
     {
       title: '银行账户',
       width: 180,
-      ellipsis: true,
       render: (_, r) =>
         r.bankAccountName
           ? `${r.bankAccountName} / ${r.bankName || ''} ${r.bankAccountNo || ''}`
@@ -391,12 +389,19 @@ export default function LogisticsBillsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-logistics-bills', billColumns, {
+    page,
+    pageSize,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
         <Typography.Title level={4} style={{ margin: 0 }}>
           物流对账
         </Typography.Title>
+        {settingsButton}
         <Typography.Text type="secondary">
           按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。
         </Typography.Text>
@@ -537,7 +542,7 @@ export default function LogisticsBillsPage() {
                 <Table
                   rowKey="id"
                   loading={loading}
-                  columns={billColumns}
+                  columns={columns}
                   dataSource={data?.items ?? []}
                   rowSelection={{
                     selectedRowKeys: selectedKeys,

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

@@ -26,6 +26,7 @@ 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 { downloadBase64File } from '../lib/exportExcel';
 import {
   ADMIN_OPTIONS_PAGE_SIZE,
@@ -590,7 +591,7 @@ export default function OrdersPage() {
     }
   }
 
-  const columns: ColumnsType<AdminOrderRow> = [
+  const baseColumns: ColumnsType<AdminOrderRow> = [
     {
       title: '商品',
       width: 240,
@@ -686,11 +687,18 @@ export default function OrdersPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
+    page,
+    pageSize,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
         <Space size={12}>
+          {settingsButton}
           <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
           {canProxyOrder ? (
             <Button type="primary" onClick={() => setProxyOpen(true)}>
@@ -830,7 +838,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 +1022,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 +1033,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 +1148,6 @@ export default function OrdersPage() {
                     {
                       title: '备注',
                       dataIndex: 'remark',
-                      ellipsis: true,
                       render: (v) => v || '—',
                     },
                     {
@@ -1436,7 +1442,6 @@ export default function OrdersPage() {
             {
               title: '商品',
               width: 160,
-              ellipsis: true,
               render: (_, row) =>
                 row.productName
                   ? `${row.productName}${row.quantity != null ? ` ×${row.quantity}` : ''}`

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

@@ -7,6 +7,8 @@ import { PARTNER_PERMISSION_KEYS, PARTNER_PERMISSION_LABELS, PARTNER_STAFF_ROLE_
 import { request, type Paginated } from '../lib/api';
 import { AdminCellLine } from '../components/AdminCellLine';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, ORDER_STATUS_LABELS, PARTNER_BILL_STATUS_LABELS, fmtTime } from '../lib/constants';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 type PartnerOption = { id: string; companyName: string };
 type ParentAccount = { id: string; name: string; phone: string };
@@ -169,11 +171,10 @@ 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}
@@ -189,7 +190,6 @@ export default function PartnerAccountsPage() {
     {
       title: '开城合伙人',
       width: 140,
-      ellipsis: true,
       render: (_, row) => row.companyName || row.parent?.name || '—',
     },
     {
@@ -254,11 +254,18 @@ 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>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <div>
           <Typography.Title level={4} style={{ margin: 0 }}>合伙人子账号</Typography.Title>
+          {settingsButton}
           <Typography.Text type="secondary">
             主账号在「开城合伙人」创建；此处仅管理子账号树与权限
           </Typography.Text>
@@ -305,7 +312,7 @@ export default function PartnerAccountsPage() {
         loading={loading}
         columns={columns}
         dataSource={treeData}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         pagination={false}
         expandable={{
           expandedRowKeys,
@@ -399,7 +406,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 +414,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' }} />
               ),
             },
           ]} />

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

@@ -22,6 +22,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -244,12 +246,11 @@ 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 },
     {
       title: '合伙人',
       width: 160,
-      ellipsis: true,
 
       render: (_, r) => partnerName(r),
     },
@@ -279,13 +280,11 @@ export default function PartnerBillsPage() {
     },
     {
       title: '收款户名',
-      ellipsis: true,
       width: 100,
 
       render: (_, r) => partnerBank(r)?.bankAccountName || '—',
     },
     {
-      ellipsis: true,
       title: '收款账号',
       width: 140,
 
@@ -337,12 +336,16 @@ export default function PartnerBillsPage() {
           )}
         </Space>
       ),
+    },
+  ];
 
   const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
+
   return (
     <div>
       {settingsModal}
       <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
+        <Typography.Title level={4} style={{ margin: 0 }}>
           合伙人账单
         </Typography.Title>
           {settingsButton}
@@ -448,7 +451,7 @@ export default function PartnerBillsPage() {
         columns={columns}
         dataSource={data?.items ?? []}
         rowSelection={{
-        scroll={{ x: 1280 }}
+          selectedRowKeys: selectedKeys,
           onChange: setSelectedKeys,
         }}
         scroll={{ x: 'max-content' }}

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

@@ -14,6 +14,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -71,12 +73,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 ? (
@@ -88,7 +89,6 @@ export default function PartnerLogsPage() {
     },
     {
       title: '账号',
-      ellipsis: true,
       width: 150,
 
       render: (_, r) => (
@@ -116,7 +116,6 @@ export default function PartnerLogsPage() {
       width: 120,
       render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
     },
-      ellipsis: true,
     {
       title: '摘要',
 
@@ -137,11 +136,15 @@ export default function PartnerLogsPage() {
           详情
         </Button>
       ),
+    },
+  ];
 
   const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-partners', baseColumns, { page, pageSize });
+
   return (
     <div>
       {settingsModal}
+      <Typography.Title level={4} style={{ marginBottom: 16 }}>
         合伙人日志
       </Typography.Title>
           {settingsButton}
@@ -216,7 +219,7 @@ export default function PartnerLogsPage() {
           showSizeChanger: true,
           onChange: (p, ps) => {
             setPage(p);
-        scroll={{ x: 1100 }}
+            setPageSize(ps);
           },
         }}
         scroll={{ x: 'max-content' }}

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

@@ -27,6 +27,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -173,17 +175,16 @@ 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' },
     { title: '主账号', dataIndex: 'phone', width: 130 },
     {
@@ -205,10 +206,14 @@ export default function PartnersPage() {
       ),
     },
   ];
+
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('partners', 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); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
           新建城市合伙人

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

@@ -23,6 +23,8 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 const STATUS_COLOR: Record<RedeemPendingStatus, string> = {
   PENDING: 'orange',
@@ -94,13 +96,12 @@ export default function PendingRedeemPage() {
     }
   }
 
-  const columns: ColumnsType<RedeemPendingItem> = [
+  const baseColumns: ColumnsType<RedeemPendingItem> = [
     { title: '待处理单号', dataIndex: 'pendingNo', width: 170 },
     {
       title: '核销码 ID',
       dataIndex: 'redeemToken',
       width: 160,
-      ellipsis: true,
 
       render: (v: string) => <Typography.Text copyable={{ text: v }}>{v.slice(0, 8)}…</Typography.Text>,
     },
@@ -132,9 +133,13 @@ export default function PendingRedeemPage() {
       ),
     },
   ];
+
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('redeem-pending', baseColumns, { page, pageSize });
 
   return (
+    <div>
       {settingsModal}
+      <Typography.Title level={4}>待处理核销（弱网兜底）</Typography.Title>
           {settingsButton}
       <Form
         form={form}
@@ -175,7 +180,7 @@ export default function PendingRedeemPage() {
         rowKey="id"
         loading={loading}
         columns={columns}
-        scroll={{ x: 1100 }}
+        dataSource={data?.items ?? []}
         scroll={{ x: 'max-content' }}
         pagination={{
           current: page,

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

@@ -13,6 +13,8 @@ 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';
+
 
 type Row = ProductDetailTemplateDto;
 
@@ -136,10 +138,10 @@ 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: '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 +160,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 +184,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 && (

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

@@ -14,6 +14,8 @@ 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';
+
 
 type ProductDetailContentDto = {
   storyTitle?: string;
@@ -387,9 +389,9 @@ 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 },
     {
       title: '累计销售',
       dataIndex: 'soldBottles',
@@ -458,7 +460,6 @@ export default function ProductsPage() {
       title: '规格',
       dataIndex: 'specText',
       width: 140,
-      ellipsis: true,
       render: (v: string, row) => (
         <Space size={4}>
           <span>{v || '默认'}</span>
@@ -468,7 +469,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,10 +494,17 @@ export default function ProductsPage() {
     },
   ], []);
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('products', 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); }}>
@@ -517,7 +525,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 +536,7 @@ export default function ProductsPage() {
                 pagination={false}
                 columns={skuColumns}
                 dataSource={row.skus ?? []}
-                scroll={{ x: 980 }}
+                scroll={{ x: 'max-content' }}
                 style={{ background: 'transparent' }}
               />
             </div>

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

@@ -14,6 +14,8 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 type Row = PromoCodeItem;
 
@@ -74,8 +76,8 @@ 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 },
     { title: '码值', dataIndex: 'code', width: 110 },
     {
       title: '场景',
@@ -160,10 +162,14 @@ export default function PromoCodesPage() {
     }
   }
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-codes', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
         <Typography.Title level={4} style={{ margin: 0 }}>推广码管理</Typography.Title>
+          {settingsButton}
         <Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>
       </div>
 
@@ -194,7 +200,7 @@ export default function PromoCodesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -7,6 +7,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -75,7 +77,7 @@ export default function RedeemRecordsPage() {
     }
   }, [data, initialRedeemNo, loading]);
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     {
       title: '核销号',
       dataIndex: 'redeemNo',
@@ -133,9 +135,13 @@ export default function RedeemRecordsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('redeem-records', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>核销记录</Typography.Title>
+          {settingsButton}
       <Form
         form={form}
         layout="inline"
@@ -175,7 +181,7 @@ export default function RedeemRecordsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1300 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -12,6 +12,8 @@ import {
   fmtTime,
 } from '../lib/constants';
 import OssUpload from '../components/OssUpload';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 type Row = {
   id: string;
@@ -58,7 +60,7 @@ export default function ResourcesPage() {
     void reload();
   }, []);
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     { title: 'ID', dataIndex: 'id', width: 80 },
     {
       title: '归属',
@@ -84,8 +86,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,12 +116,16 @@ export default function ResourcesPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('resources', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>
           OSS 资源库
         </Typography.Title>
+          {settingsButton}
         <Button type="primary" onClick={() => setCreateOpen(true)}>
           登记资源
         </Button>
@@ -170,7 +176,7 @@ export default function ResourcesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -6,6 +6,8 @@ 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';
+
 
 type StoreBrief = { id: string; name: string; status: string; cityName?: string };
 
@@ -74,7 +76,7 @@ export default function StoreAccountsPage() {
     }
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     {
       title: '姓名',
       dataIndex: 'name',
@@ -138,11 +140,15 @@ export default function StoreAccountsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-accounts', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Space direction="vertical" size={0}>
           <Typography.Title level={4} style={{ margin: 0 }}>门店账户</Typography.Title>
+          {settingsButton}
           <Typography.Text type="secondary">
             主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店
           </Typography.Text>
@@ -185,7 +191,7 @@ export default function StoreAccountsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -30,6 +30,8 @@ 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';
+
 
 type Row = {
   kind: StoreSettlementKind;
@@ -267,7 +269,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,7 +284,6 @@ export default function StoreBillsPage() {
       title: '单号',
       dataIndex: 'billNo',
       width: 180,
-      ellipsis: true,
 
       render: (v, row) => (
         <Space>
@@ -296,20 +297,18 @@ export default function StoreBillsPage() {
       dataIndex: 'date',
       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: '收款户名',
-      ellipsis: true,
       width: 100,
 
       render: (_, row) =>
         row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
     },
     {
-      ellipsis: true,
       title: '收款账号',
       width: 140,
 
@@ -376,12 +375,16 @@ export default function StoreBillsPage() {
         bankAccountName?: string;
         bankAccountNo?: string;
         bankBranch?: string;
+      }
+    | undefined;
 
   const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
+
   return (
     <div>
       {settingsModal}
       <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
+        <Typography.Title level={4} style={{ margin: 0 }}>
           门店账单
         </Typography.Title>
           {settingsButton}
@@ -513,7 +516,7 @@ export default function StoreBillsPage() {
           selectedRowKeys: selectedKeys,
           onChange: setSelectedKeys,
           getCheckboxProps: (r) => ({
-        scroll={{ x: 1300 }}
+            disabled: !(r.kind === 'T1_BILL' && r.status === 'UNPAID'),
           }),
         }}
         scroll={{ x: 'max-content' }}

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

@@ -3,7 +3,9 @@ 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';
+
 
 type CategoryNode = {
   id: string;
@@ -38,7 +40,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 +64,7 @@ export default function StoreCategoriesPage() {
 
   useEffect(() => {
     void reload();
+    request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
   }, []);
 
   function openCreate(parentId?: string) {
@@ -112,7 +117,7 @@ export default function StoreCategoriesPage() {
     void reload();
   }
 
-  const columns: ColumnsType<FlatRow> = [
+  const baseColumns: ColumnsType<FlatRow> = [
     {
       title: '层级',
       dataIndex: 'level',
@@ -141,45 +146,56 @@ 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>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Space direction="vertical" size={0}>
           <Typography.Title level={4} style={{ margin: 0 }}>门店分类</Typography.Title>
+          {settingsButton}
           <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>
+          {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>
         </Space>
       </Space>

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

@@ -12,6 +12,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -80,14 +82,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}
@@ -111,7 +113,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,9 +129,13 @@ export default function StoreLogsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-stores', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>商户日志</Typography.Title>
+          {settingsButton}
       <Typography.Paragraph type="secondary" style={{ marginTop: -8 }}>
         门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。
       </Typography.Paragraph>
@@ -164,7 +170,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 && (

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

@@ -7,6 +7,8 @@ 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';
+
 
 type Row = {
   id: string; mediaType: string; url: string; sortOrder: number; createdAt: string;
@@ -40,7 +42,7 @@ export default function StoreMediaPage() {
     setStores(res.items);
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     { title: '门店', dataIndex: ['store', 'name'], width: 140 },
     { title: '类型', dataIndex: 'mediaType', width: 80, render: (t) => <Tag>{MEDIA_TYPE_LABELS[t] || t}</Tag> },
     {
@@ -49,7 +51,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,10 +75,14 @@ export default function StoreMediaPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-media', 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={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>
       </Space>
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
@@ -86,7 +92,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();

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

@@ -32,6 +32,7 @@ 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';
 
 const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
   PENDING: '待审核',
@@ -469,7 +470,7 @@ export default function StorePackageAuditsPage() {
     }
   }
 
-  const columns: ColumnsType<StorePackageChangeRequestDto> = [
+  const baseColumns: ColumnsType<StorePackageChangeRequestDto> = [
     { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
     {
       title: '状态',
@@ -519,9 +520,16 @@ export default function StorePackageAuditsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-package-audits', baseColumns, {
+    page,
+    pageSize: 20,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>审核通知</Typography.Title>
+      {settingsButton}
       <Tabs
         activeKey={activeTab}
         onChange={setActiveTab}

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

@@ -1,9 +1,12 @@
-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';
+
 
 type Row = {
   id: string;
@@ -20,22 +23,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 +64,15 @@ export default function StoreRatingsPage() {
     { title: '评价时间', dataIndex: 'createdAt', width: 170, render: fmtTime },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('store-ratings', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4} style={{ marginTop: 0 }}>
         门店评价
       </Typography.Title>
+          {settingsButton}
       <Form
         form={form}
         layout="inline"
@@ -66,11 +81,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>

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

@@ -20,6 +20,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -147,7 +149,7 @@ export default function StoreWithdrawalsPage() {
     });
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     {
       title: '提现单号',
       dataIndex: 'withdrawNo',
@@ -229,11 +231,15 @@ export default function StoreWithdrawalsPage() {
       }
     | undefined;
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-withdrawals', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4} style={{ marginTop: 0 }}>
         门店提现审
       </Typography.Title>
+          {settingsButton}
       {overdueSummary ? (
         <Typography.Paragraph type="secondary">
           待审 {overdueSummary.pendingCount} 笔
@@ -299,7 +305,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,

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

@@ -39,6 +39,7 @@ import {
   type StoreCreateForm,
 } from '../lib/storeCreate';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
 import OssUpload from '../components/OssUpload';
@@ -198,6 +199,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 +724,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}>
+            <span>{name}</span>
             {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 +786,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 +795,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,14 +864,23 @@ export default function StoresPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('stores', baseColumns, {
+    page,
+    pageSize,
+  });
+
   return (
     <div>
+      {settingsModal}
       <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>
+          {settingsButton}
+          <Button type="primary" onClick={openCreateModal}>新建门店</Button>
+        </Space>
       </Space>
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
@@ -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,

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

@@ -46,6 +46,8 @@ 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';
+
 
 const DISPATCH_WECOM_STORAGE_KEY = 'support_ticket_dispatch_wecom';
 const DEFAULT_DISPATCH_SUPPLEMENT = '请按以下任务进入开发流程';
@@ -470,7 +472,7 @@ export default function SupportTicketsPage() {
     }
   }
 
-  const columns: ColumnsType<TicketRow> = [
+  const baseColumns: ColumnsType<TicketRow> = [
     { title: '工单号', dataIndex: 'ticketNo', width: 180 },
     {
       title: '类型',
@@ -503,7 +505,7 @@ export default function SupportTicketsPage() {
         </Space>
       ),
     },
-    { title: '标题', dataIndex: 'title', ellipsis: true },
+    { title: '标题', dataIndex: 'title' },
     { title: '创建人', dataIndex: 'creatorName', width: 100 },
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
@@ -546,8 +548,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 +564,7 @@ export default function SupportTicketsPage() {
         <Typography.Title level={4} style={{ margin: 0 }}>
           技术支持
         </Typography.Title>
+          {settingsButton}
         <Space>
           {isSuperAdmin ? (
             <>
@@ -619,7 +625,7 @@ export default function SupportTicketsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
         rowSelection={
           isSuperAdmin
             ? {

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

@@ -20,6 +20,7 @@ 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';
 
 const MOCK_KEYS = ['MOCK_SMS', 'MOCK_WECHAT', 'MOCK_PAY'] as const;
 
@@ -257,7 +258,6 @@ export default function TestWhitelistPage() {
     {
       title: '备注',
       dataIndex: 'note',
-      ellipsis: true,
       render: (v) => v || '—',
     },
     {
@@ -334,7 +334,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 +347,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 +386,18 @@ export default function TestWhitelistPage() {
     ];
   }
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('test-whitelist', phoneColumns, {
+    page: phonePage,
+    pageSize: phonePageSize,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4} style={{ marginTop: 0 }}>
         白名单管理
       </Typography.Title>
+      {settingsButton}
 
       <Card size="small" loading={mockLoading} style={{ marginBottom: 16 }}>
         <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
@@ -472,7 +479,7 @@ export default function TestWhitelistPage() {
                 <Table
                   rowKey="id"
                   loading={phonesLoading}
-                  columns={phoneColumns}
+                  columns={columns}
                   dataSource={phones?.items ?? []}
                   pagination={{
                     current: phonePage,

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

@@ -4,6 +4,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -69,7 +71,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,12 +89,10 @@ 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 || '—' },
@@ -114,9 +114,16 @@ export default function ThirdPartyLogsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-third-party', baseColumns, {
+    page,
+    pageSize,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>第三方日志</Typography.Title>
+          {settingsButton}
       <Form
         layout="inline"
         style={{ marginBottom: 16 }}
@@ -143,7 +150,7 @@ export default function ThirdPartyLogsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -25,6 +25,8 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
+import { useAdminListColumns } from '../lib/useAdminListColumns';
+
 
 type Row = {
   id: string;
@@ -115,7 +117,7 @@ export default function TicketsPage() {
     }
   }
 
-  const columns: ColumnsType<Row> = [
+  const baseColumns: ColumnsType<Row> = [
     { title: '工单号', dataIndex: 'ticketNo', width: 180 },
     {
       title: '类型',
@@ -132,7 +134,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 +156,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 +172,7 @@ export default function TicketsPage() {
         <Typography.Title level={4} style={{ margin: 0 }}>
           工单中心
         </Typography.Title>
+          {settingsButton}
         <Button type="primary" onClick={() => setCreateOpen(true)}>
           创建工单
         </Button>
@@ -205,7 +211,7 @@ export default function TicketsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -7,6 +7,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -61,10 +63,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}
@@ -84,7 +86,7 @@ export default function UserLogsPage() {
       render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
     },
     {
-      title: '摘要', ellipsis: true,
+      title: '摘要',
       render: (_, r) => summarizeExtra(r.extraJson),
     },
     {
@@ -98,9 +100,13 @@ export default function UserLogsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-users', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>用户日志</Typography.Title>
+          {settingsButton}
       <Segmented
         style={{ marginBottom: 16 }}
         options={USER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
@@ -131,7 +137,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 && (

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

@@ -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,7 @@ 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 { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 
 type UserOrderRow = {
@@ -30,6 +31,77 @@ type UserOrderRow = {
   createdAt: string;
 };
 
+function NicknameCell({
+  id,
+  nickname,
+  onSaved,
+}: {
+  id: string;
+  nickname: string | null;
+  onSaved: (id: string, nickname: string | null) => void;
+}) {
+  const [editing, setEditing] = useState(false);
+  const [value, setValue] = useState(nickname ?? '');
+  const savingRef = useRef(false);
+
+  useEffect(() => {
+    if (!editing) setValue(nickname ?? '');
+  }, [nickname, editing]);
+
+  async function commit() {
+    if (savingRef.current) return;
+    const next = value.trim() || null;
+    const prev = nickname?.trim() || null;
+    setEditing(false);
+    if (next === prev) return;
+    savingRef.current = true;
+    try {
+      const res = await request<{ id: string; nickname: string | null }>(`/admin/users/${id}`, {
+        method: 'PUT',
+        body: JSON.stringify({ nickname: next ?? '' }),
+      });
+      onSaved(id, res.nickname);
+      message.success('昵称已保存');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+      setValue(nickname ?? '');
+    } finally {
+      savingRef.current = false;
+    }
+  }
+
+  if (editing) {
+    return (
+      <Input
+        size="small"
+        autoFocus
+        maxLength={64}
+        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 }}
+    >
+      {nickname || '—'}
+    </span>
+  );
+}
+
 /** 好客权益金额展示：0 与空值统一显示占位，避免整列都是 ¥0.00 干扰 */
 function fmtBenefit(v: number | null | undefined) {
   const n = Number(v ?? 0);
@@ -244,7 +316,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 +328,30 @@ export default function UsersPage() {
         </Space>
       ),
     },
-    { title: '昵称', dataIndex: 'nickname', width: 100 },
+    {
+      title: '昵称',
+      dataIndex: 'nickname',
+      width: 140,
+      render: (v: string | null, row) => (
+        <NicknameCell
+          id={row.id}
+          nickname={v}
+          onSaved={(id, nickname) => {
+            setData((prev) =>
+              prev
+                ? { ...prev, items: prev.items.map((u) => (u.id === id ? { ...u, nickname } : u)) }
+                : prev,
+            );
+            setDetail((d) => (d && d.id === id ? { ...d, nickname } : d));
+          }}
+        />
+      ),
+    },
     {
       title: '手机',
       dataIndex: 'phone',
       width: 120,
-      render: (v) => maskPhone(v),
+      render: (v) => v || '—',
     },
     {
       title: '验手机',
@@ -289,7 +379,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 +395,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,10 +464,18 @@ export default function UsersPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('users', baseColumns, {
+    page,
+    pageSize,
+  });
+
   return (
     <div>
+      {settingsModal}
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>用户监控</Typography.Title>
+        <Space>
+          {settingsButton}
         {canDeleteUsers ? (
           <Button
             danger
@@ -390,6 +485,7 @@ export default function UsersPage() {
             批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
           </Button>
         ) : null}
+        </Space>
       </Space>
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
         <Form.Item name="phone" label="手机号">
@@ -429,7 +525,7 @@ export default function UsersPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1830 }}
+        scroll={{ x: 'max-content' }}
         rowSelection={canDeleteUsers ? {
           selectedRowKeys,
           preserveSelectedRowKeys: true,

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

@@ -7,6 +7,8 @@ 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';
+
 
 type ActorType = 'USER' | 'STORE' | 'PARTNER' | 'HQ';
 
@@ -90,12 +92,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>,
     },
@@ -123,7 +124,6 @@ export default function WechatBindingsPage() {
       render: (v) => maskPhone(v),
     },
     {
-      ellipsis: true,
       title: '身份摘要',
 
       render: (_, r) => (
@@ -160,7 +160,6 @@ export default function WechatBindingsPage() {
       width: 120,
       render: (t: ActorType) => <Tag color={ACTOR_TYPE_COLORS[t]}>{ACTOR_TYPE_LABELS[t]}</Tag>,
     },
-      ellipsis: true,
     {
       title: '账号',
 
@@ -172,14 +171,12 @@ export default function WechatBindingsPage() {
       ),
     },
     {
-      ellipsis: true,
       title: '归属',
       dataIndex: 'refLabel',
       width: 160,
 
       render: (v, r) => (v ? `${v}${r.refId ? ` #${r.refId}` : ''}` : '—'),
     },
-      ellipsis: true,
     {
       title: 'wxOpenId',
       dataIndex: 'wxOpenId',
@@ -205,9 +202,13 @@ export default function WechatBindingsPage() {
     {
       title: '状态',
       dataIndex: 'status',
+      width: 90,
+      render: (v) => String(v),
     },
   ];
+
   const { columns, settingsButton, settingsModal } = useAdminListColumns('wechat-bindings', baseColumns, { page, pageSize });
+
   return (
     <div>
       {settingsModal}

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

@@ -5,6 +5,8 @@ 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';
+
 
 export default function WecomBotLogsPage() {
   const [form] = Form.useForm();
@@ -24,12 +26,12 @@ 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) => v || r.botKey || '—' },
+    { title: '企微用户', dataIndex: 'wecomUserId', width: 120 },
+    { title: '动作', dataIndex: 'action', width: 160 },
+    { title: '权限', dataIndex: 'permission', width: 140, render: (v) => v || '—' },
     {
       title: '结果',
       dataIndex: 'success',
@@ -37,7 +39,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,9 +51,13 @@ export default function WecomBotLogsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-wecom-bots', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <Typography.Title level={4}>企微机器人日志</Typography.Title>
+          {settingsButton}
       <Typography.Paragraph type="secondary">
         记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。
       </Typography.Paragraph>
@@ -96,7 +102,7 @@ export default function WecomBotLogsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -36,6 +36,8 @@ 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';
+
 
 type FormValues = {
   name: string;
@@ -280,7 +282,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 +293,17 @@ export default function WecomBotsPage() {
         </Avatar>
       ),
     },
-    { title: '名称', dataIndex: 'name', width: 140, ellipsis: true },
+    { title: '名称', dataIndex: 'name', width: 140 },
     {
       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 +368,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 +436,7 @@ export default function WecomBotsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           pageSize,

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

@@ -34,6 +34,8 @@ 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';
+
 
 type FormValues = {
   name: string;
@@ -193,7 +195,7 @@ function PushRoutesTab() {
     }
   }
 
-  const columns: ColumnsType<WecomMessagePushDto> = [
+  const baseColumns: ColumnsType<WecomMessagePushDto> = [
     {
       title: '名称',
       dataIndex: 'name',
@@ -207,7 +209,6 @@ function PushRoutesTab() {
     {
       title: 'Webhook',
       dataIndex: 'webhookUrlMasked',
-      ellipsis: true,
     },
     {
       title: '推送条件',
@@ -262,8 +263,14 @@ function PushRoutesTab() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('wecom-pushes', baseColumns, {
+    page,
+    pageSize,
+  });
+
   return (
     <>
+      {settingsModal}
       <Typography.Paragraph type="secondary">
         配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。
       </Typography.Paragraph>
@@ -304,6 +311,7 @@ function PushRoutesTab() {
             <Button type="primary" onClick={openCreate}>
               新建推送
             </Button>
+            {settingsButton}
           </Space>
         </Form.Item>
       </Form>

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

@@ -26,6 +26,8 @@ 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';
+
 
 type Row = {
   id: string;
@@ -235,8 +237,8 @@ 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 },
     {
       title: '账单日',
       dataIndex: 'billDate',
@@ -290,8 +292,11 @@ export default function WineryBillsPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
+
   return (
     <div>
+      {settingsModal}
       <div
         style={{
           display: 'flex',
@@ -305,6 +310,7 @@ export default function WineryBillsPage() {
           <Typography.Title level={4} style={{ margin: 0 }}>
             酒厂对账单
           </Typography.Title>
+          {settingsButton}
           <Typography.Text type="secondary">
             T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色、应付为 0
             无需打款（灰），可展开订单明细
@@ -398,7 +404,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 +462,7 @@ export default function WineryBillsPage() {
               pagination={false}
               dataSource={detail.items ?? []}
               columns={[
-                { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
+                { title: '订单号', dataIndex: 'orderNo' },
                 {
                   title: '配送',
                   dataIndex: 'deliveryType',

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

@@ -9,6 +9,8 @@ import {
 import { fmtTime } from '../../lib/constants';
 import { useAdminList } from '../../lib/useAdminList';
 import type { PromoCodeDetailContext } from './PromoCodeDetailLayout';
+import { useAdminListColumns } from '../../lib/useAdminListColumns';
+
 
 export default function PromoCodeUsersPage() {
   const { id = '' } = useParams();
@@ -21,7 +23,7 @@ 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: 'phone', width: 120, render: (v) => v || '—' },
@@ -69,6 +71,8 @@ export default function PromoCodeUsersPage() {
     },
   ];
 
+  const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-code-users', baseColumns, { page, pageSize });
+
   return (
     <Table
       rowKey="id"
@@ -76,7 +80,7 @@ export default function PromoCodeUsersPage() {
       loading={loading}
       columns={columns}
       dataSource={data?.items ?? []}
-      scroll={{ x: 1100 }}
+      scroll={{ x: 'max-content' }}
       pagination={{
         current: page,
         pageSize,

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

@@ -27,6 +27,8 @@
 | 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) |
 
 ---
 
@@ -60,6 +62,14 @@
 
 **权限**：合伙人平级隔离；推广员仅拓店+看自己店；手机号脱敏（门店/合伙人中间4位）。
 
+**HQ WebAdmin 权限（v3.5.8）**：
+
+- 分组：超级管理员 / 运营 / 财务 / 客服 / **城市门店服务**
+- 生效权限 =（角色权限 ∪ 账号追加）− 账号撤销
+- 任意 HQ 账号可勾选负责城市；未勾选 = 全国。城市门店服务必须 ≥1 城，且只能看勾选城市的门店（列表、入驻审核、套餐/信息变更审核、评价、账户、资源）。分类为全国字典。
+- 城市门店服务默认：概览、门店列表、审核通知、评价、分类（不含账户/资源）。分类可新增/编辑，不可删除。概览按权限裁剪，且只看负责城市。
+- 超管始终全权限、全国可见
+
 ---
 
 ## 3. 核心规则
@@ -126,8 +136,11 @@
 - 未填联系电话时，对外展示回退登录手机号（兼容旧数据）。
 - **不**再因客户端 `validation_error` 自动创建技术支持工单。
 - 合伙人入驻提交前须展示 HQ 可配企微客服二维码，并确认已添加客服。
-- HQ 门店列表：长店名截断、操作列右固定、表过宽可横向滚动。
-- 详 [`v3.4.16`](./杜康好客-v3.4.16-门店联系电话与体验优化.md)。
+- HQ 门店列表：店名完整展示、操作列右固定、表过宽可横向滚动（v3.5.9 去掉省略号）。
+- HQ 主列表：最左序号；「列设置」控制显示列与顺序，偏好挂当前 HQ 账号。
+- 门店列表展示「累计核销好客权益」（该店核销券面额合计）。
+- HQ 用户列表：双击昵称、离开编辑即保存；列表手机号不脱敏（详情仍脱敏）。
+- 详 [`v3.4.16`](./杜康好客-v3.4.16-门店联系电话与体验优化.md)、[`v3.5.9`](./杜康好客-v3.5.9-开发文档.md)。
 
 ---
 

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

@@ -62,9 +62,13 @@
 | 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) | 🔶 开发完成 |
 
 | 日期 | 说明 |
 |------|------|
+| 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` |

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

@@ -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
+- [ ] 该角色默认无「门店账户」「门店资源」；运营原菜单不变
+- [ ] 超管仍全国、全权限
+- [ ] 分类页可见但不按城过滤；城市门店服务可新增/编辑，无删除与「同步默认分类」
+- [ ] 概览只显示有权限的卡片；城市范围账号仅统计负责城市

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

@@ -0,0 +1,113 @@
+# 杜康好客 · v3.5.9 开发文档
+
+> **2026-08-25** · admin-web / API  
+> **主题**：门店累计核销好客权益、HQ 表格去省略号、序号列与列设置；用户列表改昵称 / 手机号不脱敏
+
+---
+
+## 1. 版本目标
+
+1. **门店列表**增加「累计核销好客权益」：该店历史核销券面额合计。
+2. **全 HQ 表格**去掉 `...` 截断，长文本完整展示，横向滚动。
+3. 每张 **主列表**：最左序号（跨页连续）；「列设置」弹窗控制显示列与顺序，偏好存当前 HQ 账号。
+4. **用户列表**：双击昵称进入编辑，离开编辑（失焦 / 回车 / Esc）即写入数据库；手机号列表明文，不脱敏。
+
+**不做**：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"] } }
+```
+
+新列按默认位置插入且默认显示；未知 key 忽略。重置即删除该 `listKey`。
+
+### API
+
+| 方法 | 路径 | 说明 |
+|------|------|------|
+| GET | `/admin/auth/me` | `listColumnPrefs` |
+| PUT | `/admin/me/list-columns/:listKey` | `{ order, hidden }` 或 `{ reset: true }`；只改当前账号 |
+| PUT | `/admin/users/:id` | `{ nickname }`，空串存 `null` |
+
+`listKey` 白名单见 `packages/shared-types/src/hq-list-columns.ts`。无新权限键。
+
+---
+
+## 5. 用户列表：改昵称 / 手机号不脱敏
+
+| 项 | 行为 |
+|----|------|
+| 昵称 | 双击单元格进入输入；失焦、回车或 Esc 退出编辑即 `PUT /admin/users/:id` 保存（空串写成 `null`）；最长 64 |
+| 手机号 | 列表列明文 `phone`，不再 `maskPhone`。详情抽屉仍脱敏 |
+
+审计：`USER_UPDATE`（修改用户昵称）。无新权限键，已登录 HQ 即可（与用户列表同入口）。
+
+---
+
+## 6. Prisma / SQL
+
+`hq_account.list_column_prefs` JSON NULL。
+
+脚本：[`server/dukang-api/prisma/migrate-hq-list-column-prefs-v359.sql`](../server/dukang-api/prisma/migrate-hq-list-column-prefs-v359.sql)
+
+---
+
+## 7. 发版步骤
+
+| 步骤 | 动作 |
+|------|------|
+| 1 | 执行 `migrate-hq-list-column-prefs-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 主表长字段不再 `...`，可横向滑完
+- [ ] 主列表最左序号跨页连续
+- [ ] 列设置可隐藏/排序；保存后刷新仍在；重置恢复默认
+- [ ] 序号、操作列不能在弹窗关掉或拖走
+- [ ] 详情描述列表仍可省略
+- [ ] 用户列表双击昵称可改，离开编辑后库中已更新
+- [ ] 用户列表手机号完整可见（详情仍脱敏）

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

@@ -41,6 +41,10 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 | 合伙人 | 拓店三步→HQ审核→辖区订单/账单 |
 | HQ | 开城/商品/审核/订单/权益/核销/结算/工单 |
 
+**HQ 权限（v3.5.8）**：生效 =（角色 ∪ 追加）− 撤销。城市范围绑在账号上（空=全国；「城市门店服务」必须勾城）。门店 API 按 `cityIds` 强制过滤。城市门店服务可新增分类、不可删除；概览按权限与城市范围裁剪。
+
+**HQ 列表（v3.5.9）**：主表不省略号、可横滑；最左序号；列设置（显隐/顺序）存 `hq_account.list_column_prefs`。门店列表「累计核销好客权益」= 该店 `RedeemRecord.amount` 合计。用户列表双击昵称、离开即保存；列表手机号不脱敏。
+
 ## 5. 验收用例（必过）
 
 **主链路 15 项**：登录、4 SKU、起购、支付+权益、双通道核销、payout、关店不可见、拓店审核、配送完成、退款、T+1/T+30…  

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

@@ -87,11 +87,12 @@
 |--------|------|
 | 开城 | 城市、合伙人(全城/区域+佣金)、仓库 |
 | 商品 | SKU、上下架、详情模板 |
-| 门店 | 审核、套餐 Tab 直存/审核、合伙人列 |
+| 门店 | 审核、套餐 Tab 直存/审核、合伙人列、累计核销好客权益 |
+| 用户 | 列表手机号明文；双击昵称离开即保存 |
 | 交易 | 订单、权益券、核销记录、推广码+metrics |
 | 财务 | 门店/合伙人/酒厂/物流账单；打款确认 |
 | 工单 | 售后四类型 + 技术支持(ST) + 开发计划 |
-| 系统 | 账号权限、客户端配置、企微机器人/消息推送 |
+| 系统 | 账号权限、客户端配置、企微机器人/消息推送；列表「列设置」按账号保存 |
 | 日志 | HQ/用户/门店/合伙人/企微 |
 
 ## 6. 商品与模板
@@ -140,7 +141,7 @@ HQ 推广码：场景/合伙人绑定/上下线；touch 归因；metrics 四指
 
 ## 16. 系统设置
 
-HQ 账号/角色(`hq-permissions`) · 客户端 `minClientVersion` · 运营告警走企微消息推送(DB Webhook)。
+HQ 账号/角色(`hq-permissions`，生效=(角色∪追加)−撤销；可绑城市；城市门店服务可增分类不可删，概览按权限/城市) · 客户端 `minClientVersion` · 运营告警走企微消息推送(DB Webhook)。
 
 ## 17. 企业微信
 

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

@@ -0,0 +1,71 @@
+/** 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[];
+};
+
+export type HqListColumnPrefsMap = Partial<Record<HqListColumnKey, HqListColumnPref>>;
+
+export type SaveHqListColumnPrefsRequest = {
+  reset?: boolean;
+  order?: string[];
+  hidden?: string[];
+};

packages/shared-types/src/hq-permissions.ts

@@ -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',
+  ],
 };

packages/shared-types/src/index.ts

@@ -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';

packages/shared-types/src/ops.ts

@@ -3,6 +3,10 @@ export interface AdminListQuery {
   pageSize?: number;
 }
 
+export interface UpdateAdminUserRequest {
+  nickname: string;
+}
+
 export interface AdminPageResult<T> {
   items: T[];
   total: number;

server/dukang-api/prisma/migrate-hq-list-column-prefs-v359.sql

@@ -0,0 +1,3 @@
+-- v3.5.9: HQ 账号列表显示列 / 顺序偏好
+ALTER TABLE `hq_account`
+  ADD COLUMN `list_column_prefs` JSON NULL;

server/dukang-api/prisma/migrate-hq-permissions-v358-categories-delete.sql

@@ -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';

server/dukang-api/prisma/migrate-hq-permissions-v358.sql

@@ -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';

server/dukang-api/prisma/schema.prisma

@@ -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")
 }
@@ -1244,10 +1251,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 +1273,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 +1284,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 {

server/dukang-api/src/common/guards/hq-permission.guard.ts

@@ -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()

server/dukang-api/src/common/hq-operation/hq-operation.constants.ts

@@ -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',
@@ -141,6 +142,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]: '订单发货',

server/dukang-api/src/integrations/wecom/wecom-handbook.ts

@@ -87,7 +87,9 @@ export const WECOM_HANDBOOK_ENTRIES: HandbookEntry[] = [
       '运营：商品/开城/门店/订单/配送/权益。',
       '财务：门店/合伙人/酒厂账单与打款、发票、酒厂账户。',
       '客服：用户/订单、售后工单、发票协助。',
+      '城市门店服务：门店列表/审核/评价/分类（可新增不可删除），且限制负责城市；概览只显示有权限的数据和负责城市。',
       '超管：权限分配、技术支持评审、系统设置。',
+      '单账号可在角色之上追加或撤销权限；切换角色会清空账号级权限。',
     ].join('\n'),
   },
   {

server/dukang-api/src/modules/iam/admin-me.controller.ts

@@ -0,0 +1,21 @@
+import { Body, Controller, Param, Put, UseGuards } from '@nestjs/common';
+import { AuthService } from './auth.service';
+import { SaveHqListColumnPrefsDto } from './dto/auth.dto';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
+import { AuthUser } from '../../common/guards/jwt-auth.guard';
+
+@Controller('admin/me')
+@UseGuards(JwtAuthGuard)
+export class AdminMeController {
+  constructor(private readonly authService: AuthService) {}
+
+  @Put('list-columns/:listKey')
+  saveListColumns(
+    @CurrentUser() user: AuthUser,
+    @Param('listKey') listKey: string,
+    @Body() dto: SaveHqListColumnPrefsDto,
+  ) {
+    return this.authService.updateMyListColumnPrefs(user.actorType, user.actorId, listKey, dto);
+  }
+}

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

@@ -10,7 +10,7 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { ClientApp, SmsScene } from '@dukang/shared-types';
+import { ClientApp, SmsScene, isHqListColumnKey, type HqListColumnPrefsMap } from '@dukang/shared-types';
 import { generateUserNo } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { RedisService } from '../../common/redis/redis.service';
@@ -55,6 +55,20 @@ type UserRow = Pick<
   avatar?: { url: string } | null;
 };
 
+function parseListColumnPrefs(raw: unknown): HqListColumnPrefsMap {
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return {};
+  const out: HqListColumnPrefsMap = {};
+  for (const [key, value] of Object.entries(raw as Record<string, unknown>)) {
+    if (!isHqListColumnKey(key) || !value || typeof value !== 'object' || Array.isArray(value)) continue;
+    const row = value as { order?: unknown; hidden?: unknown };
+    out[key] = {
+      order: Array.isArray(row.order) ? row.order.filter((v): v is string => typeof v === 'string') : [],
+      hidden: Array.isArray(row.hidden) ? row.hidden.filter((v): v is string => typeof v === 'string') : [],
+    };
+  }
+  return out;
+}
+
 @Injectable()
 export class AuthService {
   constructor(
@@ -1207,11 +1221,48 @@ export class AuthService {
       const account = await this.prisma.hqAccount.findUnique({ where: { id: actorId } });
       if (!account) return null;
       const permissionKeys = await this.hqPermissions.resolveEffectiveKeys(actorId);
-      return serializeBigInt({ ...account, permissionKeys });
+      const cityScope = await this.hqPermissions.resolveCityScope(actorId);
+      const { passwordHash: _passwordHash, ...safeAccount } = account;
+      return serializeBigInt({
+        ...safeAccount,
+        listColumnPrefs: parseListColumnPrefs(account.listColumnPrefs),
+        permissionKeys,
+        cityIds: (cityScope ?? []).map((id) => id.toString()),
+        cityScoped: cityScope !== null,
+      });
     }
     return null;
   }
 
+  async updateMyListColumnPrefs(
+    actorType: string,
+    actorId: bigint,
+    listKey: string,
+    dto: { reset?: boolean; order?: string[]; hidden?: string[] },
+  ) {
+    if (actorType !== 'HQ') throw new ForbiddenException('仅总部账号可保存列表列设置');
+    if (!isHqListColumnKey(listKey)) throw new BadRequestException('未知列表');
+    const account = await this.prisma.hqAccount.findUnique({
+      where: { id: actorId },
+      select: { id: true, listColumnPrefs: true },
+    });
+    if (!account) throw new NotFoundException('账号不存在');
+    const current = parseListColumnPrefs(account.listColumnPrefs);
+    if (dto.reset) {
+      delete current[listKey];
+    } else {
+      current[listKey] = {
+        order: (dto.order ?? []).filter((k) => typeof k === 'string' && k.trim()),
+        hidden: (dto.hidden ?? []).filter((k) => typeof k === 'string' && k.trim()),
+      };
+    }
+    const updated = await this.prisma.hqAccount.update({
+      where: { id: actorId },
+      data: { listColumnPrefs: current },
+    });
+    return { listColumnPrefs: parseListColumnPrefs(updated.listColumnPrefs) };
+  }
+
   wechatDisabled() {
     throw new NotImplementedException('FEATURE_DISABLED');
   }

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

@@ -1,4 +1,4 @@
-import { IsIn, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import { IsArray, IsBoolean, IsIn, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { SmsScene } from '@dukang/shared-types';
 
 export class SendSmsDto {
@@ -129,3 +129,19 @@ export class CheckPartnerPhoneDto {
   @IsNotEmpty()
   phone: string;
 }
+
+export class SaveHqListColumnPrefsDto {
+  @IsOptional()
+  @IsBoolean()
+  reset?: boolean;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  order?: string[];
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  hidden?: string[];
+}

server/dukang-api/src/modules/iam/iam.module.ts

@@ -16,6 +16,7 @@ import { PartnerStaffService } from './partner-staff.service';
 import { StoreStaffController } from './store-staff.controller';
 import { StoreStaffService } from './store-staff.service';
 import { AdminAuthController } from './admin-auth.controller';
+import { AdminMeController } from './admin-me.controller';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { PhoneVerifiedGuard } from '../../common/guards/phone-verified.guard';
 import { OptionalJwtAuthGuard } from '../../common/guards/optional-jwt-auth.guard';
@@ -50,6 +51,7 @@ import { CommonModule } from '../common/common.module';
     UserProfileController,
     UserAddressController,
     AdminAuthController,
+    AdminMeController,
   ],
   providers: [
     AuthService,

server/dukang-api/src/modules/ops/admin-cities.controller.ts

@@ -7,6 +7,8 @@ import {
 } from '../../common/guards/hq-permission.guard';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
+import type { AuthUser } from '../../common/guards/jwt-auth.guard';
 import { AdminCitiesService } from './admin-cities.service';
 import { AdminCitiesQueryDto } from './dto/admin-query.dto';
 import { CreateCityDto, UpdateCityDto } from './dto/admin-mutate.dto';
@@ -23,8 +25,8 @@ export class AdminCitiesController {
   constructor(private readonly service: AdminCitiesService) {}
 
   @Get()
-  list(@Query() query: AdminCitiesQueryDto) {
-    return this.service.list(query);
+  list(@CurrentUser() user: AuthUser, @Query() query: AdminCitiesQueryDto) {
+    return this.service.list(query, user.actorId);
   }
 
   @Get(':id/delete-preview')

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

@@ -4,6 +4,7 @@ import { resolveMaxPartnerCommissionRate, validatePartnerCommissionRates } from
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import { PartnerCityService } from '../city-scope/partner-city.service';
+import { HqPermissionsResolver } from '../../common/guards/hq-permission.guard';
 import type { AdminCitiesQueryDto } from './dto/admin-query.dto';
 import type { CreateCityDto, UpdateCityDto } from './dto/admin-mutate.dto';
 
@@ -12,9 +13,10 @@ export class AdminCitiesService {
   constructor(
     private readonly prisma: PrismaService,
     private readonly partnerCityService: PartnerCityService,
+    private readonly hqPermissions: HqPermissionsResolver,
   ) {}
 
-  async list(query: AdminCitiesQueryDto) {
+  async list(query: AdminCitiesQueryDto, actorId?: bigint) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
     const where: Prisma.CommonCityWhereInput = {};
@@ -24,6 +26,12 @@ export class AdminCitiesService {
     if (query.partnerId) {
       where.partnerAccounts = { some: { id: BigInt(query.partnerId), isPrimary: 1 } };
     }
+    if (actorId) {
+      const scope = await this.hqPermissions.resolveCityScope(actorId);
+      if (scope !== null) {
+        where.id = { in: scope.length ? scope : [BigInt(0)] };
+      }
+    }
 
     const [items, total] = await Promise.all([
       this.prisma.commonCity.findMany({

server/dukang-api/src/modules/ops/admin-dashboard.controller.ts

@@ -1,22 +1,32 @@
 import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
 import { SuperAdminGuard } from '../../common/guards/super-admin.guard';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
+import type { AuthUser } from '../../common/guards/jwt-auth.guard';
 import { AdminDashboardService } from './admin-dashboard.service';
 import { AdminDashboardAnalyticsQueryDto } from './dto/admin-query.dto';
 
 @Controller('admin/dashboard')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('dashboard')
 export class AdminDashboardController {
   constructor(private readonly dashboardService: AdminDashboardService) {}
 
   @Get('stats')
-  stats() {
-    return this.dashboardService.getStats();
+  stats(@CurrentUser() user: AuthUser) {
+    return this.dashboardService.getStats(user.actorId);
   }
 
   @Get('analytics')
-  analytics(@Query() query: AdminDashboardAnalyticsQueryDto) {
-    return this.dashboardService.getAnalytics(query);
+  analytics(
+    @CurrentUser() user: AuthUser,
+    @Query() query: AdminDashboardAnalyticsQueryDto,
+  ) {
+    return this.dashboardService.getAnalytics(user.actorId, query);
   }
 
   @Get('version')

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

@@ -1,6 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { ForbiddenException, Injectable } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
+import type { HqPermissionKey } from '@dukang/shared-types';
 import { PrismaService } from '../../common/prisma/prisma.module';
+import {
+  HqPermissionsResolver,
+  assertHqCityInScope,
+  hqStoreCityWhere,
+  type HqCityScope,
+} from '../../common/guards/hq-permission.guard';
 import type { AdminDashboardAnalyticsQueryDto } from './dto/admin-query.dto';
 
 function startOfDay(d: Date) {
@@ -55,14 +62,63 @@ function isWithdrawOverdue(appliedAt: Date, now = new Date()): boolean {
   return now.getTime() > deadline.getTime();
 }
 
+function cityIdFilter(scope: HqCityScope): Prisma.BigIntFilter | undefined {
+  if (scope === null) return undefined;
+  if (!scope.length) return { equals: BigInt(0) };
+  return { in: scope };
+}
+
+function emptyRows<T>(): Promise<T[]> {
+  return Promise.resolve([] as T[]);
+}
+
 @Injectable()
 export class AdminDashboardService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly hqPermissions: HqPermissionsResolver,
+  ) {}
 
-  async getStats() {
+  async getStats(actorId: bigint) {
     const todayStart = new Date();
     todayStart.setHours(0, 0, 0, 0);
 
+    const [{ keys, isSuperAdmin }, scope] = await Promise.all([
+      this.hqPermissions.resolveAccess(actorId),
+      this.hqPermissions.resolveCityScope(actorId),
+    ]);
+    const can = (k: HqPermissionKey) => isSuperAdmin || keys.includes(k);
+    const storeWhere = hqStoreCityWhere(scope) ?? {};
+    const cityFilter = cityIdFilter(scope);
+    const orderWhere: Prisma.OrderWhereInput = cityFilter ? { cityId: cityFilter } : {};
+    const partnerWhere: Prisma.PartnerAccountWhereInput = {
+      isPrimary: 1,
+      ...(cityFilter ? { cityId: cityFilter } : {}),
+    };
+
+    let userWhere: Prisma.UserWhereInput = { status: 1, mergedIntoUserId: null };
+    if (scope !== null) {
+      if (!scope.length) {
+        userWhere = { id: { equals: BigInt(0) } };
+      } else {
+        const cities = await this.prisma.commonCity.findMany({
+          where: { id: { in: scope } },
+          select: { code: true },
+        });
+        const codes = cities.map((c) => c.code);
+        userWhere = {
+          status: 1,
+          mergedIntoUserId: null,
+          cityPreference: { selectedCityCode: { in: codes.length ? codes : [''] } },
+        };
+      }
+    }
+
+    const redeemTodayWhere: Prisma.RedeemRecordWhereInput = {
+      createdAt: { gte: todayStart },
+      ...(Object.keys(storeWhere).length ? { store: storeWhere } : {}),
+    };
+
     const [
       usersTotal,
       guestUsers,
@@ -79,32 +135,112 @@ export class AdminDashboardService {
       pendingPartnerDraftBills,
       openTickets,
       pendingWithdrawRows,
+      pendingStoreOnboard,
+      pendingStorePackageAudits,
+      pendingStoreInfoChanges,
     ] = await Promise.all([
-      this.prisma.user.count({ where: { status: 1, mergedIntoUserId: null } }),
-      this.prisma.user.count({
-        where: { status: 1, mergedIntoUserId: null, phoneVerifiedAt: null },
-      }),
-      this.prisma.user.count({
-        where: { status: 1, mergedIntoUserId: null, phoneVerifiedAt: { not: null } },
-      }),
-      this.prisma.user.count({ where: { mergedIntoUserId: { not: null } } }),
-      this.prisma.order.count({ where: { createdAt: { gte: todayStart } } }),
-      this.prisma.order.groupBy({
-        by: ['status'],
-        _count: { status: true },
-      }),
-      this.prisma.store.count(),
-      this.prisma.partnerAccount.count({ where: { isPrimary: 1 } }),
-      this.prisma.redeemRecord.count({ where: { createdAt: { gte: todayStart } } }),
-      this.prisma.orderDelivery.count(),
-      this.prisma.storePayout.count({ where: { status: 'PENDING' } }),
-      this.prisma.partnerBill.count({ where: { status: 'UNPAID' } }),
-      this.prisma.partnerBill.count({ where: { status: 'PENDING_REVIEW' } }),
-      this.prisma.commonTicket.count({ where: { status: { in: ['PENDING', 'OPEN'] } } }),
-      this.prisma.storeWithdrawRequest.findMany({
-        where: { status: 'PENDING_REVIEW' },
-        select: { appliedAt: true },
-      }),
+      can('users')
+        ? this.prisma.user.count({ where: userWhere })
+        : Promise.resolve(0),
+      can('users')
+        ? this.prisma.user.count({
+            where: { ...userWhere, phoneVerifiedAt: null },
+          })
+        : Promise.resolve(0),
+      can('users')
+        ? this.prisma.user.count({
+            where: { ...userWhere, phoneVerifiedAt: { not: null } },
+          })
+        : Promise.resolve(0),
+      can('users')
+        ? this.prisma.user.count({
+            where:
+              scope === null
+                ? { mergedIntoUserId: { not: null } }
+                : { id: { equals: BigInt(0) } },
+          })
+        : Promise.resolve(0),
+      can('orders')
+        ? this.prisma.order.count({
+            where: { ...orderWhere, createdAt: { gte: todayStart } },
+          })
+        : Promise.resolve(0),
+      can('orders')
+        ? this.prisma.order.groupBy({
+            by: ['status'],
+            where: orderWhere,
+            _count: { status: true },
+          })
+        : emptyRows<{ status: string; _count: { status: number } }>(),
+      can('stores') ? this.prisma.store.count({ where: storeWhere }) : Promise.resolve(0),
+      can('partners')
+        ? this.prisma.partnerAccount.count({ where: partnerWhere })
+        : Promise.resolve(0),
+      can('benefit')
+        ? this.prisma.redeemRecord.count({ where: redeemTodayWhere })
+        : Promise.resolve(0),
+      can('deliveries')
+        ? this.prisma.orderDelivery.count({
+            where: cityFilter ? { order: { cityId: cityFilter } } : undefined,
+          })
+        : Promise.resolve(0),
+      can('finance')
+        ? this.prisma.storePayout.count({
+            where: {
+              status: 'PENDING',
+              ...(Object.keys(storeWhere).length ? { store: storeWhere } : {}),
+            },
+          })
+        : Promise.resolve(0),
+      can('finance')
+        ? this.prisma.partnerBill.count({
+            where: {
+              status: 'UNPAID',
+              ...(cityFilter ? { partnerAccount: { cityId: cityFilter } } : {}),
+            },
+          })
+        : Promise.resolve(0),
+      can('finance')
+        ? this.prisma.partnerBill.count({
+            where: {
+              status: 'PENDING_REVIEW',
+              ...(cityFilter ? { partnerAccount: { cityId: cityFilter } } : {}),
+            },
+          })
+        : Promise.resolve(0),
+      can('tickets') && scope === null
+        ? this.prisma.commonTicket.count({ where: { status: { in: ['PENDING', 'OPEN'] } } })
+        : Promise.resolve(0),
+      can('finance')
+        ? this.prisma.storeWithdrawRequest.findMany({
+            where: {
+              status: 'PENDING_REVIEW',
+              ...(Object.keys(storeWhere).length ? { store: storeWhere } : {}),
+            },
+            select: { appliedAt: true },
+          })
+        : emptyRows<{ appliedAt: Date }>(),
+      can('stores')
+        ? this.prisma.store.count({
+            where: { auditStatus: 'PENDING', ...storeWhere },
+          })
+        : Promise.resolve(0),
+      can('store_audits')
+        ? this.prisma.storePackageChangeRequest.count({
+            where: {
+              status: 'PENDING',
+              ...(Object.keys(storeWhere).length ? { store: storeWhere } : {}),
+            },
+          })
+        : Promise.resolve(0),
+      can('store_audits')
+        ? this.prisma.storeInfoChangeRequest.count({
+            where: {
+              status: 'PENDING',
+              ...(Object.keys(storeWhere).length ? { store: storeWhere } : {}),
+            },
+          })
+        : Promise.resolve(0),
     ]);
 
     const now = new Date();
@@ -129,6 +265,9 @@ export class AdminDashboardService {
       openTickets,
       pendingStoreWithdrawals,
       overdueStoreWithdrawals,
+      pendingStoreOnboard,
+      pendingStorePackageAudits,
+      pendingStoreInfoChanges,
       ordersByStatus: ordersByStatus.map((row) => ({
         status: row.status,
         count: row._count.status,
@@ -152,7 +291,7 @@ export class AdminDashboardService {
     };
   }
 
-  async getAnalytics(query: AdminDashboardAnalyticsQueryDto) {
+  async getAnalytics(actorId: bigint, query: AdminDashboardAnalyticsQueryDto) {
     const today = startOfDay(new Date());
     const defaultFrom = new Date(today);
     defaultFrom.setDate(defaultFrom.getDate() - 29);
@@ -164,9 +303,18 @@ export class AdminDashboardService {
     const rangeStart = startOfDay(from <= to ? from : to);
     const rangeEnd = endOfDay(from <= to ? to : from);
 
-    let filterCityCode: string | null | undefined;
-    let filterCityId: bigint | null | undefined;
+    const [{ keys, isSuperAdmin }, scope] = await Promise.all([
+      this.hqPermissions.resolveAccess(actorId),
+      this.hqPermissions.resolveCityScope(actorId),
+    ]);
+    const can = (k: HqPermissionKey) => isSuperAdmin || keys.includes(k);
+
+    let filterCityCode: string | string[] | null | undefined;
+    let filterCityId: bigint | bigint[] | null | undefined;
     if (query.cityId === 'none') {
+      if (scope !== null) {
+        throw new ForbiddenException('无权按未选城筛选');
+      }
       filterCityCode = null;
       filterCityId = null;
     } else if (query.cityId) {
@@ -174,20 +322,47 @@ export class AdminDashboardService {
         where: { id: BigInt(query.cityId) },
         select: { id: true, code: true },
       });
-      if (city) {
-        filterCityCode = city.code;
-        filterCityId = city.id;
+      if (!city) {
+        throw new ForbiddenException('无权访问该城市的门店');
+      }
+      assertHqCityInScope(scope, city.id);
+      filterCityCode = city.code;
+      filterCityId = city.id;
+    } else if (scope !== null) {
+      if (!scope.length) {
+        filterCityId = [];
+        filterCityCode = [];
+      } else {
+        const scopedCities = await this.prisma.commonCity.findMany({
+          where: { id: { in: scope } },
+          select: { id: true, code: true },
+        });
+        filterCityId = scope;
+        filterCityCode = scopedCities.map((c) => c.code);
       }
     }
 
     const filterPromoNone = query.promoCodeId === 'none';
     const filterPromoId =
-      query.promoCodeId && query.promoCodeId !== 'none'
+      can('promo_codes') && query.promoCodeId && query.promoCodeId !== 'none'
         ? BigInt(query.promoCodeId)
         : undefined;
-    const filterPartnerId = query.partnerAccountId
-      ? BigInt(query.partnerAccountId)
-      : undefined;
+    const filterPartnerId =
+      can('partners') && query.partnerAccountId
+        ? BigInt(query.partnerAccountId)
+        : undefined;
+
+    if (filterPartnerId !== undefined && scope !== null) {
+      const partner = await this.prisma.partnerAccount.findUnique({
+        where: { id: filterPartnerId },
+        select: { cityId: true },
+      });
+      if (partner?.cityId) {
+        assertHqCityInScope(scope, partner.cityId);
+      } else if (scope !== null) {
+        throw new ForbiddenException('无权访问该城市的门店');
+      }
+    }
 
     const userWhere: Prisma.UserWhereInput = {
       status: 1,
@@ -199,10 +374,14 @@ export class AdminDashboardService {
         { cityPreference: null },
         { cityPreference: { selectedCityCode: null } },
       ];
+    } else if (Array.isArray(filterCityCode)) {
+      userWhere.cityPreference = {
+        selectedCityCode: { in: filterCityCode.length ? filterCityCode : [''] },
+      };
     } else if (filterCityCode) {
       userWhere.cityPreference = { selectedCityCode: filterCityCode };
     }
-    if (filterPromoNone) {
+    if (can('promo_codes') && filterPromoNone) {
       userWhere.promoTouch = { is: null };
     } else if (filterPromoId !== undefined) {
       userWhere.promoTouch = { promoCodeId: filterPromoId };
@@ -211,10 +390,14 @@ export class AdminDashboardService {
     const orderWhere: Prisma.OrderWhereInput = {
       createdAt: { gte: rangeStart, lte: rangeEnd },
     };
-    if (filterCityId !== undefined && filterCityId !== null) {
+    if (filterCityId === null) {
+      orderWhere.id = { in: [] };
+    } else if (Array.isArray(filterCityId)) {
+      orderWhere.cityId = { in: filterCityId.length ? filterCityId : [BigInt(0)] };
+    } else if (filterCityId !== undefined) {
       orderWhere.cityId = filterCityId;
     }
-    if (filterPromoNone) {
+    if (can('promo_codes') && filterPromoNone) {
       orderWhere.promoCodeId = null;
     } else if (filterPromoId !== undefined) {
       orderWhere.promoCodeId = filterPromoId;
@@ -226,6 +409,8 @@ export class AdminDashboardService {
     };
     if (filterCityId === null) {
       partnerWhere.cityId = null;
+    } else if (Array.isArray(filterCityId)) {
+      partnerWhere.cityId = { in: filterCityId.length ? filterCityId : [BigInt(0)] };
     } else if (filterCityId !== undefined) {
       partnerWhere.cityId = filterCityId;
     }
@@ -237,8 +422,9 @@ export class AdminDashboardService {
       createdAt: { gte: rangeStart, lte: rangeEnd },
     };
     if (filterCityId === null) {
-      // 门店必有 cityId
       storeWhere.id = { in: [] };
+    } else if (Array.isArray(filterCityId)) {
+      storeWhere.cityId = { in: filterCityId.length ? filterCityId : [BigInt(0)] };
     } else if (filterCityId !== undefined) {
       storeWhere.cityId = filterCityId;
     }
@@ -253,28 +439,56 @@ export class AdminDashboardService {
       redeemWhere.id = { in: [] };
     } else {
       const storeFilter: Prisma.StoreWhereInput = {};
-      if (filterCityId !== undefined) storeFilter.cityId = filterCityId;
+      if (Array.isArray(filterCityId)) {
+        storeFilter.cityId = { in: filterCityId.length ? filterCityId : [BigInt(0)] };
+      } else if (filterCityId !== undefined) {
+        storeFilter.cityId = filterCityId;
+      }
       if (filterPartnerId !== undefined) storeFilter.partnerAccountId = filterPartnerId;
       if (Object.keys(storeFilter).length) {
         redeemWhere.store = storeFilter;
       }
     }
 
-    const skipOrders = filterCityId === null;
+    const skipOrders = filterCityId === null || !can('orders');
+    const cityListWhere: Prisma.CommonCityWhereInput =
+      scope === null ? {} : { id: { in: scope.length ? scope : [BigInt(0)] } };
 
     const [users, orders, partners, stores, redeems, cities, promos, partnerNames] =
       await Promise.all([
-        this.prisma.user.findMany({
-          where: userWhere,
-          select: {
-            id: true,
-            createdAt: true,
-            cityPreference: { select: { selectedCityCode: true } },
-            promoTouch: { select: { promoCodeId: true } },
-          },
-        }),
+        can('users')
+          ? this.prisma.user.findMany({
+              where: userWhere,
+              select: {
+                id: true,
+                createdAt: true,
+                cityPreference: { select: { selectedCityCode: true } },
+                promoTouch: { select: { promoCodeId: true } },
+              },
+            })
+          : emptyRows<
+              Prisma.UserGetPayload<{
+                select: {
+                  id: true;
+                  createdAt: true;
+                  cityPreference: { select: { selectedCityCode: true } };
+                  promoTouch: { select: { promoCodeId: true } };
+                };
+              }>
+            >(),
         skipOrders
-          ? Promise.resolve([])
+          ? emptyRows<
+              Prisma.OrderGetPayload<{
+                select: {
+                  id: true;
+                  userId: true;
+                  createdAt: true;
+                  cityId: true;
+                  promoCodeId: true;
+                  payStatus: true;
+                };
+              }>
+            >()
           : this.prisma.order.findMany({
               where: orderWhere,
               select: {
@@ -286,45 +500,81 @@ export class AdminDashboardService {
                 payStatus: true,
               },
             }),
-        this.prisma.partnerAccount.findMany({
-          where: partnerWhere,
-          select: {
-            id: true,
-            createdAt: true,
-            cityId: true,
-            companyName: true,
-            name: true,
-          },
-        }),
-        this.prisma.store.findMany({
-          where: storeWhere,
-          select: {
-            id: true,
-            createdAt: true,
-            cityId: true,
-            partnerAccountId: true,
-          },
-        }),
-        this.prisma.redeemRecord.findMany({
-          where: redeemWhere,
-          select: {
-            id: true,
-            createdAt: true,
-            amount: true,
-            settleAmount: true,
-            store: { select: { cityId: true, partnerAccountId: true } },
-          },
-        }),
+        can('partners')
+          ? this.prisma.partnerAccount.findMany({
+              where: partnerWhere,
+              select: {
+                id: true,
+                createdAt: true,
+                cityId: true,
+                companyName: true,
+                name: true,
+              },
+            })
+          : emptyRows<
+              Prisma.PartnerAccountGetPayload<{
+                select: { id: true; createdAt: true; cityId: true; companyName: true; name: true };
+              }>
+            >(),
+        can('stores')
+          ? this.prisma.store.findMany({
+              where: storeWhere,
+              select: {
+                id: true,
+                createdAt: true,
+                cityId: true,
+                partnerAccountId: true,
+              },
+            })
+          : emptyRows<
+              Prisma.StoreGetPayload<{
+                select: { id: true; createdAt: true; cityId: true; partnerAccountId: true };
+              }>
+            >(),
+        can('benefit')
+          ? this.prisma.redeemRecord.findMany({
+              where: redeemWhere,
+              select: {
+                id: true,
+                createdAt: true,
+                amount: true,
+                settleAmount: true,
+                store: { select: { cityId: true, partnerAccountId: true } },
+              },
+            })
+          : emptyRows<
+              Prisma.RedeemRecordGetPayload<{
+                select: {
+                  id: true;
+                  createdAt: true;
+                  amount: true;
+                  settleAmount: true;
+                  store: { select: { cityId: true; partnerAccountId: true } };
+                };
+              }>
+            >(),
         this.prisma.commonCity.findMany({
+          where: cityListWhere,
           select: { id: true, code: true, name: true },
         }),
-        this.prisma.commonPromoCode.findMany({
-          select: { id: true, code: true, name: true },
-        }),
-        this.prisma.partnerAccount.findMany({
-          where: { isPrimary: 1 },
-          select: { id: true, companyName: true, name: true },
-        }),
+        can('promo_codes')
+          ? this.prisma.commonPromoCode.findMany({
+              select: { id: true, code: true, name: true },
+            })
+          : emptyRows<Prisma.CommonPromoCodeGetPayload<{ select: { id: true; code: true; name: true } }>>(),
+        can('partners') || can('stores') || can('benefit')
+          ? this.prisma.partnerAccount.findMany({
+              where: {
+                isPrimary: 1,
+                ...(cityIdFilter(scope) ? { cityId: cityIdFilter(scope) } : {}),
+              },
+              select: { id: true, companyName: true, name: true },
+            })
+          : emptyRows<
+              Prisma.PartnerAccountGetPayload<{
+                select: { id: true; companyName: true; name: true };
+              }>
+            >(),
       ]);
 
     const cityByCode = new Map(cities.map((c) => [c.code, c]));

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

@@ -1,11 +1,25 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
+import type { HqAdminRoleValue } from '@dukang/shared-types';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import type { AdminHqAccountsQueryDto } from './dto/admin-query.dto';
 import type { CreateHqAccountDto, UpdateHqAccountDto } from './dto/admin-mutate.dto';
 import { hashPassword } from '../../common/crypto/password.util';
 
+const HQ_ACCOUNT_SELECT = {
+  id: true,
+  phone: true,
+  loginName: true,
+  passwordHash: true,
+  name: true,
+  adminRole: true,
+  status: true,
+  lastLoginAt: true,
+  createdAt: true,
+  cities: { select: { cityId: true } },
+} satisfies Prisma.HqAccountSelect;
+
 function mapHqAccountRow(account: {
   id: bigint;
   phone: string;
@@ -16,6 +30,7 @@ function mapHqAccountRow(account: {
   status: string;
   lastLoginAt: Date | null;
   createdAt: Date;
+  cities?: { cityId: bigint }[];
 }) {
   return {
     id: account.id,
@@ -27,6 +42,7 @@ function mapHqAccountRow(account: {
     status: account.status,
     lastLoginAt: account.lastLoginAt,
     createdAt: account.createdAt,
+    cityIds: (account.cities ?? []).map((c) => c.cityId.toString()),
   };
 }
 
@@ -34,6 +50,31 @@ function mapHqAccountRow(account: {
 export class AdminHqAccountsService {
   constructor(private readonly prisma: PrismaService) {}
 
+  private async assertCityIds(cityIds: string[]) {
+    const unique = [...new Set(cityIds.map((id) => id.trim()).filter(Boolean))];
+    if (!unique.length) return [] as bigint[];
+    const ids = unique.map((id) => BigInt(id));
+    const count = await this.prisma.commonCity.count({ where: { id: { in: ids } } });
+    if (count !== ids.length) {
+      throw new BadRequestException('存在无效城市');
+    }
+    return ids;
+  }
+
+  private assertCityRequirement(adminRole: string, cityIds: bigint[]) {
+    if (adminRole === 'CITY_STORE_SERVICE' && !cityIds.length) {
+      throw new BadRequestException('城市门店服务须至少勾选一个负责城市');
+    }
+  }
+
+  private async replaceCities(tx: Prisma.TransactionClient, hqAccountId: bigint, cityIds: bigint[]) {
+    await tx.hqAccountCity.deleteMany({ where: { hqAccountId } });
+    if (!cityIds.length) return;
+    await tx.hqAccountCity.createMany({
+      data: cityIds.map((cityId) => ({ hqAccountId, cityId })),
+    });
+  }
+
   async list(query: AdminHqAccountsQueryDto) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
@@ -48,17 +89,7 @@ export class AdminHqAccountsService {
         orderBy: { createdAt: 'desc' },
         skip: (page - 1) * pageSize,
         take: pageSize,
-        select: {
-          id: true,
-          phone: true,
-          loginName: true,
-          passwordHash: true,
-          name: true,
-          adminRole: true,
-          status: true,
-          lastLoginAt: true,
-          createdAt: true,
-        },
+        select: HQ_ACCOUNT_SELECT,
       }),
       this.prisma.hqAccount.count({ where }),
     ]);
@@ -73,34 +104,31 @@ export class AdminHqAccountsService {
   async detail(id: bigint) {
     const account = await this.prisma.hqAccount.findUnique({
       where: { id },
-      select: {
-        id: true,
-        phone: true,
-        loginName: true,
-        passwordHash: true,
-        name: true,
-        adminRole: true,
-        status: true,
-        lastLoginAt: true,
-        createdAt: true,
-      },
+      select: HQ_ACCOUNT_SELECT,
     });
     if (!account) throw new NotFoundException('HQ 账号不存在');
     return serializeBigInt(mapHqAccountRow(account));
   }
 
   async create(dto: CreateHqAccountDto) {
-    const adminRole = (dto.adminRole ?? 'OPS') as 'SUPER_ADMIN' | 'OPS' | 'FINANCE' | 'CUSTOMER_SERVICE';
+    const adminRole = (dto.adminRole ?? 'OPS') as HqAdminRoleValue;
+    const cityIds = await this.assertCityIds(dto.cityIds ?? []);
+    this.assertCityRequirement(adminRole, cityIds);
 
     if (dto.credentialType === 'phone') {
       if (!dto.phone?.trim()) throw new BadRequestException('请填写手机号');
       const phone = dto.phone.trim();
       const exists = await this.prisma.hqAccount.findUnique({ where: { phone } });
       if (exists) throw new BadRequestException('手机号已存在');
-      const account = await this.prisma.hqAccount.create({
-        data: { phone, name: dto.name, adminRole },
+      const account = await this.prisma.$transaction(async (tx) => {
+        const created = await tx.hqAccount.create({
+          data: { phone, name: dto.name, adminRole },
+          select: HQ_ACCOUNT_SELECT,
+        });
+        await this.replaceCities(tx, created.id, cityIds);
+        return tx.hqAccount.findUniqueOrThrow({ where: { id: created.id }, select: HQ_ACCOUNT_SELECT });
       });
-      return serializeBigInt(mapHqAccountRow({ ...account, passwordHash: null }));
+      return serializeBigInt(mapHqAccountRow(account));
     }
 
     if (!dto.loginName?.trim() || !dto.password) {
@@ -114,27 +142,34 @@ export class AdminHqAccountsService {
     const phoneTaken = await this.prisma.hqAccount.findUnique({ where: { phone } });
     if (phoneTaken) throw new BadRequestException('手机号已存在');
 
-    const account = await this.prisma.hqAccount.create({
-      data: {
-        phone,
-        loginName,
-        passwordHash: hashPassword(dto.password),
-        name: dto.name,
-        adminRole,
-      },
+    const account = await this.prisma.$transaction(async (tx) => {
+      const created = await tx.hqAccount.create({
+        data: {
+          phone,
+          loginName,
+          passwordHash: hashPassword(dto.password!),
+          name: dto.name,
+          adminRole,
+        },
+        select: HQ_ACCOUNT_SELECT,
+      });
+      await this.replaceCities(tx, created.id, cityIds);
+      return tx.hqAccount.findUniqueOrThrow({ where: { id: created.id }, select: HQ_ACCOUNT_SELECT });
     });
     return serializeBigInt(mapHqAccountRow(account));
   }
 
   async update(id: bigint, dto: UpdateHqAccountDto) {
-    const current = await this.prisma.hqAccount.findUnique({ where: { id } });
+    const current = await this.prisma.hqAccount.findUnique({
+      where: { id },
+      include: { cities: { select: { cityId: true } } },
+    });
     if (!current) throw new NotFoundException('HQ 账号不存在');
 
-    if (dto.loginName !== undefined) {
-      const loginName = dto.loginName.trim();
-      if (!loginName) throw new BadRequestException('用户名不能为空');
+    const loginNameInput = dto.loginName === undefined ? undefined : dto.loginName.trim();
+    if (loginNameInput) {
       const conflict = await this.prisma.hqAccount.findFirst({
-        where: { loginName, id: { not: id } },
+        where: { loginName: loginNameInput, id: { not: id } },
       });
       if (conflict) throw new BadRequestException('用户名已存在');
     }
@@ -150,29 +185,34 @@ export class AdminHqAccountsService {
       }
     }
 
-    const account = await this.prisma.hqAccount.update({
-      where: { id },
-      data: {
-        ...(dto.name !== undefined ? { name: dto.name } : {}),
-        ...(dto.phone !== undefined ? { phone: dto.phone.trim() } : {}),
-        ...(dto.loginName !== undefined ? { loginName: dto.loginName.trim() } : {}),
-        ...(dto.password ? { passwordHash: hashPassword(dto.password) } : {}),
-        ...(dto.adminRole !== undefined
-          ? { adminRole: dto.adminRole as 'SUPER_ADMIN' | 'OPS' | 'FINANCE' | 'CUSTOMER_SERVICE' }
-          : {}),
-        ...(dto.status !== undefined ? { status: dto.status as 'ACTIVE' | 'DISABLED' } : {}),
-      },
-      select: {
-        id: true,
-        phone: true,
-        loginName: true,
-        passwordHash: true,
-        name: true,
-        adminRole: true,
-        status: true,
-        lastLoginAt: true,
-        createdAt: true,
-      },
+    const nextRole = (dto.adminRole ?? current.adminRole) as HqAdminRoleValue;
+    const nextCityIds =
+      dto.cityIds !== undefined
+        ? await this.assertCityIds(dto.cityIds)
+        : current.cities.map((c) => c.cityId);
+    this.assertCityRequirement(nextRole, nextCityIds);
+
+    const roleChanged = dto.adminRole !== undefined && dto.adminRole !== current.adminRole;
+
+    const account = await this.prisma.$transaction(async (tx) => {
+      await tx.hqAccount.update({
+        where: { id },
+        data: {
+          ...(dto.name !== undefined ? { name: dto.name } : {}),
+          ...(dto.phone !== undefined ? { phone: dto.phone.trim() } : {}),
+          ...(loginNameInput ? { loginName: loginNameInput } : {}),
+          ...(dto.password ? { passwordHash: hashPassword(dto.password) } : {}),
+          ...(dto.adminRole !== undefined ? { adminRole: nextRole } : {}),
+          ...(dto.status !== undefined ? { status: dto.status as 'ACTIVE' | 'DISABLED' } : {}),
+        },
+      });
+      if (dto.cityIds !== undefined) {
+        await this.replaceCities(tx, id, nextCityIds);
+      }
+      if (roleChanged) {
+        await tx.hqAccountPermission.deleteMany({ where: { hqAccountId: id } });
+      }
+      return tx.hqAccount.findUniqueOrThrow({ where: { id }, select: HQ_ACCOUNT_SELECT });
     });
     return serializeBigInt(mapHqAccountRow(account));
   }

server/dukang-api/src/modules/ops/admin-hq-permissions.controller.ts

@@ -45,6 +45,7 @@ export class AdminHqPermissionsController {
     includeBody: true,
   })
   saveAccountPermissions(@Param('id') id: string, @Body() dto: SaveHqAccountPermissionsDto) {
-    return this.service.saveAccountPermissions(BigInt(id), dto.permissionKeys);
+    const grantKeys = dto.grantKeys ?? dto.permissionKeys ?? [];
+    return this.service.saveAccountPermissions(BigInt(id), grantKeys, dto.denyKeys ?? []);
   }
 }

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

@@ -1,9 +1,12 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import {
+  HQ_ADMIN_ROLE_VALUES,
   HQ_PERMISSION_CATALOG,
   HQ_ROLE_DEFAULT_PERMISSIONS,
   LEGACY_SYSTEM_SETTINGS_KEY,
+  computeHqEffectivePermissionKeys,
   expandHqPermissionKeys,
+  type HqAdminRoleValue,
   type HqPermissionKey,
 } from '@dukang/shared-types';
 import { PrismaService } from '../../common/prisma/prisma.module';
@@ -14,6 +17,10 @@ const VALID_PERMISSION_KEYS = new Set<string>([
   LEGACY_SYSTEM_SETTINGS_KEY,
 ]);
 
+const EDITABLE_ROLES = new Set<HqAdminRoleValue>(
+  HQ_ADMIN_ROLE_VALUES.filter((r) => r !== 'SUPER_ADMIN'),
+);
+
 function assertPermissionKeys(keys: string[]) {
   const invalid = keys.filter((key) => !VALID_PERMISSION_KEYS.has(key));
   if (invalid.length) {
@@ -21,6 +28,13 @@ function assertPermissionKeys(keys: string[]) {
   }
 }
 
+function asAdminRole(role: string): HqAdminRoleValue {
+  if (!(HQ_ADMIN_ROLE_VALUES as readonly string[]).includes(role)) {
+    throw new BadRequestException(`无效角色: ${role}`);
+  }
+  return role as HqAdminRoleValue;
+}
+
 @Injectable()
 export class AdminHqPermissionsService {
   constructor(private readonly prisma: PrismaService) {}
@@ -28,32 +42,36 @@ export class AdminHqPermissionsService {
   catalog() {
     return {
       permissions: HQ_PERMISSION_CATALOG,
-      roles: Object.entries(HQ_ROLE_DEFAULT_PERMISSIONS).map(([role, permissionKeys]) => ({
+      roles: HQ_ADMIN_ROLE_VALUES.map((role) => ({
         role,
-        permissionKeys,
+        permissionKeys: HQ_ROLE_DEFAULT_PERMISSIONS[role],
       })),
     };
   }
 
   async getRolePermissions(role: string) {
+    const adminRole = asAdminRole(role);
     const rows = await this.prisma.hqRolePermission.findMany({
-      where: { adminRole: role as 'SUPER_ADMIN' | 'OPS' | 'FINANCE' | 'CUSTOMER_SERVICE' },
+      where: { adminRole },
       select: { permissionKey: true },
     });
     const permissionKeys =
       rows.length > 0
         ? expandHqPermissionKeys(rows.map((r) => r.permissionKey))
-        : [...(HQ_ROLE_DEFAULT_PERMISSIONS[role] ?? [])];
-    return { role, permissionKeys };
+        : [...(HQ_ROLE_DEFAULT_PERMISSIONS[adminRole] ?? [])];
+    return { role: adminRole, permissionKeys };
   }
 
   async saveRolePermissions(role: string, permissionKeys: string[]) {
-    if (role === 'SUPER_ADMIN') {
+    const adminRole = asAdminRole(role);
+    if (adminRole === 'SUPER_ADMIN') {
       throw new BadRequestException('超级管理员基础权限固定，危险操作请按用户单独授权');
     }
+    if (!EDITABLE_ROLES.has(adminRole)) {
+      throw new BadRequestException(`无效角色: ${role}`);
+    }
     assertPermissionKeys(permissionKeys);
     const normalized = expandHqPermissionKeys(permissionKeys);
-    const adminRole = role as 'OPS' | 'FINANCE' | 'CUSTOMER_SERVICE';
     await this.prisma.$transaction([
       this.prisma.hqRolePermission.deleteMany({ where: { adminRole } }),
       ...(normalized.length
@@ -76,51 +94,84 @@ export class AdminHqPermissionsService {
 
     const userPerms = await this.prisma.hqAccountPermission.findMany({
       where: { hqAccountId: accountId },
-      select: { permissionKey: true },
+      select: { permissionKey: true, effect: true },
     });
-    const userPermissionKeys = expandHqPermissionKeys(userPerms.map((p) => p.permissionKey));
+    const grantKeys = expandHqPermissionKeys(
+      userPerms.filter((p) => p.effect !== 'DENY').map((p) => p.permissionKey),
+    );
+    const denyKeys = expandHqPermissionKeys(
+      userPerms.filter((p) => p.effect === 'DENY').map((p) => p.permissionKey),
+    );
 
     if (account.adminRole === 'SUPER_ADMIN') {
-      const rolePermissionKeys = HQ_PERMISSION_CATALOG.map(
-        (p) => p.key,
-      ) as HqPermissionKey[];
-      const effectivePermissionKeys = [
-        ...new Set([...rolePermissionKeys, ...userPermissionKeys]),
-      ] as HqPermissionKey[];
+      const rolePermissionKeys = HQ_PERMISSION_CATALOG.map((p) => p.key) as HqPermissionKey[];
+      const effectivePermissionKeys = computeHqEffectivePermissionKeys(
+        rolePermissionKeys,
+        grantKeys,
+        [],
+      );
       return serializeBigInt({
         account,
-        permissionKeys: userPermissionKeys,
+        permissionKeys: grantKeys,
         rolePermissionKeys,
-        userPermissionKeys,
+        grantKeys,
+        denyKeys: [] as HqPermissionKey[],
+        userPermissionKeys: grantKeys,
         effectivePermissionKeys,
       });
     }
 
     const rolePerms = await this.getRolePermissions(account.adminRole);
-    const effectivePermissionKeys = [
-      ...new Set([...rolePerms.permissionKeys, ...userPermissionKeys]),
-    ] as HqPermissionKey[];
+    const effectivePermissionKeys = computeHqEffectivePermissionKeys(
+      rolePerms.permissionKeys,
+      grantKeys,
+      denyKeys,
+    );
 
     return serializeBigInt({
       account,
-      permissionKeys: userPermissionKeys,
+      permissionKeys: grantKeys,
       rolePermissionKeys: rolePerms.permissionKeys,
-      userPermissionKeys,
+      grantKeys,
+      denyKeys,
+      userPermissionKeys: grantKeys,
       effectivePermissionKeys,
     });
   }
 
-  async saveAccountPermissions(accountId: bigint, permissionKeys: string[]) {
+  async saveAccountPermissions(
+    accountId: bigint,
+    grantKeysInput: string[],
+    denyKeysInput: string[] = [],
+  ) {
     const account = await this.prisma.hqAccount.findUnique({ where: { id: accountId } });
     if (!account) throw new NotFoundException('HQ 账号不存在');
-    assertPermissionKeys(permissionKeys);
-    const normalized = expandHqPermissionKeys(permissionKeys);
+    assertPermissionKeys(grantKeysInput);
+    assertPermissionKeys(denyKeysInput);
+    const grantKeys = expandHqPermissionKeys(grantKeysInput);
+    const denyKeys =
+      account.adminRole === 'SUPER_ADMIN' ? [] : expandHqPermissionKeys(denyKeysInput);
+    const overlap = grantKeys.filter((k) => denyKeys.includes(k));
+    if (overlap.length) {
+      throw new BadRequestException(`同一权限不能同时追加和撤销: ${overlap.join(', ')}`);
+    }
     await this.prisma.$transaction([
       this.prisma.hqAccountPermission.deleteMany({ where: { hqAccountId: accountId } }),
-      ...(normalized.length
+      ...(grantKeys.length || denyKeys.length
         ? [
             this.prisma.hqAccountPermission.createMany({
-              data: normalized.map((permissionKey) => ({ hqAccountId: accountId, permissionKey })),
+              data: [
+                ...grantKeys.map((permissionKey) => ({
+                  hqAccountId: accountId,
+                  permissionKey,
+                  effect: 'GRANT' as const,
+                })),
+                ...denyKeys.map((permissionKey) => ({
+                  hqAccountId: accountId,
+                  permissionKey,
+                  effect: 'DENY' as const,
+                })),
+              ],
             }),
           ]
         : []),

server/dukang-api/src/modules/ops/admin-store-categories.controller.ts

@@ -1,5 +1,9 @@
 import { Body, Controller, Delete, Get, Param, Post, Put, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
 import { StoreCategoryService } from '../store/store-category.service';
@@ -9,7 +13,8 @@ import {
 } from './dto/admin-mutate.dto';
 
 @Controller('admin/store-categories')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('store_categories')
 export class AdminStoreCategoriesController {
   constructor(private readonly categories: StoreCategoryService) {}
 
@@ -24,6 +29,7 @@ export class AdminStoreCategoriesController {
   }
 
   @Post('ensure-defaults')
+  @RequireHqPermissions('store_categories_delete')
   @HqOperation({
     action: HqOperationAction.STORE_CATEGORY_ENSURE,
     refType: 'STORE_CATEGORY',
@@ -57,6 +63,7 @@ export class AdminStoreCategoriesController {
   }
 
   @Delete(':id')
+  @RequireHqPermissions('store_categories_delete')
   @HqOperation({
     action: HqOperationAction.STORE_CATEGORY_DELETE,
     refType: 'STORE_CATEGORY',

server/dukang-api/src/modules/ops/admin-store-ratings.controller.ts

@@ -1,15 +1,22 @@
 import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
+import type { AuthUser } from '../../common/guards/jwt-auth.guard';
 import { AdminStoreRatingsService } from './admin-store-ratings.service';
 import { AdminStoreRatingsQueryDto } from './dto/admin-query.dto';
 
 @Controller('admin/store-ratings')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('store_ratings')
 export class AdminStoreRatingsController {
   constructor(private readonly service: AdminStoreRatingsService) {}
 
   @Get()
-  list(@Query() query: AdminStoreRatingsQueryDto) {
-    return this.service.list(query);
+  list(@CurrentUser() user: AuthUser, @Query() query: AdminStoreRatingsQueryDto) {
+    return this.service.list(query, user.actorId);
   }
 }

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

@@ -3,15 +3,26 @@ import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import type { AdminStoreRatingsQueryDto } from './dto/admin-query.dto';
+import { HqPermissionsResolver, mergeHqStoreCityWhere } from '../../common/guards/hq-permission.guard';
 
 @Injectable()
 export class AdminStoreRatingsService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly hqPermissions: HqPermissionsResolver,
+  ) {}
 
-  async list(query: AdminStoreRatingsQueryDto) {
+  async list(query: AdminStoreRatingsQueryDto, actorId: bigint) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
-    const where: Prisma.StoreRatingWhereInput = {};
+    const scope = await this.hqPermissions.resolveCityScope(actorId);
+    if (query.storeId) {
+      await this.hqPermissions.assertStoreIdInScope(actorId, BigInt(query.storeId));
+    }
+    const storeWhere = mergeHqStoreCityWhere({}, scope, query.cityId);
+    const where: Prisma.StoreRatingWhereInput = {
+      store: storeWhere,
+    };
     if (query.storeId) where.storeId = BigInt(query.storeId);
     if (query.redeemNo) {
       where.redeemRecord = { redeemNo: { contains: query.redeemNo } };

server/dukang-api/src/modules/ops/admin-stores.controller.ts

@@ -1,7 +1,13 @@
 import { Body, Controller, Delete, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
+import type { AuthUser } from '../../common/guards/jwt-auth.guard';
 import { AdminStoresService } from './admin-stores.service';
 import {
   AdminStoreAccountsQueryDto,
@@ -19,58 +25,64 @@ import {
 } from './dto/admin-mutate.dto';
 
 @Controller('admin/stores')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('stores')
 export class AdminStoresController {
   constructor(private readonly service: AdminStoresService) {}
 
   @Get()
-  list(@Query() query: AdminStoresQueryDto) {
-    return this.service.listStores(query);
+  list(@CurrentUser() user: AuthUser, @Query() query: AdminStoresQueryDto) {
+    return this.service.listStores(query, user.actorId);
   }
 
   @Get(':id')
-  detail(@Param('id') id: string) {
-    return this.service.detailStore(BigInt(id));
+  detail(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.detailStore(BigInt(id), user.actorId);
   }
 
   @Post()
   @HqOperation({ action: HqOperationAction.STORE_CREATE, refType: 'STORE', refIdField: 'id', includeBody: true })
-  create(@Body() dto: CreateStoreDto) {
-    return this.service.createStore(dto);
+  create(@CurrentUser() user: AuthUser, @Body() dto: CreateStoreDto) {
+    return this.service.createStore(dto, user.actorId);
   }
 
   @Put(':id')
   @HqOperation({ action: HqOperationAction.STORE_UPDATE, refType: 'STORE', refIdParam: 'id', includeBody: true })
-  update(@Param('id') id: string, @Body() dto: UpdateStoreDto) {
-    return this.service.updateStore(BigInt(id), dto);
+  update(@CurrentUser() user: AuthUser, @Param('id') id: string, @Body() dto: UpdateStoreDto) {
+    return this.service.updateStore(BigInt(id), dto, user.actorId);
   }
 
   @Put(':id/status')
   @HqOperation({ action: HqOperationAction.STORE_STATUS, refType: 'STORE', refIdParam: 'id', includeBody: true })
-  updateStatus(@Param('id') id: string, @Body() dto: UpdateStoreStatusDto) {
-    return this.service.updateStoreStatus(BigInt(id), dto);
+  updateStatus(@CurrentUser() user: AuthUser, @Param('id') id: string, @Body() dto: UpdateStoreStatusDto) {
+    return this.service.updateStoreStatus(BigInt(id), dto, user.actorId);
   }
 
   @Put(':id/audit')
   @HqOperation({ action: HqOperationAction.STORE_AUDIT, refType: 'STORE', refIdParam: 'id', includeBody: true })
-  audit(@Param('id') id: string, @Body() body: { approved: boolean; remark?: string }) {
-    return this.service.auditStore(BigInt(id), body);
+  audit(
+    @CurrentUser() user: AuthUser,
+    @Param('id') id: string,
+    @Body() body: { approved: boolean; remark?: string },
+  ) {
+    return this.service.auditStore(BigInt(id), body, user.actorId);
   }
 }
 
 @Controller('admin/store-accounts')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('store_accounts')
 export class AdminStoreAccountsController {
   constructor(private readonly service: AdminStoresService) {}
 
   @Get()
-  list(@Query() query: AdminStoreAccountsQueryDto) {
-    return this.service.listStoreAccounts(query);
+  list(@CurrentUser() user: AuthUser, @Query() query: AdminStoreAccountsQueryDto) {
+    return this.service.listStoreAccounts(query, user.actorId);
   }
 
   @Get(':id')
-  detail(@Param('id') id: string) {
-    return this.service.detailStoreAccount(BigInt(id));
+  detail(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.detailStoreAccount(BigInt(id), user.actorId);
   }
 
   @Post()
@@ -80,8 +92,8 @@ export class AdminStoreAccountsController {
     refIdField: 'id',
     includeBody: true,
   })
-  create(@Body() dto: CreateStoreAccountDto) {
-    return this.service.createStoreAccount(dto);
+  create(@CurrentUser() user: AuthUser, @Body() dto: CreateStoreAccountDto) {
+    return this.service.createStoreAccount(dto, user.actorId);
   }
 
   @Put(':id')
@@ -91,8 +103,8 @@ export class AdminStoreAccountsController {
     refIdParam: 'id',
     includeBody: true,
   })
-  update(@Param('id') id: string, @Body() dto: UpdateStoreAccountDto) {
-    return this.service.updateStoreAccount(BigInt(id), dto);
+  update(@CurrentUser() user: AuthUser, @Param('id') id: string, @Body() dto: UpdateStoreAccountDto) {
+    return this.service.updateStoreAccount(BigInt(id), dto, user.actorId);
   }
 
   @Delete(':id/staff/:staffId')
@@ -101,19 +113,20 @@ export class AdminStoreAccountsController {
     refType: 'STORE_ACCOUNT',
     refIdParam: 'staffId',
   })
-  deleteStaff(@Param('id') id: string, @Param('staffId') staffId: string) {
-    return this.service.deleteStoreStaff(BigInt(id), BigInt(staffId));
+  deleteStaff(@CurrentUser() user: AuthUser, @Param('id') id: string, @Param('staffId') staffId: string) {
+    return this.service.deleteStoreStaff(BigInt(id), BigInt(staffId), user.actorId);
   }
 }
 
 @Controller('admin/store-media')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('store_media')
 export class AdminStoreMediaController {
   constructor(private readonly service: AdminStoresService) {}
 
   @Get()
-  list(@Query() query: AdminStoreMediaQueryDto) {
-    return this.service.listStoreMedia(query);
+  list(@CurrentUser() user: AuthUser, @Query() query: AdminStoreMediaQueryDto) {
+    return this.service.listStoreMedia(query, user.actorId);
   }
 
   @Post()
@@ -123,8 +136,8 @@ export class AdminStoreMediaController {
     refIdField: 'id',
     includeBody: true,
   })
-  create(@Body() dto: CreateStoreMediaDto) {
-    return this.service.createStoreMedia(dto);
+  create(@CurrentUser() user: AuthUser, @Body() dto: CreateStoreMediaDto) {
+    return this.service.createStoreMedia(dto, user.actorId);
   }
 
   @Put(':id')
@@ -132,15 +145,14 @@ export class AdminStoreMediaController {
     action: HqOperationAction.STORE_MEDIA_UPDATE,
     refType: 'STORE_MEDIA',
     refIdParam: 'id',
-    includeBody: true,
   })
-  update(@Param('id') id: string, @Body() dto: UpdateStoreMediaDto) {
-    return this.service.updateStoreMedia(BigInt(id), dto);
+  update(@CurrentUser() user: AuthUser, @Param('id') id: string, @Body() dto: UpdateStoreMediaDto) {
+    return this.service.updateStoreMedia(BigInt(id), dto, user.actorId);
   }
 
   @Delete(':id')
   @HqOperation({ action: HqOperationAction.STORE_MEDIA_DELETE, refType: 'STORE_MEDIA', refIdParam: 'id' })
-  remove(@Param('id') id: string) {
-    return this.service.deleteStoreMedia(BigInt(id));
+  remove(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.deleteStoreMedia(BigInt(id), user.actorId);
   }
 }

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

@@ -1,4 +1,4 @@
-import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 import { isMobilePhone, isStoreContactPhone, STORE_CONTACT_PHONE_HINT, validateBusinessHours } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
@@ -19,6 +19,7 @@ import type {
   UpdateStoreStatusDto,
 } from './dto/admin-mutate.dto';
 import { TestWhitelistService } from '../../common/test-whitelist/test-whitelist.service';
+import { HqPermissionsResolver, hqStoreCityWhere, mergeHqStoreCityWhere, type HqCityScope } from '../../common/guards/hq-permission.guard';
 
 /** 选填文案：空 / null / "null" 一律存库为 null，避免 String(null)==="null" */
 function normalizeStoreOptionalText(value: unknown): string | null {
@@ -54,21 +55,54 @@ export class AdminStoresService {
     private readonly storeCategoryService: StoreCategoryService,
     private readonly analyticsService: AnalyticsService,
     private readonly testWhitelist: TestWhitelistService,
+    private readonly hqPermissions: HqPermissionsResolver,
   ) {}
 
-  async listStores(query: AdminStoresQueryDto) {
+  private async storeIdsInScope(scope: HqCityScope): Promise<bigint[] | null> {
+    const where = hqStoreCityWhere(scope);
+    if (!where) return null;
+    const rows = await this.prisma.store.findMany({ where, select: { id: true } });
+    return rows.length ? rows.map((r) => r.id) : [BigInt(0)];
+  }
+
+  private async assertStoreAccountInScope(actorId: bigint, accountId: bigint) {
+    const account = await this.prisma.storeAccount.findUnique({
+      where: { id: accountId },
+      include: { bindings: { include: { store: { select: { cityId: true } } } } },
+    });
+    if (!account) throw new NotFoundException('门店账号不存在');
+    const scope = await this.hqPermissions.resolveCityScope(actorId);
+    if (scope === null) return account;
+    const ok = account.bindings.some((b) => scope.some((id) => id === b.store.cityId));
+    if (!ok) throw new ForbiddenException('无权访问该城市的门店');
+    return account;
+  }
+
+  private async assertMediaInScope(actorId: bigint, mediaId: bigint) {
+    const media = await this.prisma.commonResource.findUnique({
+      where: { id: mediaId },
+      select: { ownerType: true, ownerId: true },
+    });
+    if (!media) throw new NotFoundException('资源不存在');
+    if (media.ownerType === 'STORE') {
+      await this.hqPermissions.assertStoreIdInScope(actorId, media.ownerId);
+    }
+  }
+
+  async listStores(query: AdminStoresQueryDto, actorId: bigint) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
-    const where: Prisma.StoreWhereInput = {};
+    const scope = await this.hqPermissions.resolveCityScope(actorId);
+    let where: Prisma.StoreWhereInput = {};
     if (query.name) where.name = { contains: query.name };
     if (query.status) where.status = query.status as Prisma.EnumStoreStatusFilter['equals'];
     if (query.auditStatus) {
       where.auditStatus = query.auditStatus as Prisma.EnumStoreAuditStatusFilter['equals'];
     }
-    if (query.cityId) where.cityId = BigInt(query.cityId);
     if (query.partnerId) where.partnerAccountId = BigInt(query.partnerId);
     if (query.phone) where.phone = { contains: query.phone };
     if (query.excludeTest) where.isTest = false;
+    where = mergeHqStoreCityWhere(where, scope, query.cityId);
 
     const [items, total] = await Promise.all([
       this.prisma.store.findMany({
@@ -98,9 +132,10 @@ export class AdminStoresService {
     const pendingByStore = new Map<string, string>();
     // 每家店是否有待审核信息变更，供总部列表「审核信息 / 对比」快捷入口使用
     const pendingInfoByStore = new Map<string, string>();
+    const redeemedByStore = new Map<string, number>();
     if (items.length) {
       const storeIds = items.map((s) => s.id);
-      const [pendingReqs, pendingInfoReqs] = await Promise.all([
+      const [pendingReqs, pendingInfoReqs, redeemSums] = await Promise.all([
         this.prisma.storePackageChangeRequest.findMany({
           where: { storeId: { in: storeIds }, status: 'PENDING' },
           select: { id: true, storeId: true },
@@ -109,9 +144,17 @@ export class AdminStoresService {
           where: { storeId: { in: storeIds }, status: 'PENDING' },
           select: { id: true, storeId: true },
         }),
+        this.prisma.redeemRecord.groupBy({
+          by: ['storeId'],
+          where: { storeId: { in: storeIds } },
+          _sum: { amount: true },
+        }),
       ]);
       for (const r of pendingReqs) pendingByStore.set(r.storeId.toString(), r.id.toString());
       for (const r of pendingInfoReqs) pendingInfoByStore.set(r.storeId.toString(), r.id.toString());
+      for (const r of redeemSums) {
+        redeemedByStore.set(r.storeId.toString(), r._sum.amount != null ? Number(r._sum.amount) : 0);
+      }
     }
 
     return serializeBigInt({
@@ -124,6 +167,7 @@ export class AdminStoresService {
           // 透传：mapStoreCompat 为 { ...store } 展开，新字段不会被丢弃
           pendingPackageAuditId: pendingByStore.get(s.id.toString()) ?? null,
           pendingInfoChangeId: pendingInfoByStore.get(s.id.toString()) ?? null,
+          totalRedeemedBenefitAmount: redeemedByStore.get(s.id.toString()) ?? 0,
           partner: s.partnerAccount,
           account: s.bindings[0]?.storeAccount ?? null,
           bindings: undefined,
@@ -135,7 +179,8 @@ export class AdminStoresService {
     });
   }
 
-  async detailStore(id: bigint) {
+  async detailStore(id: bigint, actorId: bigint) {
+    await this.hqPermissions.assertStoreIdInScope(actorId, id);
     const store = await this.prisma.store.findUnique({
       where: { id },
       include: {
@@ -184,7 +229,8 @@ export class AdminStoresService {
     }));
   }
 
-  async updateStoreStatus(id: bigint, dto: UpdateStoreStatusDto) {
+  async updateStoreStatus(id: bigint, dto: UpdateStoreStatusDto, actorId: bigint) {
+    await this.hqPermissions.assertStoreIdInScope(actorId, id);
     const store = await this.prisma.store.update({
       where: { id },
       data: { status: dto.status as 'OPEN' | 'PAUSED' | 'CLOSED' },
@@ -192,7 +238,8 @@ export class AdminStoresService {
     return serializeBigInt(store);
   }
 
-  async auditStore(id: bigint, dto: { approved: boolean; remark?: string }) {
+  async auditStore(id: bigint, dto: { approved: boolean; remark?: string }, actorId: bigint) {
+    await this.hqPermissions.assertStoreIdInScope(actorId, id);
     const store = await this.prisma.store.findUnique({ where: { id } });
     if (!store) throw new NotFoundException('门店不存在');
     if (store.auditStatus !== 'PENDING' && store.auditStatus !== 'REJECTED') {
@@ -258,7 +305,8 @@ export class AdminStoresService {
     });
   }
 
-  async updateStore(id: bigint, dto: UpdateStoreDto) {
+  async updateStore(id: bigint, dto: UpdateStoreDto, actorId: bigint) {
+    await this.hqPermissions.assertStoreIdInScope(actorId, id);
     const current = await this.prisma.store.findUnique({ where: { id } });
     if (!current) throw new NotFoundException('门店不存在');
 
@@ -524,10 +572,11 @@ export class AdminStoresService {
       }
     });
 
-    return this.detailStore(id);
+    return this.detailStore(id, actorId);
   }
 
-  async createStore(dto: CreateStoreDto) {
+  async createStore(dto: CreateStoreDto, actorId: bigint) {
+    await this.hqPermissions.assertStoreCityInScope(actorId, BigInt(dto.cityId));
     const normalizedPhone = dto.phone.trim();
     if (!isMobilePhone(normalizedPhone)) {
       throw new BadRequestException('请输入正确的手机号码');
@@ -727,10 +776,11 @@ export class AdminStoresService {
       });
     }
 
-    return this.detailStore(store.id);
+    return this.detailStore(store.id, actorId);
   }
 
-  async createStoreAccount(dto: CreateStoreAccountDto) {
+  async createStoreAccount(dto: CreateStoreAccountDto, actorId: bigint) {
+    await this.hqPermissions.assertStoreIdInScope(actorId, BigInt(dto.storeId));
     const store = await this.prisma.store.findUnique({
       where: { id: BigInt(dto.storeId) },
       include: { bindings: true },
@@ -768,15 +818,24 @@ export class AdminStoresService {
     return serializeBigInt(account);
   }
 
-  async listStoreMedia(query: AdminStoreMediaQueryDto) {
+  async listStoreMedia(query: AdminStoreMediaQueryDto, actorId: bigint) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
+    const scope = await this.hqPermissions.resolveCityScope(actorId);
+    if (query.storeId) {
+      await this.hqPermissions.assertStoreIdInScope(actorId, BigInt(query.storeId));
+    }
     const where: Prisma.CommonResourceWhereInput = {
       ownerType: 'STORE',
       status: 'ACTIVE',
     };
     if (query.storeId) where.ownerId = BigInt(query.storeId);
     if (query.mediaType) where.mediaType = query.mediaType as Prisma.EnumResourceMediaTypeFilter['equals'];
+    const storeScope = hqStoreCityWhere(scope);
+    if (storeScope && !query.storeId) {
+      const ids = await this.storeIdsInScope(scope);
+      if (ids) where.ownerId = { in: ids };
+    }
 
     const [items, total] = await Promise.all([
       this.prisma.commonResource.findMany({
@@ -790,7 +849,8 @@ export class AdminStoresService {
     return serializeBigInt({ items, total, page, pageSize });
   }
 
-  async createStoreMedia(dto: CreateStoreMediaDto) {
+  async createStoreMedia(dto: CreateStoreMediaDto, actorId: bigint) {
+    await this.hqPermissions.assertStoreIdInScope(actorId, BigInt(dto.storeId));
     const store = await this.prisma.store.findUnique({ where: { id: BigInt(dto.storeId) } });
     if (!store) throw new BadRequestException('门店不存在');
     const media = await this.prisma.commonResource.create({
@@ -808,7 +868,8 @@ export class AdminStoresService {
     return serializeBigInt(media);
   }
 
-  async updateStoreMedia(id: bigint, dto: UpdateStoreMediaDto) {
+  async updateStoreMedia(id: bigint, dto: UpdateStoreMediaDto, actorId: bigint) {
+    await this.assertMediaInScope(actorId, id);
     const media = await this.prisma.commonResource.update({
       where: { id },
       data: {
@@ -820,7 +881,8 @@ export class AdminStoresService {
     return serializeBigInt(media);
   }
 
-  async deleteStoreMedia(id: bigint) {
+  async deleteStoreMedia(id: bigint, actorId: bigint) {
+    await this.assertMediaInScope(actorId, id);
     await this.prisma.commonResource.update({
       where: { id },
       data: { status: 'DELETED' },
@@ -828,13 +890,20 @@ export class AdminStoresService {
     return { ok: true };
   }
 
-  async listStoreAccounts(query: AdminStoreAccountsQueryDto) {
+  async listStoreAccounts(query: AdminStoreAccountsQueryDto, actorId: bigint) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
+    if (query.storeId) {
+      await this.hqPermissions.assertStoreIdInScope(actorId, BigInt(query.storeId));
+    }
+    const scope = await this.hqPermissions.resolveCityScope(actorId);
     const where: Prisma.StoreAccountWhereInput = { isPrimary: 1 };
     if (query.phone) where.phone = { contains: query.phone };
     if (query.storeId) {
       where.bindings = { some: { storeId: BigInt(query.storeId) } };
+    } else {
+      const storeWhere = hqStoreCityWhere(scope);
+      if (storeWhere) where.bindings = { some: { store: storeWhere } };
     }
     if (query.status) where.status = query.status as Prisma.EnumAccountStatusFilter['equals'];
     if (query.excludeTest) where.isTest = false;
@@ -866,7 +935,8 @@ export class AdminStoresService {
     return serializeBigInt({ items: mapped, total, page, pageSize });
   }
 
-  async detailStoreAccount(id: bigint) {
+  async detailStoreAccount(id: bigint, actorId: bigint) {
+    await this.assertStoreAccountInScope(actorId, id);
     const account = await this.prisma.storeAccount.findUnique({
       where: { id },
       include: {
@@ -895,7 +965,8 @@ export class AdminStoresService {
     });
   }
 
-  async updateStoreAccount(id: bigint, dto: UpdateStoreAccountDto) {
+  async updateStoreAccount(id: bigint, dto: UpdateStoreAccountDto, actorId: bigint) {
+    await this.assertStoreAccountInScope(actorId, id);
     const account = await this.prisma.storeAccount.update({
       where: { id },
       data: {
@@ -908,7 +979,8 @@ export class AdminStoresService {
   }
 
   /** HQ 删除门店子账号（非主账号） */
-  async deleteStoreStaff(parentAccountId: bigint, staffId: bigint) {
+  async deleteStoreStaff(parentAccountId: bigint, staffId: bigint, actorId: bigint) {
+    await this.assertStoreAccountInScope(actorId, parentAccountId);
     const parent = await this.prisma.storeAccount.findUnique({ where: { id: parentAccountId } });
     if (!parent || parent.isPrimary !== 1) {
       throw new BadRequestException('主账号不存在');

server/dukang-api/src/modules/ops/admin-users.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Param, Post, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import {
   HqPermissionGuard,
@@ -8,7 +8,7 @@ import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
 import { AdminUsersService } from './admin-users.service';
 import { AdminUsersQueryDto } from './dto/admin-query.dto';
-import { BatchDeleteUsersConfirmDto, BatchDeleteUsersDto } from './dto/admin-mutate.dto';
+import { BatchDeleteUsersConfirmDto, BatchDeleteUsersDto, UpdateAdminUserDto } from './dto/admin-mutate.dto';
 
 @Controller('admin/users')
 @UseGuards(HqAuthGuard)
@@ -48,6 +48,17 @@ export class AdminUsersController {
     return this.usersService.detail(BigInt(id));
   }
 
+  @Put(':id')
+  @HqOperation({
+    action: HqOperationAction.USER_UPDATE,
+    refType: 'USER',
+    refIdParam: 'id',
+    includeBody: true,
+  })
+  update(@Param('id') id: string, @Body() dto: UpdateAdminUserDto) {
+    return this.usersService.updateUser(BigInt(id), dto);
+  }
+
   @Delete(':id')
   @UseGuards(HqPermissionGuard)
   @RequireHqPermissions('users_delete')

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

@@ -188,6 +188,18 @@ export class AdminUsersService {
     });
   }
 
+  async updateUser(id: bigint, dto: { nickname: string }) {
+    const user = await this.prisma.user.findUnique({ where: { id }, select: { id: true } });
+    if (!user) throw new NotFoundException('用户不存在');
+    const nickname = dto.nickname.trim() || null;
+    const updated = await this.prisma.user.update({
+      where: { id },
+      data: { nickname },
+      select: { id: true, userNo: true, nickname: true },
+    });
+    return serializeBigInt(updated);
+  }
+
   async previewBatchDelete(ids: bigint[]) {
     const uniqueIds = [...new Set(ids)];
     if (!uniqueIds.length) {

server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts

@@ -949,6 +949,12 @@ export class BatchDeleteUsersConfirmDto extends BatchDeleteUsersDto {
   confirmRisk: boolean;
 }
 
+export class UpdateAdminUserDto {
+  @IsString()
+  @MaxLength(64)
+  nickname: string;
+}
+
 /** HQ 订单发货（目前仅小飞侠 XFX） */
 export class AdminShipOrderDto {
   @IsIn(['XFX'])
@@ -1109,8 +1115,13 @@ export class CreateHqAccountDto {
   name: string;
 
   @IsOptional()
-  @IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE'])
+  @IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE', 'CITY_STORE_SERVICE'])
   adminRole?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  cityIds?: string[];
 }
 
 export class UpdateHqAccountDto {
@@ -1131,12 +1142,17 @@ export class UpdateHqAccountDto {
   name?: string;
 
   @IsOptional()
-  @IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE'])
+  @IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE', 'CITY_STORE_SERVICE'])
   adminRole?: string;
 
   @IsOptional()
   @IsIn(['ACTIVE', 'DISABLED'])
   status?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  cityIds?: string[];
 }
 
 export class SaveHqRolePermissionsDto {
@@ -1146,9 +1162,20 @@ export class SaveHqRolePermissionsDto {
 }
 
 export class SaveHqAccountPermissionsDto {
+  @IsOptional()
   @IsArray()
   @IsString({ each: true })
-  permissionKeys: string[];
+  permissionKeys?: string[];
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  grantKeys?: string[];
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  denyKeys?: string[];
 }
 
 export class CreateProductDto {

server/dukang-api/src/modules/ops/dto/admin-query.dto.ts

@@ -352,6 +352,10 @@ export class AdminStoreRatingsQueryDto extends PaginationQueryDto {
   @IsString()
   storeId?: string;
 
+  @IsOptional()
+  @IsString()
+  cityId?: string;
+
   @IsOptional()
   @IsString()
   redeemNo?: string;

server/dukang-api/src/modules/store/store-info-change.controller.ts

@@ -13,6 +13,10 @@ import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import { ShopStoreGuard } from '../../common/guards/shop-store.guard';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { StoreInfoChangeService } from './store-info-change.service';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
 
 @Controller('partner/stores')
 @UseGuards(JwtAuthGuard)
@@ -56,17 +60,19 @@ export class ShopStoreInfoChangeController {
 }
 
 @Controller('admin/store-info-change-requests')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('store_audits')
 export class AdminStoreInfoChangeController {
   constructor(private readonly svc: StoreInfoChangeService) {}
 
   @Get('summary')
-  summary() {
-    return this.svc.adminSummary();
+  summary(@CurrentUser() user: AuthUser) {
+    return this.svc.adminSummary(user.actorId);
   }
 
   @Get()
   list(
+    @CurrentUser() user: AuthUser,
     @Query('status') status?: string,
     @Query('page') page?: string,
     @Query('pageSize') pageSize?: string,
@@ -75,12 +81,13 @@ export class AdminStoreInfoChangeController {
       status: (status as 'PENDING' | 'APPROVED' | 'REJECTED') || undefined,
       page: page ? Number(page) : undefined,
       pageSize: pageSize ? Number(pageSize) : undefined,
+      actorId: user.actorId,
     });
   }
 
   @Get(':id')
-  detail(@Param('id') id: string) {
-    return this.svc.adminDetail(BigInt(id));
+  detail(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.svc.adminDetail(BigInt(id), user.actorId);
   }
 
   @Put(':id/audit')

server/dukang-api/src/modules/store/store-info-change.service.ts

@@ -21,6 +21,7 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
 import { StoreService } from './store.service';
 import { PartnerCityService } from '../city-scope/partner-city.service';
 import { WecomMessagePushService } from '../../integrations/wecom/wecom-message-push.service';
+import { HqPermissionsResolver, hqStoreCityWhere } from '../../common/guards/hq-permission.guard';
 
 type ChangeableField = (typeof STORE_INFO_CHANGEABLE_FIELDS)[number];
 
@@ -145,6 +146,7 @@ export class StoreInfoChangeService {
     private readonly storeService: StoreService,
     private readonly partnerCityService: PartnerCityService,
     private readonly wecomPush: WecomMessagePushService,
+    private readonly hqPermissions: HqPermissionsResolver,
   ) {}
 
   private async loadLiveMediaFields(storeId: bigint, coverResourceId: bigint | null) {
@@ -373,10 +375,16 @@ export class StoreInfoChangeService {
     status?: StoreInfoChangeStatus;
     page?: number;
     pageSize?: number;
+    actorId: bigint;
   }): Promise<{ items: StoreInfoChangeRequestDto[]; total: number; page: number; pageSize: number }> {
     const page = Math.max(1, opts.page || 1);
     const pageSize = Math.min(Math.max(opts.pageSize || 20, 1), 100);
-    const where = opts.status ? { status: opts.status } : {};
+    const scope = await this.hqPermissions.resolveCityScope(opts.actorId);
+    const storeWhere = hqStoreCityWhere(scope);
+    const where = {
+      ...(opts.status ? { status: opts.status } : {}),
+      ...(storeWhere ? { store: storeWhere } : {}),
+    };
     const [rows, total] = await Promise.all([
       this.prisma.storeInfoChangeRequest.findMany({
         where,
@@ -395,20 +403,24 @@ export class StoreInfoChangeService {
     return { items, total, page, pageSize };
   }
 
-  async adminSummary(): Promise<{ pendingCount: number; packagePendingCount: number }> {
+  async adminSummary(actorId: bigint): Promise<{ pendingCount: number; packagePendingCount: number }> {
+    const scope = await this.hqPermissions.resolveCityScope(actorId);
+    const storeWhere = hqStoreCityWhere(scope);
+    const cityFilter = storeWhere ? { store: storeWhere } : {};
     const [infoPending, packagePending] = await Promise.all([
-      this.prisma.storeInfoChangeRequest.count({ where: { status: 'PENDING' } }),
-      this.prisma.storePackageChangeRequest.count({ where: { status: 'PENDING' } }),
+      this.prisma.storeInfoChangeRequest.count({ where: { status: 'PENDING', ...cityFilter } }),
+      this.prisma.storePackageChangeRequest.count({ where: { status: 'PENDING', ...cityFilter } }),
     ]);
     return { pendingCount: infoPending, packagePendingCount: packagePending };
   }
 
-  async adminDetail(id: bigint): Promise<StoreInfoChangeRequestDto> {
+  async adminDetail(id: bigint, actorId: bigint): Promise<StoreInfoChangeRequestDto> {
     const row = await this.prisma.storeInfoChangeRequest.findUnique({
       where: { id },
-      include: { store: { select: { name: true } } },
+      include: { store: { select: { name: true, cityId: true } } },
     });
     if (!row) throw new NotFoundException('变更请求不存在');
+    await this.hqPermissions.assertStoreCityInScope(actorId, row.store.cityId);
     const dto = this.toDto(
       row as unknown as Record<string, unknown>,
       (row as { store?: { name?: string } }).store?.name,
@@ -430,8 +442,12 @@ export class StoreInfoChangeService {
     rejectReason?: string;
     reviewerId: bigint;
   }): Promise<StoreInfoChangeRequestDto> {
-    const row = await this.prisma.storeInfoChangeRequest.findUnique({ where: { id: input.id } });
+    const row = await this.prisma.storeInfoChangeRequest.findUnique({
+      where: { id: input.id },
+      include: { store: { select: { cityId: true } } },
+    });
     if (!row) throw new NotFoundException('变更请求不存在');
+    await this.hqPermissions.assertStoreCityInScope(input.reviewerId, row.store.cityId);
     if (row.status !== 'PENDING') {
       throw new BadRequestException('该变更请求已处理');
     }

server/dukang-api/src/modules/store/store-package.controller.ts

@@ -4,6 +4,10 @@ import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import { ShopStoreGuard } from '../../common/guards/shop-store.guard';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { StorePackageService } from './store-package.service';
+import {
+  HqPermissionGuard,
+  RequireHqPermissions,
+} from '../../common/guards/hq-permission.guard';
 
 @Controller('partner/stores')
 @UseGuards(JwtAuthGuard)
@@ -49,48 +53,58 @@ export class ShopStorePackageController {
 }
 
 @Controller('admin/stores')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('stores')
 export class AdminStorePackageController {
   constructor(private readonly packages: StorePackageService) {}
 
   @Get(':storeId/packages')
-  getPackages(@Param('storeId') storeId: string) {
-    return this.packages.adminGetPackages(BigInt(storeId));
+  getPackages(@CurrentUser() user: AuthUser, @Param('storeId') storeId: string) {
+    return this.packages.adminGetPackages(BigInt(storeId), user.actorId);
   }
 
   @Put(':storeId/packages')
-  savePackages(@Param('storeId') storeId: string, @Body() body: { packages: unknown }) {
+  savePackages(
+    @CurrentUser() user: AuthUser,
+    @Param('storeId') storeId: string,
+    @Body() body: { packages: unknown },
+  ) {
     const normalized = this.packages.normalizePackages(body.packages);
-    return this.packages.adminDirectSave(BigInt(storeId), normalized);
+    return this.packages.adminDirectSave(BigInt(storeId), normalized, user.actorId);
   }
 }
 
 @Controller('admin/store-package-audits')
-@UseGuards(HqAuthGuard)
+@UseGuards(HqAuthGuard, HqPermissionGuard)
+@RequireHqPermissions('store_audits')
 export class AdminStorePackageAuditController {
   constructor(private readonly packages: StorePackageService) {}
 
   @Get('summary')
-  summary() {
-    return this.packages.adminAuditSummary();
+  summary(@CurrentUser() user: AuthUser) {
+    return this.packages.adminAuditSummary(user.actorId);
   }
 
   @Get()
   list(
+    @CurrentUser() user: AuthUser,
     @Query('status') status?: string,
     @Query('page') page?: string,
     @Query('pageSize') pageSize?: string,
   ) {
-    return this.packages.adminListAudits({
-      status: status || undefined,
-      page: page ? Number(page) : undefined,
-      pageSize: pageSize ? Number(pageSize) : undefined,
-    });
+    return this.packages.adminListAudits(
+      {
+        status: status || undefined,
+        page: page ? Number(page) : undefined,
+        pageSize: pageSize ? Number(pageSize) : undefined,
+      },
+      user.actorId,
+    );
   }
 
   @Get(':requestId')
-  detail(@Param('requestId') requestId: string) {
-    return this.packages.adminGetAuditDetail(BigInt(requestId));
+  detail(@CurrentUser() user: AuthUser, @Param('requestId') requestId: string) {
+    return this.packages.adminGetAuditDetail(BigInt(requestId), user.actorId);
   }
 
   @Put(':requestId/audit')