Merge pull request 'Dev' (#31) from dev into main

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

.cursor/rules/dukang-core.mdc

@@ -0,0 +1,55 @@
+---
+description: 杜康好客全局约束 — Monorepo 布局、文档优先级、2 人 OWNER 边界
+alwaysApply: true
+---
+
+# 杜康好客 · 核心规则
+
+## Monorepo 布局
+
+- `apps/` — preV1：`h5-user`、`h5-shop`、`h5-partner`、`admin-web`
+- `packages/` — `shared-types`、`domain`、`shared-ui`
+- `server/dukang-api/` — NestJS 单体 API
+- `pages/` — UI 原型（**只读参照**）
+
+> V2 目标为 Taro 四端（`mini-user` 等），编码以 **当前实际目录** 为准。
+
+## 文档
+
+- **V3.0 业务事实源**：`杜康好客-v3-PRD.md`
+- V3 实现验收：`杜康好客-v3编码手册.md`
+- V2 蓝图：`杜康好客-V2编码手册.md`（与 V3 冲突时 V3 PRD 优先）
+- preV1 裁剪：`杜康好客-preV1编码手册.md`
+- 协作：`conventions.md` · AI 入口：`AGENTS.md`
+
+**禁止**：编码时修改业务规则；需求变更只改 `杜康好客-v3-PRD.md`。
+
+## 边界（2 人团队）
+
+> **临时（2026-07）**：刘京尧任务由 `jacy-dukang` 代管，B+D 路径可改。
+
+| 负责人 | 路径 |
+|--------|------|
+| jacy-dukang | `apps/*`, `packages/`, `callbacks/`, `jobs/`, `common/`, `integrations/`, 全部 `modules/*` |
+| ~~刘京尧~~ | ~~`apps/h5-partner/`, `apps/h5-shop/`, `modules/{store,redeem}/`~~（暂代管） |
+
+- 跨模块只 inject **exported Service**，禁止 `prisma` 写他人表
+- `apps/*` 禁止 import `server/*` 或其他 app
+- Mock 只在 `integrations/*`，不在业务 Service 散落
+
+## 共享契约
+
+- 枚举/DTO → `packages/shared-types`
+- 纯规则 → `packages/domain`（无 IO）
+
+## 核心业务常量
+
+- 权益额 = `benefit_amount ?? price`
+- 核销：直接核销 `0 < amount ≤ 全部 ACTIVE 权益总余额`；带单据核销 `0 < amount ≤ 该单据可用金额`；Redis 码 3 分钟
+- 订单 Tab（V3.0）：`待付款 | 已付款 | 已完成`
+- API：`/api/v1`，响应 `{ code, message, data }`
+
+## 提交
+
+- Conventional Commits：`feat(trade):` 等
+- 不提交 `.env`

.cursor/rules/git-conventions.mdc

@@ -1,11 +1,33 @@
 ---
-description: 杜康提交 scope 与发版默认（生产）
+description: Git 提交与 PR 协作规范
 alwaysApply: true
 ---
 
-# Git / 发版（杜康专属）
+# Git 规范
 
-- Conventional Commits，scope = 端或模块：`feat(trade):`、`fix(redeem):`
+## 提交格式
-- 只说「发布/发版」→ 生产（`main` + `deploy-prod.sh`）；明确说「发测试」才 staging。流程见 `/dukang-release`
+
-- 改 API/表 → 同步 v3-PRD + v3编码手册 + `shared-types`
+Conventional Commits，scope = 端或模块名：
-- Prisma 迁移须 Review
+
+```
+feat(trade): add order preview API
+fix(redeem): validate redeem amount against balance
+chore(shared-types): add OrderStatus enum
+```
+
+## 禁止提交
+
+- `.env`、`.env.local` 等敏感配置
+- `node_modules/`、`dist/`（已在 .gitignore）
+
+## PR 与 Review
+
+- feature 分支 + 小步 PR
+- 跨模块改动需相关双 Owner Review
+- Prisma 迁移必须多 Owner Review
+
+## Agent 行为
+
+- **仅用户明确要求时** 才执行 git commit / push
+- 不 amend 已推送的 commit，不 force push main/master/dev
+- 发版：`dev`→测试(staging)，`main`→生产；用户只说「发布/发版」默认发**生产**（见 dukang-release skill）；明确说「发测试」才发 staging

.cursor/skills/dukang-coding/SKILL.md

@@ -21,7 +21,7 @@ disable-model-invocation: true
 ## 会话启动（按序）
 
 1. 确认阶段：**V3.0** → 读 `杜康好客-v3-PRD.md` + `@dukang-v3`；preV1 → preV1 手册；V2 蓝图 → V2 手册
-2. 读 [`AGENTS.md`](../../AGENTS.md) OWNER 段 + 对应 `apps/` 或 `server/dukang-api/AGENTS.md` → **只改本 OWNER 路径**
+2. 读 [`AGENTS.md`](../../AGENTS.md) OWNER 表 → **只改本 OWNER 路径**
 3. 有任务卡 ID → 配合 `dukang-task-card` skill 或查 preV1 §9 / V2 §七
 4. UI 任务 → `pages/ROUTE_MAP.md` + 对应 `pages/{端}/` 原型
 5. 编码前过一遍下方 Checklist

.cursor/skills/dukang-prev1/SKILL.md

@@ -5,7 +5,6 @@ description: >-
   MOCK_SMS/MOCK_PAY/MOCK_DELIVERY flags, Seed data, and V2 upgrade path.
   Use when working on Mock providers, feature flags, preV1 task cards P1-*,
   or smoke tests — not for V2 WeChat/payment production integration.
-disable-model-invocation: true
 ---
 
 # 杜康好客 · preV1 Mock Skill

.cursor/skills/dukang-release/SKILL.md

@@ -4,7 +4,6 @@ description: >-
   杜康好客发布流程：dev→测试(staging)，main→生产；同机双栈。
   Use when the user says 发布、上传、deploy、上线、发版、发测试、发生产,
   or @杜康发布 / @dukang-release.
-disable-model-invocation: true
 ---
 
 # 杜康发布

.cursor/skills/dukang-task-card/SKILL.md

@@ -4,7 +4,6 @@ description: >-
   Executes Dukang Haoke task cards (P1-M* or M0-M6) one at a time with DoD
   verification. Use when the user provides a task ID like P1-M2-002 or M2-FE-U-003,
   or asks to start/implement a milestone card from the coding manuals.
-disable-model-invocation: true
 ---
 
 # 杜康好客 · 任务卡 Skill

.gitignore

@@ -21,8 +21,4 @@ coverage/
 server/dukang-api/prisma/migrations/
 debug_v3.xlsx
 ~$debug_v3.xlsx
-server/dukang-api/assets/fonts/*.ttf
-server/dukang-api/assets/fonts/*.ttc
-server/dukang-api/assets/fonts/*.otf
 deploy/auto-release.env
-deploy/backups/

AGENTS.md

@@ -1,37 +1,133 @@
 # 杜康好客 · AGENTS.md
 
-> AI 编码入口。人类读 [`agent.md`](./agent.md)。启动、端口、测试账号见 [`README.md`](./README.md)。
+> AI 编码入口。人类协作者仍读 [`agent.md`](./agent.md)；本文件供 Cursor / Codex / Copilot 等自动加载。
 
-杜康酒业 O2O：**购酒 → 发券 → 门店核销**。Monorepo + NestJS 单体（`/api/v1`，`{ code, message, data }`）。
+## 项目概览
 
-| 路径 | 说明 |
+杜康酒业 O2O 平台：**购酒 → 发券 → 门店核销**。Monorepo + 单体 NestJS（方案三：模块 OWNER）。
-|------|------|
-| `apps/` | `h5-user` · `h5-shop` · `h5-partner` · `admin-web` · `mini-user` |
-| `packages/` | `shared-types`（枚举/DTO）· `domain`（纯规则，无 IO）· `shared-ui` |
-| `server/dukang-api/` | 唯一 API |
-| `pages/` | UI 原型，只读 |
 
-前端：[`apps/AGENTS.md`](./apps/AGENTS.md)。后端模块/表 OWNER：[`server/dukang-api/AGENTS.md`](./server/dukang-api/AGENTS.md)。
+| 阶段 | 手册 | 说明 |
+|------|------|------|
+| **V3.0 唯一需求源** | [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) | 产品需求与三波交付（**只看这个**） |
+| **现状对照** | [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md) | 已完成 / 冲突 / 缺口审计 |
+| **V3 实现验收** | [`杜康好客-v3编码手册.md`](./杜康好客-v3编码手册.md) | 核销规则、分工、闭环 |
+| ~~V2 / preV1~~ | 历史参考（**已压缩**；V2 全文见 git 2026-08-06 前） | **不再作为需求依据** |
 
-## 文档（冲突时）
+**禁止**：臆造 PRD 未定义规则；依赖 `doc/` 下过时文档；跨 OWNER 直写他人 Prisma 表。
 
-1. `杜康好客-v3-PRD.md` — **唯一需求事实源**（编码时禁止改业务规则；需求变更只改它）
+## 启动命令
-2. `杜康好客-v3-现状对照.md` — 进度
+
-3. `杜康好客-v3编码手册.md` — 验收、核销、分工
+```bash
-4. `conventions.md` — 协作边界
+# 基础设施
-5. V2 手册 §四–§六 — 架构/DB/API **参考**（与 V3 冲突则忽略）
+cd deploy && docker compose up -d   # dukang-v1：MySQL :6016 Redis :6017
+
+# 依赖与数据库
+pnpm install
+cp server/dukang-api/.env.example server/dukang-api/.env
+pnpm db:generate && pnpm db:validate
+cd server/dukang-api && npx prisma db push && pnpm prisma:seed
+
+# 开发（分终端）
+pnpm dev:api      # http://localhost:3010/api/v1
+pnpm dev:user     # :5173
+pnpm dev:shop     # :5174
+pnpm dev:partner  # :5175
+pnpm dev:admin    # preV1 HQ 替代（内部工具，非 V2 小程序）
+
+# 验证
+node scripts/smoke-v3.mjs
+node scripts/smoke-prev1.mjs
+pnpm lint && pnpm test
+```
+
+Mock 验证码：`999888`。测试账号见 [`README.md`](./README.md)。
+
+> **端口冲突**：`h5-partner` 与 `admin-web` 同为 5175，勿同时 `dev:partner` + `dev:admin`。
+
+## 文档优先级（冲突时）
+
+1. `杜康好客-v3-PRD.md` — **唯一需求事实源**
+2. `杜康好客-v3-现状对照.md` — 实现进度审计
+3. `杜康好客-v3编码手册.md` — 实现验收、核销、分工
+4. `conventions.md` — 协作与模块边界
+5. V2 手册 §四 §五 §六 — 仅作架构/DB/API **参考**（与 V3 冲突时忽略）
 6. `pages/{user,shop,partner,hq}/` — UI 参照
 
-**禁止**：臆造 PRD 未定义规则；依赖 `doc/` 过时文档；`apps/*` import `server/*`；跨模块 `prisma` 写他人表。V2 / preV1 手册不再作需求依据。
+> **V2 / preV1 手册不再作为需求依据。**
 
-## OWNER（2026-07 起暂由 jacy 代管全部）
+## 团队与 OWNER 边界（2 人）
 
-`jacy-dukang` 可改 `apps/*`、`packages/*`、全部后端模块。逻辑边界仍按 A/B/C/D，便于子 Agent 隔离。Prisma 迁移由 jacy 主导。
+| 负责人 | Git 账号 | 职责 |
+|--------|----------|------|
+| **Jacy**（管理员） | `jacy-dukang` | C 端、admin-web、后端主模块、packages、Prisma 迁移主 Review |
+| **刘景尧** | `刘景尧` | 合伙人 H5、门店 H5、`store` / `redeem` 模块（**暂由 jacy-dukang 代管**） |
 
-- 跨模块只 inject 对方 **exported Service**
+> **临时分工（2026-07）**：刘景尧任务暂由 `jacy-dukang` 全权负责；逻辑 OWNER B+D 路径可改，Prisma 迁移由 jacy 主导。
-- Mock 只在 `integrations/*`；微信/配送回调只进 `callbacks/`
 
-## 不可偏离
+逻辑模块边界仍按 A/B/C/D 划分（便于 Agent 隔离），**当前人员合并**如下：
+
+| 逻辑 OWNER | 负责人 | 可改路径 | 后端 Module |
+|------------|--------|----------|-------------|
+| **A + C + Lead + B + D** | jacy-dukang | `apps/*`, `packages/*`, `callbacks/`, `jobs/`, `common/`, `integrations/` | 全部后端模块 |
+| ~~B + D~~ | ~~刘景尧~~ | — | 恢复分工前由 jacy 代管 |
+
+**Prisma 迁移**：jacy-dukang 主导 Review；涉及 `store_*` / 核销表时仍建议刘景尧知会（恢复分工后共同 Review）。
+
+### 跨模块规则（R1–R8 摘要）
+
+- 只 inject 对方 Module **exports 的 Service**，禁止 `prisma.xxx` 写他人表
+- `apps/*` 禁止 import `server/*` 源码；只走 HTTP + `packages/shared-types`
+- 业务纯规则 → `packages/domain`；枚举/DTO → `packages/shared-types`
+- 微信/配送回调入口 **仅** `callbacks/`；Mock 实现 **仅** `integrations/*`
+
+## Cursor 规范
+
+| 类型 | 路径 | 说明 |
+|------|------|------|
+| Rules | `.cursor/rules/` | 自动加载的编码规范 |
+| 编码 Skill | `.cursor/skills/dukang-coding/` | @dukang-coding |
+| V3.0 需求 Skill | `.cursor/skills/dukang-v3/` | @dukang-v3（PRD、Wave、REQ/ACC） |
+| 需求 Skill | `.cursor/skills/dukang-project/` | @dukang-project |
+| preV1 Skill | `.cursor/skills/dukang-prev1/` | Mock / Feature Flag |
+| 任务卡 Skill | `.cursor/skills/dukang-task-card/` | DLV-W* / P1-* / M*-* |
+| 发布 Skill | `.cursor/skills/dukang-release/` | @杜康发布 / @dukang-release |
+
+## 子 Agent（按职责选用）
+
+在 Cursor Agent 输入 `/` 选择：
+
+| 子 Agent | 负责人 | 适用场景 |
+|----------|--------|----------|
+| `v3-delivery-lead` | jacy-dukang | V3.0 三波交付统筹、DLV 拆分、跨 Owner 协调 |
+| `v3-req-reviewer` | — | V3.0 需求只读审查、REQ/ACC 缺口分析 |
+| `owner-a-user-trade` | jacy-dukang | C 端、订单、支付、权益、埋点 |
+| `owner-c-catalog-ops` | jacy-dukang | admin-web、开城商品、结算、运营 |
+| `backend-lead` | jacy-dukang | packages、callbacks、jobs、Prisma 横切 |
+| `owner-b-partner-store` | 刘景尧 | 合伙人 H5、门店 CRUD/审核 |
+| `owner-d-shop-redeem` | 刘景尧 | 门店 H5、核销 |
+| `boundary-reviewer` | — | PR 前只读审查跨模块违规 |
+
+## Skills（按需 @）
+
+| Skill | 何时用 |
+|-------|--------|
+| `dukang-v3` | V3.0 PRD、现状对照、Wave/REQ/ACC |
+| `dukang-coding` | 实现功能、修 Bug（通用编码流程） |
+| `dukang-project` | PRD/需求评审、原型对照、任务卡规划（**不用于日常编码**） |
+| `dukang-prev1` | Mock 开关、preV1 裁剪、Feature Flag |
+| `dukang-task-card` | 领取任务卡 `DLV-W*-*` / `P1-*` / `M*-*` 并按 DoD 交付 |
+| `dukang-release`（杜康发布） | `dev_jacy`→`dev` 合并 + `deploy.sh` 发版 |
+
+## 快速指令
+
+- 现状审计：`@dukang-v3` + [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)
+- 实现 DLV 任务：`@dukang-coding 实现 DLV-W1-M2`
+- 波次规划：`/v3-delivery-lead 拆分 Wave 2 任务`
+- 需求缺口审查：`/v3-req-reviewer 审查门店提现`
+- PR 前审查：`/boundary-reviewer`
+- 原型参照：`pages/{user,shop,partner}/`（只读）
+
+## 核心业务常量（不可偏离）
 
 ```
 权益额 = benefit_amount ?? price
@@ -41,10 +137,38 @@ C 端门店仅 status=OPEN
 订单 Tab：待付款 | 已付款 | 已完成
 ```
 
-微信：iOS H5 登录后禁止仅 SPA 跳转再扫码（`packages/weixin-sdk/GOTCHAS.md`）。小程序 `open-type` 按钮祖先禁止 `stopPropagation`；weapp 标题只用 `navigationBarTitleText`。`h5-partner` 与 `admin-web` 同端口 5175，勿同时开。
+**iOS 微信 H5 JSSDK**：登录/OAuth 后禁止仅 SPA 跳转再调扫码；见 `packages/weixin-sdk/GOTCHAS.md`、知识库「门店端 · 踩坑」。
+**微信小程序 open-type**：`chooseAvatar` 等 Button 的祖先禁止 `stopPropagation`（会编成 catchtap）；见知识库「C 端 · 踩坑」、`.cursor/rules/mini-user-weapp-opentype.mdc`。
+**微信小程序页面标题**：weapp 只用原生 `navigationBarTitleText`，不要再画一层与导航栏重复的 `SubPageHeader` title；见 `.cursor/rules/mini-user-weapp-nav-title.mdc`。
 
-## 按需加载
+## 环境与发版
 
-- 编码 `/dukang-coding` · V3 需求 `/dukang-v3` · 发版 `/dukang-release`（只说「发版」= 生产）
+| 环境 | 分支 | 目录 | 端口 | 域名 |
-- 子 Agent：`/owner-a-user-trade` 等（见 `.cursor/agents/`）
+|------|------|------|------|------|
-- DoD：验收项满足；不跨模块直写表；类型在 `shared-types`、规则在 `domain`；相关 lint/单测过
+| local | `dev_jacy` | 本机 Docker 6016/6017 | API `:3010` | — |
+| **staging 测试** | `dev` | `/opt/dukang-staging` | 8190–8194 | `*-test.dukanghaoke.com` |
+| **production 生产** | `main` | `/opt/dukang` | 8090–8094 | `*.dukanghaoke.com` |
+
+- 日常发布 → `deploy/deploy-staging.sh`（`dev`）
+- 生产发布 → `deploy/deploy-prod.sh`（`main`，验收后）
+- Staging：正式微信 + 全 Mock；配置见 `.env.staging.example`
+- 详情：`@dukang-release` / `.cursor/skills/dukang-release/SKILL.md`
+
+## 提交与 PR
+
+- Conventional Commits：`feat(trade):`、`fix(redeem):`；scope = 端或模块
+- 跨模块 PR → jacy-dukang + 刘景尧 共同 Review（若涉及双方模块）
+- 改 API/表 → 同步 v3-PRD + v3编码手册 + `shared-types`
+- 不提交 `.env`、`dist/`、`node_modules/`
+
+## 完成定义（DoD）
+
+- [ ] 任务卡验收项全部满足
+- [ ] 未跨模块直写 Prisma 表
+- [ ] 枚举/DTO 在 `shared-types`；纯规则在 `domain`
+- [ ] `pnpm lint` 无新增错误；相关 domain 单测通过
+
+## 嵌套指引
+
+- 后端细节：[`server/dukang-api/AGENTS.md`](./server/dukang-api/AGENTS.md)
+- 前端四 App：[`apps/AGENTS.md`](./apps/AGENTS.md)

apps/admin-web/src/admin.css

@@ -16,109 +16,37 @@ body,
 }
 
 /*
- * 后台表格：不换行、完整展示（v3.5.9 去掉省略号）
+ * 后台内容行：不换行 + 超出省略
- * 描述列表仍省略，避免详情抽屉被长字段撑破
+ * 覆盖主内容区、Drawer、Modal 内的表格与描述列表
  */
 .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: visible;
+  overflow: hidden;
-  text-overflow: clip;
+  text-overflow: ellipsis;
 }
 
-/* 拖表头分割线改列宽 */
+/* 操作列、含交互控件的不截断 */
-.admin-layout .ant-table-thead > tr > th.admin-th-resizable {
-  position: relative;
-}
-
-.admin-col-resize-handle {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  width: 10px;
-  cursor: col-resize;
-  z-index: 3;
-  user-select: none;
-  touch-action: none;
-}
-
-.admin-col-resize-handle:hover,
-.admin-col-resizing .admin-col-resize-handle {
-  background: rgba(22, 119, 255, 0.18);
-}
-
-body.admin-col-resizing,
-body.admin-col-resizing * {
-  cursor: col-resize !important;
-  user-select: none !important;
-}
-
-/* 列表页顶栏：标题左、主操作右、列设置最右 */
-.admin-list-header {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 16px;
-  margin-bottom: 16px;
-}
-
-.admin-list-header-left {
-  min-width: 0;
-}
-
-.admin-list-header-desc {
-  margin-top: 4px;
-  color: rgba(0, 0, 0, 0.45);
-  line-height: 1.5;
-}
-
-.admin-list-header-right {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 8px;
-  flex-shrink: 0;
-  margin-left: auto;
-}
-
-.admin-list-settings-slot {
-  display: inline-flex;
-  margin-left: auto;
-  order: 99;
-  flex-shrink: 0;
-}
-
-.admin-list-settings-btn.ant-btn {
-  color: rgba(0, 0, 0, 0.55);
-  padding-inline: 8px;
-}
-
-.admin-list-settings-btn.ant-btn:hover {
-  color: rgba(0, 0, 0, 0.88);
-}
-
-/* 操作列保持可见 */
 .admin-layout .ant-table-cell:has(.ant-btn),
 .ant-drawer .ant-table-cell:has(.ant-btn),
 .ant-modal .ant-table-cell:has(.ant-btn),
@@ -143,9 +71,10 @@ body.admin-col-resizing * {
   max-width: none;
 }
 
-/* 表格单元格主/副信息同一行 */
+/* 表格单元格双行信息合并为单行省略 */
 .admin-cell-line {
-  display: inline;
+  display: block;
+  max-width: 100%;
 }
 
 .admin-cell-line-secondary {
@@ -153,23 +82,6 @@ body.admin-col-resizing * {
   font-size: 12px;
 }
 
-.admin-primary-link {
-  display: inline;
-  margin: 0;
-  padding: 0;
-  border: 0;
-  background: none;
-  font: inherit;
-  color: inherit;
-  text-decoration: underline;
-  text-underline-offset: 3px;
-  cursor: pointer;
-}
-
-.admin-primary-link:hover {
-  color: #1677ff;
-}
-
 .admin-table-nowrap .ant-table-cell,
 .admin-table-nowrap .ant-table-cell-ellipsis {
   white-space: nowrap;

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

@@ -1,10 +1,12 @@
+import { Typography } from 'antd';
+
 type AdminCellLineProps = {
   primary?: string | null;
   secondary?: string | null;
   separator?: string;
 };
 
-/** 表格单元格：主/副信息同一行完整展示 */
+/** 表格单元格：主/副信息同一行展示，超出省略，hover 显示全文 */
 export function AdminCellLine({
   primary,
   secondary,
@@ -12,9 +14,14 @@ export function AdminCellLine({
 }: AdminCellLineProps) {
   const main = primary?.trim() || '—';
   const sub = secondary?.trim();
+  const full = sub ? `${main}${separator}${sub}` : main;
 
   return (
-    <span className="admin-cell-line">
+    <Typography.Text
+      className="admin-cell-line"
+      ellipsis={{ tooltip: full }}
+      style={{ maxWidth: '100%' }}
+    >
       {main}
       {sub ? (
         <span className="admin-cell-line-secondary">
@@ -22,6 +29,6 @@ export function AdminCellLine({
           {sub}
         </span>
       ) : null}
-    </span>
+    </Typography.Text>
   );
 }

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

@@ -1,102 +0,0 @@
-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/AdminListHeader.tsx

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

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

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

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

@@ -215,10 +215,11 @@ 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: 'phone', width: 120 },
     {
       title: '管辖',

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

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

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

@@ -1,616 +0,0 @@
-import { useMemo, useState } from 'react';
-import {
-  Button, Image, Input, InputNumber, Modal, Radio, Select, Space, Switch, Table, Typography, message,
-} from 'antd';
-import { EditOutlined, MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { request } from '../lib/api';
-import { PRODUCT_STATUS_LABELS } from '../lib/constants';
-import OssUpload from './OssUpload';
-
-type SpecValue = { id?: string; name: string; sortOrder?: number };
-type SpecAttr = { id?: string; name: string; sortOrder?: number; values: SpecValue[] };
-type SkuRow = {
-  id?: string;
-  specValueIds: string[];
-  skuCode?: string;
-  barcode69: string;
-  price: number;
-  benefitAmount?: number;
-  status: string;
-  allowOnlinePurchase: boolean;
-  allowCrossCityDelivery: boolean;
-  allowOnSitePickup: boolean;
-  saleUnit: 'BOTTLE' | 'BOX';
-  bottlesPerUnit: number;
-  isDefault: boolean;
-  sortOrder?: number;
-  specText?: string;
-  imageUrl?: string | null;
-};
-
-function cartesian(attrs: SpecAttr[]): string[][] {
-  if (!attrs.length) return [[]];
-  return attrs.reduce<string[][]>(
-    (acc, attr) => {
-      const next: string[][] = [];
-      const values = attr.values.filter((v) => v.name?.trim());
-      for (const prev of acc) {
-        for (const v of values) {
-          const vid = v.id || `__new__:${attr.name}:${v.name}`;
-          next.push([...prev, vid]);
-        }
-      }
-      return next.length ? next : acc;
-    },
-    [[]],
-  );
-}
-
-function keyOf(ids: string[]) {
-  return [...ids].sort().join('_');
-}
-
-type Props = {
-  productId: string;
-  initialAttrs: SpecAttr[];
-  initialSkus: SkuRow[];
-  onSaved: () => void;
-};
-
-export default function ProductSpecsEditor({ productId, initialAttrs, initialSkus, onSaved }: Props) {
-  const [attrs, setAttrs] = useState<SpecAttr[]>(
-    initialAttrs.length
-      ? initialAttrs
-      : [],
-  );
-  const [skus, setSkus] = useState<SkuRow[]>(
-    initialSkus.length
-      ? initialSkus.map((s) => ({
-          ...s,
-          specValueIds: s.specValueIds ?? [],
-          status: s.status || 'ON_SALE',
-          allowOnlinePurchase: s.allowOnlinePurchase !== false,
-          allowCrossCityDelivery: s.allowCrossCityDelivery !== false,
-          allowOnSitePickup: !!s.allowOnSitePickup,
-          saleUnit: s.saleUnit === 'BOX' ? 'BOX' : 'BOTTLE',
-          bottlesPerUnit: s.bottlesPerUnit || (s.saleUnit === 'BOX' ? 6 : 1),
-          isDefault: !!s.isDefault,
-          imageUrl: s.imageUrl ?? '',
-        }))
-      : [
-          {
-            specValueIds: [],
-            barcode69: '',
-            price: 0,
-            status: 'ON_SALE',
-            allowOnlinePurchase: true,
-            allowCrossCityDelivery: true,
-            allowOnSitePickup: false,
-            saleUnit: 'BOTTLE',
-            bottlesPerUnit: 1,
-            isDefault: true,
-            imageUrl: '',
-          },
-        ],
-  );
-  const [saving, setSaving] = useState(false);
-  const [editIndex, setEditIndex] = useState<number | null>(null);
-
-  const combos = useMemo(() => cartesian(attrs.filter((a) => a.name.trim() && a.values.some((v) => v.name.trim()))), [attrs]);
-
-  function regenerateMatrix() {
-    const byKey = new Map(skus.map((s) => [keyOf(s.specValueIds ?? []), s]));
-    const next: SkuRow[] = combos.map((ids, i) => {
-      const existing = byKey.get(keyOf(ids));
-      if (existing) return { ...existing, specValueIds: ids, sortOrder: i };
-      return {
-        specValueIds: ids,
-        barcode69: '',
-        price: skus[0]?.price ?? 0,
-        benefitAmount: skus[0]?.benefitAmount,
-        status: 'DRAFT',
-        allowOnlinePurchase: true,
-        allowCrossCityDelivery: true,
-        allowOnSitePickup: false,
-        saleUnit: 'BOTTLE',
-        bottlesPerUnit: 1,
-        isDefault: i === 0,
-        sortOrder: i,
-        imageUrl: '',
-      };
-    });
-    if (next.length && !next.some((s) => s.isDefault)) next[0].isDefault = true;
-    setSkus(next.length ? next : skus);
-  }
-
-  function patchSku(index: number, patch: Partial<SkuRow>) {
-    setSkus((prev) => {
-      const next = [...prev];
-      next[index] = { ...next[index], ...patch };
-      return next;
-    });
-  }
-
-  async function handleSave() {
-    setSaving(true);
-    try {
-      // 1) 保存规格轴（新建值尚无 id，先提交 attrs）
-      const specsRes = await request<{
-        specAttrs: SpecAttr[];
-        skus: SkuRow[];
-      }>(`/admin/products/${productId}/specs`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          attrs: attrs.map((a, i) => ({
-            id: a.id,
-            name: a.name.trim(),
-            sortOrder: i,
-            values: a.values
-              .filter((v) => v.name.trim())
-              .map((v, j) => ({ id: v.id, name: v.name.trim(), sortOrder: j })),
-          })),
-        }),
-      });
-
-      // 映射临时 id → 真实 id
-      const nameToId = new Map<string, string>();
-      for (const a of specsRes.specAttrs ?? []) {
-        for (const v of a.values ?? []) {
-          nameToId.set(`${a.name}:${v.name}`, v.id!);
-        }
-      }
-      const resolveIds = (ids: string[]) =>
-        ids.map((id) => {
-          if (!id.startsWith('__new__:')) return id;
-          const [, attrName, valueName] = id.split(':');
-          const real = nameToId.get(`${attrName}:${valueName}`);
-          if (!real) throw new Error(`规格值未创建：${attrName}/${valueName}`);
-          return real;
-        });
-
-      const payloadSkus = skus.map((s, i) => ({
-        id: s.id,
-        specValueIds: resolveIds(s.specValueIds ?? []),
-        barcode69: s.barcode69.trim(),
-        price: s.price,
-        benefitAmount: s.benefitAmount,
-        status: s.status,
-        allowOnlinePurchase: s.allowOnlinePurchase,
-        allowCrossCityDelivery: s.allowCrossCityDelivery,
-        allowOnSitePickup: s.allowOnSitePickup,
-        saleUnit: s.saleUnit,
-        bottlesPerUnit: s.saleUnit === 'BOX' ? s.bottlesPerUnit || 6 : 1,
-        isDefault: !!s.isDefault,
-        sortOrder: i,
-        imageUrl: s.imageUrl?.trim() || null,
-      }));
-
-      const barcodes = payloadSkus.map((row) => row.barcode69);
-      if (barcodes.some((b) => !b)) throw new Error('每个规格须填写独立 69 码');
-      if (new Set(barcodes).size !== barcodes.length) {
-        throw new Error('同一商品内 69 码不可重复，每个规格请填写不同 69 码');
-      }
-
-      await request(`/admin/products/${productId}/skus`, {
-        method: 'PUT',
-        body: JSON.stringify({ skus: payloadSkus }),
-      });
-      message.success('规格与 SKU 已保存');
-      onSaved();
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '保存失败');
-    } finally {
-      setSaving(false);
-    }
-  }
-
-  const editing = editIndex != null ? skus[editIndex] : null;
-
-  return (
-    <div>
-      <Typography.Paragraph type="secondary">
-        SKU 码由系统自动生成（DK 开头），无需填写。每个规格必须填写<strong>互不相同</strong>的 69 码，并可单独上传主图。
-        点「填写」在弹窗中编辑。先配置销售规格轴（如「包装」），再生成 SKU 矩阵。
-      </Typography.Paragraph>
-
-      <Typography.Title level={5}>规格轴</Typography.Title>
-      {attrs.map((attr, ai) => (
-        <div key={ai} style={{ marginBottom: 12, padding: 12, border: '1px solid #f0f0f0', borderRadius: 8 }}>
-          <Space align="start" style={{ width: '100%' }} wrap>
-            <Input
-              style={{ width: 140 }}
-              placeholder="规格名"
-              value={attr.name}
-              onChange={(e) => {
-                const next = [...attrs];
-                next[ai] = { ...attr, name: e.target.value };
-                setAttrs(next);
-              }}
-            />
-            <Button
-              type="text"
-              danger
-              icon={<MinusCircleOutlined />}
-              onClick={() => setAttrs(attrs.filter((_, i) => i !== ai))}
-            />
-          </Space>
-          <div style={{ marginTop: 8 }}>
-            {attr.values.map((val, vi) => (
-              <Space key={vi} style={{ display: 'flex', marginBottom: 6 }}>
-                <Input
-                  placeholder="规格值"
-                  value={val.name}
-                  onChange={(e) => {
-                    const next = [...attrs];
-                    const values = [...attr.values];
-                    values[vi] = { ...val, name: e.target.value };
-                    next[ai] = { ...attr, values };
-                    setAttrs(next);
-                  }}
-                />
-                <Button
-                  type="text"
-                  danger
-                  icon={<MinusCircleOutlined />}
-                  onClick={() => {
-                    const next = [...attrs];
-                    next[ai] = { ...attr, values: attr.values.filter((_, j) => j !== vi) };
-                    setAttrs(next);
-                  }}
-                />
-              </Space>
-            ))}
-            <Button
-              type="dashed"
-              size="small"
-              icon={<PlusOutlined />}
-              onClick={() => {
-                const next = [...attrs];
-                next[ai] = { ...attr, values: [...attr.values, { name: '' }] };
-                setAttrs(next);
-              }}
-            >
-              添加规格值
-            </Button>
-          </div>
-        </div>
-      ))}
-      <Space style={{ marginBottom: 16 }}>
-        <Button
-          icon={<PlusOutlined />}
-          disabled={attrs.length >= 3}
-          onClick={() => setAttrs([...attrs, { name: '', values: [{ name: '' }] }])}
-        >
-          添加规格轴
-        </Button>
-        <Button onClick={regenerateMatrix}>按规格生成 SKU 矩阵</Button>
-      </Space>
-
-      <Typography.Title level={5}>SKU 列表</Typography.Title>
-      <Table
-        size="small"
-        rowKey={(_, i) => String(i)}
-        pagination={false}
-        scroll={{ x: 1240 }}
-        dataSource={skus}
-        columns={[
-          {
-            title: '规格',
-            width: 140,
-            render: (_, row) => row.specText || (row.specValueIds?.length ? row.specValueIds.join(',') : '默认'),
-          },
-          {
-            title: 'SKU',
-            width: 110,
-            render: (_, row) => (
-              <Typography.Text type="secondary">
-                {row.skuCode || '保存后自动生成'}
-              </Typography.Text>
-            ),
-          },
-          {
-            title: <span>69码 <Typography.Text type="danger">*</Typography.Text></span>,
-            width: 180,
-            render: (_, row, index) => (
-              <Input
-                placeholder="本规格独立 69 码"
-                value={row.barcode69}
-                onChange={(e) => {
-                  const next = [...skus];
-                  next[index] = { ...row, barcode69: e.target.value };
-                  setSkus(next);
-                }}
-              />
-            ),
-          },
-          {
-            title: '售价',
-            width: 100,
-            render: (_, row, index) => (
-              <InputNumber
-                min={0}
-                style={{ width: '100%' }}
-                value={row.price}
-                onChange={(v) => {
-                  const next = [...skus];
-                  next[index] = { ...row, price: Number(v) || 0 };
-                  setSkus(next);
-                }}
-              />
-            ),
-          },
-          {
-            title: '权益',
-            width: 100,
-            render: (_, row, index) => (
-              <InputNumber
-                min={0}
-                style={{ width: '100%' }}
-                value={row.benefitAmount}
-                onChange={(v) => {
-                  const next = [...skus];
-                  next[index] = { ...row, benefitAmount: v == null ? undefined : Number(v) };
-                  setSkus(next);
-                }}
-              />
-            ),
-          },
-          {
-            title: '状态',
-            width: 110,
-            render: (_, row, index) => (
-              <Select
-                style={{ width: '100%' }}
-                value={row.status}
-                options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
-                onChange={(status) => {
-                  const next = [...skus];
-                  next[index] = { ...row, status };
-                  setSkus(next);
-                }}
-              />
-            ),
-          },
-          {
-            title: '单位',
-            width: 160,
-            render: (_, row, index) => (
-              <Space>
-                <Select
-                  style={{ width: 80 }}
-                  value={row.saleUnit}
-                  options={[
-                    { value: 'BOTTLE', label: '瓶' },
-                    { value: 'BOX', label: '箱' },
-                  ]}
-                  onChange={(saleUnit) => {
-                    const next = [...skus];
-                    next[index] = {
-                      ...row,
-                      saleUnit,
-                      bottlesPerUnit: saleUnit === 'BOX' ? row.bottlesPerUnit || 6 : 1,
-                    };
-                    setSkus(next);
-                  }}
-                />
-                {row.saleUnit === 'BOX' ? (
-                  <InputNumber
-                    min={1}
-                    style={{ width: 70 }}
-                    value={row.bottlesPerUnit}
-                    onChange={(v) => {
-                      const next = [...skus];
-                      next[index] = { ...row, bottlesPerUnit: Number(v) || 6 };
-                      setSkus(next);
-                    }}
-                  />
-                ) : null}
-              </Space>
-            ),
-          },
-          {
-            title: '履约',
-            width: 200,
-            render: (_, row, index) => (
-              <Space direction="vertical" size={0}>
-                <Switch
-                  checkedChildren="线上"
-                  unCheckedChildren="线上"
-                  checked={row.allowOnlinePurchase}
-                  onChange={(checked) => {
-                    const next = [...skus];
-                    next[index] = {
-                      ...row,
-                      allowOnlinePurchase: checked,
-                      allowCrossCityDelivery: checked ? row.allowCrossCityDelivery : false,
-                    };
-                    setSkus(next);
-                  }}
-                />
-                <Switch
-                  checkedChildren="跨城"
-                  unCheckedChildren="跨城"
-                  disabled={!row.allowOnlinePurchase}
-                  checked={row.allowCrossCityDelivery}
-                  onChange={(checked) => {
-                    const next = [...skus];
-                    next[index] = { ...row, allowCrossCityDelivery: checked };
-                    setSkus(next);
-                  }}
-                />
-                <Switch
-                  checkedChildren="现场"
-                  unCheckedChildren="现场"
-                  checked={row.allowOnSitePickup}
-                  onChange={(checked) => {
-                    const next = [...skus];
-                    next[index] = { ...row, allowOnSitePickup: checked };
-                    setSkus(next);
-                  }}
-                />
-              </Space>
-            ),
-          },
-          {
-            title: '默认',
-            width: 70,
-            render: (_, row, index) => (
-              <Radio
-                checked={row.isDefault}
-                onChange={() => {
-                  setSkus(skus.map((s, i) => ({ ...s, isDefault: i === index })));
-                }}
-              />
-            ),
-          },
-          {
-            title: '主图',
-            width: 72,
-            render: (_, row) =>
-              row.imageUrl ? (
-                <Image src={row.imageUrl} width={40} height={40} style={{ objectFit: 'cover', borderRadius: 4 }} />
-              ) : (
-                <Typography.Text type="secondary">无</Typography.Text>
-              ),
-          },
-          {
-            title: '编辑',
-            width: 80,
-            fixed: 'right',
-            render: (_, row, index) => (
-              <Button type="link" size="small" icon={<EditOutlined />} onClick={() => setEditIndex(index)}>
-                填写
-              </Button>
-            ),
-          },
-        ]}
-      />
-
-      <Button type="primary" loading={saving} style={{ marginTop: 16 }} onClick={() => void handleSave()}>
-        保存规格与 SKU
-      </Button>
-
-      <Modal
-        title={`编辑规格${editing?.specText ? ` · ${editing.specText}` : editing?.skuCode ? ` · ${editing.skuCode}` : ''}`}
-        open={editIndex != null}
-        onCancel={() => setEditIndex(null)}
-        onOk={() => setEditIndex(null)}
-        okText="完成"
-        width={560}
-        destroyOnClose
-      >
-        {editing && editIndex != null ? (
-          <Space direction="vertical" size={14} style={{ width: '100%' }}>
-            <div>
-              <Typography.Text type="secondary">SKU</Typography.Text>
-              <div>{editing.skuCode || '保存后自动生成'}</div>
-            </div>
-            <div>
-              <Typography.Text>69 码 <Typography.Text type="danger">*</Typography.Text></Typography.Text>
-              <Input
-                placeholder="本规格独立 69 码"
-                value={editing.barcode69}
-                onChange={(e) => patchSku(editIndex, { barcode69: e.target.value })}
-              />
-            </div>
-            <div>
-              <Typography.Text>主图</Typography.Text>
-              <OssUpload
-                bizType="COVER"
-                value={editing.imageUrl || ''}
-                onChange={(url) => patchSku(editIndex, { imageUrl: url })}
-              />
-            </div>
-            <Space>
-              <div>
-                <Typography.Text>售价</Typography.Text>
-                <InputNumber
-                  min={0}
-                  style={{ width: 140 }}
-                  value={editing.price}
-                  onChange={(v) => patchSku(editIndex, { price: Number(v) || 0 })}
-                />
-              </div>
-              <div>
-                <Typography.Text>权益</Typography.Text>
-                <InputNumber
-                  min={0}
-                  style={{ width: 140 }}
-                  value={editing.benefitAmount}
-                  onChange={(v) => patchSku(editIndex, { benefitAmount: v == null ? undefined : Number(v) })}
-                />
-              </div>
-            </Space>
-            <div>
-              <Typography.Text>状态</Typography.Text>
-              <Select
-                style={{ width: '100%' }}
-                value={editing.status}
-                options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
-                onChange={(status) => patchSku(editIndex, { status })}
-              />
-            </div>
-            <Space>
-              <Select
-                style={{ width: 100 }}
-                value={editing.saleUnit}
-                options={[
-                  { value: 'BOTTLE', label: '瓶' },
-                  { value: 'BOX', label: '箱' },
-                ]}
-                onChange={(saleUnit) =>
-                  patchSku(editIndex, {
-                    saleUnit,
-                    bottlesPerUnit: saleUnit === 'BOX' ? editing.bottlesPerUnit || 6 : 1,
-                  })
-                }
-              />
-              {editing.saleUnit === 'BOX' ? (
-                <InputNumber
-                  min={1}
-                  value={editing.bottlesPerUnit}
-                  onChange={(v) => patchSku(editIndex, { bottlesPerUnit: Number(v) || 6 })}
-                />
-              ) : null}
-            </Space>
-            <Space>
-              <Switch
-                checkedChildren="线上"
-                unCheckedChildren="线上"
-                checked={editing.allowOnlinePurchase}
-                onChange={(checked) =>
-                  patchSku(editIndex, {
-                    allowOnlinePurchase: checked,
-                    allowCrossCityDelivery: checked ? editing.allowCrossCityDelivery : false,
-                  })
-                }
-              />
-              <Switch
-                checkedChildren="跨城"
-                unCheckedChildren="跨城"
-                disabled={!editing.allowOnlinePurchase}
-                checked={editing.allowCrossCityDelivery}
-                onChange={(checked) => patchSku(editIndex, { allowCrossCityDelivery: checked })}
-              />
-              <Switch
-                checkedChildren="现场"
-                unCheckedChildren="现场"
-                checked={editing.allowOnSitePickup}
-                onChange={(checked) => patchSku(editIndex, { allowOnSitePickup: checked })}
-              />
-              <Switch
-                checkedChildren="默认"
-                unCheckedChildren="默认"
-                checked={editing.isDefault}
-                onChange={(checked) => {
-                  if (!checked) return;
-                  setSkus((prev) => prev.map((s, i) => ({ ...s, isDefault: i === editIndex })));
-                }}
-              />
-            </Space>
-          </Space>
-        ) : null}
-      </Modal>
-    </div>
-  );
-}

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

@@ -51,7 +51,6 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
   const [regionCodes, setRegionCodes] = useState<string[]>([]);
   const [addressDetail, setAddressDetail] = useState('');
   const [productId, setProductId] = useState<string>();
-  const [skuId, setSkuId] = useState<string>();
   const [quantity, setQuantity] = useState(2);
   const [promoCodeId, setPromoCodeId] = useState<string>();
   const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>('ADDRESS');
@@ -88,37 +87,9 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
   }, [open]);
 
   const selectedProduct = options?.products.find((p) => p.id === productId);
-  const skuOptions = (selectedProduct?.skus ?? []).filter((s) => s.status === 'ON_SALE');
+  const allowOnline = selectedProduct ? selectedProduct.allowOnlinePurchase !== false : true;
-  const selectedSku =
+  const allowOnSite = !!selectedProduct?.allowOnSitePickup;
-    skuOptions.find((s) => s.id === skuId) ||
+  const allowCrossCity = selectedProduct ? selectedProduct.allowCrossCityDelivery !== false : true;
-    skuOptions.find((s) => s.id === selectedProduct?.defaultSkuId) ||
-    skuOptions[0];
-  const allowOnline = selectedSku
-    ? selectedSku.allowOnlinePurchase !== false
-    : selectedProduct
-      ? selectedProduct.allowOnlinePurchase !== false
-      : true;
-  const allowOnSite = selectedSku
-    ? !!selectedSku.allowOnSitePickup
-    : !!selectedProduct?.allowOnSitePickup;
-  const allowCrossCity = selectedSku
-    ? selectedSku.allowCrossCityDelivery !== false
-    : selectedProduct
-      ? selectedProduct.allowCrossCityDelivery !== false
-      : true;
-
-  useEffect(() => {
-    if (!open || !selectedProduct) return;
-    const def =
-      skuOptions.find((s) => s.id === selectedProduct.defaultSkuId) ||
-      skuOptions.find((s) => s.isDefault) ||
-      skuOptions[0];
-    if (def && skuId !== def.id && (!skuId || !skuOptions.some((s) => s.id === skuId))) {
-      setSkuId(def.id);
-      setQuantity(def.saleUnit === 'BOX' ? 1 : Math.max(quantity, 2));
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open, productId, selectedProduct?.id]);
 
   useEffect(() => {
     if (!open || !selectedProduct) return;
@@ -144,7 +115,6 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
           productId,
           quantity,
           deliveryMode,
-          skuId: skuId || undefined,
           receiverCity: deliveryMode === 'ADDRESS' ? region?.city || undefined : undefined,
           receiverDistrict: deliveryMode === 'ADDRESS' ? region?.district || undefined : undefined,
         }),
@@ -154,7 +124,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
         .finally(() => setPreviewLoading(false));
     }, 300);
     return () => window.clearTimeout(timer);
-  }, [open, productId, skuId, quantity, deliveryMode, region?.city, region?.district, step]);
+  }, [open, productId, quantity, deliveryMode, region?.city, region?.district, step]);
 
   useEffect(() => () => stopPoll(), []);
 
@@ -165,8 +135,6 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
     setRegionCodes([]);
     setAddressDetail('');
     setQuantity(2);
-    setProductId(undefined);
-    setSkuId(undefined);
     setPromoCodeId(undefined);
     setDeliveryMode('ADDRESS');
     setAutoReceive(false);
@@ -234,7 +202,6 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
       productId: productId!,
       quantity,
       promoCodeId: promoCodeId || undefined,
-      skuId: skuId || undefined,
     };
 
     setSubmitting(true);
@@ -350,10 +317,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
                 loading={loadingOptions}
                 placeholder="选择商品"
                 value={productId}
-                onChange={(id) => {
+                onChange={setProductId}
-                  setProductId(id);
-                  setSkuId(undefined);
-                }}
                 options={(options?.products ?? []).map((p) => ({
                   value: p.id,
                   label: `${p.name} · ${p.spec} · ¥${fmtMoney(p.price)}`,
@@ -361,25 +325,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
               />
             </Form.Item>
 
-            {skuOptions.length > 1 || selectedProduct?.specEnabled ? (
+            <Form.Item label="数量" required>
-              <Form.Item label="规格" required>
-                <Select
-                  placeholder="选择规格"
-                  value={skuId}
-                  onChange={(id) => {
-                    setSkuId(id);
-                    const sku = skuOptions.find((s) => s.id === id);
-                    if (sku?.saleUnit === 'BOX') setQuantity(1);
-                  }}
-                  options={skuOptions.map((s) => ({
-                    value: s.id,
-                    label: `${s.specText || '默认'} · ¥${fmtMoney(s.price)} · ${s.saleUnit === 'BOX' ? `${s.bottlesPerUnit}瓶/箱` : '瓶'}`,
-                  }))}
-                />
-              </Form.Item>
-            ) : null}
-
-            <Form.Item label={selectedSku?.saleUnit === 'BOX' ? '数量（箱）' : '数量（瓶）'} required>
               <InputNumber
                 min={1}
                 value={quantity}

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

@@ -23,11 +23,6 @@ export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone =
         cityName?: string;
         address?: string;
         partnerAccount?: { companyName?: string };
-        primaryAccount?: {
-          bankAccountName?: string | null;
-          bankAccountNo?: string | null;
-          bankBranch?: string | null;
-        } | null;
       }
     | undefined;
   const coupon = detail.coupon as { couponNo?: string; order?: { orderNo?: string } } | undefined;
@@ -51,15 +46,6 @@ export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone =
       </Descriptions.Item>
       <Descriptions.Item label="门店地址">{store?.address ?? '—'}</Descriptions.Item>
       <Descriptions.Item label="合伙人">{store?.partnerAccount?.companyName ?? '—'}</Descriptions.Item>
-      <Descriptions.Item label="收款户名">
-        {store?.primaryAccount?.bankAccountName || '—'}
-      </Descriptions.Item>
-      <Descriptions.Item label="收款账号">
-        {store?.primaryAccount?.bankAccountNo || '—'}
-      </Descriptions.Item>
-      <Descriptions.Item label="开户行">
-        {store?.primaryAccount?.bankBranch || '—'}
-      </Descriptions.Item>
       <Descriptions.Item label="权益券号">{coupon?.couponNo ?? '—'}</Descriptions.Item>
       <Descriptions.Item label="关联订单">{coupon?.order?.orderNo ?? '—'}</Descriptions.Item>
       {Array.isArray(detail.allocations) && (detail.allocations as unknown[]).length > 0 ? (

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

@@ -174,13 +174,11 @@ function PackageDetailCard({
   pkg,
   change,
   changes,
-  imageSize = 72,
 }: {
   title?: string;
   pkg: StorePackageItemDto | StorePackageViewDto;
   change?: keyof typeof CHANGE_LABELS;
   changes?: FieldChange[];
-  imageSize?: number;
 }) {
   const images = normalizeStorePackageImageUrls(pkg);
   const meta = change ? CHANGE_LABELS[change] : null;
@@ -219,7 +217,7 @@ function PackageDetailCard({
         <Image.PreviewGroup>
           <Space wrap size={8}>
             {images.map((url) => (
-              <Image key={url} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
+              <Image key={url} src={url} width={72} height={72} style={{ objectFit: 'cover', borderRadius: 4 }} />
             ))}
           </Space>
         </Image.PreviewGroup>
@@ -267,7 +265,6 @@ export type StorePackageAuditPanelProps = {
   requestId: string;
   /** 是否在面板顶部显示通过/驳回（抽屉 extra 另有按钮时可关） */
   showActions?: boolean;
-  fullscreen?: boolean;
   onAudited?: () => void;
   onDetailLoaded?: (detail: StorePackageAuditDetailDto | null) => void;
 };
@@ -276,7 +273,6 @@ export type StorePackageAuditPanelProps = {
 export default function StorePackageAuditPanel({
   requestId,
   showActions = true,
-  fullscreen = false,
   onAudited,
   onDetailLoaded,
 }: StorePackageAuditPanelProps) {
@@ -393,7 +389,6 @@ export default function StorePackageAuditPanel({
                 title={`套餐 ${index + 1}`}
                 pkg={pkg}
                 change={changeByKey.get(packageKey(pkg, index))}
-                imageSize={fullscreen ? 160 : 72}
               />
             ))
           ) : (
@@ -412,7 +407,6 @@ export default function StorePackageAuditPanel({
                 pkg={pkg}
                 change={changeByKey.get(packageKey(pkg, index))}
                 changes={changesByKey.get(packageKey(pkg, index))}
-                imageSize={fullscreen ? 160 : 72}
               />
             ))
           ) : (

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

@@ -20,11 +20,10 @@ import {
   AccountBookOutlined,
   ProjectOutlined,
 } from '@ant-design/icons';
-import { hasAnySystemSettingsPermission, hasAnyStoreMenuPermission } from '@dukang/shared-types';
+import { hasAnySystemSettingsPermission } 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;
 
@@ -157,9 +156,6 @@ 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');
   }
@@ -179,11 +175,11 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/knowledge-bases': 'knowledge_bases',
     'stores-group': 'stores',
     '/stores': 'stores',
-    '/store-package-audits': 'store_audits',
+    '/store-package-audits': 'stores',
-    '/store-ratings': 'store_ratings',
+    '/store-ratings': 'stores',
-    '/store-categories': 'store_categories',
+    '/store-categories': 'stores',
-    '/store-accounts': 'store_accounts',
+    '/store-accounts': 'stores',
-    '/store-media': 'store_media',
+    '/store-media': 'stores',
     'partners-group': 'partners',
     '/cities': 'partners',
     '/city-partners': 'partners',
@@ -200,10 +196,10 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/benefit/ledgers': 'benefit',
     '/redeem-records': 'benefit',
     '/redeem-pending': 'benefit',
-    '/redeem/debug': 'benefit_debug',
+    '/redeem/debug': 'benefit',
     'deliveries-group': 'deliveries',
     '/deliveries': 'deliveries',
-    '/deliveries/xiaofeixia': 'deliveries_debug',
+    '/deliveries/xiaofeixia': 'deliveries',
     '/tickets': 'tickets',
     '/tickets/support': 'tech_support',
     'dev-plan-group': 'dev_plan',
@@ -417,9 +413,7 @@ export default function AdminLayout() {
           style={{ flex: 1, minHeight: 0, overflow: 'auto' }}
         >
           <Content style={{ margin: 24 }}>
-            <ListColumnPrefsProvider initial={profile?.listColumnPrefs}>
+            <Outlet />
-              <Outlet />
-            </ListColumnPrefsProvider>
           </Content>
         </div>
       </Layout>

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

@@ -1,54 +0,0 @@
-import { createContext, useCallback, useContext, useEffect, useMemo, useState, type ReactNode } from 'react';
-import type { HqListColumnKey, HqListColumnPref, HqListColumnPrefsMap } from '@dukang/shared-types';
-import { request } from './api';
-
-type Ctx = {
-  prefs: HqListColumnPrefsMap;
-  ready: boolean;
-  setPrefs: (next: HqListColumnPrefsMap) => void;
-  save: (listKey: HqListColumnKey, next: HqListColumnPref | null) => Promise<void>;
-};
-
-const ListColumnPrefsContext = createContext<Ctx>({
-  prefs: {},
-  ready: false,
-  setPrefs: () => {},
-  save: async () => {},
-});
-
-export function ListColumnPrefsProvider({
-  initial,
-  children,
-}: {
-  initial?: HqListColumnPrefsMap;
-  children: ReactNode;
-}) {
-  const [prefs, setPrefs] = useState<HqListColumnPrefsMap>(initial ?? {});
-  const [ready] = useState(true);
-
-  useEffect(() => {
-    if (initial) setPrefs(initial);
-  }, [initial]);
-
-  const save = useCallback(async (listKey: HqListColumnKey, next: HqListColumnPref | null) => {
-    const res = await request<{ listColumnPrefs: HqListColumnPrefsMap }>(
-      `/admin/me/list-columns/${listKey}`,
-      {
-        method: 'PUT',
-        body: JSON.stringify(
-          next
-            ? { order: next.order, hidden: next.hidden, widths: next.widths }
-            : { reset: true },
-        ),
-      },
-    );
-    setPrefs(res.listColumnPrefs ?? {});
-  }, []);
-
-  const value = useMemo(() => ({ prefs, ready, setPrefs, save }), [prefs, ready, save]);
-  return <ListColumnPrefsContext.Provider value={value}>{children}</ListColumnPrefsContext.Provider>;
-}
-
-export function useListColumnPrefs() {
-  return useContext(ListColumnPrefsContext);
-}

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

@@ -1,5 +1,3 @@
-import type { HqListColumnPrefsMap } from '@dukang/shared-types';
-
 export const apiBase = '/api/v1';
 export const CLIENT_APP = 'HQ_WEB';
 
@@ -10,9 +8,6 @@ export type HqProfile = {
   adminRole: string;
   status: string;
   permissionKeys?: string[];
-  cityIds?: string[];
-  cityScoped?: boolean;
-  listColumnPrefs?: HqListColumnPrefsMap;
 };
 
 export function getToken() {
@@ -92,9 +87,6 @@ export type DashboardStats = {
   openTickets?: number;
   pendingStoreWithdrawals?: number;
   overdueStoreWithdrawals?: number;
-  pendingStoreOnboard?: number;
-  pendingStorePackageAudits?: number;
-  pendingStoreInfoChanges?: number;
   ordersByStatus: Array<{ status: string; count: number }>;
 };
 
@@ -169,7 +161,6 @@ export type AdminUserRow = {
   wxOpenId: string | null;
   wechatVerified: boolean;
   nickname: string | null;
-  hqRemark: string | null;
   status: number;
   sourceType: string;
   sourceRefId: string | null;
@@ -202,21 +193,8 @@ export type AdminOrderRow = {
   productName?: string;
   productSpec?: string;
   quantity?: number;
-  saleUnit?: string;
   receiverName: string;
   receiverPhone: string;
-  receiverProvince?: string;
-  receiverCity?: string;
-  receiverDistrict?: string;
-  receiverAddress?: string;
-  benefitAmount?: number;
-  benefitCoupon?: {
-    couponNo?: string;
-    totalAmount?: number;
-    usedAmount?: number;
-    balance?: number;
-    status?: string;
-  } | null;
   createdAt: string;
   cityId?: string;
   city?: { id: string; name: string; code: string };

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

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

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

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

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

@@ -8,19 +8,3 @@ export function downloadExcelCsv(csv: string, filename: string) {
   a.click();
   URL.revokeObjectURL(url);
 }
-
-/** Download binary file from base64 payload returned by HQ export APIs. */
-export function downloadBase64File(contentBase64: string, filename: string, mimeType: string) {
-  const binary = atob(contentBase64);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i += 1) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  const blob = new Blob([bytes], { type: mimeType });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement('a');
-  a.href = url;
-  a.download = filename;
-  a.click();
-  URL.revokeObjectURL(url);
-}

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

@@ -1,97 +0,0 @@
-import type { ColumnType } from 'antd/es/table';
-import type { HqListColumnKey, HqListColumnPref } from '@dukang/shared-types';
-
-export const SERIAL_COLUMN_KEY = '__serial';
-export const ACTIONS_COLUMN_KEY = '__actions';
-
-export function columnKey<T>(col: ColumnType<T>, index: number): string {
-  if (col.key != null && String(col.key).length) return String(col.key);
-  const dataIndex = col.dataIndex;
-  if (typeof dataIndex === 'string' && dataIndex) return dataIndex;
-  if (Array.isArray(dataIndex) && dataIndex.length) return dataIndex.map(String).join('.');
-  if (typeof col.title === 'string' && col.title) return col.title;
-  return `col-${index}`;
-}
-
-export function isActionsColumn<T>(col: ColumnType<T>, key: string): boolean {
-  if (key === ACTIONS_COLUMN_KEY || key === 'actions' || key === 'action') return true;
-  return col.title === '操作';
-}
-
-export function mergeColumnOrder(defaultKeys: string[], pref?: HqListColumnPref): string[] {
-  const known = new Set(defaultKeys);
-  const ordered = (pref?.order ?? []).filter((k) => known.has(k));
-  for (const key of defaultKeys) {
-    if (ordered.includes(key)) continue;
-    const defaultIdx = defaultKeys.indexOf(key);
-    let insertAt = ordered.length;
-    for (let i = 0; i < ordered.length; i += 1) {
-      if (defaultKeys.indexOf(ordered[i]) > defaultIdx) {
-        insertAt = i;
-        break;
-      }
-    }
-    ordered.splice(insertAt, 0, key);
-  }
-  return ordered;
-}
-
-export function visibleColumnKeys(defaultKeys: string[], pref?: HqListColumnPref): string[] {
-  const hidden = new Set(pref?.hidden ?? []);
-  return mergeColumnOrder(defaultKeys, pref).filter((k) => !hidden.has(k));
-}
-
-export function applyColumnPrefs<T>(
-  columns: ColumnType<T>[],
-  pref: HqListColumnPref | undefined,
-): ColumnType<T>[] {
-  const keyed = columns.map((col, i) => {
-    const key = columnKey(col, i);
-    return { col: { ...col, key }, key, actions: isActionsColumn(col, key) };
-  });
-  const configurable = keyed.filter((c) => !c.actions);
-  const actions = keyed.filter((c) => c.actions);
-  const defaultKeys = configurable.map((c) => c.key);
-  const visible = new Set(visibleColumnKeys(defaultKeys, pref));
-  const orderedKeys = mergeColumnOrder(defaultKeys, pref).filter((k) => visible.has(k));
-  const byKey = new Map(configurable.map((c) => [c.key, c.col]));
-  return [
-    ...orderedKeys
-      .map((k) => {
-        const col = byKey.get(k);
-        if (!col) return null;
-        const w = pref?.widths?.[k];
-        return w != null ? { ...col, width: w } : col;
-      })
-      .filter((c): c is ColumnType<T> => !!c),
-    ...actions.map((c) => {
-      const w = pref?.widths?.[c.key];
-      return w != null ? { ...c.col, width: w } : c.col;
-    }),
-  ];
-}
-
-export type ListColumnSettingItem = {
-  key: string;
-  title: string;
-  visible: boolean;
-};
-
-export function settingItems<T>(
-  columns: ColumnType<T>[],
-  pref?: HqListColumnPref,
-): ListColumnSettingItem[] {
-  const keyed = columns
-    .map((col, i) => ({ col, key: columnKey(col, i) }))
-    .filter(({ col, key }) => !isActionsColumn(col, key));
-  const hidden = new Set(pref?.hidden ?? []);
-  const order = mergeColumnOrder(keyed.map((c) => c.key), pref);
-  const byKey = new Map(keyed.map((c) => [c.key, c.col]));
-  return order.map((key) => {
-    const col = byKey.get(key);
-    const title = typeof col?.title === 'string' ? col.title : key;
-    return { key, title, visible: !hidden.has(key) };
-  });
-}
-
-export type { HqListColumnKey };

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

@@ -1,175 +0,0 @@
-import { useCallback, useMemo, useRef, useState } from 'react';
-import { Button, message } from 'antd';
-import { SettingOutlined } from '@ant-design/icons';
-import type { ColumnsType, ColumnType } from 'antd/es/table';
-import type { HqListColumnKey } from '@dukang/shared-types';
-import { AdminListColumnsModal } from '../components/AdminListColumnsModal';
-import { useListColumnPrefs } from './ListColumnPrefsContext';
-import {
-  ACTIONS_COLUMN_KEY,
-  SERIAL_COLUMN_KEY,
-  applyColumnPrefs,
-  columnKey,
-  settingItems,
-  type ListColumnSettingItem,
-} from './list-column-prefs';
-import { beginColumnResize, withResizeTitle } from './column-resize';
-
-type Options = {
-  page?: number;
-  pageSize?: number;
-};
-
-export function useAdminListColumns<T>(
-  listKey: HqListColumnKey,
-  allColumns: ColumnsType<T>,
-  options: Options = {},
-) {
-  const { page = 1, pageSize = 20 } = options;
-  const { prefs, save } = useListColumnPrefs();
-  const [open, setOpen] = useState(false);
-  const [saving, setSaving] = useState(false);
-  const [localWidths, setLocalWidths] = useState<Record<string, number>>({});
-  const pref = prefs[listKey];
-  const prefRef = useRef(pref);
-  prefRef.current = pref;
-  const localWidthsRef = useRef(localWidths);
-  localWidthsRef.current = localWidths;
-  const itemsRef = useRef<ListColumnSettingItem[]>([]);
-
-  const configured = useMemo(
-    () => applyColumnPrefs(allColumns as ColumnType<T>[], pref),
-    [allColumns, pref],
-  );
-
-  const items = useMemo(
-    () => settingItems(allColumns as ColumnType<T>[], pref),
-    [allColumns, pref],
-  );
-  itemsRef.current = items;
-
-  const serialCol: ColumnType<T> = useMemo(
-    () => ({
-      key: SERIAL_COLUMN_KEY,
-      title: '序号',
-      width: 64,
-      fixed: 'left' as const,
-      render: (_: unknown, __: T, index: number) => (page - 1) * pageSize + index + 1,
-    }),
-    [page, pageSize],
-  );
-
-  const persistPref = useCallback(
-    async (next: { order: string[]; hidden: string[]; widths?: Record<string, number> } | null) => {
-      if (!next) {
-        setLocalWidths({});
-        await save(listKey, null);
-        return;
-      }
-      await save(listKey, next);
-    },
-    [listKey, save],
-  );
-
-  const persist = useCallback(
-    async (next: ListColumnSettingItem[] | null) => {
-      setSaving(true);
-      try {
-        if (!next) {
-          await persistPref(null);
-        } else {
-          const widths = { ...(prefRef.current?.widths ?? {}), ...localWidthsRef.current };
-          await persistPref({
-            order: next.map((i) => i.key),
-            hidden: next.filter((i) => !i.visible).map((i) => i.key),
-            ...(Object.keys(widths).length ? { widths } : {}),
-          });
-        }
-        setOpen(false);
-        message.success(next ? '列设置已保存' : '已恢复默认列');
-      } catch (e) {
-        message.error(e instanceof Error ? e.message : '保存失败');
-      } finally {
-        setSaving(false);
-      }
-    },
-    [persistPref],
-  );
-
-  const persistWidth = useCallback(
-    async (key: string, width: number) => {
-      const current = prefRef.current;
-      const prevW = current?.widths?.[key];
-      if (prevW === width) return;
-      const order = current?.order?.length ? current.order : itemsRef.current.map((i) => i.key);
-      const hidden = current?.hidden ?? [];
-      const widths = { ...(current?.widths ?? {}), ...localWidthsRef.current, [key]: width };
-      try {
-        await persistPref({ order, hidden, widths });
-      } catch (e) {
-        message.error(e instanceof Error ? e.message : '列宽保存失败');
-      }
-    },
-    [persistPref],
-  );
-
-  const columns = useMemo<ColumnsType<T>>(() => {
-    const merged: ColumnType<T>[] = [
-      serialCol,
-      ...configured.map((col) =>
-        col.title === '操作' || col.key === ACTIONS_COLUMN_KEY || col.key === 'actions'
-          ? { ...col, key: col.key ?? ACTIONS_COLUMN_KEY }
-          : col,
-      ),
-    ];
-    const widths = { ...(pref?.widths ?? {}), ...localWidths };
-    return merged.map((col, i) => {
-      const key = columnKey(col, i);
-      const width = widths[key] ?? (typeof col.width === 'number' ? col.width : undefined);
-      const prevHeader = col.onHeaderCell;
-      return {
-        ...col,
-        key,
-        width,
-        title: withResizeTitle(col.title, (e) => {
-          const th = (e.currentTarget as HTMLElement).closest('th');
-          const startWidth = width ?? th?.getBoundingClientRect().width ?? 120;
-          beginColumnResize(
-            e,
-            startWidth,
-            (next) => setLocalWidths((prev) => ({ ...prev, [key]: next })),
-            (next) => void persistWidth(key, next),
-          );
-        }),
-        onHeaderCell: (column) => {
-          const extra = typeof prevHeader === 'function' ? prevHeader(column) : {};
-          return {
-            ...extra,
-            className: [extra.className, 'admin-th-resizable'].filter(Boolean).join(' '),
-          };
-        },
-      };
-    });
-  }, [configured, serialCol, pref?.widths, localWidths, persistWidth]);
-
-  const settingsButton = (
-    <span className="admin-list-settings-slot">
-      <Button type="text" icon={<SettingOutlined />} className="admin-list-settings-btn" onClick={() => setOpen(true)}>
-        列设置
-      </Button>
-    </span>
-  );
-
-  const settingsModal = (
-    <AdminListColumnsModal
-      open={open}
-      items={items}
-      saving={saving}
-      onCancel={() => setOpen(false)}
-      onReset={() => void persist(null)}
-      onSave={(draft) => void persist(draft)}
-    />
-  );
-
-  return { columns, settingsButton, settingsModal };
-}

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

@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 import {
   Button,
   Descriptions,
@@ -10,7 +9,6 @@ import {
   Modal,
   Popconfirm,
   Select,
-  Space,
   Table,
   Tag,
   Typography,
@@ -19,23 +17,9 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import type { AdminBenefitGrantRequest } from '@dukang/shared-types';
 import { request } from '../lib/api';
-import { COUPON_STATUS_LABELS, DELIVERY_TYPE_LABELS, fmtTime } from '../lib/constants';
+import { COUPON_STATUS_LABELS, fmtTime } from '../lib/constants';
 import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
-type CouponOrder = {
-  id?: string;
-  orderNo?: string;
-  productName?: string | null;
-  productSpec?: string | null;
-  quantity?: number | null;
-  saleUnit?: string | null;
-  deliveryType?: string | null;
-  payAmount?: number | string | null;
-};
 
 type Row = {
   id: string;
@@ -46,43 +30,10 @@ type Row = {
   status: string;
   sourceProduct: string;
   createdAt: string;
-  user?: { id?: string; userNo: string; phone: string | null };
+  user?: { userNo: string; phone: string | null };
-  order?: CouponOrder | null;
+  order?: { orderNo: string } | null;
 };
 
-function saleUnitLabel(unit?: string | null) {
-  if (unit === 'BOX') return '箱';
-  if (unit === 'BOTTLE') return '瓶';
-  return '';
-}
-
-function formatPayAmount(v?: number | string | null) {
-  if (v == null || v === '') return '';
-  const n = Number(v);
-  return Number.isFinite(n) ? `¥${n.toFixed(2)}` : '';
-}
-
-/** 来源：有订单时展示商品名、规格、数量、配送方式、金额；手动发放沿用 sourceProduct */
-function formatCouponSource(row: { sourceProduct?: string; order?: CouponOrder | null }) {
-  const order = row.order;
-  if (!order?.orderNo && !order?.productName) {
-    return row.sourceProduct || '—';
-  }
-  const unit = saleUnitLabel(order.saleUnit);
-  const qty =
-    order.quantity != null ? `${order.quantity}${unit}` : '';
-  const delivery = DELIVERY_TYPE_LABELS[order.deliveryType ?? ''] || order.deliveryType || '';
-  const amount = formatPayAmount(order.payAmount);
-  const parts = [
-    order.productName || row.sourceProduct,
-    order.productSpec,
-    qty,
-    delivery,
-    amount,
-  ].filter((p) => p != null && String(p).trim() !== '');
-  return parts.join(' / ') || row.sourceProduct || '—';
-}
-
 type CouponRedeemRecord = {
   id: string;
   redeemNo: string;
@@ -107,10 +58,11 @@ type CouponRedeemSummary = {
 type CouponDetail = Row & {
   redeemSummary?: CouponRedeemSummary | null;
   redeemRecords?: CouponRedeemRecord[];
+  user?: { userNo?: string; phone?: string | null };
+  order?: { orderNo?: string } | null;
 };
 
 export default function BenefitCouponsPage() {
-  const navigate = useNavigate();
   const [form] = Form.useForm();
   const [grantForm] = Form.useForm<AdminBenefitGrantRequest>();
   const [filters, setFilters] = useState<Record<string, string>>({});
@@ -147,62 +99,21 @@ export default function BenefitCouponsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '券号', dataIndex: 'couponNo', width: 200, ellipsis: false },
-      title: '券号',
+    { title: '用户', dataIndex: ['user', 'userNo'], width: 120, ellipsis: false },
-      dataIndex: 'couponNo',
-      width: 200,
-      ellipsis: false,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request(`/admin/benefit/coupons/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
-    {
-      title: '用户',
-      dataIndex: ['user', 'userNo'],
-      width: 120,
-      ellipsis: false,
-      render: (v: string | undefined, row) =>
-        row.user?.id ? (
-          <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}>
-            {v}
-          </AdminPrimaryLink>
-        ) : (
-          v || '—'
-        ),
-    },
     { title: '手机号', dataIndex: ['user', 'phone'], width: 120, render: (v) => v || '—' },
     {
       title: '订单',
       dataIndex: ['order', 'orderNo'],
       width: 180,
       ellipsis: false,
-      render: (v: string | undefined) =>
+      render: (v) => v || '—',
-        v ? (
-          <AdminPrimaryLink onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}>
-            {v}
-          </AdminPrimaryLink>
-        ) : (
-          '—'
-        ),
     },
     { title: '总额', dataIndex: 'totalAmount', width: 80, render: (v) => `¥${v}` },
     { title: '余额', dataIndex: 'balance', width: 80, render: (v) => `¥${v}` },
     { title: '状态', dataIndex: 'status', width: 90, render: (s) => <Tag>{COUPON_STATUS_LABELS[s] || s}</Tag> },
-    {
+    { title: '来源', dataIndex: 'sourceProduct', ellipsis: true },
-      title: '来源',
-      dataIndex: 'sourceProduct',
-      width: 360,
-      ellipsis: false,
-      render: (_: string, row) => formatCouponSource(row),
-    },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作',
@@ -244,20 +155,16 @@ 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 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="好客权益券"
+          好客权益券
-        settings={settingsButton}
+        </Typography.Title>
-        actions={
+        <Button type="primary" onClick={() => setGrantOpen(true)}>
-          <Button type="primary" onClick={() => setGrantOpen(true)}>
+          手动发放
-            手动发放
+        </Button>
-          </Button>
+      </div>
-        }
-      />
 
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="couponNo" label="券号">
@@ -283,7 +190,7 @@ export default function BenefitCouponsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         pagination={{
           current: page,
           pageSize,
@@ -361,37 +268,15 @@ export default function BenefitCouponsPage() {
           <>
             <Descriptions column={1} bordered size="small">
               <Descriptions.Item label="券号">{detail.couponNo}</Descriptions.Item>
-              <Descriptions.Item label="用户">
+              <Descriptions.Item label="用户">{detail.user?.userNo ?? '—'}</Descriptions.Item>
-                {detail.user?.id ? (
-                  <AdminPrimaryLink
-                    onClick={() => navigate('/users', { state: { openUserId: String(detail.user!.id) } })}
-                  >
-                    {detail.user?.userNo}
-                  </AdminPrimaryLink>
-                ) : (
-                  (detail.user?.userNo ?? '—')
-                )}
-              </Descriptions.Item>
               <Descriptions.Item label="手机号">{detail.user?.phone ?? '—'}</Descriptions.Item>
-              <Descriptions.Item label="关联订单">
+              <Descriptions.Item label="关联订单">{detail.order?.orderNo ?? '—'}</Descriptions.Item>
-                {detail.order?.orderNo ? (
-                  <AdminPrimaryLink
-                    onClick={() =>
-                      navigate(`/orders?orderNo=${encodeURIComponent(detail.order!.orderNo!)}`)
-                    }
-                  >
-                    {detail.order.orderNo}
-                  </AdminPrimaryLink>
-                ) : (
-                  '—'
-                )}
-              </Descriptions.Item>
               <Descriptions.Item label="总额">¥{Number(detail.totalAmount).toFixed(2)}</Descriptions.Item>
               <Descriptions.Item label="余额">¥{Number(detail.balance).toFixed(2)}</Descriptions.Item>
               <Descriptions.Item label="状态">
                 {COUPON_STATUS_LABELS[detail.status] || detail.status}
               </Descriptions.Item>
-              <Descriptions.Item label="来源">{formatCouponSource(detail)}</Descriptions.Item>
+              <Descriptions.Item label="来源">{detail.sourceProduct}</Descriptions.Item>
             </Descriptions>
 
             <Typography.Title level={5} style={{ marginTop: 16, marginBottom: 8 }}>
@@ -431,7 +316,7 @@ export default function BenefitCouponsPage() {
                   locale={{ emptyText: '暂无关联核销单' }}
                   dataSource={detail.redeemRecords ?? []}
                   columns={[
-                    { title: '核销号', dataIndex: 'redeemNo' },
+                    { title: '核销号', dataIndex: 'redeemNo', ellipsis: true },
                     {
                       title: '角色',
                       dataIndex: 'role',
@@ -442,7 +327,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,9 +3,6 @@ import { Form, Input, Select, Button, Table, Tag, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { LEDGER_TYPE_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-
 
 type Row = {
   id: string; type: string; amount: number; balanceAfter: number; remark: string | null; createdAt: string;
@@ -27,22 +24,19 @@ export default function BenefitLedgersPage() {
     [filters],
   );
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: 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' },
+    { title: '备注', dataIndex: 'remark', ellipsis: true },
     { 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>
-      <AdminListHeader title="权益流水" settings={settingsButton} />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="userId" label="用户ID"><Input allowClear /></Form.Item>
         <Form.Item name="couponId" label="券ID"><Input allowClear /></Form.Item>
@@ -51,7 +45,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: 'max-content' }}
+      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1000 }}
         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,10 +24,6 @@ import { ADMIN_OPTIONS_PAGE_SIZE, CITY_STATUS_LABELS, fmtTime } from '../lib/con
 import { useAdminList } from '../lib/useAdminList';
 import CityPartnersPanel from '../components/CityPartnersPanel';
 import ChinaProvinceCityCascader from '../components/ChinaProvinceCityCascader';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type WarehouseRow = {
   id: string;
@@ -227,16 +223,9 @@ export default function CitiesPage() {
     }
   };
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '编码', dataIndex: 'code', width: 90 },
-    {
+    { title: '城市', dataIndex: 'name', width: 100 },
-      title: '城市',
-      dataIndex: 'name',
-      width: 100,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row)}>{v}</AdminPrimaryLink>
-      ),
-    },
     { title: '省份', dataIndex: 'province', width: 90 },
     { title: '状态', dataIndex: 'status', width: 90, render: (s) => <Tag>{CITY_STATUS_LABELS[s] || s}</Tag> },
     { title: '合伙人', dataIndex: 'partnerBindingCount', width: 90 },
@@ -272,7 +261,7 @@ export default function CitiesPage() {
 
   const warehouseColumns: ColumnsType<WarehouseRow> = [
     { title: '仓库名', dataIndex: 'name' },
-    { title: '地址', dataIndex: 'address' },
+    { title: '地址', dataIndex: 'address', ellipsis: true },
     { title: '联系人', dataIndex: 'contactName', width: 90 },
     { title: '电话', dataIndex: 'contactPhone', width: 120 },
     {
@@ -281,7 +270,7 @@ export default function CitiesPage() {
       width: 100,
       render: (v: WarehouseManagerType) => WAREHOUSE_MANAGER_LABELS[v] || v,
     },
-    { title: '合伙人', dataIndex: 'partnerCompanyName', render: (v) => v || '—' },
+    { title: '合伙人', dataIndex: 'partnerCompanyName', ellipsis: true, render: (v) => v || '—' },
     { title: '状态', dataIndex: 'status', width: 80, render: (s) => <Tag>{s}</Tag> },
     {
       title: '操作',
@@ -322,16 +311,12 @@ 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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>城市</Typography.Title>
-        title="城市"
+        <Button type="primary" onClick={openCreateModal}>新建城市</Button>
-        settings={settingsButton}
+      </Space>
-        actions={<Button type="primary" onClick={openCreateModal}>新建城市</Button>}
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="城市"><Input allowClear /></Form.Item>
         <Form.Item name="code" label="编码"><Input allowClear /></Form.Item>
@@ -340,7 +325,7 @@ export default function CitiesPage() {
         </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table scroll={{ x: 'max-content' }} rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []}
+      <Table 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)}>
@@ -638,9 +623,9 @@ export default function CitiesPage() {
                 )}
                 columns={[
                   { title: '类型', dataIndex: 'kind', width: 80 },
-                  { title: '名称', dataIndex: 'name' },
+                  { title: '名称', dataIndex: 'name', ellipsis: true },
                   { title: '手机号', dataIndex: 'phone', width: 120 },
-                  { title: '归属', dataIndex: 'parent' },
+                  { title: '归属', dataIndex: 'parent', ellipsis: true },
                 ]}
               />
             </div>
@@ -655,12 +640,13 @@ export default function CitiesPage() {
                 locale={{ emptyText: '无门店' }}
                 dataSource={deletePreview.stores}
                 columns={[
-                  { title: '门店名', dataIndex: 'name' },
+                  { title: '门店名', dataIndex: 'name', ellipsis: true },
                   { 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,10 +36,6 @@ import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import PartnerSubAccountList, { type PartnerSubAccountRow } from '../components/PartnerSubAccountList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type SubRow = PartnerSubAccountRow;
 
@@ -265,27 +261,22 @@ export default function CityPartnersPage() {
     setCreateMaxRate(Number(cityRes.maxPartnerCommissionRate ?? 0.05));
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '城市', dataIndex: 'cityName', width: 90 },
     {
       title: '区县',
       dataIndex: 'districtCodes',
       width: 160,
+      ellipsis: true,
       render: (codes: string[] | null | undefined, row) =>
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
-    {
+    { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
-      title: '公司名',
-      dataIndex: 'companyName',
-      width: 140,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openPartner(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '主账号姓名',
       dataIndex: 'name',
       width: 120,
+      ellipsis: true,
       render: (v, row) => (
         <Space size={4}>
           <span>{v}</span>
@@ -320,6 +311,7 @@ export default function CityPartnersPage() {
       title: '管仓仓库',
       dataIndex: 'managedWarehouseName',
       width: 110,
+      ellipsis: true,
       render: (v) => v || '—',
     },
     {
@@ -346,34 +338,30 @@ export default function CityPartnersPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('city-partners', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="城市合伙人"
+          城市合伙人
-        settings={settingsButton}
+        </Typography.Title>
-        actions={
+        <Button
-          <Button
+          type="primary"
-            type="primary"
+          onClick={() => {
-            onClick={() => {
+            createForm.resetFields();
-              createForm.resetFields();
+            createForm.setFieldsValue({
-              createForm.setFieldsValue({
+              orderCommissionRate: 0,
-                orderCommissionRate: 0,
+              redeemCommissionRate: 3,
-                redeemCommissionRate: 3,
+              scopeType: CityPartnerScopeType.CITY_WIDE,
-                scopeType: CityPartnerScopeType.CITY_WIDE,
+            });
-              });
+            setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
-              setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
+            setCreateMaxRate(0.05);
-              setCreateMaxRate(0.05);
+            setCreateCityCode(undefined);
-              setCreateCityCode(undefined);
+            setCreateOpen(true);
-              setCreateOpen(true);
+          }}
-            }}
+        >
-          >
+          新建合伙人
-            新建合伙人
+        </Button>
-          </Button>
+      </Space>
-        }
-      />
 
       <Alert
         type="info"
@@ -439,7 +427,7 @@ export default function CityPartnersPage() {
         loading={loading}
         columns={columns}
         dataSource={toTableRows(data?.items ?? [])}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         childrenColumnName="__noTreeChildren__"
         expandable={{
           expandedRowRender: (record) => (

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

@@ -14,6 +14,7 @@ import {
   Switch,
   Table,
   Tag,
+  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -29,10 +30,6 @@ import {
 import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -73,7 +70,6 @@ function FulfillmentFields({
   onModeChange: (mode: WarehouseFulfillmentMode) => void;
 }) {
   const autoShip = mode === WarehouseFulfillmentMode.API_AUTO;
-
   return (
     <>
       <Form.Item
@@ -223,7 +219,7 @@ export default function CityWarehousesPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     {
       title: '城市',
       width: 100,
@@ -233,15 +229,8 @@ export default function CityWarehousesPage() {
         </span>
       ),
     },
-    {
+    { title: '仓库', dataIndex: 'name', width: 140, ellipsis: true },
-      title: '仓库',
+    { title: '地址', dataIndex: 'address', width: 180, ellipsis: true },
-      dataIndex: 'name',
-      width: 140,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
-      ),
-    },
-    { title: '地址', dataIndex: 'address', width: 180 },
     { title: '联系人', dataIndex: 'contactName', width: 90 },
     { title: '电话', dataIndex: 'contactPhone', width: 120 },
     {
@@ -253,6 +242,7 @@ export default function CityWarehousesPage() {
       title: '合伙人',
       dataIndex: 'partnerCompanyName',
       width: 120,
+      ellipsis: true,
       render: (v, row) =>
         v && row.partnerAccountId ? (
           <Link to="/city-partners">{v}</Link>
@@ -308,37 +298,28 @@ 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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>仓库</Typography.Title>
-        title="仓库"
+        <Button
-        settings={settingsButton}
+          type="primary"
-        actions={
+          onClick={() => {
-          <Button
+            createForm.resetFields();
-            type="primary"
+            setCreateManagerType(WarehouseManagerType.HQ);
-            onClick={() => {
+            setCreateCityId(undefined);
-              createForm.resetFields();
+            setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
-              setCreateManagerType(WarehouseManagerType.HQ);
+            createForm.setFieldsValue({
-              setCreateCityId(undefined);
+              managerType: WarehouseManagerType.HQ,
-              setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
+              status: WarehouseStatus.ACTIVE,
-              createForm.setFieldsValue({
+              fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
-                managerType: WarehouseManagerType.HQ,
+            });
-                status: WarehouseStatus.ACTIVE,
+            setCreateOpen(true);
-                fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
+          }}
-              });
+        >
-              setCreateOpen(true);
+          新增仓库
-            }}
+        </Button>
-          >
+      </Space>
-            新增仓库
-          </Button>
-        }
-      />
 
       <Alert
         type="info"
@@ -386,7 +367,7 @@ export default function CityWarehousesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1400 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -64,20 +64,6 @@ 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];
@@ -129,26 +115,18 @@ 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([]));
-    if ((profile.permissionKeys ?? []).includes('promo_codes')) {
+    void request<Paginated<PromoOption>>(`/admin/promo-codes?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
-      void request<Paginated<PromoOption>>(`/admin/promo-codes?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setPromos(res.items ?? []))
-        .then((res) => setPromos(res.items ?? []))
+      .catch(() => setPromos([]));
-        .catch(() => setPromos([]));
+    void request<Paginated<{ id: string; companyName?: string | null; name: string }>>(
-    }
+      `/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
-    if ((profile.permissionKeys ?? []).includes('partners')) {
+    )
-      void request<Paginated<{ id: string; companyName?: string | null; name: string }>>(
+      .then((res) => setPartners(res.items ?? []))
-        `/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
+      .catch(() => setPartners([]));
-      )
+  }, [loadVersion]);
-        .then((res) => setPartners(res.items ?? []))
-        .catch(() => setPartners([]));
-    }
-  }, [profile]);
 
   useEffect(() => {
     void loadAnalytics(filters);
@@ -228,19 +206,9 @@ 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 },
+      legend: { data: ['新增用户', '订单数'] },
       grid: { left: 40, right: 20, top: 40, bottom: 40 },
       xAxis: {
         type: 'category',
@@ -248,25 +216,18 @@ export default function DashboardPage() {
         axisLabel: { rotate: rows.length > 14 ? 45 : 0 },
       },
       yAxis: { type: 'value', minInterval: 1 },
-      series,
+      series: [
+        { name: '新增用户', type: 'line', smooth: true, data: rows.map((r) => r.users) },
+        { name: '订单数', type: 'line', smooth: true, data: rows.map((r) => r.orders) },
+      ],
     };
-  }, [analytics, canUsers, canOrders]);
+  }, [analytics]);
 
   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 },
+      legend: { data: ['用户', '订单'] },
       grid: { left: 48, right: 20, top: 40, bottom: 48 },
       xAxis: {
         type: 'category',
@@ -274,25 +235,18 @@ export default function DashboardPage() {
         axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
       },
       yAxis: { type: 'value', minInterval: 1 },
-      series,
+      series: [
+        { name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 },
+        { name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 },
+      ],
     };
-  }, [analytics, canUsers, canOrders]);
+  }, [analytics]);
 
   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 },
+      legend: { data: ['用户', '订单'] },
       grid: { left: 48, right: 20, top: 40, bottom: 64 },
       xAxis: {
         type: 'category',
@@ -300,36 +254,18 @@ export default function DashboardPage() {
         axisLabel: { interval: 0, rotate: rows.length > 3 ? 30 : 0 },
       },
       yAxis: { type: 'value', minInterval: 1 },
-      series,
+      series: [
+        { name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 },
+        { name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 },
+      ],
     };
-  }, [analytics, canUsers, canOrders]);
+  }, [analytics]);
 
   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 },
+      legend: { data: ['新增合伙人', '新签门店', '核销笔数', '核销金额'] },
       grid: { left: 48, right: 48, top: 48, bottom: 40 },
       xAxis: {
         type: 'category',
@@ -340,29 +276,26 @@ export default function DashboardPage() {
         { type: 'value', name: '数量', minInterval: 1 },
         { type: 'value', name: '金额', minInterval: 1 },
       ],
-      series,
+      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),
+        },
+      ],
     };
-  }, [analytics, canPartners, canStores, canBenefit]);
+  }, [analytics]);
 
   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 },
+      legend: { data: ['合伙人', '门店', '核销笔数'] },
       grid: { left: 48, right: 20, top: 40, bottom: 48 },
       xAxis: {
         type: 'category',
@@ -370,31 +303,19 @@ export default function DashboardPage() {
         axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
       },
       yAxis: { type: 'value', minInterval: 1 },
-      series,
+      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 },
+      ],
     };
-  }, [analytics, canPartners, canStores, canBenefit]);
+  }, [analytics]);
 
   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 },
+      legend: { data: ['门店', '核销笔数', '核销金额'] },
       grid: { left: 48, right: 48, top: 40, bottom: 64 },
       xAxis: {
         type: 'category',
@@ -405,9 +326,18 @@ export default function DashboardPage() {
         { type: 'value', name: '数量', minInterval: 1 },
         { type: 'value', name: '金额' },
       ],
-      series,
+      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),
+        },
+      ],
     };
-  }, [analytics, canStores, canBenefit]);
+  }, [analytics]);
 
   const redeemByCityOption = useMemo<EChartsOption>(() => {
     const rows = analytics?.byCity ?? [];
@@ -438,9 +368,7 @@ export default function DashboardPage() {
 
   return (
     <div>
-      <Typography.Title level={4}>
+      <Typography.Title level={4}>数据概览</Typography.Title>
-        {cityScoped ? '数据概览（负责城市）' : '数据概览'}
-      </Typography.Title>
 
       {isSuperAdmin ? (
       <Card
@@ -483,94 +411,46 @@ export default function DashboardPage() {
       ) : null}
 
       <Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
-        {!permsReady ? (
+        <Col xs={24} sm={12} lg={6}>
-          <Col xs={24} sm={12} lg={6}>
+          <Card loading={loading}>
-            <Card loading />
+            <Statistic title="有效用户" value={stats?.usersTotal ?? 0} />
-          </Col>
+          </Card>
-        ) : null}
+        </Col>
-        {permsReady && canUsers ? (
+        <Col xs={24} sm={12} lg={6}>
-          <Col xs={24} sm={12} lg={6}>
+          <Card loading={loading}>
-            <Card loading={loading}>
+            <Statistic title="访客（未验手机）" value={stats?.guestUsers ?? 0} valueStyle={{ color: '#faad14' }} />
-              <Statistic title="有效用户" value={stats?.usersTotal ?? 0} />
+          </Card>
-            </Card>
+        </Col>
-          </Col>
+        <Col xs={24} sm={12} lg={6}>
-        ) : null}
+          <Card loading={loading}>
-        {permsReady && canUsers ? (
+            <Statistic title="已验手机" value={stats?.verifiedUsers ?? 0} valueStyle={{ color: '#52c41a' }} />
-          <Col xs={24} sm={12} lg={6}>
+          </Card>
-            <Card loading={loading}>
+        </Col>
-              <Statistic title="访客（未验手机）" value={stats?.guestUsers ?? 0} valueStyle={{ color: '#faad14' }} />
+        <Col xs={24} sm={12} lg={6}>
-            </Card>
+          <Card loading={loading}>
-          </Col>
+            <Statistic title="今日下单" value={stats?.ordersToday ?? 0} />
-        ) : null}
+          </Card>
-        {permsReady && canUsers ? (
+        </Col>
-          <Col xs={24} sm={12} lg={6}>
+        <Col xs={24} sm={12} lg={6}>
-            <Card loading={loading}>
+          <Card loading={loading}>
-              <Statistic title="已验手机" value={stats?.verifiedUsers ?? 0} valueStyle={{ color: '#52c41a' }} />
+            <Statistic title="门店" value={stats?.storesTotal ?? 0} />
-            </Card>
+          </Card>
-          </Col>
+        </Col>
-        ) : null}
+        <Col xs={24} sm={12} lg={6}>
-        {permsReady && canOrders ? (
+          <Card loading={loading}>
-          <Col xs={24} sm={12} lg={6}>
+            <Statistic title="合伙人" value={stats?.partnersTotal ?? 0} />
-            <Card loading={loading}>
+          </Card>
-              <Statistic title="今日下单" value={stats?.ordersToday ?? 0} />
+        </Col>
-            </Card>
+        <Col xs={24} sm={12} lg={6}>
-          </Col>
+          <Card loading={loading}>
-        ) : null}
+            <Statistic title="今日核销" value={stats?.redeemToday ?? 0} />
-        {permsReady && canStores ? (
+          </Card>
-          <Col xs={24} sm={12} lg={6}>
+        </Col>
-            <Card loading={loading}>
+        <Col xs={24} sm={12} lg={6}>
-              <Statistic title="门店" value={stats?.storesTotal ?? 0} />
+          <Card loading={loading}>
-            </Card>
+            <Statistic title="配送单" value={stats?.deliveriesTotal ?? 0} />
-          </Col>
+          </Card>
-        ) : null}
+        </Col>
-        {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
@@ -598,73 +478,62 @@ export default function DashboardPage() {
           <Form.Item name="cityId" label="城市">
             <Select
               allowClear
-              placeholder={cityScoped ? '全部负责城市' : '全部开城'}
+              placeholder="全部开城"
               style={{ width: 160 }}
               options={[
-                ...(cityScoped ? [] : [{ value: 'none', label: '未选城' }]),
+                { value: 'none', label: '未选城' },
                 ...cities.map((c) => ({ value: c.id, label: c.name })),
               ]}
             />
           </Form.Item>
-          {canPromo ? (
+          <Form.Item name="promoCodeId" label="推广码">
-            <Form.Item name="promoCodeId" label="推广码">
+            <Select
-              <Select
+              allowClear
-                allowClear
+              placeholder="全部来源"
-                placeholder="全部来源"
+              style={{ width: 200 }}
-                style={{ width: 200 }}
+              options={[
-                options={[
+                { value: 'none', label: '自然量 / 无推广码' },
-                  { value: 'none', label: '自然量 / 无推广码' },
+                ...promos.map((p) => ({ value: p.id, label: `${p.name}（${p.code}）` })),
-                  ...promos.map((p) => ({ value: p.id, label: `${p.name}（${p.code}）` })),
+              ]}
-                ]}
+            />
-              />
+          </Form.Item>
-            </Form.Item>
+          <Form.Item name="partnerAccountId" label="合伙人">
-          ) : null}
+            <Select
-          {canPartners ? (
+              allowClear
-            <Form.Item name="partnerAccountId" label="合伙人">
+              placeholder="全部合伙人"
-              <Select
+              style={{ width: 200 }}
-                allowClear
+              options={partners.map((p) => ({
-                placeholder="全部合伙人"
+                value: p.id,
-                style={{ width: 200 }}
+                label: p.companyName || p.name,
-                options={partners.map((p) => ({
+              }))}
-                  value: p.id,
+            />
-                  label: p.companyName || p.name,
+          </Form.Item>
-                }))}
-              />
-            </Form.Item>
-          ) : null}
           <Form.Item>
             <Button type="primary" htmlType="submit">查询</Button>
           </Form.Item>
         </Form>
       </Card>
 
-      {canUsers || canOrders ? (
       <Card
-        title={canUsers && canOrders ? '用户 / 订单统计' : canUsers ? '用户统计' : '订单统计'}
+        title="用户 / 订单统计"
         style={{ marginBottom: 24 }}
         extra={
           <Space>
-            {canOrders ? <Link to={`/orders?${ordersDrillQs}`}>查看订单</Link> : null}
+            <Link to={`/orders?${ordersDrillQs}`}>查看订单</Link>
-            {canUsers ? <Link to="/users">查看用户</Link> : null}
+            <Link to="/users">查看用户</Link>
           </Space>
         }
       >
         <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
-          {canUsers ? (
+          <Col xs={24} sm={8}>
-            <Col xs={24} sm={8}>
+            <Statistic title="区间新增用户" value={analytics?.summary.users ?? 0} />
-              <Statistic title="区间新增用户" value={analytics?.summary.users ?? 0} />
+          </Col>
-            </Col>
+          <Col xs={24} sm={8}>
-          ) : null}
+            <Statistic title="区间订单数" value={analytics?.summary.orders ?? 0} />
-          {canOrders ? (
+          </Col>
-            <Col xs={24} sm={8}>
+          <Col xs={24} sm={8}>
-              <Statistic title="区间订单数" value={analytics?.summary.orders ?? 0} />
+            <Statistic title="区间付费用户" value={analytics?.summary.payingUsers ?? 0} />
-            </Col>
+          </Col>
-          ) : null}
-          {canOrders ? (
-            <Col xs={24} sm={8}>
-              <Statistic title="区间付费用户" value={analytics?.summary.payingUsers ?? 0} />
-            </Col>
-          ) : null}
         </Row>
 
         <Row gutter={[16, 16]}>
@@ -673,7 +542,7 @@ export default function DashboardPage() {
               <ReactECharts option={byDateOption} style={{ height: 320 }} notMerge />
             </Card>
           </Col>
-          <Col xs={24} lg={canPromo ? 12 : 24}>
+          <Col xs={24} lg={12}>
             <Card
               type="inner"
               title="按城市（点击柱联动筛选）"
@@ -693,7 +562,6 @@ export default function DashboardPage() {
               />
             </Card>
           </Col>
-          {canPromo ? (
           <Col xs={24} lg={12}>
             <Card
               type="inner"
@@ -716,53 +584,42 @@ export default function DashboardPage() {
               />
             </Card>
           </Col>
-          ) : null}
         </Row>
       </Card>
-      ) : null}
 
-      {canPartners || canStores || canBenefit ? (
       <Card
-        title={[canPartners && '合伙人', canStores && '门店', canBenefit && '核销'].filter(Boolean).join(' / ') + '统计'}
+        title="合伙人 / 门店 / 核销统计"
         style={{ marginBottom: 24 }}
         extra={
           <Space>
-            {canPartners ? <Link to="/city-partners">查看合伙人</Link> : null}
+            <Link to="/city-partners">查看合伙人</Link>
-            {canStores ? <Link to="/stores">查看门店</Link> : null}
+            <Link to="/stores">查看门店</Link>
-            {canBenefit ? <Link to="/redeem-records">查看核销</Link> : null}
+            <Link to="/redeem-records">查看核销</Link>
           </Space>
         }
       >
         <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
-          {canPartners ? (
+          <Col xs={24} sm={6}>
-            <Col xs={24} sm={6}>
+            <Statistic title="区间新增合伙人" value={analytics?.summary.partners ?? 0} />
-              <Statistic title="区间新增合伙人" value={analytics?.summary.partners ?? 0} />
+          </Col>
-            </Col>
+          <Col xs={24} sm={6}>
-          ) : null}
+            <Statistic title="区间新签门店" value={analytics?.summary.stores ?? 0} />
-          {canStores ? (
+          </Col>
-            <Col xs={24} sm={6}>
+          <Col xs={24} sm={6}>
-              <Statistic title="区间新签门店" value={analytics?.summary.stores ?? 0} />
+            <Statistic title="区间核销笔数" value={analytics?.summary.redeems ?? 0} />
-            </Col>
+          </Col>
-          ) : null}
+          <Col xs={24} sm={6}>
-          {canBenefit ? (
+            <Statistic title="区间核销金额" value={analytics?.summary.redeemAmount ?? 0} precision={2} />
-            <Col xs={24} sm={6}>
+          </Col>
-              <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={canBenefit ? 12 : 24}>
+          <Col xs={24} lg={12}>
             <Card
               type="inner"
               title="按城市（点击柱联动筛选）"
@@ -782,7 +639,6 @@ export default function DashboardPage() {
               />
             </Card>
           </Col>
-          {canBenefit ? (
           <Col xs={24} lg={12}>
             <Card
               type="inner"
@@ -803,8 +659,6 @@ export default function DashboardPage() {
               />
             </Card>
           </Col>
-          ) : null}
-          {canPartners && (canStores || canBenefit) ? (
           <Col xs={24}>
             <Card
               type="inner"
@@ -827,14 +681,10 @@ 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}
@@ -854,8 +704,6 @@ export default function DashboardPage() {
             </Typography.Text>
           </Card>
         </Col>
-        ) : null}
-        {canFinance ? (
         <Col xs={24} sm={12} lg={8}>
           <Card
             loading={loading}
@@ -869,8 +717,6 @@ export default function DashboardPage() {
             />
           </Card>
         </Col>
-        ) : null}
-        {canFinance ? (
         <Col xs={24} sm={12} lg={8}>
           <Card
             loading={loading}
@@ -891,28 +737,20 @@ 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]}>
-        {canUsers ? (
+        <Col xs={24} lg={12}>
-        <Col xs={24} lg={canOrders ? 12 : 24}>
           <Card title="已合并访客账号" loading={loading}>
             <Statistic value={stats?.mergedUsers ?? 0} suffix="个" />
           </Card>
         </Col>
-        ) : null}
+        <Col xs={24} lg={12}>
-        {canOrders ? (
-        <Col xs={24} lg={canUsers ? 12 : 24}>
           <Card title="订单状态分布" loading={loading}>
             <Table
               size="small"
@@ -930,9 +768,7 @@ export default function DashboardPage() {
             />
           </Card>
         </Col>
-        ) : null}
       </Row>
-      ) : null}
     </div>
   );
 }

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

@@ -7,10 +7,6 @@ import OrderTrackDrawer from '../components/OrderTrackDrawer';
 import { request } from '../lib/api';
 import { ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -19,8 +15,6 @@ type Row = {
   trackingNo: string | null;
   providerOrderNo: string | null;
   updatedAt: string;
-  /** 当次应付物流费 */
-  logisticsFee?: number | null;
   order?: {
     id: string;
     orderNo: string;
@@ -65,32 +59,10 @@ export default function DeliveriesPage() {
     setTrackOpen(true);
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
-      title: '订单号',
-      dataIndex: ['order', 'orderNo'],
-      width: 170,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            const d = await request<Row>(`/admin/deliveries/${row.id}`);
-            setDetail(d);
-            editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     { title: 'provider', dataIndex: 'provider', width: 90 },
     { title: '运单号', dataIndex: 'trackingNo', width: 140, render: (v) => v || '—' },
-    {
-      title: '运费',
-      dataIndex: 'logisticsFee',
-      width: 90,
-      render: (v: number | null | undefined) => (v == null ? '—' : `¥${Number(v).toFixed(2)}`),
-    },
     { title: '第三方单号', dataIndex: 'providerOrderNo', width: 140, render: (v) => v || '—' },
     { title: '订单状态', dataIndex: ['order', 'status'], width: 100, render: (s) => ORDER_STATUS_LABELS[s] || s },
     { title: '收货人', dataIndex: ['order', 'receiverName'], width: 90 },
@@ -111,19 +83,16 @@ export default function DeliveriesPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('deliveries', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>快递/配送单</Typography.Title>
-      <AdminListHeader title="快递/配送单" settings={settingsButton} />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="orderNo" label="订单号"><Input allowClear /></Form.Item>
         <Form.Item name="provider" label="provider"><Input allowClear placeholder="MOCK" /></Form.Item>
         <Form.Item name="trackingNo" label="运单号"><Input allowClear /></Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 'max-content' }}
+      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1100 }}
         pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
       <Drawer title="配送单编辑" width={480} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={
@@ -144,9 +113,6 @@ export default function DeliveriesPage() {
             <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
               <Descriptions.Item label="订单">{detail.order?.orderNo}</Descriptions.Item>
               <Descriptions.Item label="收货">{detail.order?.receiverName} {detail.order?.receiverPhone}</Descriptions.Item>
-              <Descriptions.Item label="运费">
-                {detail.logisticsFee == null ? '—' : `¥${Number(detail.logisticsFee).toFixed(2)}`}
-              </Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
               <Form.Item name="provider" label="provider" rules={[{ required: true }]}><Input /></Form.Item>

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

@@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
 import {
   Button,
   Form,
-  Image,
   Input,
   Modal,
   Popconfirm,
@@ -19,7 +18,6 @@ import {
   DEV_PLAN_TASK_TYPE_LABELS,
   SUPPORT_TICKET_STATUS_LABELS,
   type DevPlanTaskDto,
-  type DevPlanTaskExportFormat,
   type DevPlanTaskStatusDto,
   type DevPlanTaskTypeDto,
   type DevPlanVersionDto,
@@ -27,13 +25,7 @@ import {
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
-import { downloadBase64File } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
-import OssUpload from '../components/OssUpload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
   value: v,
@@ -64,8 +56,6 @@ export default function DevPlanTasksPage() {
   const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
   const [saving, setSaving] = useState(false);
   const [dispatching, setDispatching] = useState(false);
-  const [exportFormat, setExportFormat] = useState<DevPlanTaskExportFormat>('xlsx');
-  const [exporting, setExporting] = useState(false);
   const [form] = Form.useForm();
   const [dispatchForm] = Form.useForm<{ supplement?: string }>();
   const [batchForm] = Form.useForm<{ status?: DevPlanTaskStatusDto; versionId?: string }>();
@@ -98,30 +88,24 @@ export default function DevPlanTasksPage() {
 
   function openCreate() {
     setEditing(null);
-    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined, attachmentUrls: [''] });
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
     setModalOpen(true);
   }
 
   function openEdit(row: DevPlanTaskDto) {
     setEditing(row);
-    form.setFieldsValue({
+    form.setFieldsValue({ content: row.content, type: row.type, status: row.status });
-      content: row.content,
-      type: row.type,
-      status: row.status,
-      attachmentUrls: row.attachmentUrls?.length ? row.attachmentUrls : [''],
-    });
     setModalOpen(true);
   }
 
   async function save() {
     const values = await form.validateFields();
-    const attachmentUrls = (values.attachmentUrls ?? []).map((u: string) => u?.trim()).filter(Boolean);
     setSaving(true);
     try {
       if (editing) {
         await request(`/admin/dev-plan/tasks/${editing.id}`, {
           method: 'PUT',
-          body: JSON.stringify({ ...values, attachmentUrls }),
+          body: JSON.stringify(values),
         });
         message.success('已更新');
       } else {
@@ -131,7 +115,6 @@ export default function DevPlanTasksPage() {
             content: values.content,
             type: values.type,
             supportTicketId: values.supportTicketId || undefined,
-            attachmentUrls,
           }),
         });
         message.success('已创建');
@@ -216,43 +199,8 @@ export default function DevPlanTasksPage() {
     }
   }
 
-  async function exportTasks(scope: 'filter' | 'selected') {
+  const columns: ColumnsType<DevPlanTaskDto> = [
-    setExporting(true);
+    { title: '任务号', dataIndex: 'taskNo', width: 160 },
-    try {
-      const result = await request<{
-        filename: string;
-        mimeType: string;
-        contentBase64: string;
-        count: number;
-      }>('/admin/dev-plan/tasks/export', {
-        method: 'POST',
-        body: JSON.stringify({
-          scope,
-          format: exportFormat,
-          ids: scope === 'selected' ? selectedRowKeys : undefined,
-          status: filters.status || undefined,
-          type: filters.type || undefined,
-          keyword: filters.keyword || undefined,
-        }),
-      });
-      downloadBase64File(result.contentBase64, result.filename, result.mimeType);
-      message.success(`已导出 ${result.count} 条任务`);
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '导出失败');
-    } finally {
-      setExporting(false);
-    }
-  }
-
-  const baseColumns: ColumnsType<DevPlanTaskDto> = [
-    {
-      title: '任务号',
-      dataIndex: 'taskNo',
-      width: 160,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '类型',
       dataIndex: 'type',
@@ -267,23 +215,7 @@ export default function DevPlanTasksPage() {
         <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_TASK_STATUS_LABELS[s]}</Tag>
       ),
     },
-    { title: '内容', dataIndex: 'content' },
+    { title: '内容', dataIndex: 'content', ellipsis: true },
-    {
-      title: '附件',
-      width: 100,
-      render: (_, row) =>
-        row.attachmentUrls?.length ? (
-          <Image.PreviewGroup>
-            <Space size={4}>
-              {row.attachmentUrls.slice(0, 3).map((url) => (
-                <Image key={url} src={url} width={32} height={32} style={{ objectFit: 'cover' }} />
-              ))}
-            </Space>
-          </Image.PreviewGroup>
-        ) : (
-          '—'
-        ),
-    },
     { title: '来源工单', dataIndex: 'supportTicketNo', width: 140, render: (v) => v || '—' },
     { title: '创建人', dataIndex: 'creatorName', width: 90 },
     { title: '创建时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
@@ -305,45 +237,24 @@ 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 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="开发计划 · 任务列表"
+          开发计划 · 任务列表
-        settings={settingsButton}
+        </Typography.Title>
-        actions={
+        <Space>
-          <>
+          <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
-            <Select
+            批量编辑
-              value={exportFormat}
+          </Button>
-              style={{ width: 120 }}
+          <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
-              onChange={setExportFormat}
+            评审
-              options={[
+          </Button>
-                { value: 'markdown', label: 'Markdown' },
+          <Button type="primary" onClick={openCreate}>
-                { value: 'docx', label: 'Word' },
+            新建任务
-                { value: 'xlsx', label: 'Excel' },
+          </Button>
-                { value: 'pdf', label: 'PDF' },
+        </Space>
-              ]}
+      </div>
-            />
-            <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
-              导出已勾选
-            </Button>
-            <Button loading={exporting} onClick={() => void exportTasks('filter')}>
-              导出全部筛选
-            </Button>
-            <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
-              批量编辑
-            </Button>
-            <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
-              评审
-            </Button>
-            <Button type="primary" onClick={openCreate}>
-              新建任务
-            </Button>
-          </>
-        }
-      />
 
       <Form
         layout="inline"
@@ -376,7 +287,7 @@ export default function DevPlanTasksPage() {
           selectedRowKeys,
           onChange: (keys) => setSelectedRowKeys(keys as string[]),
         }}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
         pagination={{
           current: page,
           pageSize,
@@ -422,29 +333,6 @@ export default function DevPlanTasksPage() {
               />
             </Form.Item>
           )}
-          <Form.Item label="附件图片">
-            <Form.List name="attachmentUrls">
-              {(fields, { add, remove }) => (
-                <>
-                  {fields.map((field) => (
-                    <Space key={field.key} align="start" style={{ display: 'flex', marginBottom: 8 }}>
-                      <Form.Item {...field} style={{ flex: 1, marginBottom: 0 }}>
-                        <OssUpload bizType="SUPPORT_TICKET_ATTACHMENT" mediaType="IMAGE" />
-                      </Form.Item>
-                      {fields.length > 1 ? (
-                        <Button type="link" danger onClick={() => remove(field.name)}>
-                          删除
-                        </Button>
-                      ) : null}
-                    </Space>
-                  ))}
-                  <Button type="dashed" onClick={() => add('')} block>
-                    添加图片
-                  </Button>
-                </>
-              )}
-            </Form.List>
-          </Form.Item>
         </Form>
       </Modal>
 

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

@@ -9,6 +9,7 @@ import {
   Space,
   Table,
   Tag,
+  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -21,10 +22,6 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 
 const STATUS_OPTIONS = (Object.keys(DEV_PLAN_VERSION_STATUS_LABELS) as DevPlanVersionStatusDto[]).map(
@@ -122,10 +119,8 @@ export default function DevPlanVersionsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<DevPlanVersionDto> = [
+  const columns: ColumnsType<DevPlanVersionDto> = [
-    { title: '版本号', dataIndex: 'versionNo', width: 120, render: (v, row) => (
+    { title: '版本号', dataIndex: 'versionNo', width: 120 },
-      <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
-    ) },
     {
       title: '状态',
       dataIndex: 'status',
@@ -134,7 +129,7 @@ export default function DevPlanVersionsPage() {
         <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_VERSION_STATUS_LABELS[s]}</Tag>
       ),
     },
-    { title: '内容', dataIndex: 'content', render: (v) => v || '—' },
+    { title: '内容', dataIndex: 'content', ellipsis: true, 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) : '—') },
@@ -163,20 +158,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 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="开发计划 · 版本列表"
+          开发计划 · 版本列表
-        settings={settingsButton}
+        </Typography.Title>
-        actions={
+        <Button type="primary" onClick={openCreate}>
-          <Button type="primary" onClick={openCreate}>
+          新建版本
-            新建版本
+        </Button>
-          </Button>
+      </div>
-        }
-      />
 
       <Form
         layout="inline"
@@ -199,7 +190,7 @@ export default function DevPlanVersionsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -4,9 +4,6 @@ import { Card, Descriptions, Drawer, Select, Space, Table, Tag } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -58,22 +55,9 @@ export default function DomainEventsPage() {
     load();
   }, [load]);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v) },
-    {
+    { title: '类型', dataIndex: 'eventType', width: 130, render: (v) => <Tag>{v}</Tag> },
-      title: '类型',
-      dataIndex: 'eventType',
-      width: 130,
-      render: (v, r) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request<Row>(`/admin/logs/domain-events/${r.id}`));
-          }}
-        >
-          <Tag>{v}</Tag>
-        </AdminPrimaryLink>
-      ),
-    },
     { title: '关联', render: (_, r) => `${r.refType} #${r.refId}` },
     { title: '状态', dataIndex: 'status', width: 100 },
     { title: '摘要', render: (_, r) => r.param1 || r.remark || '—' },
@@ -92,13 +76,8 @@ 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="领域事件" extra={settingsButton}>
+    <Card title="领域事件">
-      {settingsModal}
       <Space wrap style={{ marginBottom: 16 }}>
         <Select
           style={{ width: 180 }}

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

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

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

@@ -3,14 +3,9 @@ import {
   Button, Drawer, Form, Input, Modal, Radio, Select, Space, Table, Tag, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { HQ_ADMIN_ROLES } from '@dukang/shared-types';
+import { request, type HqProfile } from '../lib/api';
-import { request, type HqProfile, type Paginated } from '../lib/api';
+import { ACCOUNT_STATUS_LABELS, fmtTime } from '../lib/constants';
-import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -22,13 +17,14 @@ type Row = {
   status: string;
   lastLoginAt: string | null;
   createdAt: string;
-  cityIds?: string[];
 };
 
-type CityOption = { id: string; name: string };
+const ROLE_LABELS: Record<string, string> = {
-
+  SUPER_ADMIN: '超级管理员',
-const ROLE_OPTIONS = HQ_ADMIN_ROLES.map((r) => ({ value: r.value, label: r.label }));
+  OPS: '运营',
-const ROLE_LABELS = Object.fromEntries(HQ_ADMIN_ROLES.map((r) => [r.value, r.label]));
+  FINANCE: '财务',
+  CUSTOMER_SERVICE: '客服',
+};
 
 export default function HqAccountsPage() {
   const [profile, setProfile] = useState<HqProfile | null>(null);
@@ -50,52 +46,15 @@ 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(() => {});
   }, []);
 
-  useEffect(() => {
+  const columns: ColumnsType<Row> = [
-    if (!isSuperAdmin) return;
+    { title: '姓名', dataIndex: 'name' },
-    request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
-      .then((res) => setCities(res.items))
-      .catch(() => {});
-  }, [isSuperAdmin]);
-
-  const cityOptions = cities.map((c) => ({ value: c.id, label: c.name }));
-
-  const baseColumns: ColumnsType<Row> = [
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      render: (v, row) =>
-        isSuperAdmin ? (
-          <AdminPrimaryLink
-            onClick={() => {
-              setDetail(row);
-              editForm.setFieldsValue({
-                name: row.name,
-                phone: row.phone,
-                loginName: row.loginName,
-                adminRole: row.adminRole,
-                status: row.status,
-                cityIds: row.cityIds ?? [],
-              });
-              setDrawerOpen(true);
-            }}
-          >
-            {v}
-          </AdminPrimaryLink>
-        ) : (
-          v
-        ),
-    },
     { title: '用户名', dataIndex: 'loginName', width: 120, render: (v) => v || '—' },
     { title: '手机', dataIndex: 'phone', width: 130 },
     {
@@ -108,18 +67,7 @@ export default function HqAccountsPage() {
         </Space>
       ),
     },
-    { title: '角色', dataIndex: 'adminRole', width: 130, render: (r) => ROLE_LABELS[r] || r },
+    { title: '角色', dataIndex: 'adminRole', width: 110, 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 },
     {
@@ -133,7 +81,6 @@ export default function HqAccountsPage() {
             loginName: row.loginName,
             adminRole: row.adminRole,
             status: row.status,
-            cityIds: row.cityIds ?? [],
           });
           setDrawerOpen(true);
         }}>编辑</Button>
@@ -141,57 +88,43 @@ 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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>HQ 账户</Typography.Title>
-        title="HQ 账户"
+        {isSuperAdmin && (
-        settings={settingsButton}
+          <Button
-        actions={
+            type="primary"
-          isSuperAdmin ? (
+            onClick={() => {
-            <Button
+              createForm.resetFields();
-              type="primary"
+              createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS' });
-              onClick={() => {
+              setCreateOpen(true);
-                createForm.resetFields();
+            }}
-                createForm.setFieldsValue({ credentialType: 'phone', adminRole: 'OPS', cityIds: [] });
+          >
-                setCreateOpen(true);
+            新建账户
-              }}
+          </Button>
-            >
+        )}
-              新建账户
+      </Space>
-            </Button>
-          ) : null
-        }
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="phone" label="手机"><Input allowClear /></Form.Item>
         <Form.Item name="adminRole" label="角色">
-          <Select allowClear style={{ width: 160 }} options={ROLE_OPTIONS} />
+          <Select allowClear style={{ width: 120 }} options={Object.entries(ROLE_LABELS).map(([value, label]) => ({ value, label }))} />
         </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table scroll={{ x: 'max-content' }} rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []}
+      <Table 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={460} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Drawer title="编辑 HQ 账户" width={420} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={
-          <Button type="primary" loading={saving} onClick={async () => {
+          <Button type="primary" onClick={async () => {
             if (!detail) return;
-            try {
+            const v = await editForm.validateFields();
-              const v = await editForm.validateFields();
+            const payload = { ...v };
-              const payload: Record<string, unknown> = { ...v };
+            if (!payload.password) delete payload.password;
-              if (!payload.password) delete payload.password;
+            await request(`/admin/hq-accounts/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
-              if (!String(payload.loginName ?? '').trim()) delete payload.loginName;
+            message.success('已保存');
-              setSaving(true);
+            setDrawerOpen(false);
-              await request(`/admin/hq-accounts/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
+            void reload();
-              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">
@@ -211,15 +144,7 @@ export default function HqAccountsPage() {
             <Input.Password placeholder="至少 6 位" />
           </Form.Item>
           <Form.Item name="adminRole" label="角色">
-            <Select options={ROLE_OPTIONS} />
+            <Select options={Object.entries(ROLE_LABELS).map(([value, label]) => ({ value, label }))} />
-          </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 }))} />
@@ -231,19 +156,15 @@ export default function HqAccountsPage() {
         open={createOpen}
         onCancel={() => setCreateOpen(false)}
         onOk={async () => {
-          try {
+          const v = await createForm.validateFields();
-            const v = await createForm.validateFields();
+          await request('/admin/hq-accounts', { method: 'POST', body: JSON.stringify(v) });
-            await request('/admin/hq-accounts', { method: 'POST', body: JSON.stringify(v) });
+          message.success('已创建');
-            message.success('已创建');
+          setCreateOpen(false);
-            setCreateOpen(false);
+          createForm.resetFields();
-            createForm.resetFields();
+          void reload();
-            void reload();
-          } catch (e) {
-            if (e instanceof Error && e.message) message.error(e.message);
-          }
         }}
       >
-        <Form form={createForm} layout="vertical" initialValues={{ credentialType: 'phone', adminRole: 'OPS', cityIds: [] }}>
+        <Form form={createForm} layout="vertical" initialValues={{ credentialType: 'phone', adminRole: 'OPS' }}>
           <Form.Item name="credentialType" label="创建方式">
             <Radio.Group>
               <Radio value="phone">手机号账户（短信登录）</Radio>
@@ -252,15 +173,7 @@ export default function HqAccountsPage() {
           </Form.Item>
           <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
           <Form.Item name="adminRole" label="角色">
-            <Select options={ROLE_OPTIONS} />
+            <Select options={Object.entries(ROLE_LABELS).map(([value, label]) => ({ value, label }))} />
-          </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,10 +9,6 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { HQ_OPERATION_ACTION_OPTIONS, resolveHqOperationLabel } from '../lib/hq-log';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -56,11 +52,12 @@ export default function HqLogsPage() {
     form.setFieldsValue(filters);
   }, [form, filters]);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作人',
       width: 200,
+      ellipsis: true,
       render: (_, r) => (
         <AdminCellLine
           primary={r.hqName}
@@ -72,17 +69,7 @@ export default function HqLogsPage() {
       title: '行为',
       dataIndex: 'actionLabel',
       width: 160,
-      render: (v, r) => (
+      render: (v, r) => <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>,
-        <AdminPrimaryLink
-          onClick={async () => {
-            const res = await request<Row>(`/admin/logs/hq/${r.id}`);
-            setDetail(res);
-            setDrawerOpen(true);
-          }}
-        >
-          <Tag color="blue">{v || resolveHqOperationLabel(r.action)}</Tag>
-        </AdminPrimaryLink>
-      ),
     },
     { title: '对象类型', dataIndex: 'refType', width: 120, render: (v) => v || '—' },
     { title: '对象 ID', dataIndex: 'refId', width: 100, render: (v) => v || '—' },
@@ -105,16 +92,12 @@ export default function HqLogsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-hq', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>HQ 操作日志</Typography.Title>
-      <AdminListHeader
+      <Typography.Paragraph type="secondary">
-        title="HQ 操作日志"
+        记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
-        settings={settingsButton}
+      </Typography.Paragraph>
-        description="记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。"
-      />
 
       <Form
         form={form}
@@ -167,7 +150,7 @@ export default function HqLogsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 900 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -17,7 +17,6 @@ import {
 import {
   HQ_ADMIN_ROLES,
   HQ_PERMISSION_CATALOG,
-  computeHqEffectivePermissionKeys,
   type HqPermissionKey,
 } from '@dukang/shared-types';
 import { request, type HqProfile } from '../lib/api';
@@ -28,8 +27,6 @@ type AccountPermRes = {
   account: AccountOption;
   permissionKeys: string[];
   rolePermissionKeys: string[];
-  grantKeys?: string[];
-  denyKeys?: string[];
   userPermissionKeys: string[];
   effectivePermissionKeys: string[];
 };
@@ -49,17 +46,11 @@ 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%' }}
@@ -90,13 +81,6 @@ 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>
@@ -104,16 +88,7 @@ function PermissionChecklist({
               <Row gutter={[12, 10]}>
                 {items.map((item) => (
                   <Col key={item.key} xs={24} sm={12} md={span}>
-                    <Checkbox value={item.key}>
+                    <Checkbox value={item.key}>{item.label}</Checkbox>
-                      {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>
@@ -125,14 +100,6 @@ 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');
@@ -144,8 +111,6 @@ 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);
 
@@ -156,8 +121,8 @@ export default function HqPermissionsPage() {
   const selectedIsSuperAdmin = selectedAccount?.adminRole === 'SUPER_ADMIN';
 
   const previewEffectiveKeys = useMemo(
-    () => computeHqEffectivePermissionKeys(roleInheritedKeys, grantKeys, denyKeys),
+    () => [...new Set([...roleInheritedKeys, ...accountKeys])],
-    [roleInheritedKeys, grantKeys, denyKeys],
+    [roleInheritedKeys, accountKeys],
   );
 
   const isSuperAdmin = profile?.adminRole === 'SUPER_ADMIN';
@@ -186,10 +151,8 @@ export default function HqPermissionsPage() {
     setAccountLoading(true);
     request<AccountPermRes>(`/admin/hq-permissions/accounts/${accountId}`)
       .then((res) => {
-        setGrantKeys(res.grantKeys ?? res.userPermissionKeys ?? []);
+        setAccountKeys(res.userPermissionKeys);
-        setDenyKeys(res.denyKeys ?? []);
         setRoleInheritedKeys(res.rolePermissionKeys);
-        setAccountKeys(res.effectivePermissionKeys);
       })
       .finally(() => setAccountLoading(false));
   }, [isSuperAdmin, accountId]);
@@ -216,12 +179,10 @@ export default function HqPermissionsPage() {
     try {
       const res = await request<AccountPermRes>(`/admin/hq-permissions/accounts/${accountId}`, {
         method: 'PUT',
-        body: JSON.stringify({ grantKeys, denyKeys }),
+        body: JSON.stringify({ permissionKeys: accountKeys }),
       });
-      setGrantKeys(res.grantKeys ?? res.userPermissionKeys ?? []);
+      setAccountKeys(res.userPermissionKeys);
-      setDenyKeys(res.denyKeys ?? []);
       setRoleInheritedKeys(res.rolePermissionKeys);
-      setAccountKeys(res.effectivePermissionKeys);
       message.success('用户权限已保存');
     } catch (e) {
       message.error(e instanceof Error ? e.message : '保存失败');
@@ -243,9 +204,8 @@ export default function HqPermissionsPage() {
     <div>
       <Typography.Title level={4}>权限分配</Typography.Title>
       <Typography.Paragraph type="secondary">
-        按角色配置基础权限；按用户可追加或撤销。最终生效权限 =（角色权限 ∪ 追加）− 撤销。
+        按角色配置基础权限；按用户可追加专属权限。最终生效权限 = 角色权限 ∪ 用户权限。
         超级管理员默认拥有除「危险操作」外的全部权限；删除用户/订单/城市需在「按用户分配」中单独勾选（默认均无）。
-        运营/财务默认可删除门店分类；城市门店服务可新增分类，不可删除。
         「系统设置」已拆分为各配置分组；「财务」对应门店/合伙人/酒厂账单。
       </Typography.Paragraph>
 
@@ -315,51 +275,59 @@ 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
+                    <PermissionChecklist value={accountKeys} onChange={setAccountKeys} />
-                      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>
-                      <Space wrap size={[4, 4]}>
+                      {selectedIsSuperAdmin ? (
-                        {previewEffectiveKeys.map((key) => {
+                        <Space wrap size={[4, 4]}>
-                          const item = HQ_PERMISSION_CATALOG.find((p) => p.key === (key as HqPermissionKey));
+                          <Tag>基础权限（全部）</Tag>
-                          return (
+                          {accountKeys.map((key) => {
-                            <Tag key={key}>
+                            const item = HQ_PERMISSION_CATALOG.find((p) => p.key === (key as HqPermissionKey));
-                              {item?.label || key}
+                            return (
-                            </Tag>
+                              <Tag key={key} color="orange">
-                          );
+                                {item?.label || key}
-                        })}
+                              </Tag>
-                      </Space>
+                            );
+                          })}
+                        </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
+                      <Button type="primary" loading={accountSaving} onClick={() => void saveAccountPermissions()}>
-                        type="primary"
-                        loading={accountSaving}
-                        disabled={selectedIsSuperAdmin}
-                        onClick={() => void saveAccountPermissions()}
-                      >
                         保存用户权限
                       </Button>
                     </div>

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

@@ -11,16 +11,15 @@ import {
   Space,
   Table,
   Tag,
+  Typography,
   Upload,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
-  INVOICE_CATEGORY_LABELS,
   INVOICE_KIND_LABELS,
   INVOICE_STATUS_LABELS,
   INVOICE_TITLE_TYPE_LABELS,
-  type InvoiceCategory,
   type InvoiceKind,
   type InvoiceStatus,
   type InvoiceTitleType,
@@ -29,10 +28,6 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -40,7 +35,6 @@ type Row = {
   orderNo?: string;
   titleType: InvoiceTitleType;
   invoiceKind: InvoiceKind;
-  invoiceCategory?: InvoiceCategory;
   titleName: string;
   status: InvoiceStatus;
   overdue?: boolean;
@@ -60,7 +54,6 @@ type CreateFormValues = {
   orderNo: string;
   titleType: InvoiceTitleType;
   invoiceKind: InvoiceKind;
-  invoiceCategory?: InvoiceCategory;
   titleName: string;
   taxNo?: string;
   addressPhone?: string;
@@ -163,7 +156,6 @@ export default function InvoicesPage() {
           orderNo: values.orderNo.trim(),
           titleType: values.titleType,
           invoiceKind: values.invoiceKind,
-          invoiceCategory: values.invoiceCategory,
           titleName: values.titleName.trim(),
           taxNo: values.taxNo?.trim() || undefined,
           addressPhone: values.addressPhone?.trim() || undefined,
@@ -184,7 +176,7 @@ export default function InvoicesPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '申请单号', dataIndex: 'invoiceNo', width: 180 },
     { title: '订单号', dataIndex: 'orderNo', width: 160 },
     {
@@ -194,24 +186,10 @@ export default function InvoicesPage() {
     },
     {
       title: '票种',
-      width: 140,
+      width: 120,
       render: (_, r) => INVOICE_KIND_LABELS[r.invoiceKind] ?? r.invoiceKind,
     },
-    {
+    { title: '名称', dataIndex: 'titleName', ellipsis: true },
-      title: '类型',
-      width: 88,
-      render: (_, r) =>
-        r.invoiceCategory
-          ? INVOICE_CATEGORY_LABELS[r.invoiceCategory] ?? r.invoiceCategory
-          : '—',
-    },
-    {
-      title: '名称',
-      dataIndex: 'titleName',
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => openDetail(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '状态',
       width: 110,
@@ -236,30 +214,32 @@ export default function InvoicesPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('invoices', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <div
-      <AdminListHeader
+        style={{
-        title="发票管理"
+          display: 'flex',
-        settings={settingsButton}
+          justifyContent: 'space-between',
-        actions={
+          alignItems: 'center',
-          <Button
+          marginBottom: 16,
-            type="primary"
+        }}
-            onClick={() => {
+      >
-              createForm.setFieldsValue({
+        <Typography.Title level={4} style={{ margin: 0 }}>
-                titleType: 'PERSONAL',
+          发票管理
-                invoiceKind: 'NORMAL',
+        </Typography.Title>
-                invoiceCategory: 'LIQUOR',
+        <Button
-              });
+          type="primary"
-              setCreateOpen(true);
+          onClick={() => {
-            }}
+            createForm.setFieldsValue({
-          >
+              titleType: 'PERSONAL',
-            创建发票申请
+              invoiceKind: 'NORMAL',
-          </Button>
+            });
-        }
+            setCreateOpen(true);
-      />
+          }}
+        >
+          创建发票申请
+        </Button>
+      </div>
       <Form
         form={filterForm}
         layout="inline"
@@ -292,7 +272,7 @@ export default function InvoicesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1000 }}
         rowClassName={(r) => (r.overdue ? 'ant-table-row-overdue' : '')}
         pagination={{
           current: page,
@@ -344,11 +324,6 @@ export default function InvoicesPage() {
             <Descriptions.Item label="发票类型">
               {INVOICE_KIND_LABELS[detail.invoiceKind]}
             </Descriptions.Item>
-            <Descriptions.Item label="类型">
-              {detail.invoiceCategory
-                ? INVOICE_CATEGORY_LABELS[detail.invoiceCategory]
-                : '—'}
-            </Descriptions.Item>
             <Descriptions.Item label="抬头名称">{detail.titleName}</Descriptions.Item>
             <Descriptions.Item label="税号">{detail.taxNo ?? '—'}</Descriptions.Item>
             <Descriptions.Item label="地址电话">{detail.addressPhone ?? '—'}</Descriptions.Item>
@@ -407,18 +382,6 @@ export default function InvoicesPage() {
               }}
             />
           </Form.Item>
-          <Form.Item
-            name="invoiceCategory"
-            label="类型"
-            rules={[{ required: true, message: '请选择类型' }]}
-          >
-            <Select
-              options={(Object.keys(INVOICE_CATEGORY_LABELS) as InvoiceCategory[]).map((k) => ({
-                value: k,
-                label: INVOICE_CATEGORY_LABELS[k],
-              }))}
-            />
-          </Form.Item>
           <Form.Item
             name="titleType"
             label="抬头类型"

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

@@ -25,10 +25,6 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type FormValues = {
   name: string;
@@ -128,15 +124,9 @@ export default function KnowledgeBasesPage() {
     }
   };
 
-  const baseColumns: ColumnsType<KnowledgeBaseDto> = [
+  const columns: ColumnsType<KnowledgeBaseDto> = [
-    {
+    { title: '名称', dataIndex: 'name' },
-      title: '名称',
+    { title: '说明', dataIndex: 'description', ellipsis: true },
-      dataIndex: 'name',
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
-      ),
-    },
-    { title: '说明', dataIndex: 'description' },
     { title: '文档数', dataIndex: 'documentCount', width: 90 },
     {
       title: '启用',
@@ -194,7 +184,7 @@ export default function KnowledgeBasesPage() {
 
   const docColumns: ColumnsType<KnowledgeDocumentDto> = [
     { title: '标题', dataIndex: 'title' },
-    { title: '文件', dataIndex: 'fileName' },
+    { title: '文件', dataIndex: 'fileName', ellipsis: true },
     {
       title: '状态',
       dataIndex: 'status',
@@ -260,16 +250,16 @@ export default function KnowledgeBasesPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('knowledge-bases', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Space style={{ marginBottom: 16 }} wrap>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="知识库"
+          知识库
-        settings={settingsButton}
+        </Typography.Title>
-        description="支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索"
+        <Typography.Text type="secondary">
-      />
+          支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索
+        </Typography.Text>
+      </Space>
 
       <Form
         form={filterForm}

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

@@ -25,10 +25,6 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type FormValues = {
   name: string;
@@ -157,21 +153,15 @@ export default function LlmConfigsPage() {
     }
   };
 
-  const baseColumns: ColumnsType<LlmApiConfigDto> = [
+  const columns: ColumnsType<LlmApiConfigDto> = [
-    {
+    { title: '名称', dataIndex: 'name' },
-      title: '名称',
-      dataIndex: 'name',
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '提供商',
       dataIndex: 'provider',
       width: 120,
       render: (p: LlmProvider) => LLM_PROVIDER_LABELS[p] || p,
     },
-    { title: '模型', dataIndex: 'modelName' },
+    { title: '模型', dataIndex: 'modelName', ellipsis: true },
     {
       title: 'Key',
       dataIndex: 'apiKeyConfigured',
@@ -267,16 +257,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>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="语言模型配置"
+          语言模型配置
-        settings={settingsButton}
+        </Typography.Title>
-        description="非超管仅可见自己创建的配置，且创建后只能改是否生效"
+        <Typography.Text type="secondary">
-      />
+          非超管仅可见自己创建的配置，且创建后只能改是否生效
+        </Typography.Text>
+      </Space>
 
       <Form
         form={filterForm}

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

@@ -29,9 +29,6 @@ import { fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { request } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 type BillRow = {
   id: string;
@@ -47,13 +44,6 @@ type BillRow = {
   settlementMethod: string;
   status: string;
   paidAt?: string | null;
-  paymentRef?: string | null;
-  fulfillmentProvider?: {
-    bankAccountName?: string | null;
-    bankName?: string | null;
-    bankBranch?: string | null;
-    bankAccountNo?: string | null;
-  };
 };
 
 type BillItem = {
@@ -150,30 +140,14 @@ export default function LogisticsBillsPage() {
   }, [summaryPeriod]);
 
   function confirmPay(ids: string[], amountHint?: number) {
-    let paymentRef = '';
     Modal.confirm({
       title: '确认结算？',
-      content: (
+      content: `将确认 ${ids.length} 笔物流对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。充值模式将扣减余额，挂账模式标记已打款。`,
-        <div>
-          <div>
-            将确认 {ids.length} 笔物流对账单
-            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。充值模式将扣减余额，挂账模式标记已打款。
-          </div>
-          <Input
-            placeholder="打款凭证号（可选）"
-            style={{ marginTop: 8 }}
-            onChange={(e) => {
-              paymentRef = e.target.value;
-            }}
-          />
-        </div>
-      ),
       okText: '确认结算',
       cancelText: '取消',
       onOk: async () => {
-        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/logistics-bills/${ids[0]}/confirm`, { method: 'POST', body });
+          await request(`/admin/logistics-bills/${ids[0]}/confirm`, { method: 'POST' });
         } else {
           await request('/admin/logistics-bills/batch-confirm', {
             method: 'POST',
@@ -243,19 +217,11 @@ export default function LogisticsBillsPage() {
   }
 
   const summary = data?.summary;
-  const providerBank = (r: BillRow) => r.fulfillmentProvider;
   const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
   const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.logisticsAmount), 0);
 
   const billColumns: ColumnsType<BillRow> = [
-    {
+    { title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
-      title: '账单号',
-      dataIndex: 'billNo',
-      width: 170,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '承运商',
       width: 140,
@@ -282,16 +248,6 @@ export default function LogisticsBillsPage() {
       width: 110,
       render: (v) => `¥${Number(v).toFixed(2)}`,
     },
-    {
-      title: '收款户名',
-      width: 100,
-      render: (_, r) => providerBank(r)?.bankAccountName || '—',
-    },
-    {
-      title: '收款账号',
-      width: 140,
-      render: (_, r) => providerBank(r)?.bankAccountNo || '—',
-    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -347,6 +303,7 @@ export default function LogisticsBillsPage() {
     {
       title: '银行账户',
       width: 180,
+      ellipsis: true,
       render: (_, r) =>
         r.bankAccountName
           ? `${r.bankAccountName} / ${r.bankName || ''} ${r.bankAccountNo || ''}`
@@ -398,19 +355,16 @@ 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 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="物流对账"
+          物流对账
-        settings={settingsButton}
+        </Typography.Title>
-        description="按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。"
+        <Typography.Text type="secondary">
-      />
+          按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。
+        </Typography.Text>
+      </Space>
 
       <Tabs
         items={[
@@ -547,7 +501,7 @@ export default function LogisticsBillsPage() {
                 <Table
                   rowKey="id"
                   loading={loading}
-                  columns={columns}
+                  columns={billColumns}
                   dataSource={data?.items ?? []}
                   rowSelection={{
                     selectedRowKeys: selectedKeys,
@@ -596,31 +550,7 @@ export default function LogisticsBillsPage() {
               <Descriptions.Item label="结算时间">
                 {detail.paidAt ? fmtTime(detail.paidAt) : '—'}
               </Descriptions.Item>
-              <Descriptions.Item label="打款凭证">
-                {detail.paymentRef ? String(detail.paymentRef) : '—'}
-              </Descriptions.Item>
             </Descriptions>
-            {providerBank(detail) ? (
-              <>
-                <Typography.Title level={5} style={{ marginTop: 16 }}>
-                  收款账户
-                </Typography.Title>
-                <Descriptions column={1} size="small" bordered style={{ marginBottom: 16 }}>
-                  <Descriptions.Item label="户名">
-                    {providerBank(detail)?.bankAccountName || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="开户银行">
-                    {providerBank(detail)?.bankName || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="开户支行">
-                    {providerBank(detail)?.bankBranch || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="账号">
-                    {providerBank(detail)?.bankAccountNo || '—'}
-                  </Descriptions.Item>
-                </Descriptions>
-              </>
-            ) : null}
             <Table
               rowKey="id"
               size="small"

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

@@ -1,12 +1,10 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import { Link, useSearchParams } from 'react-router-dom';
 import {
   Alert,
   Button,
   Checkbox,
-  Col,
   Collapse,
-  DatePicker,
   Descriptions,
   Drawer,
   Form,
@@ -14,7 +12,6 @@ import {
   InputNumber,
   Modal,
   Radio,
-  Row,
   Select,
   Space,
   Table,
@@ -23,17 +20,10 @@ import {
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import dayjs, { type Dayjs } from 'dayjs';
-import { ORDER_TYPE_LABELS } from '@dukang/shared-types';
 import { request, type AdminOrderItem, type AdminOrderRow, type HqProfile, type Paginated } from '../lib/api';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-import { downloadBase64File } from '../lib/exportExcel';
 import {
   ADMIN_OPTIONS_PAGE_SIZE,
   DELIVERY_PROVIDER_LABELS,
-  DELIVERY_TYPE_LABELS,
   ORDER_STATUS_COLORS,
   ORDER_STATUS_LABELS,
   ORDER_STATUS_OPERATOR_LABELS,
@@ -140,117 +130,6 @@ type OrderDetail = AdminOrderRow & {
 
 type ShipMode = 'WAREHOUSE' | 'EXPRESS';
 
-type OrderExportScope = 'filter' | 'selected';
-type OrderExportFormat = 'xlsx' | 'pdf';
-
-type OrderExportFilters = {
-  orderNo?: string;
-  status?: string | string[];
-  orderType?: string;
-  cityId?: string;
-  receiverPhone?: string;
-  fulfillmentHold?: boolean;
-  excludeTest?: boolean;
-  deliveryType?: string;
-  dateRange?: [Dayjs, Dayjs];
-};
-
-type OrderExportResult = {
-  filename: string;
-  mimeType: string;
-  contentBase64: string;
-  count: number;
-};
-
-const ORDER_TYPE_OPTIONS = Object.entries(ORDER_TYPE_LABELS).map(([value, label]) => ({ value, label }));
-
-const DELIVERY_TYPE_OPTIONS = [
-  { value: 'LOCAL', label: '同城' },
-  { value: 'CROSS_CITY', label: '跨城' },
-  { value: 'ON_SITE_PICKUP', label: '现场提货' },
-];
-
-function isOnSitePickupOrder(row: Pick<AdminOrderRow, 'deliveryType' | 'receiverProvince' | 'receiverCity' | 'receiverAddress'>) {
-  return (
-    row.deliveryType === 'ON_SITE_PICKUP' ||
-    row.receiverAddress === '现场取货' ||
-    row.receiverAddress === '现场提货' ||
-    (row.receiverProvince === '现场' && row.receiverCity === '现场')
-  );
-}
-
-function formatReceiverAddress(row: AdminOrderRow) {
-  if (isOnSitePickupOrder(row)) return '现场取货';
-  const region = [row.receiverProvince, row.receiverCity, row.receiverDistrict].filter(Boolean).join('');
-  const detail = row.receiverAddress || '';
-  if (!region) return detail;
-  if (!detail || detail.startsWith(region)) return detail || region;
-  return `${region}${detail}`;
-}
-
-function datePresetRange(kind: 'day' | 'week' | 'month' | 'quarter' | 'year'): [Dayjs, Dayjs] {
-  const now = dayjs();
-  if (kind === 'day') return [now.startOf('day'), now.endOf('day')];
-  if (kind === 'week') {
-    const monday = now.startOf('day').subtract((now.day() + 6) % 7, 'day');
-    return [monday, monday.add(6, 'day').endOf('day')];
-  }
-  if (kind === 'month') return [now.startOf('month'), now.endOf('month')];
-  if (kind === 'quarter') {
-    const start = now.month(Math.floor(now.month() / 3) * 3).startOf('month');
-    return [start, start.add(2, 'month').endOf('month')];
-  }
-  return [now.startOf('year'), now.endOf('year')];
-}
-
-const DATE_PRESETS: Array<{ key: 'day' | 'week' | 'month' | 'quarter' | 'year'; label: string }> = [
-  { key: 'day', label: '当日' },
-  { key: 'week', label: '当周' },
-  { key: 'month', label: '当月' },
-  { key: 'quarter', label: '当季' },
-  { key: 'year', label: '当年' },
-];
-
-function formatBenefitBrief(row: AdminOrderRow) {
-  const coupon = row.benefitCoupon;
-  if (coupon) {
-    return `总额¥${Number(coupon.totalAmount ?? 0).toFixed(0)} / 已用¥${Number(coupon.usedAmount ?? 0).toFixed(0)} / 余¥${Number(coupon.balance ?? 0).toFixed(0)}`;
-  }
-  if (row.benefitAmount != null) return `¥${Number(row.benefitAmount).toFixed(0)}`;
-  return '—';
-}
-
-function selectedStatuses(status: unknown): string[] {
-  if (Array.isArray(status)) return status.filter((s): s is string => Boolean(s));
-  if (typeof status === 'string' && status) return [status];
-  return [];
-}
-
-function buildExportPayload(
-  scope: OrderExportScope,
-  format: OrderExportFormat,
-  filters: OrderExportFilters,
-  selectedIds: string[],
-) {
-  const payload: Record<string, unknown> = { scope, format };
-  if (scope === 'selected') {
-    payload.ids = selectedIds;
-    return payload;
-  }
-  if (filters.orderNo) payload.orderNo = filters.orderNo;
-  const statuses = selectedStatuses(filters.status);
-  if (statuses.length) payload.status = statuses;
-  if (filters.orderType) payload.orderType = filters.orderType;
-  if (filters.cityId) payload.cityId = filters.cityId;
-  if (filters.receiverPhone) payload.receiverPhone = filters.receiverPhone;
-  if (filters.deliveryType) payload.deliveryType = filters.deliveryType;
-  if (filters.fulfillmentHold) payload.fulfillmentHold = true;
-  if (filters.excludeTest) payload.excludeTest = true;
-  if (filters.dateRange?.[0]) payload.createdFrom = filters.dateRange[0].format('YYYY-MM-DD');
-  if (filters.dateRange?.[1]) payload.createdTo = filters.dateRange[1].format('YYYY-MM-DD');
-  return payload;
-}
-
 function orderProductRows(detail: OrderDetail): AdminOrderItem[] {
   if (detail.items?.length) return detail.items;
   if (!detail.productName) return [];
@@ -283,7 +162,6 @@ function warehouseToDefaults(wh: WarehouseOption, base?: ShipDefaults | null): S
 }
 
 export default function OrdersPage() {
-  const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const initialOrderNo = searchParams.get('orderNo')?.trim() || '';
   const [form] = Form.useForm();
@@ -314,11 +192,8 @@ export default function OrdersPage() {
   const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
   const [proxyOpen, setProxyOpen] = useState(false);
   const [trackOpen, setTrackOpen] = useState(false);
-  const [exporting, setExporting] = useState(false);
-  const [exportFormat, setExportFormat] = useState<OrderExportFormat>('xlsx');
   const canDeleteOrders = (profile?.permissionKeys ?? []).includes('orders_delete');
   const canProxyOrder = (profile?.permissionKeys ?? []).includes('orders');
-  const canExportOrders = (profile?.permissionKeys ?? []).includes('orders');
 
   const selectedOrders = useMemo(
     () => (data?.items ?? []).filter((row) => selectedRowKeys.includes(row.id)),
@@ -363,23 +238,19 @@ export default function OrdersPage() {
     try {
       const values = form.getFieldsValue();
       const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
-      if (initialOrderNo) qs.set('orderNo', initialOrderNo);
       if (values.orderNo) qs.set('orderNo', values.orderNo);
-      for (const status of selectedStatuses(values.status)) qs.append('status', status);
+      if (values.status) qs.set('status', values.status);
       if (values.orderType) qs.set('orderType', values.orderType);
       if (values.cityId) qs.set('cityId', values.cityId);
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
       if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true');
       if (values.excludeTest) qs.set('excludeTest', 'true');
-      if (values.deliveryType) qs.set('deliveryType', values.deliveryType);
-      if (values.dateRange?.[0]) qs.set('createdFrom', values.dateRange[0].format('YYYY-MM-DD'));
-      if (values.dateRange?.[1]) qs.set('createdTo', values.dateRange[1].format('YYYY-MM-DD'));
       const res = await request<Paginated<AdminOrderRow>>(`/admin/orders?${qs}`);
       setData(res);
     } finally {
       setLoading(false);
     }
-  }, [form, page, pageSize, initialOrderNo]);
+  }, [form, page, pageSize]);
 
   useEffect(() => {
     void load();
@@ -580,128 +451,79 @@ export default function OrdersPage() {
     }
   }
 
-  async function submitExport(scope: OrderExportScope) {
+  const columns: ColumnsType<AdminOrderRow> = [
-    const values = form.getFieldsValue() as OrderExportFilters;
-    if (scope === 'selected' && !selectedRowKeys.length) {
-      message.warning('请先勾选要导出的订单');
-      return;
-    }
-    setExporting(true);
-    try {
-      const payload = buildExportPayload(scope, exportFormat, values, selectedRowKeys);
-      const result = await request<OrderExportResult>('/admin/orders/export', {
-        method: 'POST',
-        body: JSON.stringify(payload),
-      });
-      downloadBase64File(result.contentBase64, result.filename, result.mimeType);
-      message.success(`已导出 ${result.count} 条订单`);
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '导出失败');
-    } finally {
-      setExporting(false);
-    }
-  }
-
-  const baseColumns: ColumnsType<AdminOrderRow> = [
     {
       title: '订单号',
       dataIndex: 'orderNo',
-      width: 180,
+      width: 200,
       render: (v, row) => (
         <Space size={4}>
-          <AdminPrimaryLink onClick={() => openDetail(row.id)}>{v}</AdminPrimaryLink>
+          <span>{v}</span>
           {row.isTest ? <Tag color="orange">测试</Tag> : null}
         </Space>
       ),
     },
     {
-      title: '用户',
+      title: '城市',
-      key: 'user',
+      width: 90,
-      width: 120,
+      render: (_, row) => row.city?.name || '—',
-      render: (_, row) =>
-        row.user?.id ? (
-          <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}>
-            {row.user.userNo}
-          </AdminPrimaryLink>
-        ) : (
-          (row.user?.userNo || '—')
-        ),
     },
     {
       title: '商品',
-      key: 'productName',
       width: 180,
-      render: (_, row) => (
+      ellipsis: true,
+      render: (_, row) => {
+        const name = row.productName || '—';
+        const qty = row.quantity != null ? ` ×${row.quantity}` : '';
+        return (
+          <span title={row.productSpec ? `${name}（${row.productSpec}）` : name}>
+            {name}{qty}
+          </span>
+        );
+      },
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 140,
+      render: (s, row) => (
         <Space size={4} wrap>
-          <span>{row.productName || '—'}</span>
+          <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
-          {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
+          {row.fulfillmentHold ? <Tag color="orange">大单待确认</Tag> : null}
           {row.orderType === 'PROXY' || row.isProxyOrder ? (
-            <Tag color="purple">代下单</Tag>
+            <Tag color="purple" title={row.proxyPartnerName || undefined}>
+              代下单
+            </Tag>
           ) : null}
         </Space>
       ),
     },
     {
-      title: '规格',
+      title: '配送',
-      dataIndex: 'productSpec',
-      width: 140,
-      render: (v: string | undefined) => v || '—',
-    },
-    {
-      title: '数量',
-      dataIndex: 'quantity',
-      width: 80,
-      render: (v: number | undefined, row) =>
-        v == null ? '—' : `${v}${row.saleUnit === 'BOX' ? '箱' : '瓶'}`,
-    },
-    {
-      title: '配送方式',
       dataIndex: 'deliveryType',
-      width: 100,
-      render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 100,
-      render: (s: string) => (
-        <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
-      ),
-    },
-    {
-      title: '实付',
-      dataIndex: 'payAmount',
       width: 90,
-      render: (v: number) => `¥${v}`,
+      render: (v) =>
+        v === 'ON_SITE_PICKUP' ? '现场提货' : v === 'LOCAL' ? '同城' : '跨城',
+    },
+    { title: '实付', dataIndex: 'payAmount', width: 90, render: (v) => `¥${v}` },
+    { title: '收货人', dataIndex: 'receiverName', width: 90 },
+    { title: '手机', dataIndex: 'receiverPhone', width: 120 },
+    {
+      title: '用户',
+      dataIndex: ['user', 'userNo'],
+      width: 110,
+      render: (_, row) => row.user?.userNo || '—',
     },
     {
-      title: '好客权益',
+      title: '快递',
-      width: 200,
+      width: 100,
-      render: (_, row) => formatBenefitBrief(row),
+      render: (_, row) => row.delivery?.trackingNo || row.delivery?.provider || '—',
-    },
-    {
-      title: '收货人',
-      dataIndex: 'receiverName',
-      width: 90,
-      render: (v: string | undefined) => v || '—',
-    },
-    {
-      title: '电话',
-      dataIndex: 'receiverPhone',
-      width: 120,
-      render: (v: string | undefined) => v || '—',
-    },
-    {
-      title: '地址',
-      key: 'receiverAddress',
-      width: 260,
-      render: (_, row) => formatReceiverAddress(row) || '—',
     },
     {
       title: '下单时间',
       dataIndex: 'createdAt',
       width: 170,
-      render: fmtTime,
+      render: (v) => new Date(v).toLocaleString('zh-CN'),
     },
     {
       title: '操作',
@@ -733,28 +555,28 @@ export default function OrdersPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
-    page,
-    pageSize,
-  });
-
   return (
     <div>
-      {settingsModal}
+      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
-        title="订单监控"
+        <Space>
-        settings={settingsButton}
+          <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
-        actions={
+          {canProxyOrder ? (
-          <>
+            <Button type="primary" onClick={() => setProxyOpen(true)}>
-            <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
+              代下单
-            {canProxyOrder ? (
+            </Button>
-              <Button type="primary" onClick={() => setProxyOpen(true)}>
+          ) : null}
-                代下单
+          {canDeleteOrders ? (
-              </Button>
+            <Button
-            ) : null}
+              danger
-          </>
+              disabled={!selectedRowKeys.length}
-        }
+              onClick={() => setBatchDeleteOpen(true)}
-      />
+            >
+              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
+            </Button>
+          ) : null}
+        </Space>
+      </Space>
 
       {!canDeleteOrders && profile ? (
         <Alert
@@ -770,117 +592,54 @@ export default function OrdersPage() {
         />
       ) : null}
 
-      <Form form={form} layout="vertical" onFinish={() => { setPage(1); void load(); }}>
+      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
-        <Row gutter={[16, 8]}>
+        <Form.Item name="orderNo" label="订单号">
-          <Col xs={24} md={14} lg={12}>
+          <Input placeholder="DK..." allowClear />
-            <Form.Item label="下单日期" style={{ marginBottom: 12 }}>
+        </Form.Item>
-              <Space direction="vertical" size={8} style={{ width: '100%' }}>
+        <Form.Item name="status" label="状态">
-                <Form.Item name="dateRange" noStyle>
+          <Select allowClear style={{ width: 120 }} options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
-                  <DatePicker.RangePicker allowClear style={{ width: '100%' }} />
+        </Form.Item>
-                </Form.Item>
+        <Form.Item name="orderType" label="类型">
-                <Space size={8} wrap>
+          <Select
-                  {DATE_PRESETS.map((preset) => (
+            allowClear
-                    <Button
+            style={{ width: 120 }}
-                      key={preset.key}
+            placeholder="全部"
-                      size="small"
+            options={[
-                      onClick={() => form.setFieldsValue({ dateRange: datePresetRange(preset.key) })}
+              { value: 'NORMAL', label: '普通订单' },
-                    >
+              { value: 'PROXY', label: '代下单' },
-                      {preset.label}
+            ]}
-                    </Button>
+          />
-                  ))}
+        </Form.Item>
-                </Space>
+        <Form.Item name="cityId" label="城市">
-              </Space>
+          <Select
-            </Form.Item>
+            allowClear
-          </Col>
+            showSearch
-          <Col xs={24} sm={12} md={8} lg={6}>
+            optionFilterProp="label"
-            <Form.Item name="status" label="状态" style={{ marginBottom: 12 }}>
+            style={{ width: 140 }}
-              <Select
+            placeholder="全部"
-                mode="multiple"
+            options={cities.map((c) => ({ value: c.id, label: c.name }))}
-                allowClear
+          />
-                maxTagCount="responsive"
+        </Form.Item>
-                placeholder="全部"
+        <Form.Item name="receiverPhone" label="收货手机">
-                options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+          <Input allowClear />
-              />
+        </Form.Item>
-            </Form.Item>
+        <Form.Item name="fulfillmentHold" label="大单拦截" valuePropName="checked">
-          </Col>
+          <Select
-          <Col xs={12} sm={6} md={5} lg={3}>
+            allowClear
-            <Form.Item name="orderType" label="类型" style={{ marginBottom: 12 }}>
+            style={{ width: 140 }}
-              <Select allowClear placeholder="全部" options={ORDER_TYPE_OPTIONS} />
+            placeholder="全部"
-            </Form.Item>
+            options={[{ value: true, label: '仅待确认大单' }]}
-          </Col>
+          />
-          <Col xs={12} sm={6} md={5} lg={3}>
+        </Form.Item>
-            <Form.Item name="deliveryType" label="配送" style={{ marginBottom: 12 }}>
+        <Form.Item name="excludeTest" valuePropName="checked">
-              <Select allowClear placeholder="全部" options={DELIVERY_TYPE_OPTIONS} />
+          <Checkbox>过滤测试账号</Checkbox>
-            </Form.Item>
+        </Form.Item>
-          </Col>
+        <Form.Item>
-          <Col xs={12} sm={6} md={5} lg={3}>
+          <Space>
-            <Form.Item name="cityId" label="城市" style={{ marginBottom: 12 }}>
-              <Select
-                allowClear
-                showSearch
-                optionFilterProp="label"
-                placeholder="全部"
-                options={cities.map((c) => ({ value: c.id, label: c.name }))}
-              />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={8} md={6} lg={6}>
-            <Form.Item name="receiverPhone" label="收货手机" style={{ marginBottom: 12 }}>
-              <Input allowClear placeholder="手机号" />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={8} md={8} lg={8}>
-            <Form.Item label=" " colon={false} style={{ marginBottom: 12 }}>
-              <Space size={16} wrap>
-                <Form.Item name="fulfillmentHold" valuePropName="checked" noStyle>
-                  <Checkbox>大单拦截</Checkbox>
-                </Form.Item>
-                <Form.Item name="excludeTest" valuePropName="checked" noStyle>
-                  <Checkbox>过滤测试</Checkbox>
-                </Form.Item>
-              </Space>
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '8px 0 16px', gap: 12, flexWrap: 'wrap' }}>
-          {canExportOrders ? (
-            <Space size={12} wrap>
-              <Radio.Group
-                optionType="button"
-                buttonStyle="solid"
-                value={exportFormat}
-                onChange={(e) => setExportFormat(e.target.value)}
-              >
-                <Radio.Button value="xlsx">Excel</Radio.Button>
-                <Radio.Button value="pdf">PDF</Radio.Button>
-              </Radio.Group>
-              <Button
-                disabled={!selectedRowKeys.length}
-                loading={exporting}
-                onClick={() => void submitExport('selected')}
-              >
-                导出已勾选{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
-              </Button>
-              <Button loading={exporting} onClick={() => void submitExport('filter')}>
-                导出全部筛选
-              </Button>
-            </Space>
-          ) : <span />}
-          <Space size={12} wrap>
             <Button type="primary" htmlType="submit">查询</Button>
             <Button onClick={() => { form.resetFields(); setPage(1); void load(); }}>重置</Button>
-            {canDeleteOrders ? (
-              <Button
-                danger
-                disabled={!selectedRowKeys.length}
-                onClick={() => setBatchDeleteOpen(true)}
-              >
-                批量删除{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
-              </Button>
-            ) : null}
           </Space>
-        </div>
+        </Form.Item>
       </Form>
 
       <Table
@@ -888,18 +647,16 @@ export default function OrdersPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1500 }}
-        rowSelection={{
+        rowSelection={canDeleteOrders ? {
           selectedRowKeys,
-          preserveSelectedRowKeys: true,
           onChange: (keys) => setSelectedRowKeys(keys as string[]),
-        }}
+        } : undefined}
         pagination={{
           current: page,
           pageSize,
           total: data?.total ?? 0,
           showSizeChanger: true,
-          showTotal: (total) => `共 ${total} 条`,
           onChange: (p, ps) => {
             setPage(p);
             setPageSize(ps);
@@ -1072,7 +829,7 @@ export default function OrdersPage() {
                   locale={{ emptyText: '暂无关联核销单' }}
                   dataSource={detail.redeemRecords ?? []}
                   columns={[
-                    { title: '核销号', dataIndex: 'redeemNo', width: 160 },
+                    { title: '核销号', dataIndex: 'redeemNo', width: 160, ellipsis: true },
                     {
                       title: '角色',
                       dataIndex: 'role',
@@ -1083,6 +840,7 @@ export default function OrdersPage() {
                     {
                       title: '门店',
                       dataIndex: ['store', 'name'],
+                      ellipsis: true,
                       render: (v: string | undefined, row) =>
                         v ? `${v}${row.store?.cityName ? `（${row.store.cityName}）` : ''}` : '—',
                     },
@@ -1198,6 +956,7 @@ export default function OrdersPage() {
                     {
                       title: '备注',
                       dataIndex: 'remark',
+                      ellipsis: true,
                       render: (v) => v || '—',
                     },
                     {
@@ -1492,6 +1251,7 @@ 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

@@ -5,11 +5,8 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { PARTNER_PERMISSION_KEYS, PARTNER_PERMISSION_LABELS, PARTNER_STAFF_ROLE_LABELS, type PartnerPermissionKey } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+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';
-import { AdminListHeader } from '../components/AdminListHeader';
-
 
 type PartnerOption = { id: string; companyName: string };
 type ParentAccount = { id: string; name: string; phone: string };
@@ -172,24 +169,27 @@ export default function PartnerAccountsPage() {
     return keys;
   }
 
-  const baseColumns: ColumnsType<AccountTreeRow> = [
+  const columns: ColumnsType<AccountTreeRow> = [
     {
       title: '姓名 / 类型',
       width: 200,
+      ellipsis: true,
       render: (_, row) => (
-        <span className="admin-cell-line">
+        <AdminCellLine
-          <AdminPrimaryLink onClick={() => void openAccount(row.id)}>{row.name}</AdminPrimaryLink>
+          primary={row.name}
-          <span className="admin-cell-line-secondary">
+          secondary={
-            {' · '}
+            row.parentAccountId
-            {row.parentAccountId ? `子账号 · ${staffRoleLabel(row.staffRole)}` : '主账号'}
+              ? `子账号 · ${staffRoleLabel(row.staffRole)}`
-          </span>
+              : '主账号'
-        </span>
+          }
+        />
       ),
     },
     { title: '手机', dataIndex: 'phone', width: 120 },
     {
       title: '开城合伙人',
       width: 140,
+      ellipsis: true,
       render: (_, row) => row.companyName || row.parent?.name || '—',
     },
     {
@@ -254,19 +254,16 @@ 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' }}>
-      <AdminListHeader
+        <div>
-        title="合伙人子账号"
+          <Typography.Title level={4} style={{ margin: 0 }}>合伙人子账号</Typography.Title>
-        settings={settingsButton}
+          <Typography.Text type="secondary">
-        description="主账号在「开城合伙人」创建；此处仅管理子账号树与权限"
+            主账号在「开城合伙人」创建；此处仅管理子账号树与权限
-      />
+          </Typography.Text>
+        </div>
+      </Space>
       <Form
         form={form}
         layout="inline"
@@ -308,7 +305,7 @@ export default function PartnerAccountsPage() {
         loading={loading}
         columns={columns}
         dataSource={treeData}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         pagination={false}
         expandable={{
           expandedRowKeys,
@@ -402,7 +399,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: 'max-content' }} />
+                  dataSource={detail.bills ?? []} pagination={false} scroll={{ x: 700 }} />
               ),
             },
             {
@@ -410,7 +407,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: 'max-content' }} />
+                  dataSource={detail.orders ?? []} pagination={false} scroll={{ x: 650 }} />
               ),
             },
           ]} />

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

@@ -3,8 +3,6 @@ import {
   Button,
   Card,
   DatePicker,
-  Descriptions,
-  Drawer,
   Form,
   Input,
   Modal,
@@ -22,10 +20,6 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -37,22 +31,8 @@ type Row = {
   periodStart: string;
   periodEnd: string;
   rejectReason?: string | null;
-  paymentRef?: string | null;
+  partner?: { companyName?: string; phone?: string };
-  paidAt?: string | null;
+  partnerAccount?: { companyName?: string; phone?: string };
-  partner?: {
-    companyName?: string;
-    phone?: string;
-    bankAccountName?: string | null;
-    bankAccountNo?: string | null;
-    bankBranch?: string | null;
-  };
-  partnerAccount?: {
-    companyName?: string;
-    phone?: string;
-    bankAccountName?: string | null;
-    bankAccountNo?: string | null;
-    bankBranch?: string | null;
-  };
 };
 
 type PartnerOption = { id: string; companyName: string; phone?: string };
@@ -97,8 +77,6 @@ export default function PartnerBillsPage() {
   const [rejectForm] = Form.useForm();
   const [rejecting, setRejecting] = useState(false);
   const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
-  const [detail, setDetail] = useState<Row | null>(null);
-  const [drawerOpen, setDrawerOpen] = useState(false);
 
   useEffect(() => {
     void request<Paginated<PartnerOption>>(`/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -149,30 +127,17 @@ export default function PartnerBillsPage() {
   }
 
   function markPaid(ids: string[], amountHint?: number) {
-    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: (
+      content: `将标记 ${ids.length} 笔账单为已打款${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。`,
-        <div>
-          <div>
-            将标记 {ids.length} 笔账单为已打款
-            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。
-          </div>
-          <Input
-            placeholder="打款凭证号（可选）"
-            style={{ marginTop: 8 }}
-            onChange={(e) => {
-              paymentRef = e.target.value;
-            }}
-          />
-        </div>
-      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
-        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/partner-bills/${ids[0]}/mark-paid`, { method: 'POST', body });
+          await request(`/admin/partner-bills/${ids[0]}/mark-paid`, {
+            method: 'POST',
+            body: JSON.stringify({ paymentRef: `PAY-${Date.now()}` }),
+          });
         } else {
           await request('/admin/partner-bills/batch-mark-paid', {
             method: 'POST',
@@ -217,12 +182,6 @@ export default function PartnerBillsPage() {
     }
   }
 
-  async function openDetail(id: string) {
-    const d = await request<Row>(`/admin/partner-bills/${id}`);
-    setDetail(d);
-    setDrawerOpen(true);
-  }
-
   async function exportExcel() {
     setExporting(true);
     try {
@@ -242,24 +201,17 @@ export default function PartnerBillsPage() {
 
   const summary = data?.summary;
   const partnerName = (r: Row) => r.partner?.companyName || r.partnerAccount?.companyName || '—';
-  const partnerBank = (r: Row) => r.partnerAccount ?? r.partner;
   const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
   const canSend = selectedRows.filter((r) => r.status === 'PENDING_REVIEW' || r.status === 'REJECTED');
   const canPay = selectedRows.filter((r) => r.status === 'UNPAID');
   const payAmount = canPay.reduce((s, r) => s + Number(r.totalAmount), 0);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '账单号', dataIndex: 'billNo', width: 180, ellipsis: true },
-      title: '账单号',
-      dataIndex: 'billNo',
-      width: 180,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '合伙人',
       width: 160,
+      ellipsis: true,
       render: (_, r) => partnerName(r),
     },
     {
@@ -286,16 +238,6 @@ export default function PartnerBillsPage() {
       width: 110,
       render: (v) => `¥${Number(v).toFixed(2)}`,
     },
-    {
-      title: '收款户名',
-      width: 100,
-      render: (_, r) => partnerBank(r)?.bankAccountName || '—',
-    },
-    {
-      title: '收款账号',
-      width: 140,
-      render: (_, r) => partnerBank(r)?.bankAccountNo || '—',
-    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -317,9 +259,6 @@ export default function PartnerBillsPage() {
       fixed: 'right',
       render: (_, row) => (
         <Space size={0} wrap>
-          <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
-            明细
-          </Button>
           {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && (
             <Button type="link" size="small" onClick={() => sendBills([row.id])}>
               发送
@@ -345,16 +284,16 @@ export default function PartnerBillsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="合伙人账单"
+          合伙人账单
-        settings={settingsButton}
+        </Typography.Title>
-        description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
+        <Typography.Text type="secondary">
-      />
+          每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款
+        </Typography.Text>
+      </Space>
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>
@@ -456,7 +395,7 @@ export default function PartnerBillsPage() {
           selectedRowKeys: selectedKeys,
           onChange: setSelectedKeys,
         }}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1280 }}
         pagination={{
           current: page,
           pageSize,
@@ -526,59 +465,6 @@ export default function PartnerBillsPage() {
           </Button>
         </Form>
       </Modal>
-
-      <Drawer
-        title="合伙人账单明细"
-        open={drawerOpen}
-        onClose={() => setDrawerOpen(false)}
-        width={560}
-      >
-        {detail && (
-          <>
-            <Descriptions column={1} size="small" bordered>
-              <Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
-              <Descriptions.Item label="合伙人">{partnerName(detail)}</Descriptions.Item>
-              <Descriptions.Item label="账期">
-                {String(detail.periodStart).slice(0, 10)} ~ {String(detail.periodEnd).slice(0, 10)}
-              </Descriptions.Item>
-              <Descriptions.Item label="订单佣金">
-                ¥{Number(detail.orderCommission).toFixed(2)}
-              </Descriptions.Item>
-              <Descriptions.Item label="核销佣金">
-                ¥{Number(detail.redeemCommission).toFixed(2)}
-              </Descriptions.Item>
-              <Descriptions.Item label="应付合计">
-                ¥{Number(detail.totalAmount).toFixed(2)}
-              </Descriptions.Item>
-              <Descriptions.Item label="状态">
-                <Tag color={STATUS_COLORS[detail.status] || 'default'}>
-                  {STATUS_LABELS[detail.status] || detail.status}
-                </Tag>
-              </Descriptions.Item>
-              <Descriptions.Item label="打款时间">
-                {detail.paidAt ? fmtTime(detail.paidAt) : '—'}
-              </Descriptions.Item>
-              <Descriptions.Item label="打款凭证">
-                {detail.paymentRef ? String(detail.paymentRef) : '—'}
-              </Descriptions.Item>
-            </Descriptions>
-            <Typography.Title level={5} style={{ marginTop: 16 }}>
-              收款账户
-            </Typography.Title>
-            <Descriptions column={1} size="small" bordered>
-              <Descriptions.Item label="户名">
-                {partnerBank(detail)?.bankAccountName || '—'}
-              </Descriptions.Item>
-              <Descriptions.Item label="账号">
-                {partnerBank(detail)?.bankAccountNo || '—'}
-              </Descriptions.Item>
-              <Descriptions.Item label="开户行">
-                {partnerBank(detail)?.bankBranch || '—'}
-              </Descriptions.Item>
-            </Descriptions>
-          </>
-        )}
-      </Drawer>
     </div>
   );
 }

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

@@ -14,10 +14,6 @@ import { request } from '../lib/api';
 import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -75,11 +71,12 @@ export default function PartnerLogsPage() {
     form.setFieldsValue(filters);
   }, [form, filters]);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '合伙人',
       width: 180,
+      ellipsis: true,
       render: (_, r) => (
         r.isSubAccount ? (
           <Tag color="blue">子账号</Tag>
@@ -91,6 +88,7 @@ export default function PartnerLogsPage() {
     {
       title: '账号',
       width: 150,
+      ellipsis: true,
       render: (_, r) => (
         <AdminCellLine
           primary={r.accountName}
@@ -110,21 +108,7 @@ export default function PartnerLogsPage() {
         <Tag>{PARTNER_LOG_CATEGORY_LABELS[v ?? ''] || resolvePartnerLogCategory(r.eventName) || '其他'}</Tag>
       ),
     },
-    {
+    { title: '事件', dataIndex: 'eventName', width: 180 },
-      title: '事件',
-      dataIndex: 'eventName',
-      width: 180,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request(`/admin/logs/partners/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '关联',
       width: 120,
@@ -132,6 +116,7 @@ export default function PartnerLogsPage() {
     },
     {
       title: '摘要',
+      ellipsis: true,
       render: (_, r) => summarizeExtra(r.extraJson),
     },
     {
@@ -152,12 +137,11 @@ export default function PartnerLogsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-partners', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4} style={{ marginBottom: 16 }}>
-      <AdminListHeader title="合伙人日志" settings={settingsButton} />
+        合伙人日志
+      </Typography.Title>
       <Segmented
         options={PARTNER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
         value={category}
@@ -232,7 +216,7 @@ export default function PartnerLogsPage() {
             setPageSize(ps);
           },
         }}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
       />
       <Drawer title="日志详情" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={520}>
         {detail && (

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

@@ -27,10 +27,6 @@ import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -177,22 +173,17 @@ export default function PartnersPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '城市', dataIndex: 'cityName', width: 100 },
     {
       title: '区县',
       dataIndex: 'districtCodes',
       width: 160,
+      ellipsis: true,
       render: (codes: string[] | null | undefined, row) =>
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
-    {
+    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
-      title: '公司名',
-      dataIndex: 'companyName',
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openPartner(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
     { title: '主账号', dataIndex: 'phone', width: 130 },
     {
       title: '管辖',
@@ -214,20 +205,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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>开城合伙人</Typography.Title>
-        title="开城合伙人"
+        <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
-        settings={settingsButton}
+          新建城市合伙人
-        actions={
+        </Button>
-          <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
+      </Space>
-            新建城市合伙人
-          </Button>
-        }
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
         <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>

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

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

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

@@ -13,9 +13,6 @@ import { useAdminList } from '../lib/useAdminList';
 import DetailImageUrlList from '../components/DetailImageUrlList';
 import type { ProductDetailTemplateDto } from '../lib/product-detail-templates';
 import { TEMPLATE_MAX_DETAIL_IMAGES } from '../lib/product-detail-templates';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = ProductDetailTemplateDto;
 
@@ -139,26 +136,10 @@ export default function ProductDetailTemplatesPage() {
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [createOpen, setCreateOpen] = useState(false);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '编码', dataIndex: 'code', width: 120 },
-    {
+    { title: '名称', dataIndex: 'name', width: 120 },
-      title: '名称',
+    { title: '说明', dataIndex: 'description', width: 200, ellipsis: true },
-      dataIndex: 'name',
-      width: 120,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            const d = await request<Record<string, unknown>>(`/admin/product-detail-templates/${row.id}`);
-            setDetail(d);
-            editForm.setFieldsValue(mapToForm(d));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
-    { title: '说明', dataIndex: 'description', width: 200 },
     { title: '香型', dataIndex: 'aromaType', width: 90, render: (v) => (v ? AROMA_TYPE_LABELS[v] || v : '—') },
     { title: '详情图', dataIndex: 'detailImageUrls', width: 80, render: (v: string[] | undefined) => v?.length ?? 0 },
     { title: '排序', dataIndex: 'sortOrder', width: 60 },
@@ -177,17 +158,10 @@ 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); }}>
@@ -201,7 +175,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: 'max-content' }}
+      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1100 }}
         pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
       <Drawer title="编辑详情模板" width={640} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (

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

@@ -12,12 +12,7 @@ import OssUpload from '../components/OssUpload';
 import MultiImageUpload from '../components/MultiImageUpload';
 import DetailImageUrlList from '../components/DetailImageUrlList';
 import ProductDetailTemplatePicker from '../components/ProductDetailTemplatePicker';
-import ProductSpecsEditor from '../components/ProductSpecsEditor';
 import type { FormInstance } from 'antd/es/form';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type ProductDetailContentDto = {
   storyTitle?: string;
@@ -25,22 +20,6 @@ type ProductDetailContentDto = {
   features?: Array<{ icon: string; title: string; desc: string }>;
 };
 
-type SkuListRow = {
-  id: string;
-  skuCode: string;
-  barcode69: string;
-  specText: string;
-  price: number;
-  benefitAmount: number;
-  status: string;
-  isDefault?: boolean;
-  allowOnSitePickup?: boolean;
-  allowOnlinePurchase?: boolean;
-  allowCrossCityDelivery?: boolean;
-  soldBottles?: number;
-  virtual?: boolean;
-};
-
 type Row = {
   id: string;
   skuCode: string;
@@ -50,15 +29,9 @@ type Row = {
   aromaType: string;
   spec: string;
   price: number;
-  priceMin?: number;
-  priceMax?: number;
-  soldBottles?: number;
   benefitAmount: number;
   status: string;
   sortOrder: number;
-  skuCount?: number;
-  specEnabled?: boolean;
-  skus?: SkuListRow[];
   allowOnSitePickup?: boolean;
   allowOnlinePurchase?: boolean;
   allowCrossCityDelivery?: boolean;
@@ -240,33 +213,7 @@ function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
   );
 }
 
-function FulfillmentTags(row: {
+function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormInstance }) {
-  allowOnlinePurchase?: boolean;
-  allowCrossCityDelivery?: boolean;
-  allowOnSitePickup?: boolean;
-}) {
-  return (
-    <Space size={[0, 4]} wrap>
-      {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
-      {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
-        <Tag color="cyan">跨城</Tag>
-      ) : null}
-      {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
-      {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
-    </Space>
-  );
-}
-
-function BaseInfoFields({
-  mode,
-  form,
-  hideFulfillment,
-}: {
-  mode: 'create' | 'edit';
-  form: FormInstance;
-  /** 多规格商品：履约只在规格 SKU 上编辑 */
-  hideFulfillment?: boolean;
-}) {
   return (
     <>
       {mode === 'create' && (
@@ -274,13 +221,8 @@ function BaseInfoFields({
           <Form.Item label="SKU">
             <Input disabled placeholder="保存后自动生成" />
           </Form.Item>
-          <Form.Item
+          <Form.Item name="barcode69" label="69码" rules={[{ required: true }]}>
-            name="barcode69"
+            <Input />
-            label="69码"
-            rules={[{ required: true, message: '请填写默认规格 69 码' }]}
-            extra="默认规格的 69 码；若有多种规格，保存后请到「规格与 SKU」为每个规格分别填写不同 69 码"
-          >
-            <Input placeholder="默认规格 69 码" />
           </Form.Item>
           <Form.Item name="aromaType" label="香型" rules={[{ required: true }]}>
             <Select options={Object.entries(AROMA_TYPE_LABELS).map(([value, label]) => ({ value, label }))} />
@@ -308,47 +250,39 @@ function BaseInfoFields({
       <Form.Item name="sortOrder" label="排序">
         <InputNumber min={0} style={{ width: '100%' }} />
       </Form.Item>
-      {hideFulfillment ? (
+      <Form.Item
-        <Typography.Paragraph type="secondary" style={{ marginBottom: 16 }}>
+        name="allowOnlinePurchase"
-          该商品有多种规格，履约（线上 / 跨城 / 现场）请到「规格与 SKU」中按规格设置。
+        label="允许线上购买"
-        </Typography.Paragraph>
+        valuePropName="checked"
-      ) : (
+        extra="配送到址（同城）"
-        <>
+      >
+        <Switch
+          checkedChildren="开"
+          unCheckedChildren="关"
+          onChange={(checked) => {
+            if (!checked) form.setFieldsValue({ allowCrossCityDelivery: false });
+          }}
+        />
+      </Form.Item>
+      <Form.Item noStyle shouldUpdate={(prev, cur) => prev.allowOnlinePurchase !== cur.allowOnlinePurchase}>
+        {() => (
           <Form.Item
-            name="allowOnlinePurchase"
+            name="allowCrossCityDelivery"
-            label="允许线上购买"
+            label="允许跨城配送"
             valuePropName="checked"
-            extra="配送到址（同城）"
+            extra="须先开启线上购买"
           >
             <Switch
               checkedChildren="开"
               unCheckedChildren="关"
-              onChange={(checked) => {
+              disabled={!form.getFieldValue('allowOnlinePurchase')}
-                if (!checked) form.setFieldsValue({ allowCrossCityDelivery: false });
-              }}
             />
           </Form.Item>
-          <Form.Item noStyle shouldUpdate={(prev, cur) => prev.allowOnlinePurchase !== cur.allowOnlinePurchase}>
+        )}
-            {() => (
+      </Form.Item>
-              <Form.Item
+      <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
-                name="allowCrossCityDelivery"
+        <Switch checkedChildren="开" unCheckedChildren="关" />
-                label="允许跨城配送"
+      </Form.Item>
-                valuePropName="checked"
-                extra="须先开启线上购买"
-              >
-                <Switch
-                  checkedChildren="开"
-                  unCheckedChildren="关"
-                  disabled={!form.getFieldValue('allowOnlinePurchase')}
-                />
-              </Form.Item>
-            )}
-          </Form.Item>
-          <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
-            <Switch checkedChildren="开" unCheckedChildren="关" />
-          </Form.Item>
-        </>
-      )}
       <VisibilityWhitelistFields form={form} />
       <Form.Item name="coverUrl" label="封面">
         <OssUpload bizType="COVER" mediaType="IMAGE" />
@@ -391,43 +325,13 @@ export default function ProductsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = useMemo(() => [
+  const columns: ColumnsType<Row> = useMemo(() => [
+    { title: 'SKU', dataIndex: 'skuCode', width: 90 },
+    { title: '商品名', dataIndex: 'name', width: 180, ellipsis: true },
     { title: '香型', dataIndex: 'aromaType', width: 80, render: (v) => AROMA_TYPE_LABELS[v] || v },
-    { title: '品名', dataIndex: 'name', width: 200, render: (v, row) => (
+    { title: '规格', dataIndex: 'spec', width: 120, ellipsis: true },
-      <AdminPrimaryLink onClick={async () => {
+    { title: '售价', dataIndex: 'price', width: 80, render: (v) => `¥${v}` },
-        const d = await request<Record<string, unknown>>(`/admin/products/${row.id}`);
+    { title: '权益额', dataIndex: 'benefitAmount', width: 80, render: (v) => `¥${v}` },
-        setDetail(d);
-        editForm.setFieldsValue(mapDetailToForm(d));
-        setDrawerOpen(true);
-      }}>{v}</AdminPrimaryLink>
-    ) },
-    {
-      title: '累计销售',
-      dataIndex: 'soldBottles',
-      width: 110,
-      render: (v: number | undefined) => `累计 ${v ?? 0} 瓶`,
-    },
-    {
-      title: '售价',
-      key: 'priceRange',
-      width: 120,
-      render: (_, row) => {
-        const min = row.priceMin ?? row.price;
-        const max = row.priceMax ?? row.price;
-        if (min === max) return `¥${min}`;
-        return `¥${min} ~ ¥${max}`;
-      },
-    },
-    {
-      title: '规格数',
-      dataIndex: 'skuCount',
-      width: 80,
-      render: (v: number | undefined, row) => {
-        const real = v ?? 0;
-        if (real > 0) return real;
-        return row.skus?.some((s) => s.virtual) ? 1 : 0;
-      },
-    },
     { title: '状态', dataIndex: 'status', width: 80, render: (s) => (
       <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
     ) },
@@ -438,7 +342,23 @@ export default function ProductsPage() {
       render: (v: boolean) =>
         v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
+    {
+      title: '履约',
+      key: 'fulfillment',
+      width: 160,
+      render: (_, row) => (
+        <Space size={[0, 4]} wrap>
+          {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
+          {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
+            <Tag color="cyan">跨城</Tag>
+          ) : null}
+          {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
+          {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
+        </Space>
+      ),
+    },
     { title: '排序', dataIndex: 'sortOrder', width: 60 },
+    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作', width: 120,
       render: (_, row) => (
@@ -451,7 +371,7 @@ export default function ProductsPage() {
           }}>编辑</Button>
           <Popconfirm
             title="确认删除该商品？"
-            description={`将永久删除「${row.name}」，此操作不可恢复。`}
+            description={`将永久删除「${row.name}」（${row.skuCode}），此操作不可恢复。`}
             okText="确认删除"
             cancelText="取消"
             okButtonProps={{ danger: true }}
@@ -464,62 +384,14 @@ export default function ProductsPage() {
     },
   ], [detail, editForm]);
 
-  const skuColumns: ColumnsType<SkuListRow> = useMemo(() => [
-    {
-      title: '规格',
-      dataIndex: 'specText',
-      width: 140,
-      render: (v: string, row) => (
-        <Space size={4}>
-          <span>{v || '默认'}</span>
-          {row.isDefault ? <Tag color="blue">默认</Tag> : null}
-          {row.virtual ? <Tag>未建SKU</Tag> : null}
-        </Space>
-      ),
-    },
-    { title: 'SKU', dataIndex: 'skuCode', width: 110 },
-    { title: '69码', dataIndex: 'barcode69', width: 160 },
-    { title: '售价', dataIndex: 'price', width: 90, render: (v) => `¥${v}` },
-    { title: '权益额', dataIndex: 'benefitAmount', width: 90, render: (v) => `¥${v}` },
-    {
-      title: '累计销售',
-      dataIndex: 'soldBottles',
-      width: 100,
-      render: (v: number | undefined) => `${v ?? 0} 瓶`,
-    },
-    {
-      title: '履约',
-      key: 'fulfillment',
-      width: 160,
-      render: (_, row) => <FulfillmentTags {...row} />,
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 90,
-      render: (s) => (
-        <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
-      ),
-    },
-  ], []);
-
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('products', baseColumns, {
-    page,
-    pageSize,
-  });
-
   return (
     <div>
-      {settingsModal}
+      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>商品管理</Typography.Title>
-        title="商品管理"
+        <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
-        settings={settingsButton}
+      </Space>
-        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>}
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-        <Form.Item name="name" label="名称">
+        <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
-          <Input allowClear placeholder="名称 / SKU / 69 码" style={{ width: 200 }} />
-        </Form.Item>
         <Form.Item name="status" label="状态">
           <Select allowClear style={{ width: 110 }} options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
         </Form.Item>
@@ -528,46 +400,17 @@ export default function ProductsPage() {
         </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table
+      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1320 }}
-        rowKey="id"
+        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-        className="admin-table-nowrap"
+      <Drawer title="编辑商品" width={720} open={drawerOpen} onClose={() => setDrawerOpen(false)}
-        loading={loading}
-        columns={columns}
-        dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
-        expandable={{
-          rowExpandable: () => true,
-          expandedRowRender: (row) => (
-            <div style={{ margin: '-8px -8px -8px 24px', padding: 12, background: '#f5f5f5', borderRadius: 6 }}>
-              <Table
-                size="small"
-                rowKey="id"
-                pagination={false}
-                columns={skuColumns}
-                dataSource={row.skus ?? []}
-                scroll={{ x: 'max-content' }}
-                style={{ background: 'transparent' }}
-              />
-            </div>
-          ),
-        }}
-        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }}
-      />
-      <Drawer title="编辑商品" width={1100} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Button type="primary" onClick={async () => {
             const v = await editForm.validateFields();
-            const multiSku = Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1;
+            if (!v.allowOnlinePurchase && !v.allowOnSitePickup) {
-            if (!multiSku && !v.allowOnlinePurchase && !v.allowOnSitePickup) {
               message.error('请至少勾选「允许线上购买」或「允许现场取货」之一');
               return;
             }
             const payload = buildProductPayload(v);
-            if (multiSku) {
-              delete (payload as { allowOnlinePurchase?: boolean }).allowOnlinePurchase;
-              delete (payload as { allowCrossCityDelivery?: boolean }).allowCrossCityDelivery;
-              delete (payload as { allowOnSitePickup?: boolean }).allowOnSitePickup;
-            }
             await request(`/admin/products/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
             message.success('已保存');
             setDrawerOpen(false);
@@ -577,24 +420,13 @@ export default function ProductsPage() {
         {detail && (
           <>
             <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
-              <Descriptions.Item label="默认 SKU">{String(detail.skuCode)}（系统生成）</Descriptions.Item>
+              <Descriptions.Item label="SKU">{String(detail.skuCode)}</Descriptions.Item>
-              <Descriptions.Item label="默认 69 码">{String(detail.barcode69)}</Descriptions.Item>
+              <Descriptions.Item label="69码">{String(detail.barcode69)}</Descriptions.Item>
               <Descriptions.Item label="香型">{AROMA_TYPE_LABELS[String(detail.aromaType)] || String(detail.aromaType)}</Descriptions.Item>
-              <Descriptions.Item label="创建时间">{fmtTime(String(detail.createdAt ?? ''))}</Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
               <Tabs items={[
-                {
+                { key: 'base', label: '基础信息', children: <BaseInfoFields mode="edit" form={editForm} /> },
-                  key: 'base',
-                  label: '基础信息',
-                  children: (
-                    <BaseInfoFields
-                      mode="edit"
-                      form={editForm}
-                      hideFulfillment={Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1}
-                    />
-                  ),
-                },
                 {
                   key: 'detail',
                   label: '详情页',
@@ -605,23 +437,6 @@ export default function ProductsPage() {
                     />
                   ),
                 },
-                {
-                  key: 'specs',
-                  label: '规格与 SKU',
-                  children: (
-                    <ProductSpecsEditor
-                      productId={String(detail.id)}
-                      initialAttrs={(detail.specAttrs as never) ?? []}
-                      initialSkus={(detail.skus as never) ?? []}
-                      onSaved={async () => {
-                        const d = await request<Record<string, unknown>>(`/admin/products/${detail.id}`);
-                        setDetail(d);
-                        editForm.setFieldsValue(mapDetailToForm(d));
-                        void reload();
-                      }}
-                    />
-                  ),
-                },
               ]} />
             </Form>
           </>

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

@@ -14,10 +14,6 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = PromoCodeItem;
 
@@ -78,15 +74,8 @@ export default function PromoCodesPage() {
     void loadScenes();
   }, []);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '名称', dataIndex: 'name', width: 160, ellipsis: true },
-      title: '名称',
-      dataIndex: 'name',
-      width: 160,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => navigate(`/promo-codes/${row.id}`)}>{v}</AdminPrimaryLink>
-      ),
-    },
     { title: '码值', dataIndex: 'code', width: 110 },
     {
       title: '场景',
@@ -171,16 +160,12 @@ 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 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>推广码管理</Typography.Title>
-        title="推广码管理"
+        <Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>
-        settings={settingsButton}
+      </div>
-        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>}
-      />
 
       <Form
         form={filterForm}
@@ -209,7 +194,7 @@ export default function PromoCodesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -7,10 +7,6 @@ import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDesc
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -79,14 +75,14 @@ export default function RedeemRecordsPage() {
     }
   }, [data, initialRedeemNo, loading]);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     {
       title: '核销号',
       dataIndex: 'redeemNo',
       width: 200,
       render: (v, row) => (
         <span>
-          <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+          {v}
           {row.isTest ? (
             <Tag color="orange" style={{ marginLeft: 6 }}>
               测试
@@ -137,12 +133,9 @@ export default function RedeemRecordsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('redeem-records', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>核销记录</Typography.Title>
-      <AdminListHeader title="核销记录" settings={settingsButton} />
       <Form
         form={form}
         layout="inline"
@@ -182,7 +175,7 @@ export default function RedeemRecordsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1300 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -12,9 +12,6 @@ import {
   fmtTime,
 } from '../lib/constants';
 import OssUpload from '../components/OssUpload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-
 
 type Row = {
   id: string;
@@ -61,7 +58,7 @@ export default function ResourcesPage() {
     void reload();
   }, []);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: 'ID', dataIndex: 'id', width: 80 },
     {
       title: '归属',
@@ -87,8 +84,8 @@ export default function ResourcesPage() {
           </a>
         ),
     },
-    { title: 'URL', dataIndex: 'url' },
+    { title: 'URL', dataIndex: 'url', ellipsis: true },
-    { title: 'OSS Key', dataIndex: 'ossKey', width: 160 },
+    { title: 'OSS Key', dataIndex: 'ossKey', ellipsis: true, width: 160 },
     { title: '排序', dataIndex: 'sortOrder', width: 60 },
     {
       title: '状态',
@@ -117,16 +114,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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="OSS 资源库"
+          OSS 资源库
-        settings={settingsButton}
+        </Typography.Title>
-        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>登记资源</Button>}
+        <Button type="primary" onClick={() => setCreateOpen(true)}>
-      />
+          登记资源
+        </Button>
+      </Space>
       <Form
         form={form}
         layout="inline"
@@ -173,7 +170,7 @@ export default function ResourcesPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -6,10 +6,6 @@ import type { ColumnsType } from 'antd/es/table';
 import { request, type Paginated } from '../lib/api';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, STORE_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type StoreBrief = { id: string; name: string; status: string; cityName?: string };
 
@@ -78,21 +74,14 @@ export default function StoreAccountsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     {
       title: '姓名',
       dataIndex: 'name',
       width: 120,
       render: (v, row) => (
         <Space size={4}>
-          <AdminPrimaryLink
+          <span>{v}</span>
-            onClick={async () => {
-              setDetail(await request(`/admin/store-accounts/${row.id}`));
-              setDrawerOpen(true);
-            }}
-          >
-            {v}
-          </AdminPrimaryLink>
           {row.isTest ? <Tag color="orange">测试</Tag> : null}
         </Space>
       ),
@@ -149,27 +138,25 @@ 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' }}>
-      <AdminListHeader
+        <Space direction="vertical" size={0}>
-        title="门店账户"
+          <Typography.Title level={4} style={{ margin: 0 }}>门店账户</Typography.Title>
-        settings={settingsButton}
+          <Typography.Text type="secondary">
-        description="主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店"
+            主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店
-        actions={
+          </Typography.Text>
-          <Button
+        </Space>
-            type="primary"
+        <Button
-            onClick={() => {
+          type="primary"
-              void loadStores();
+          onClick={() => {
-              setCreateOpen(true);
+            void loadStores();
-            }}
+            setCreateOpen(true);
-          >
+          }}
-            新建账户
+        >
-          </Button>
+          新建账户
-        }
+        </Button>
-      />
+      </Space>
       <Form
         form={form}
         layout="inline"
@@ -198,7 +185,7 @@ export default function StoreAccountsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -30,10 +30,6 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   kind: StoreSettlementKind;
@@ -48,11 +44,6 @@ type Row = {
   settlementRate?: number | null;
   payoutCount?: number | null;
   store?: { id: string; name: string; cityName: string; phone?: string | null };
-  bankAccount?: {
-    bankAccountName?: string | null;
-    bankAccountNo?: string | null;
-    bankBranch?: string | null;
-  } | null;
 };
 
 type StoreOption = { id: string; name: string; phone: string };
@@ -64,11 +55,6 @@ const STATUS_COLORS: Record<string, string> = {
   REJECTED: 'red',
 };
 
-function settlementStatusColor(kind: StoreSettlementKind, status: string) {
-  if (status === 'PAID') return kind === 'WITHDRAW' ? 'cyan' : 'green';
-  return STATUS_COLORS[status] || 'default';
-}
-
 const KIND_COLORS: Record<StoreSettlementKind, string> = {
   T1_BILL: 'blue',
   WITHDRAW: 'purple',
@@ -132,30 +118,14 @@ export default function StoreBillsPage() {
   }, []);
 
   function confirmPay(ids: string[], amountHint?: number) {
-    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: (
+      content: `将确认 ${ids.length} 笔 T+1 门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
-        <div>
-          <div>
-            将确认 {ids.length} 笔 T+1 门店对账单
-            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。
-          </div>
-          <Input
-            placeholder="打款凭证号（可选）"
-            style={{ marginTop: 8 }}
-            onChange={(e) => {
-              paymentRef = e.target.value;
-            }}
-          />
-        </div>
-      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
-        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
+          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST' });
         } else {
           setBatchLoading(true);
           try {
@@ -271,24 +241,23 @@ export default function StoreBillsPage() {
   );
   const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.amount), 0);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     {
       title: '类型',
       dataIndex: 'kind',
       width: 100,
       render: (k: StoreSettlementKind) => (
-        <Tag color={KIND_COLORS[k]} style={{ minWidth: 72, textAlign: 'center' }}>
+        <Tag color={KIND_COLORS[k]}>{STORE_SETTLEMENT_KIND_LABELS[k] ?? k}</Tag>
-          {STORE_SETTLEMENT_KIND_LABELS[k] ?? k}
-        </Tag>
       ),
     },
     {
       title: '单号',
       dataIndex: 'billNo',
       width: 180,
+      ellipsis: true,
       render: (v, row) => (
         <Space>
-          <AdminPrimaryLink onClick={() => void openDetail(row)}>{v}</AdminPrimaryLink>
+          <span>{v}</span>
           {row.overdue ? <Tag color="magenta">超时</Tag> : null}
         </Space>
       ),
@@ -299,21 +268,9 @@ export default function StoreBillsPage() {
       width: 160,
       render: (v, row) => (row.kind === 'T1_BILL' ? String(v || '').slice(0, 10) : fmtTime(v)),
     },
-    { title: '门店', dataIndex: ['store', 'name'], width: 140 },
+    { title: '门店', dataIndex: ['store', 'name'], width: 140, ellipsis: true },
     { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
     { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
-    {
-      title: '收款户名',
-      width: 100,
-      render: (_, row) =>
-        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
-    },
-    {
-      title: '收款账号',
-      width: 140,
-      render: (_, row) =>
-        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
-    },
     {
       title: '笔数',
       width: 80,
@@ -331,9 +288,7 @@ export default function StoreBillsPage() {
       dataIndex: 'status',
       width: 100,
       render: (s: string, row) => (
-        <Tag color={settlementStatusColor(row.kind, s)}>
+        <Tag color={STATUS_COLORS[s] || 'default'}>{storeSettlementStatusLabel(row.kind, s)}</Tag>
-          {storeSettlementStatusLabel(row.kind, s)}
-        </Tag>
       ),
     },
     {
@@ -377,28 +332,21 @@ export default function StoreBillsPage() {
       }
     | undefined;
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>
-        title="门店账单"
+          门店账单
-        settings={settingsButton}
+        </Typography.Title>
-        description={
+        <Typography.Text type="secondary">
-          <>
+          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口
-            含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
+        </Typography.Text>
-            「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
+        {overdueSummary && overdueSummary.overdueCount > 0 ? (
-            {overdueSummary && overdueSummary.overdueCount > 0 ? (
+          <Typography.Text type="danger">
-              <div>
+            手动提现超时未审 {overdueSummary.overdueCount} 笔（待审共 {overdueSummary.pendingCount}）
-                <Typography.Text type="danger">
+          </Typography.Text>
-                  手动提现超时未审 {overdueSummary.overdueCount} 笔（待审共 {overdueSummary.pendingCount}）
+        ) : null}
-                </Typography.Text>
+      </Space>
-              </div>
-            ) : null}
-          </>
-        }
-      />
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>
@@ -520,7 +468,7 @@ export default function StoreBillsPage() {
             disabled: !(r.kind === 'T1_BILL' && r.status === 'UNPAID'),
           }),
         }}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1300 }}
         pagination={{
           current: page,
           pageSize,
@@ -555,32 +503,7 @@ export default function StoreBillsPage() {
               <Descriptions.Item label="打款时间">
                 {detail.paidAt ? fmtTime(String(detail.paidAt)) : '—'}
               </Descriptions.Item>
-              <Descriptions.Item label="打款凭证">
-                {detail.paymentRef ? String(detail.paymentRef) : '—'}
-              </Descriptions.Item>
             </Descriptions>
-            {(detail.storeAccount as {
-              bankAccountName?: string;
-              bankAccountNo?: string;
-              bankBranch?: string;
-            } | null) ? (
-              <>
-                <Typography.Title level={5} style={{ marginTop: 16 }}>
-                  收款账户
-                </Typography.Title>
-                <Descriptions column={1} size="small" bordered>
-                  <Descriptions.Item label="户名">
-                    {(detail.storeAccount as { bankAccountName?: string }).bankAccountName || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="账号">
-                    {(detail.storeAccount as { bankAccountNo?: string }).bankAccountNo || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="开户行">
-                    {(detail.storeAccount as { bankBranch?: string }).bankBranch || '—'}
-                  </Descriptions.Item>
-                </Descriptions>
-              </>
-            ) : null}
             <Typography.Title level={5} style={{ marginTop: 16 }}>
               核销明细
             </Typography.Title>

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

@@ -3,11 +3,7 @@ import {
   Button, Form, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { request, type HqProfile } from '../lib/api';
+import { request } from '../lib/api';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type CategoryNode = {
   id: string;
@@ -42,9 +38,7 @@ 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(
@@ -66,7 +60,6 @@ export default function StoreCategoriesPage() {
 
   useEffect(() => {
     void reload();
-    request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
   }, []);
 
   function openCreate(parentId?: string) {
@@ -119,7 +112,7 @@ export default function StoreCategoriesPage() {
     void reload();
   }
 
-  const baseColumns: ColumnsType<FlatRow> = [
+  const columns: ColumnsType<FlatRow> = [
     {
       title: '层级',
       dataIndex: 'level',
@@ -132,7 +125,7 @@ export default function StoreCategoriesPage() {
       render: (name, row) => (
         <span style={{ paddingLeft: row.level === 2 ? 24 : 0 }}>
           {row.level === 2 ? `${row.parentName || ''} / ` : ''}
-          <AdminPrimaryLink onClick={() => openEdit(row)}>{name}</AdminPrimaryLink>
+          {name}
         </span>
       ),
     },
@@ -148,59 +141,48 @@ export default function StoreCategoriesPage() {
     },
     {
       title: '操作',
-      width: canDelete ? 220 : 160,
+      width: 220,
       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}
-          {canDelete ? (
+          <Popconfirm
-            <Popconfirm
+            title={row.level === 1 ? '删除一级分类？若有门店占用将改为停用' : '删除该分类？若有门店占用将改为停用'}
-              title={row.level === 1 ? '删除一级分类？若有门店占用将改为停用' : '删除该分类？若有门店占用将改为停用'}
+            onConfirm={async () => {
-              onConfirm={async () => {
+              await request(`/admin/store-categories/${row.id}`, { method: 'DELETE' });
-                await request(`/admin/store-categories/${row.id}`, { method: 'DELETE' });
+              message.success('已处理');
-                message.success('已处理');
+              void reload();
-                void reload();
+            }}
-              }}
+          >
-            >
+            <Button type="link" size="small" danger>删除</Button>
-              <Button type="link" size="small" danger>删除</Button>
+          </Popconfirm>
-            </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' }}>
-      <AdminListHeader
+        <Space direction="vertical" size={0}>
-        title="门店分类"
+          <Typography.Title level={4} style={{ margin: 0 }}>门店分类</Typography.Title>
-        settings={settingsButton}
+          <Typography.Text type="secondary">两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择</Typography.Text>
-        description="两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择"
+        </Space>
-        actions={
+        <Space>
-          <>
+          <Button
-            {canDelete ? (
+            onClick={async () => {
-              <Button
+              await request('/admin/store-categories/ensure-defaults', { method: 'POST' });
-                onClick={async () => {
+              message.success('已同步默认分类');
-                  await request('/admin/store-categories/ensure-defaults', { method: 'POST' });
+              void reload();
-                  message.success('已同步默认分类');
+            }}
-                  void reload();
+          >
-                }}
+            同步默认分类
-              >
+          </Button>
-                同步默认分类
+          <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
-              </Button>
+        </Space>
-            ) : null}
+      </Space>
-            <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
-          </>
-        }
-      />
 
       <Table
         rowKey="id"

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

@@ -12,10 +12,6 @@ import { request } from '../lib/api';
 import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -84,14 +80,14 @@ export default function StoreLogsPage() {
     form.setFieldsValue(filters);
   }, [form, filters]);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
-      title: '门店', width: 180,
+      title: '门店', width: 180, ellipsis: true,
       render: (_, r) => <AdminCellLine primary={r.storeName} secondary={r.storeId} />,
     },
     {
-      title: '账号', width: 150,
+      title: '账号', width: 150, ellipsis: true,
       render: (_, r) => (
         <AdminCellLine
           primary={r.accountName}
@@ -105,23 +101,7 @@ export default function StoreLogsPage() {
         <Tag>{STORE_LOG_CATEGORY_LABELS[v ?? ''] || resolveStoreLogCategory(r.eventName) || '其他'}</Tag>
       ),
     },
-    {
+    { title: '事件', dataIndex: 'eventName', width: 160 },
-      title: '事件',
-      dataIndex: 'eventName',
-      width: 160,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            const parsed = parseCompositeId(row.id);
-            if (!parsed) return;
-            setDetail(await request(`/admin/logs/stores/${parsed.source}/${parsed.rawId}`));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '来源', dataIndex: 'source', width: 100,
       render: (v: Row['source']) => SOURCE_LABELS[v] || v,
@@ -131,7 +111,7 @@ export default function StoreLogsPage() {
       render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
     },
     {
-      title: '摘要',
+      title: '摘要', ellipsis: true,
       render: (_, r) => summarizeExtra(r.extraJson),
     },
     {
@@ -147,16 +127,12 @@ export default function StoreLogsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-stores', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>商户日志</Typography.Title>
-      <AdminListHeader
+      <Typography.Paragraph type="secondary" style={{ marginTop: -8 }}>
-        title="商户日志"
+        门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。
-        settings={settingsButton}
+      </Typography.Paragraph>
-        description="门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。"
-      />
       <Segmented
         style={{ marginBottom: 16 }}
         options={STORE_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
@@ -188,7 +164,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: 'max-content' }}
+      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1200 }}
         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,10 +7,6 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, MEDIA_TYPE_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string; mediaType: string; url: string; sortOrder: number; createdAt: string;
@@ -44,23 +40,8 @@ export default function StoreMediaPage() {
     setStores(res.items);
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '门店', dataIndex: ['store', 'name'], width: 140 },
-      title: '门店',
-      dataIndex: ['store', 'name'],
-      width: 140,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={() => {
-            setEditing(row);
-            editForm.setFieldsValue(row);
-            setEditOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     { title: '类型', dataIndex: 'mediaType', width: 80, render: (t) => <Tag>{MEDIA_TYPE_LABELS[t] || t}</Tag> },
     {
       title: '预览', dataIndex: 'url', width: 100,
@@ -68,7 +49,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' },
+    { title: 'URL', dataIndex: 'url', ellipsis: true },
     { title: '排序', dataIndex: 'sortOrder', width: 70 },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
@@ -92,16 +73,12 @@ 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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>门店资源</Typography.Title>
-        title="门店资源"
+        <Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>
-        settings={settingsButton}
+      </Space>
-        actions={<Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>}
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="storeId" label="门店ID"><Input allowClear /></Form.Item>
         <Form.Item name="mediaType" label="类型">
@@ -109,7 +86,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: 'max-content' }}
+      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 900 }}
         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,9 +32,6 @@ import { request, type Paginated } from '../lib/api';
 import { notifyPackageAuditChanged } from '../lib/admin-events';
 import { fmtTime } from '../lib/constants';
 import StorePackageAuditPanel from '../components/StorePackageAuditPanel';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
   PENDING: '待审核',
@@ -58,12 +55,10 @@ function InfoChangeImageDiff({
   field,
   live,
   proposed,
-  imageSize = 72,
 }: {
   field: string;
   live: unknown;
   proposed: unknown;
-  imageSize?: number;
 }) {
   const liveUrls =
     field === 'coverUrl'
@@ -88,7 +83,7 @@ function InfoChangeImageDiff({
           <Image.PreviewGroup>
             <Space wrap size={8}>
               {liveUrls.map((url) => (
-                <Image key={`live-${url}`} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
+                <Image key={`live-${url}`} src={url} width={72} height={72} style={{ objectFit: 'cover', borderRadius: 4 }} />
               ))}
             </Space>
           </Image.PreviewGroup>
@@ -104,7 +99,7 @@ function InfoChangeImageDiff({
           <Image.PreviewGroup>
             <Space wrap size={8}>
               {proposedUrls.map((url) => (
-                <Image key={`new-${url}`} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
+                <Image key={`new-${url}`} src={url} width={72} height={72} style={{ objectFit: 'cover', borderRadius: 4 }} />
               ))}
             </Space>
           </Image.PreviewGroup>
@@ -133,7 +128,6 @@ function InfoChangeAuditPanel({
   const [rejectOpen, setRejectOpen] = useState(false);
   const [rejectReason, setRejectReason] = useState('');
   const [activeId, setActiveId] = useState<string | null>(null);
-  const [infoFullscreen, setInfoFullscreen] = useState(false);
 
   async function reload(nextPage = page, nextStatus = status) {
     setLoading(true);
@@ -201,15 +195,7 @@ function InfoChangeAuditPanel({
   }
 
   const columns: ColumnsType<StoreInfoChangeRequestDto> = [
-    {
+    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
-      title: '门店',
-      dataIndex: 'storeName',
-      render: (_, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>
-          {row.storeName || row.storeId}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -300,33 +286,25 @@ function InfoChangeAuditPanel({
 
       <Drawer
         title={detail ? `${detail.storeName || detail.storeId} · 信息变更` : '信息变更详情'}
-        width={infoFullscreen ? '100%' : 680}
+        width={680}
         open={detailOpen}
-        onClose={() => {
+        onClose={() => setDetailOpen(false)}
-          setDetailOpen(false);
-          setInfoFullscreen(false);
-        }}
         extra={
-          <Space>
+          detail?.status === 'PENDING' ? (
-            <Button onClick={() => setInfoFullscreen((v) => !v)}>
+            <Space>
-              {infoFullscreen ? '退出全屏' : '全屏查看'}
+              <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
-            </Button>
+              <Button
-            {detail?.status === 'PENDING' ? (
+                danger
-              <>
+                onClick={() => {
-                <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
+                  setActiveId(detail.id);
-                <Button
+                  setRejectReason('');
-                  danger
+                  setRejectOpen(true);
-                  onClick={() => {
+                }}
-                    setActiveId(detail.id);
+              >
-                    setRejectReason('');
+                驳回
-                    setRejectOpen(true);
+              </Button>
-                  }}
+            </Space>
-                >
+          ) : null
-                  驳回
-                </Button>
-              </>
-            ) : null}
-          </Space>
         }
       >
         {detailLoading ? (
@@ -350,12 +328,7 @@ function InfoChangeAuditPanel({
                     label={STORE_INFO_CHANGEABLE_FIELD_LABELS[d.field] ?? d.field}
                   >
                     {d.field === 'coverUrl' || d.field === 'envPhotoUrls' ? (
-                      <InfoChangeImageDiff
+                      <InfoChangeImageDiff field={d.field} live={d.live} proposed={d.proposed} />
-                        field={d.field}
-                        live={d.live}
-                        proposed={d.proposed}
-                        imageSize={infoFullscreen ? 160 : 72}
-                      />
                     ) : (
                       <span>
                         <Typography.Text delete type="secondary">
@@ -415,7 +388,6 @@ export default function StorePackageAuditsPage() {
   const [detailOpen, setDetailOpen] = useState(false);
   const [activeRequestId, setActiveRequestId] = useState<string | null>(null);
   const [drawerTitle, setDrawerTitle] = useState('套餐变更详情');
-  const [packageFullscreen, setPackageFullscreen] = useState(false);
 
   async function reload(nextPage = page, nextStatus = status) {
     setLoading(true);
@@ -480,16 +452,8 @@ export default function StorePackageAuditsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<StorePackageChangeRequestDto> = [
+  const columns: ColumnsType<StorePackageChangeRequestDto> = [
-    {
+    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
-      title: '门店',
-      dataIndex: 'storeName',
-      render: (_, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>
-          {row.storeName || row.storeId}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -538,15 +502,9 @@ 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>
-      <AdminListHeader title="审核通知" settings={settingsButton} />
       <Tabs
         activeKey={activeTab}
         onChange={setActiveTab}
@@ -596,23 +554,14 @@ export default function StorePackageAuditsPage() {
 
       <Drawer
         title={drawerTitle}
-        width={packageFullscreen ? '100%' : 880}
+        width={880}
         open={detailOpen}
-        onClose={() => {
+        onClose={() => setDetailOpen(false)}
-          setDetailOpen(false);
-          setPackageFullscreen(false);
-        }}
         destroyOnClose
-        extra={
-          <Button onClick={() => setPackageFullscreen((v) => !v)}>
-            {packageFullscreen ? '退出全屏' : '全屏查看'}
-          </Button>
-        }
       >
         {activeRequestId ? (
           <StorePackageAuditPanel
             requestId={activeRequestId}
-            fullscreen={packageFullscreen}
             onAudited={() => {
               setDetailOpen(false);
               void reload(page, status);

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

@@ -1,13 +1,9 @@
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
-import { Button, Form, Input, Select, Table, Typography } from 'antd';
+import { Button, Form, Input, Table, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { useSearchParams } from 'react-router-dom';
-import { fmtTime, ADMIN_OPTIONS_PAGE_SIZE } from '../lib/constants';
+import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { request, type Paginated } from '../lib/api';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-
 
 type Row = {
   id: string;
@@ -24,30 +20,22 @@ 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 baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '核销号', dataIndex: 'redeemNo', width: 180 },
     {
       title: '门店',
@@ -65,12 +53,11 @@ 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 }}>
-      <AdminListHeader title="门店评价" settings={settingsButton} />
+        门店评价
+      </Typography.Title>
       <Form
         form={form}
         layout="inline"
@@ -79,22 +66,11 @@ 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,10 +20,6 @@ import { STORE_WITHDRAW_STATUS_LABELS, type StoreWithdrawStatus } from '@dukang/
 import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -151,14 +147,14 @@ export default function StoreWithdrawalsPage() {
     });
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     {
       title: '提现单号',
       dataIndex: 'withdrawNo',
       width: 180,
       render: (v, row) => (
         <Space>
-          <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
+          <Typography.Link onClick={() => void openDetail(row.id)}>{v}</Typography.Link>
           {row.overdue ? <Tag color="magenta">超时</Tag> : null}
         </Space>
       ),
@@ -233,12 +229,11 @@ 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 }}>
-      <AdminListHeader title="门店提现审" settings={settingsButton} />
+        门店提现审
+      </Typography.Title>
       {overdueSummary ? (
         <Typography.Paragraph type="secondary">
           待审 {overdueSummary.pendingCount} 笔
@@ -304,7 +299,7 @@ export default function StoreWithdrawalsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
         rowClassName={(row) => (row.overdue ? 'ant-table-row-selected' : '')}
         pagination={{
           current: page,

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

@@ -39,9 +39,6 @@ import {
   type StoreCreateForm,
 } from '../lib/storeCreate';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
 import OssUpload from '../components/OssUpload';
@@ -201,9 +198,6 @@ 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 };
@@ -726,60 +720,47 @@ export default function StoresPage() {
     }
   }
 
-  const baseColumns: ColumnsType<StoreRow> = [
+  const columns: 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} wrap={false}>
+          <Space size={4} style={{ maxWidth: '100%' }} wrap={false}>
-            <AdminPrimaryLink onClick={() => void openStoreDetail(row)}>{name === '—' ? '' : name}</AdminPrimaryLink>
+            <Typography.Text ellipsis={{ tooltip: name }} style={{ maxWidth: row.isTest ? 110 : 160 }}>
+              {name}
+            </Typography.Text>
             {row.isTest ? <Tag color="orange">测试</Tag> : null}
           </Space>
         );
       },
     },
     {
-      key: 'category',
       title: '分类',
       width: 100,
+      ellipsis: true,
       render: (_, row) => row.category?.name || '—',
     },
-    { key: 'cityName', title: '城市', dataIndex: 'cityName', width: 80 },
+    { title: '城市', dataIndex: 'cityName', width: 80, ellipsis: true },
-    { key: 'phone', title: '登录号', dataIndex: 'phone', width: 120 },
+    { 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';
@@ -788,7 +769,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 }}>
+              <Typography.Text type="secondary" style={{ fontSize: 12, maxWidth: 88 }} ellipsis={{ tooltip: row.rejectReason }}>
                 {row.rejectReason}
               </Typography.Text>
             ) : null}
@@ -797,29 +778,32 @@ export default function StoresPage() {
       },
     },
     {
-      key: 'partner',
       title: '开城合伙人',
       dataIndex: 'partner',
       width: 140,
+      ellipsis: { showTitle: false },
       render: (partner: StoreRow['partner']) => {
         if (!partner) return '—';
-        return partnerOptionLabel({ id: partner.id ?? '', ...partner });
+        const label = partnerOptionLabel({ id: partner.id ?? '', ...partner });
+        return (
+          <Typography.Text ellipsis={{ tooltip: label }} style={{ maxWidth: 124 }}>
+            {label}
+          </Typography.Text>
+        );
       },
     },
     {
-      key: 'visibilityWhitelistEnabled',
       title: '可见',
       dataIndex: 'visibilityWhitelistEnabled',
       width: 90,
       render: (v) =>
         v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
-    { key: 'intro', title: '介绍', dataIndex: 'intro', width: 160, render: (v) => v || '—' },
+    { title: '介绍', dataIndex: 'intro', width: 160, ellipsis: true, render: (v) => v || '—' },
-    { key: 'sortOrder', title: '排序', dataIndex: 'sortOrder', width: 70 },
+    { title: '排序', dataIndex: 'sortOrder', width: 70 },
-    { key: 'accountName', title: '店长', dataIndex: ['account', 'name'], width: 90, render: (v) => v || '—' },
+    { title: '店长', dataIndex: ['account', 'name'], width: 90, ellipsis: true, render: (v) => v || '—' },
-    { key: 'createdAt', title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
+    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
-      key: 'actions',
       title: '操作',
       width: 280,
       fixed: 'right',
@@ -866,22 +850,15 @@ 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' }}>
-      <AdminListHeader
+        <Space direction="vertical" size={0}>
-        title="门店"
+          <Typography.Title level={4} style={{ margin: 0 }}>门店</Typography.Title>
-        settings={settingsButton}
+          <Typography.Text type="secondary">共 {data?.total ?? 0} 家门店（含合伙人录入）</Typography.Text>
-        description={`共 ${data?.total ?? 0} 家门店（含合伙人录入）`}
+        </Space>
-        actions={
+        <Button type="primary" onClick={openCreateModal}>新建门店</Button>
-          <Button type="primary" onClick={openCreateModal}>新建门店</Button>
+      </Space>
-        }
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
         <Form.Item name="phone" label="电话"><Input allowClear /></Form.Item>
@@ -941,7 +918,7 @@ export default function StoresPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1720 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -46,9 +46,6 @@ import { request, type HqProfile } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 const DISPATCH_WECOM_STORAGE_KEY = 'support_ticket_dispatch_wecom';
 const DEFAULT_DISPATCH_SUPPLEMENT = '请按以下任务进入开发流程';
@@ -221,13 +218,8 @@ export default function SupportTicketsPage() {
 
     setReviewOpen(false);
     const summary = [detail!.title, detail!.content].filter(Boolean).join('\n').slice(0, 500);
-    const ticketUrls = (detail!.attachmentUrls ?? []).filter(Boolean);
     tasksForm.setFieldsValue({
-      tasks: [{
+      tasks: [{ content: summary || detail!.title, type: mapSupportTicketTypeToDevPlanTask(detail!.ticketType) }],
-        content: summary || detail!.title,
-        type: mapSupportTicketTypeToDevPlanTask(detail!.ticketType),
-        attachmentUrls: ticketUrls,
-      }],
       dispatchToWecom: localStorage.getItem(DISPATCH_WECOM_STORAGE_KEY) !== 'false',
       dispatchSupplement: DEFAULT_DISPATCH_SUPPLEMENT,
     });
@@ -372,11 +364,7 @@ export default function SupportTicketsPage() {
         body: JSON.stringify({
           decision: 'APPROVE',
           note: note?.trim() || undefined,
-          tasks: values.tasks.map((t) => ({
+          tasks: values.tasks.map((t) => ({ content: t.content.trim(), type: t.type })),
-            content: t.content.trim(),
-            type: t.type,
-            attachmentUrls: t.attachmentUrls?.length ? t.attachmentUrls : detail!.attachmentUrls,
-          })),
           dispatchToWecom: !!values.dispatchToWecom,
           dispatchSupplement: values.dispatchSupplement?.trim() || undefined,
         }),
@@ -473,7 +461,7 @@ export default function SupportTicketsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<TicketRow> = [
+  const columns: ColumnsType<TicketRow> = [
     { title: '工单号', dataIndex: 'ticketNo', width: 180 },
     {
       title: '类型',
@@ -506,13 +494,7 @@ export default function SupportTicketsPage() {
         </Space>
       ),
     },
-    {
+    { title: '标题', dataIndex: 'title', ellipsis: true },
-      title: '标题',
-      dataIndex: 'title',
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(String(row.id))}>{v}</AdminPrimaryLink>
-      ),
-    },
     { title: '创建人', dataIndex: 'creatorName', width: 100 },
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
@@ -555,11 +537,8 @@ export default function SupportTicketsPage() {
     return null;
   })();
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('support-tickets', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
       <div
         style={{
           display: 'flex',
@@ -571,7 +550,6 @@ export default function SupportTicketsPage() {
         <Typography.Title level={4} style={{ margin: 0 }}>
           技术支持
         </Typography.Title>
-          {settingsButton}
         <Space>
           {isSuperAdmin ? (
             <>
@@ -632,7 +610,7 @@ export default function SupportTicketsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 900 }}
         rowSelection={
           isSuperAdmin
             ? {

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

@@ -20,9 +20,6 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { request, type Paginated } from '../lib/api';
 import { fmtTime } from '../lib/constants';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const MOCK_KEYS = ['MOCK_SMS', 'MOCK_WECHAT', 'MOCK_PAY'] as const;
 
@@ -256,25 +253,11 @@ export default function TestWhitelistPage() {
   }
 
   const phoneColumns: ColumnsType<PhoneRow> = [
-    {
+    { title: '手机号', dataIndex: 'phone', width: 140 },
-      title: '手机号',
-      dataIndex: 'phone',
-      width: 140,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={() => {
-            setEditRow(row);
-            editForm.setFieldsValue({ note: row.note ?? '' });
-            setEditOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '备注',
       dataIndex: 'note',
+      ellipsis: true,
       render: (v) => v || '—',
     },
     {
@@ -351,7 +334,7 @@ export default function TestWhitelistPage() {
     if (accountType === 'partner') {
       return [
         { title: '姓名', dataIndex: 'name', width: 100 },
-        { title: '公司', dataIndex: 'companyName', render: (v) => (v as string) || '—' },
+        { title: '公司', dataIndex: 'companyName', ellipsis: true, render: (v) => (v as string) || '—' },
         { title: '手机', dataIndex: 'phone', width: 120 },
         {
           title: '标记',
@@ -364,7 +347,7 @@ export default function TestWhitelistPage() {
     }
     if (accountType === 'store') {
       return [
-        { title: '门店名', dataIndex: 'name', width: 160 },
+        { title: '门店名', dataIndex: 'name', width: 160, ellipsis: true },
         { title: '城市', dataIndex: 'cityName', width: 90 },
         { title: '电话', dataIndex: 'phone', width: 120 },
         { title: '状态', dataIndex: 'status', width: 90 },
@@ -403,15 +386,11 @@ 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 }}>
-      <AdminListHeader title="白名单管理" settings={settingsButton} />
+        白名单管理
+      </Typography.Title>
 
       <Card size="small" loading={mockLoading} style={{ marginBottom: 16 }}>
         <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
@@ -493,7 +472,7 @@ export default function TestWhitelistPage() {
                 <Table
                   rowKey="id"
                   loading={phonesLoading}
-                  columns={columns}
+                  columns={phoneColumns}
                   dataSource={phones?.items ?? []}
                   pagination={{
                     current: phonePage,

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

@@ -4,10 +4,6 @@ import type { ColumnsType } from 'antd/es/table';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -73,7 +69,7 @@ export default function ThirdPartyLogsPage() {
   const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     { title: 'Provider', dataIndex: 'provider', width: 120 },
     { title: '场景', dataIndex: 'scene', width: 120 },
@@ -91,27 +87,15 @@ export default function ThirdPartyLogsPage() {
     {
       title: '错误信息',
       dataIndex: 'errorMessage',
+      ellipsis: true,
       render: (v: string | null | undefined) => v || '—',
     },
     {
       title: '请求摘要',
+      ellipsis: true,
       render: (_, r) => summarizeJson(r.requestBody),
     },
-    {
+    { title: '外部单号', dataIndex: 'externalNo', width: 140, render: (v) => v || '—' },
-      title: '外部单号',
-      dataIndex: 'externalNo',
-      width: 140,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request(`/common/third-party-logs/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '操作',
       width: 80,
@@ -130,15 +114,9 @@ export default function ThirdPartyLogsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-third-party', baseColumns, {
-    page,
-    pageSize,
-  });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>第三方日志</Typography.Title>
-      <AdminListHeader title="第三方日志" settings={settingsButton} />
       <Form
         layout="inline"
         style={{ marginBottom: 16 }}
@@ -165,7 +143,7 @@ export default function ThirdPartyLogsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -25,9 +25,6 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -118,22 +115,8 @@ export default function TicketsPage() {
     }
   }
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '工单号', dataIndex: 'ticketNo', width: 180 },
-      title: '工单号',
-      dataIndex: 'ticketNo',
-      width: 180,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request(`/admin/tickets/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '类型',
       dataIndex: 'ticketType',
@@ -149,7 +132,7 @@ export default function TicketsPage() {
       ),
     },
     { title: '关联', width: 140, render: (_, r) => `${r.refType}#${r.refId}` },
-    { title: '备注', dataIndex: 'remark' },
+    { title: '备注', dataIndex: 'remark', ellipsis: true },
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作',
@@ -171,11 +154,8 @@ 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',
@@ -187,7 +167,6 @@ export default function TicketsPage() {
         <Typography.Title level={4} style={{ margin: 0 }}>
           工单中心
         </Typography.Title>
-          {settingsButton}
         <Button type="primary" onClick={() => setCreateOpen(true)}>
           创建工单
         </Button>
@@ -226,7 +205,7 @@ export default function TicketsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 900 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -7,10 +7,6 @@ import { request } from '../lib/api';
 import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -65,10 +61,10 @@ export default function UserLogsPage() {
     form.setFieldsValue(filters);
   }, [form, filters]);
 
-  const baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
-      title: '用户', width: 180,
+      title: '用户', width: 180, ellipsis: true,
       render: (_, r) => (
         <AdminCellLine
           primary={r.nickname || r.userNo}
@@ -82,27 +78,13 @@ export default function UserLogsPage() {
         <Tag>{CATEGORY_LABELS[v ?? ''] || resolveUserLogCategory(r.eventName) || '其他'}</Tag>
       ),
     },
-    {
+    { title: '事件', dataIndex: 'eventName', width: 160 },
-      title: '事件',
-      dataIndex: 'eventName',
-      width: 160,
-      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request(`/admin/logs/users/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     {
       title: '关联', width: 120,
       render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
     },
     {
-      title: '摘要',
+      title: '摘要', ellipsis: true,
       render: (_, r) => summarizeExtra(r.extraJson),
     },
     {
@@ -116,12 +98,9 @@ export default function UserLogsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-users', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>用户日志</Typography.Title>
-      <AdminListHeader title="用户日志" settings={settingsButton} />
       <Segmented
         style={{ marginBottom: 16 }}
         options={USER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
@@ -152,7 +131,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: 'max-content' }}
+      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1000 }}
         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, useRef, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
 import {
   Alert,
@@ -19,9 +19,6 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { USER_SOURCE_TYPE_LABELS, resolveUserLogCategory, type UserSourceType } from '@dukang/shared-types';
 import { request, type AdminUserRow, type HqProfile, type Paginated } from '../lib/api';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 
 type UserOrderRow = {
@@ -33,77 +30,6 @@ type UserOrderRow = {
   createdAt: string;
 };
 
-function HqRemarkCell({
-  id,
-  hqRemark,
-  onSaved,
-}: {
-  id: string;
-  hqRemark: string | null;
-  onSaved: (id: string, hqRemark: string | null) => void;
-}) {
-  const [editing, setEditing] = useState(false);
-  const [value, setValue] = useState(hqRemark ?? '');
-  const savingRef = useRef(false);
-
-  useEffect(() => {
-    if (!editing) setValue(hqRemark ?? '');
-  }, [hqRemark, editing]);
-
-  async function commit() {
-    if (savingRef.current) return;
-    const next = value.trim() || null;
-    const prev = hqRemark?.trim() || null;
-    setEditing(false);
-    if (next === prev) return;
-    savingRef.current = true;
-    try {
-      const res = await request<{ id: string; hqRemark: string | null }>(`/admin/users/${id}`, {
-        method: 'PUT',
-        body: JSON.stringify({ hqRemark: next ?? '' }),
-      });
-      onSaved(id, res.hqRemark);
-      message.success('备注已保存');
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '保存失败');
-      setValue(hqRemark ?? '');
-    } finally {
-      savingRef.current = false;
-    }
-  }
-
-  if (editing) {
-    return (
-      <Input
-        size="small"
-        autoFocus
-        maxLength={128}
-        value={value}
-        onChange={(e) => setValue(e.target.value)}
-        onBlur={() => void commit()}
-        onPressEnter={() => void commit()}
-        onKeyDown={(e) => {
-          if (e.key === 'Escape') void commit();
-        }}
-        onClick={(e) => e.stopPropagation()}
-      />
-    );
-  }
-
-  return (
-    <span
-      title="双击修改备注，离开后保存"
-      onDoubleClick={(e) => {
-        e.stopPropagation();
-        setEditing(true);
-      }}
-      style={{ cursor: 'text', display: 'inline-block', minWidth: 48 }}
-    >
-      {hqRemark || '—'}
-    </span>
-  );
-}
-
 /** 好客权益金额展示：0 与空值统一显示占位，避免整列都是 ¥0.00 干扰 */
 function fmtBenefit(v: number | null | undefined) {
   const n = Number(v ?? 0);
@@ -318,7 +244,7 @@ export default function UsersPage() {
     { title: '下单时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
   ];
 
-  const baseColumns: ColumnsType<AdminUserRow> = [
+  const columns: ColumnsType<AdminUserRow> = [
     {
       title: '用户编号',
       dataIndex: 'userNo',
@@ -330,38 +256,12 @@ export default function UsersPage() {
         </Space>
       ),
     },
-    {
+    { title: '昵称', dataIndex: 'nickname', width: 100 },
-      title: '昵称',
-      dataIndex: 'nickname',
-      width: 140,
-      render: (v: string | null, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
-    {
-      title: '备注',
-      dataIndex: 'hqRemark',
-      width: 160,
-      render: (v: string | null, row) => (
-        <HqRemarkCell
-          id={row.id}
-          hqRemark={v}
-          onSaved={(id, hqRemark) => {
-            setData((prev) =>
-              prev
-                ? { ...prev, items: prev.items.map((u) => (u.id === id ? { ...u, hqRemark } : u)) }
-                : prev,
-            );
-            setDetail((d) => (d && d.id === id ? { ...d, hqRemark } : d));
-          }}
-        />
-      ),
-    },
     {
       title: '手机',
       dataIndex: 'phone',
       width: 120,
-      render: (v) => v || '—',
+      render: (v) => maskPhone(v),
     },
     {
       title: '验手机',
@@ -389,6 +289,7 @@ export default function UsersPage() {
       title: '来源 ID',
       dataIndex: 'sourceRefId',
       width: 100,
+      ellipsis: true,
       render: (v, row) => {
         if (!v) return '—';
         if (row.sourceType === 'PROMO_CODE') {
@@ -405,11 +306,13 @@ export default function UsersPage() {
       title: '来源标签',
       dataIndex: 'sourceLabel',
       width: 120,
+      ellipsis: true,
       render: (v) => v || '—',
     },
     {
       title: 'deviceKey',
       dataIndex: 'deviceKey',
+      ellipsis: true,
       render: (v) => v || '—',
     },
     {
@@ -474,29 +377,20 @@ 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' }}>
-      <AdminListHeader
+        <Typography.Title level={4} style={{ margin: 0 }}>用户监控</Typography.Title>
-        title="用户监控"
+        {canDeleteUsers ? (
-        settings={settingsButton}
+          <Button
-        actions={
+            danger
-          canDeleteUsers ? (
+            disabled={!selectedRowKeys.length}
-            <Button
+            onClick={() => void openBatchDeleteModal()}
-              danger
+          >
-              disabled={!selectedRowKeys.length}
+            批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
-              onClick={() => void openBatchDeleteModal()}
+          </Button>
-            >
+        ) : null}
-              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
+      </Space>
-            </Button>
-          ) : null
-        }
-      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
         <Form.Item name="phone" label="手机号">
           <Input placeholder="模糊搜索" allowClear />
@@ -535,7 +429,7 @@ export default function UsersPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1830 }}
         rowSelection={canDeleteUsers ? {
           selectedRowKeys,
           preserveSelectedRowKeys: true,
@@ -568,7 +462,6 @@ export default function UsersPage() {
               <Descriptions.Item label="ID">{detail.id}</Descriptions.Item>
               <Descriptions.Item label="用户编号">{detail.userNo}</Descriptions.Item>
               <Descriptions.Item label="昵称">{detail.nickname || '—'}</Descriptions.Item>
-              <Descriptions.Item label="备注">{detail.hqRemark || '—'}</Descriptions.Item>
               <Descriptions.Item label="手机号">{maskPhone(detail.phone)}</Descriptions.Item>
               <Descriptions.Item label="验手机时间">
                 {detail.phoneVerifiedAt ? new Date(detail.phoneVerifiedAt).toLocaleString('zh-CN') : '未验证'}

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

@@ -7,10 +7,6 @@ import { request } from '../lib/api';
 import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime, maskPhone } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type ActorType = 'USER' | 'STORE' | 'PARTNER' | 'HQ';
 
@@ -94,11 +90,12 @@ export default function WechatBindingsPage() {
     setDrawerOpen(true);
   }
 
-  const baseColumns: ColumnsType<GroupRow> = [
+  const columns: ColumnsType<GroupRow> = [
     {
       title: 'unionId',
       dataIndex: 'unionId',
       width: 180,
+      ellipsis: true,
       render: (v) => v || <Tag>无 unionId</Tag>,
     },
     {
@@ -122,12 +119,11 @@ export default function WechatBindingsPage() {
       title: '手机号',
       dataIndex: 'primaryPhone',
       width: 140,
-      render: (v, row) => (
+      render: (v) => maskPhone(v),
-        <AdminPrimaryLink onClick={() => void openDetail(row)}>{maskPhone(v)}</AdminPrimaryLink>
-      ),
     },
     {
       title: '身份摘要',
+      ellipsis: true,
       render: (_, r) => (
         <AdminCellLine
           primary={r.identities.map((i) => ACTOR_TYPE_LABELS[i.actorType]).join(' / ')}
@@ -164,6 +160,7 @@ export default function WechatBindingsPage() {
     },
     {
       title: '账号',
+      ellipsis: true,
       render: (_, r) => (
         <AdminCellLine
           primary={r.name || '—'}
@@ -175,12 +172,14 @@ export default function WechatBindingsPage() {
       title: '归属',
       dataIndex: 'refLabel',
       width: 160,
+      ellipsis: true,
       render: (v, r) => (v ? `${v}${r.refId ? ` #${r.refId}` : ''}` : '—'),
     },
     {
       title: 'wxOpenId',
       dataIndex: 'wxOpenId',
       width: 160,
+      ellipsis: true,
     },
     {
       title: '手机验证',
@@ -206,16 +205,12 @@ export default function WechatBindingsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('wechat-bindings', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>微信绑定总览</Typography.Title>
-      <AdminListHeader
+      <Typography.Paragraph type="secondary">
-        title="微信绑定总览"
+        按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。
-        settings={settingsButton}
+      </Typography.Paragraph>
-        description="按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。"
-      />
 
       <Form
         form={form}

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

@@ -5,10 +5,6 @@ import { useAdminList } from '../lib/useAdminList';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import type { WecomBotLogDto } from '@dukang/shared-types';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 export default function WecomBotLogsPage() {
   const [form] = Form.useForm();
@@ -28,19 +24,12 @@ export default function WecomBotLogsPage() {
     [filters],
   );
 
-  const baseColumns: ColumnsType<WecomBotLogDto> = [
+  const columns: ColumnsType<WecomBotLogDto> = [
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
-    {
+    { title: '机器人', dataIndex: 'botName', width: 120, ellipsis: true, render: (v, r) => v || r.botKey || '—' },
-      title: '机器人',
+    { title: '企微用户', dataIndex: 'wecomUserId', width: 120, ellipsis: true },
-      dataIndex: 'botName',
+    { title: '动作', dataIndex: 'action', width: 160, ellipsis: true },
-      width: 120,
+    { title: '权限', dataIndex: 'permission', width: 140, ellipsis: true, render: (v) => v || '—' },
-      render: (v, r) => (
-        <AdminPrimaryLink onClick={() => setDetail(r)}>{v || r.botKey || ''}</AdminPrimaryLink>
-      ),
-    },
-    { title: '企微用户', dataIndex: 'wecomUserId', width: 120 },
-    { title: '动作', dataIndex: 'action', width: 160 },
-    { title: '权限', dataIndex: 'permission', width: 140, render: (v) => v || '—' },
     {
       title: '结果',
       dataIndex: 'success',
@@ -48,7 +37,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' },
+    { title: '输入摘要', dataIndex: 'inputSummary', ellipsis: true },
     {
       title: '操作',
       width: 80,
@@ -60,16 +49,12 @@ export default function WecomBotLogsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('logs-wecom-bots', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <Typography.Title level={4}>企微机器人日志</Typography.Title>
-      <AdminListHeader
+      <Typography.Paragraph type="secondary">
-        title="企微机器人日志"
+        记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。
-        settings={settingsButton}
+      </Typography.Paragraph>
-        description="记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。"
-      />
 
       <Form
         form={form}
@@ -111,7 +96,7 @@ export default function WecomBotLogsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -36,9 +36,6 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type FormValues = {
   name: string;
@@ -283,7 +280,7 @@ export default function WecomBotsPage() {
 
   const runtimeMap = new Map((runtime?.bots ?? []).map((b) => [b.id, b]));
 
-  const baseColumns: ColumnsType<WecomBotDto> = [
+  const columns: ColumnsType<WecomBotDto> = [
     {
       title: '头像',
       dataIndex: 'avatarUrl',
@@ -294,24 +291,18 @@ export default function WecomBotsPage() {
         </Avatar>
       ),
     },
-    {
+    { title: '名称', dataIndex: 'name', width: 140, ellipsis: true },
-      title: '名称',
-      dataIndex: 'name',
-      width: 140,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openEdit(row)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '角色',
       dataIndex: 'role',
       width: 120,
       render: (r: WecomBotRole) => WECOM_BOT_ROLE_LABELS[r] || r,
     },
-    { title: 'BotID', dataIndex: 'botId', width: 160 },
+    { title: 'BotID', dataIndex: 'botId', width: 160, ellipsis: true },
     {
       title: '权限',
       dataIndex: 'permissions',
+      ellipsis: true,
       render: (perms: WecomBotPermission[]) =>
         perms.map((p) => (
           <Tag key={p} style={{ marginBottom: 2 }}>
@@ -376,20 +367,13 @@ 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 ? '开' : '关'}` : ''}
@@ -444,7 +428,7 @@ export default function WecomBotsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1200 }}
         pagination={{
           current: page,
           pageSize,

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

@@ -34,10 +34,6 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type FormValues = {
   name: string;
@@ -197,20 +193,21 @@ function PushRoutesTab() {
     }
   }
 
-  const baseColumns: ColumnsType<WecomMessagePushDto> = [
+  const columns: ColumnsType<WecomMessagePushDto> = [
     {
       title: '名称',
       dataIndex: 'name',
       render: (name: string, row) => (
         <Space>
           <Avatar src={row.avatarUrl ?? undefined}>{name.slice(0, 1)}</Avatar>
-          <AdminPrimaryLink onClick={() => openEdit(row)}>{name}</AdminPrimaryLink>
+          <span>{name}</span>
         </Space>
       ),
     },
     {
       title: 'Webhook',
       dataIndex: 'webhookUrlMasked',
+      ellipsis: true,
     },
     {
       title: '推送条件',
@@ -265,23 +262,11 @@ function PushRoutesTab() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('wecom-pushes', baseColumns, {
-    page,
-    pageSize,
-  });
-
   return (
     <>
-      {settingsModal}
+      <Typography.Paragraph type="secondary">
-      <AdminListHeader
+        配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。
-        settings={settingsButton}
+      </Typography.Paragraph>
-        description="配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。"
-        actions={
-          <Button type="primary" onClick={openCreate}>
-            新建推送
-          </Button>
-        }
-      />
 
       <Form
         form={filterForm}
@@ -316,6 +301,9 @@ function PushRoutesTab() {
             >
               重置
             </Button>
+            <Button type="primary" onClick={openCreate}>
+              新建推送
+            </Button>
           </Space>
         </Form.Item>
       </Form>

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

@@ -26,10 +26,6 @@ import { fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
-import { useAdminListColumns } from '../lib/useAdminListColumns';
-import { AdminListHeader } from '../components/AdminListHeader';
-import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-
 
 type Row = {
   id: string;
@@ -41,13 +37,6 @@ type Row = {
   wineryAmount: number;
   status: string;
   paidAt?: string | null;
-  paymentRef?: string | null;
-  wineryBank?: {
-    bankAccountName?: string | null;
-    bankName?: string | null;
-    bankBranch?: string | null;
-    bankAccountNo?: string | null;
-  };
 };
 
 type BillItem = {
@@ -138,30 +127,14 @@ export default function WineryBillsPage() {
     (profile?.permissionKeys ?? []).includes('system_settings_winery_bank');
 
   function confirmPay(ids: string[], amountHint?: number) {
-    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: (
+      content: `将确认 ${ids.length} 笔酒厂对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
-        <div>
-          <div>
-            将确认 {ids.length} 笔酒厂对账单
-            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。
-          </div>
-          <Input
-            placeholder="打款凭证号（可选）"
-            style={{ marginTop: 8 }}
-            onChange={(e) => {
-              paymentRef = e.target.value;
-            }}
-          />
-        </div>
-      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
-        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/winery-bills/${ids[0]}/confirm`, { method: 'POST', body });
+          await request(`/admin/winery-bills/${ids[0]}/confirm`, { method: 'POST' });
         } else {
           await request('/admin/winery-bills/batch-confirm', {
             method: 'POST',
@@ -239,15 +212,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 baseColumns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = [
-    {
+    { title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
-      title: '账单号',
-      dataIndex: 'billNo',
-      width: 170,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => void openDetail(row.id)}>{v}</AdminPrimaryLink>
-      ),
-    },
     {
       title: '账单日',
       dataIndex: 'billDate',
@@ -301,23 +267,32 @@ export default function WineryBillsPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
-
   return (
     <div>
-      {settingsModal}
+      <div
-      <AdminListHeader
+        style={{
-        title="酒厂对账单"
+          display: 'flex',
-        settings={settingsButton}
+          justifyContent: 'space-between',
-        description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
+          alignItems: 'flex-start',
-        actions={
+          marginBottom: 16,
-          canEditWineryBank ? (
+          gap: 16,
-            <Button type="default" onClick={() => void openBankModal()}>
+        }}
-              酒厂银行账户信息配置
+      >
-            </Button>
+        <Space direction="vertical" size={0}>
-          ) : null
+          <Typography.Title level={4} style={{ margin: 0 }}>
-        }
+            酒厂对账单
-      />
+          </Typography.Title>
+          <Typography.Text type="secondary">
+            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色、应付为 0
+            无需打款（灰），可展开订单明细
+          </Typography.Text>
+        </Space>
+        {canEditWineryBank ? (
+          <Button type="default" onClick={() => void openBankModal()}>
+            酒厂银行账户信息配置
+          </Button>
+        ) : null}
+      </div>
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>
@@ -400,7 +375,7 @@ export default function WineryBillsPage() {
           onChange: setSelectedKeys,
           getCheckboxProps: (r) => ({ disabled: !canConfirmWineryPay(r) }),
         }}
-        scroll={{ x: 'max-content' }}
+        scroll={{ x: 1100 }}
         pagination={{
           current: page,
           pageSize,
@@ -424,31 +399,7 @@ export default function WineryBillsPage() {
                 {displayWineryStatus(detail.status, detail.wineryAmount).label}
               </Descriptions.Item>
               <Descriptions.Item label="打款时间">{detail.paidAt ? fmtTime(detail.paidAt) : '—'}</Descriptions.Item>
-              <Descriptions.Item label="打款凭证">
-                {detail.paymentRef ? String(detail.paymentRef) : '—'}
-              </Descriptions.Item>
             </Descriptions>
-            {detail.wineryBank ? (
-              <>
-                <Typography.Title level={5} style={{ marginTop: 16 }}>
-                  收款账户（酒厂）
-                </Typography.Title>
-                <Descriptions column={1} size="small" bordered>
-                  <Descriptions.Item label="户名">
-                    {detail.wineryBank.bankAccountName || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="开户银行">
-                    {detail.wineryBank.bankName || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="开户支行">
-                    {detail.wineryBank.bankBranch || '—'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="账号">
-                    {detail.wineryBank.bankAccountNo || '—'}
-                  </Descriptions.Item>
-                </Descriptions>
-              </>
-            ) : null}
             <Typography.Title level={5} style={{ marginTop: 16 }}>
               订单明细
             </Typography.Title>
@@ -458,7 +409,7 @@ export default function WineryBillsPage() {
               pagination={false}
               dataSource={detail.items ?? []}
               columns={[
-                { title: '订单号', dataIndex: 'orderNo' },
+                { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
                 {
                   title: '配送',
                   dataIndex: 'deliveryType',

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

@@ -9,10 +9,6 @@ import {
 import { fmtTime } from '../../lib/constants';
 import { useAdminList } from '../../lib/useAdminList';
 import type { PromoCodeDetailContext } from './PromoCodeDetailLayout';
-import { useAdminListColumns } from '../../lib/useAdminListColumns';
-import { AdminPrimaryLink } from '../../components/AdminPrimaryLink';
-import { AdminListHeader } from '../../components/AdminListHeader';
-
 
 export default function PromoCodeUsersPage() {
   const { id = '' } = useParams();
@@ -25,18 +21,9 @@ export default function PromoCodeUsersPage() {
     [id],
   );
 
-  const baseColumns: ColumnsType<PromoCodeAttributedUser> = [
+  const columns: ColumnsType<PromoCodeAttributedUser> = [
     { title: '用户编号', dataIndex: 'userNo', width: 120 },
-    {
+    { title: '昵称', dataIndex: 'nickname', width: 100, render: (v) => v || '—' },
-      title: '昵称',
-      dataIndex: 'nickname',
-      width: 100,
-      render: (v, row) => (
-        <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: row.id } })}>
-          {v}
-        </AdminPrimaryLink>
-      ),
-    },
     { title: '手机', dataIndex: 'phone', width: 120, render: (v) => v || '—' },
     {
       title: '验手机',
@@ -82,27 +69,21 @@ export default function PromoCodeUsersPage() {
     },
   ];
 
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-code-users', baseColumns, { page, pageSize });
-
   return (
-    <>
+    <Table
-      {settingsModal}
+      rowKey="id"
-      <AdminListHeader settings={settingsButton} />
+      className="admin-table-nowrap"
-      <Table
+      loading={loading}
-        rowKey="id"
+      columns={columns}
-        className="admin-table-nowrap"
+      dataSource={data?.items ?? []}
-        loading={loading}
+      scroll={{ x: 1100 }}
-        columns={columns}
+      pagination={{
-        dataSource={data?.items ?? []}
+        current: page,
-        scroll={{ x: 'max-content' }}
+        pageSize,
-        pagination={{
+        total: data?.total ?? 0,
-          current: page,
+        showSizeChanger: true,
-          pageSize,
+        onChange: (p, ps) => { setPage(p); setPageSize(ps); },
-          total: data?.total ?? 0,
+      }}
-          showSizeChanger: true,
+    />
-          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
-        }}
-      />
-    </>
   );
 }

apps/h5-partner/src/pages/ProxyOrderPage.tsx

@@ -58,7 +58,6 @@ export default function ProxyOrderPage() {
   const [regionCodes, setRegionCodes] = useState<string[]>(draft0.regionCodes);
   const [addressDetail, setAddressDetail] = useState(draft0.addressDetail);
   const [productId, setProductId] = useState(draft0.productId);
-  const [skuId, setSkuId] = useState('');
   const [quantity, setQuantity] = useState(draft0.quantity);
   const [promoCodeId, setPromoCodeId] = useState(draft0.promoCodeId);
   const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>(draft0.deliveryMode);
@@ -157,37 +156,9 @@ export default function ProxyOrderPage() {
   ]);
 
   const selectedProduct = options?.products.find((p) => p.id === productId);
-  const skuOptions = (selectedProduct?.skus ?? []).filter((s) => s.status === 'ON_SALE');
+  const allowOnline = selectedProduct ? selectedProduct.allowOnlinePurchase !== false : true;
-  const selectedSku =
+  const allowOnSite = !!selectedProduct?.allowOnSitePickup;
-    skuOptions.find((s) => s.id === skuId) ||
+  const allowCrossCity = selectedProduct ? selectedProduct.allowCrossCityDelivery !== false : true;
-    skuOptions.find((s) => s.id === selectedProduct?.defaultSkuId) ||
-    skuOptions[0];
-  const allowOnline = selectedSku
-    ? selectedSku.allowOnlinePurchase !== false
-    : selectedProduct
-      ? selectedProduct.allowOnlinePurchase !== false
-      : true;
-  const allowOnSite = selectedSku
-    ? !!selectedSku.allowOnSitePickup
-    : !!selectedProduct?.allowOnSitePickup;
-  const allowCrossCity = selectedSku
-    ? selectedSku.allowCrossCityDelivery !== false
-    : selectedProduct
-      ? selectedProduct.allowCrossCityDelivery !== false
-      : true;
-
-  useEffect(() => {
-    if (!selectedProduct) return;
-    const def =
-      skuOptions.find((s) => s.id === selectedProduct.defaultSkuId) ||
-      skuOptions.find((s) => s.isDefault) ||
-      skuOptions[0];
-    if (def && (!skuId || !skuOptions.some((s) => s.id === skuId))) {
-      setSkuId(def.id);
-      if (def.saleUnit === 'BOX') setQuantity(1);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [productId, selectedProduct?.id, options]);
 
   useEffect(() => {
     if (!selectedProduct) return;
@@ -213,7 +184,6 @@ export default function ProxyOrderPage() {
           productId,
           quantity,
           deliveryMode,
-          skuId: skuId || undefined,
           receiverCity: deliveryMode === 'ADDRESS' ? region?.city || undefined : undefined,
           receiverDistrict: deliveryMode === 'ADDRESS' ? region?.district || undefined : undefined,
         }),
@@ -230,7 +200,7 @@ export default function ProxyOrderPage() {
         .finally(() => setPreviewLoading(false));
     }, 300);
     return () => clearTimeout(timer);
-  }, [productId, skuId, quantity, deliveryMode, region?.city, region?.district]);
+  }, [productId, quantity, deliveryMode, region?.city, region?.district]);
 
   function validateForm(): string | null {
     if (!/^1\d{10}$/.test(phone.trim())) return '请输入有效手机号';
@@ -389,7 +359,6 @@ export default function ProxyOrderPage() {
       productId,
       quantity,
       promoCodeId: promoCodeId || undefined,
-      skuId: skuId || undefined,
     };
 
     setSubmitting(true);
@@ -555,35 +524,8 @@ export default function ProxyOrderPage() {
               </button>
             </section>
 
-            {skuOptions.length > 1 || selectedProduct?.specEnabled ? (
-              <section className="partner-form-section">
-                <label className="partner-form-label">规格</label>
-                <div className="partner-input-wrap">
-                  <select
-                    className="partner-input"
-                    value={skuId}
-                    onChange={(e) => {
-                      const id = e.target.value;
-                      setSkuId(id);
-                      const sku = skuOptions.find((s) => s.id === id);
-                      if (sku?.saleUnit === 'BOX') setQuantity(1);
-                    }}
-                  >
-                    {skuOptions.map((s) => (
-                      <option key={s.id} value={s.id}>
-                        {s.specText || '默认'} · ¥{fmtMoney(s.price)} ·{' '}
-                        {s.saleUnit === 'BOX' ? `${s.bottlesPerUnit}瓶/箱` : '瓶'}
-                      </option>
-                    ))}
-                  </select>
-                </div>
-              </section>
-            ) : null}
-
             <section className="partner-form-section">
-              <label className="partner-form-label">
+              <label className="partner-form-label">数量</label>
-                {selectedSku?.saleUnit === 'BOX' ? '数量（箱）' : '数量（瓶）'}
-              </label>
               <div className="partner-input-wrap">
                 <input
                   className="partner-input"

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

@@ -463,7 +463,7 @@ export default function HomePage() {
 
             <div className="shop-home-stat">
 
-              <p className="shop-home-stat-label">今日核销金额</p>
+              <p className="shop-home-stat-label">今日到账金额</p>
 
               <p className="shop-home-stat-value">
 

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

@@ -196,7 +196,9 @@ export default function RecordsPage() {
                       </div>
                       <p className="shop-record-time">
                         核销时间:{' '}
-                        {new Date(String(r.createdAt)).toLocaleString('zh-CN', { hour12: false })}
+                        {new Date(String(r.createdAt))
+                          .toLocaleString('zh-CN', { hour12: false })
+                          .slice(0, 16)}
                       </p>
                       <p className="shop-record-channel">
                         <span

apps/mini-user/package.json

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

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

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

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

@@ -1,20 +1,19 @@
 import { Text, View } from '@tarojs/components';
+import BenefitFigure from './BenefitFigure';
 
 type CouponBadgeProps = {
   amount: number | string;
   label?: string;
 };
 
-/** 首页商品角标：纯文案「享{amount}好客权益」（无门店图标） */
+/** Taro 友好版权益角标（对齐 shared-ui CouponBadge） */
 export default function CouponBadge({ amount, label = '好客权益' }: CouponBadgeProps) {
   const n = Number(amount);
   const display = Number.isFinite(n) ? (Number.isInteger(n) ? String(n) : n.toFixed(0)) : String(amount);
   return (
     <View className="coupon-badge">
-      <Text>
+      <Text>享</Text>
-        享{display}
+      <BenefitFigure value={`${display} ${label}`} size="sm" />
-        {label}
-      </Text>
     </View>
   );
 }

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

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

apps/mini-user/src/lib/checkout-nav.ts

@@ -1,6 +1,5 @@
 export type CheckoutContext = {
   productId?: string;
-  skuId?: string;
   qty?: string;
   addressId?: string;
   cross?: boolean;
@@ -10,7 +9,6 @@ export type CheckoutContext = {
 export function buildQuery(ctx: CheckoutContext): string {
   const parts: string[] = [];
   if (ctx.productId) parts.push(`productId=${encodeURIComponent(ctx.productId)}`);
-  if (ctx.skuId) parts.push(`skuId=${encodeURIComponent(ctx.skuId)}`);
   if (ctx.qty) parts.push(`qty=${encodeURIComponent(ctx.qty)}`);
   if (ctx.addressId) parts.push(`addressId=${encodeURIComponent(ctx.addressId)}`);
   if (ctx.cross) parts.push('cross=1');
@@ -38,14 +36,12 @@ export function buildAddressEditUrl(id: string | undefined, ctx: CheckoutContext
 export function buildPayUrl(params: {
   orderId: string;
   productId?: string;
-  skuId?: string;
   qty?: string;
   addressId?: string;
   cross?: boolean;
 }): string {
   const parts = [`orderId=${encodeURIComponent(params.orderId)}`];
   if (params.productId) parts.push(`productId=${encodeURIComponent(params.productId)}`);
-  if (params.skuId) parts.push(`skuId=${encodeURIComponent(params.skuId)}`);
   if (params.qty) parts.push(`qty=${encodeURIComponent(params.qty)}`);
   if (params.addressId) parts.push(`addressId=${encodeURIComponent(params.addressId)}`);
   if (params.cross) parts.push('cross=1');
@@ -55,7 +51,6 @@ export function buildPayUrl(params: {
 export function readCheckoutContext(params: Record<string, string | undefined>): CheckoutContext {
   return {
     productId: params.productId,
-    skuId: params.skuId,
     qty: params.qty,
     addressId: params.addressId,
     cross: params.cross === '1',

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

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

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

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

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

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

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

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

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

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

apps/mini-user/src/pages/invoice-apply/index.tsx

@@ -7,9 +7,9 @@ import SubPageHeader from '../../components/SubPageHeader';
 import { request, toast } from '../../lib/api';
 import { usePageView } from '../../lib/usePageView';
 import {
-  INVOICE_CATEGORY_LABELS,
+  INVOICE_KIND_LABELS,
   INVOICE_TITLE_TYPE_LABELS,
-  type InvoiceCategory,
+  type InvoiceKind,
   type UserInvoiceTitleDto,
 } from '@dukang/shared-types';
 
@@ -42,8 +42,7 @@ export default function InvoiceApplyPage() {
 
   const [titles, setTitles] = useState<UserInvoiceTitleDto[]>([]);
   const [selectedId, setSelectedId] = useState('');
-  const [invoiceCategory, setInvoiceCategory] = useState<InvoiceCategory>('LIQUOR');
+  const [invoiceKind, setInvoiceKind] = useState<InvoiceKind>('NORMAL');
-  const [remark, setRemark] = useState('');
   const [emailOverride, setEmailOverride] = useState('');
   const [phoneOverride, setPhoneOverride] = useState('');
   const [loading, setLoading] = useState(true);
@@ -104,17 +103,19 @@ export default function InvoiceApplyPage() {
       toast('请填写联系电话');
       return;
     }
+    if (invoiceKind === 'SPECIAL' && selected.titleType !== 'ENTERPRISE') {
+      toast('专用发票仅支持企业抬头');
+      return;
+    }
     setSubmitting(true);
     try {
       await request(`/trade/orders/${orderId}/invoices`, {
         method: 'POST',
         data: {
           titleId: selectedId,
-          invoiceKind: 'NORMAL',
+          invoiceKind,
-          invoiceCategory,
           email,
           phone,
-          remark: remark.trim() || undefined,
         },
       });
       toast('发票申请已提交', 'success');
@@ -191,26 +192,20 @@ export default function InvoiceApplyPage() {
         ) : null}
 
         {canApply ? (
-          <>
+          <View className="invoice-title-field" style={{ marginBottom: 16 }}>
-            <View className="invoice-title-field" style={{ marginBottom: 16 }}>
+            <Text className="invoice-title-label">发票类型</Text>
-              <Text className="invoice-title-label">发票类型</Text>
+            <View className="invoice-title-type-row">
-              <Text className="invoice-kind-static">增值税普通发票</Text>
+              {(['NORMAL', 'SPECIAL'] as InvoiceKind[]).map((k) => (
+                <Text
+                  key={k}
+                  className={`invoice-title-type-chip${invoiceKind === k ? ' active' : ''}`}
+                  onClick={() => setInvoiceKind(k)}
+                >
+                  {INVOICE_KIND_LABELS[k]}
+                </Text>
+              ))}
             </View>
-            <View className="invoice-title-field" style={{ marginBottom: 16 }}>
+          </View>
-              <Text className="invoice-title-label">类型</Text>
-              <View className="invoice-title-type-row">
-                {(['LIQUOR', 'CATERING'] as InvoiceCategory[]).map((k) => (
-                  <Text
-                    key={k}
-                    className={`invoice-title-type-chip${invoiceCategory === k ? ' active' : ''}`}
-                    onClick={() => setInvoiceCategory(k)}
-                  >
-                    {INVOICE_CATEGORY_LABELS[k]}
-                  </Text>
-                ))}
-              </View>
-            </View>
-          </>
         ) : null}
 
         {canApply ? (
@@ -263,11 +258,7 @@ export default function InvoiceApplyPage() {
 
         {canApply && selected && !selected.email ? (
           <View className="invoice-title-field" style={{ marginTop: 16 }}>
-            <Text className="invoice-title-label">
+            <Text className="invoice-title-label">接收邮箱</Text>
-              <Text className="invoice-title-star">*</Text>
-              接收邮箱
-              <Text className="invoice-title-label-hint">必填</Text>
-            </Text>
             <Input
               className="invoice-title-input"
               placeholder="电子发票将发送至此邮箱"
@@ -288,19 +279,6 @@ export default function InvoiceApplyPage() {
             />
           </View>
         ) : null}
-
-        {canApply ? (
-          <View className="invoice-title-field" style={{ marginTop: 16 }}>
-            <Text className="invoice-title-label">备注</Text>
-            <Input
-              className="invoice-title-input"
-              maxlength={200}
-              placeholder="选填，将显示在发票申请备注中"
-              value={remark}
-              onInput={(e) => setRemark(e.detail.value)}
-            />
-          </View>
-        ) : null}
       </View>
 
       {canApply && titles.length > 0 ? (

apps/mini-user/src/pages/invoice-titles/index.tsx

@@ -26,24 +26,6 @@ const ACTION_ICONS = {
 
 type EditDraft = UpsertInvoiceTitleRequest & { id?: string };
 
-function FieldLabel({
-  children,
-  required,
-  hint,
-}: {
-  children: string;
-  required?: boolean;
-  hint?: string;
-}) {
-  return (
-    <Text className="invoice-title-label">
-      {required ? <Text className="invoice-title-star">*</Text> : null}
-      {children}
-      {hint ? <Text className="invoice-title-label-hint">{hint}</Text> : null}
-    </Text>
-  );
-}
-
 function TitleActionIcon({
   kind,
   label,
@@ -138,15 +120,6 @@ export default function InvoiceTitlesPage() {
       toast('企业抬头须填写税号');
       return;
     }
-    const email = draft.email?.trim() || '';
-    if (!email) {
-      toast('请填写接收邮箱（必填）');
-      return;
-    }
-    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-      toast('邮箱格式不正确');
-      return;
-    }
     setSaving(true);
     try {
       const payload: UpsertInvoiceTitleRequest = {
@@ -179,10 +152,6 @@ export default function InvoiceTitlesPage() {
   }
 
   async function setDefault(t: UserInvoiceTitleDto) {
-    if (!t.email?.trim()) {
-      toast('请先补全接收邮箱后再设为默认');
-      return;
-    }
     try {
       await request(`/trade/invoice-titles/${t.id}`, {
         method: 'PUT',
@@ -272,7 +241,7 @@ export default function InvoiceTitlesPage() {
             </Text>
 
             <View className="invoice-title-field">
-              <FieldLabel required>抬头类型</FieldLabel>
+              <Text className="invoice-title-label">抬头类型</Text>
               <View className="invoice-title-type-row">
                 {(['PERSONAL', 'ENTERPRISE'] as InvoiceTitleType[]).map((tp) => (
                   <Text
@@ -289,7 +258,7 @@ export default function InvoiceTitlesPage() {
             </View>
 
             <View className="invoice-title-field">
-              <FieldLabel required>抬头名称</FieldLabel>
+              <Text className="invoice-title-label">抬头名称</Text>
               <Input
                 className="invoice-title-input"
                 maxlength={128}
@@ -301,7 +270,7 @@ export default function InvoiceTitlesPage() {
 
             {draft.titleType === 'ENTERPRISE' ? (
               <View className="invoice-title-field">
-                <FieldLabel required>税号</FieldLabel>
+                <Text className="invoice-title-label">税号</Text>
                 <Input
                   className="invoice-title-input"
                   maxlength={32}
@@ -313,13 +282,11 @@ export default function InvoiceTitlesPage() {
             ) : null}
 
             <View className="invoice-title-field">
-              <FieldLabel required hint="必填，电子发票将发送至此">
+              <Text className="invoice-title-label">接收邮箱</Text>
-                接收邮箱
-              </FieldLabel>
               <Input
                 className="invoice-title-input"
                 maxlength={128}
-                placeholder="请填写邮箱（必填）"
+                placeholder="电子发票将发送至此邮箱"
                 value={draft.email || ''}
                 onInput={(e) => setDraft({ ...draft, email: e.detail.value })}
               />
@@ -344,7 +311,7 @@ export default function InvoiceTitlesPage() {
                   <Input
                     className="invoice-title-input"
                     maxlength={256}
-                    placeholder="选填"
+                    placeholder="专用发票需要，选填"
                     value={draft.addressPhone || ''}
                     onInput={(e) => setDraft({ ...draft, addressPhone: e.detail.value })}
                   />
@@ -354,7 +321,7 @@ export default function InvoiceTitlesPage() {
                   <Input
                     className="invoice-title-input"
                     maxlength={256}
-                    placeholder="选填"
+                    placeholder="专用发票需要，选填"
                     value={draft.bankAccount || ''}
                     onInput={(e) => setDraft({ ...draft, bankAccount: e.detail.value })}
                   />

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

@@ -32,14 +32,12 @@ type OrderPreview = {
   quantityOk?: boolean;
   quantityMessage?: string | null;
   minQty?: number;
-  saleUnit?: 'BOTTLE' | 'BOX';
 };
 
 export default function OrderConfirmPickupPage() {
   const router = useRouter();
   const productId = router.params.productId ?? '';
-  const skuId = router.params.skuId ?? '';
+  const [quantity, setQuantity] = useState(Math.max(2, Number(router.params.qty || 2)));
-  const [quantity, setQuantity] = useState(Math.max(1, Number(router.params.qty || 2)));
   const [preview, setPreview] = useState<OrderPreview | null>(null);
   const [previewLoading, setPreviewLoading] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -52,7 +50,7 @@ export default function OrderConfirmPickupPage() {
     setPreviewLoading(true);
     request<OrderPreview>('/trade/orders/preview', {
       method: 'POST',
-      data: { productId, quantity, onSitePickup: true, ...(skuId ? { skuId } : {}) },
+      data: { productId, quantity, onSitePickup: true },
     })
       .then((data) => {
         if (!cancelled) {
@@ -72,16 +70,15 @@ export default function OrderConfirmPickupPage() {
     return () => {
       cancelled = true;
     };
-  }, [productId, skuId, quantity]);
+  }, [productId, quantity]);
 
-  const unitLabel = preview?.saleUnit === 'BOX' ? '箱' : '瓶';
   const minQty = preview?.minQty ?? 2;
   const quantityOk = preview ? preview.quantityOk !== false && quantity >= minQty : false;
   const canSubmit = !!preview && quantityOk && !loading && !previewLoading;
 
   function updateQuantity(next: number) {
     if (next < minQty) {
-      const tip = `现场提货至少购买 ${minQty}${unitLabel}`;
+      const tip = `现场提货至少购买 ${minQty} 瓶`;
       toast(tip);
       setMsg(tip);
       if (next < 1) return;
@@ -94,13 +91,12 @@ export default function OrderConfirmPickupPage() {
   async function doSubmit() {
     const order = await request<{ id: string }>('/trade/orders', {
       method: 'POST',
-      data: { productId, quantity, onSitePickup: true, ...(skuId ? { skuId } : {}) },
+      data: { productId, quantity, onSitePickup: true },
     });
     Taro.redirectTo({
       url: buildPayUrl({
         orderId: order.id,
         productId,
-        skuId: skuId || undefined,
         qty: String(quantity),
       }),
     });

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

@@ -11,9 +11,7 @@ import { maskPhone } from '../../lib/phone';
 import { ensurePayReady } from '../../lib/pay-ready';
 import { fetchUserProfile } from '../../lib/pay-wechat';
 import { request, toast } from '../../lib/api';
-import DeliveryHintHtml from '../../components/DeliveryHintHtml';
 import { canCrossCity, isCrossCityAddress } from '../../lib/product-fulfillment';
-import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
 import { getProductMainImage } from '../../lib/product-images';
 import BenefitFigure from '../../components/BenefitFigure';
 
@@ -56,9 +54,6 @@ type OrderPreview = {
   minQty?: number;
   allowCrossCityDelivery?: boolean;
   allowOnlinePurchase?: boolean;
-  skuId?: string;
-  saleUnit?: 'BOTTLE' | 'BOX';
-  bottlesPerUnit?: number;
 };
 
 const CROSS_CITY_BLOCK_MSG = '该商品不支持跨城配送，请更换为开城城市内的收货地址';
@@ -71,13 +66,11 @@ export default function OrderConfirmPage() {
   const router = useRouter();
   const checkoutCtx = readCheckoutContext(router.params);
   const productId = checkoutCtx.productId ?? '';
-  const skuId = checkoutCtx.skuId ?? '';
   const forceCross = checkoutCtx.cross === true;
   const [quantity, setQuantity] = useState(Math.max(1, Number(checkoutCtx.qty || 2)));
   const [addresses, setAddresses] = useState<Address[]>([]);
   const [addressId, setAddressId] = useState(checkoutCtx.addressId || '');
   const [preview, setPreview] = useState<OrderPreview | null>(null);
-  const [localHintHtml, setLocalHintHtml] = useState('');
   const [previewLoading, setPreviewLoading] = useState(false);
   const [loading, setLoading] = useState(false);
   const [msg, setMsg] = useState('');
@@ -103,12 +96,11 @@ export default function OrderConfirmPage() {
     if (!productId) return;
     let cancelled = false;
     setPreviewLoading(true);
-    const body: { productId: string; quantity: number; addressId?: string; skuId?: string } = {
+    const body: { productId: string; quantity: number; addressId?: string } = {
       productId,
       quantity,
     };
     if (addressId) body.addressId = addressId;
-    if (skuId) body.skuId = skuId;
 
     request<OrderPreview>('/trade/orders/preview', { method: 'POST', data: body })
       .then((data) => {
@@ -147,25 +139,13 @@ export default function OrderConfirmPage() {
     return () => {
       cancelled = true;
     };
-  }, [productId, skuId, quantity, addressId]);
+  }, [productId, quantity, addressId]);
 
   const selectedAddress = useMemo(
     () => addresses.find((a) => String(a.id) === addressId),
     [addresses, addressId],
   );
 
-  useEffect(() => {
-    const cityName = selectedAddress?.city;
-    if (!cityName) {
-      setLocalHintHtml('');
-      return;
-    }
-    void loadLocalDeliveries().then((list) => {
-      const row = matchLocalDelivery(list, { cityName });
-      setLocalHintHtml(row ? resolveLocalDeliveryHintHtml(row) : '');
-    });
-  }, [selectedAddress?.city]);
-
   const allowCross =
     preview?.allowCrossCityDelivery !== undefined
       ? canCrossCity({ allowCrossCityDelivery: preview.allowCrossCityDelivery })
@@ -177,7 +157,6 @@ export default function OrderConfirmPage() {
     forceCross || preview?.deliveryType === 'CROSS_CITY' || localCross;
   const crossBlocked = isCross && !allowCross;
   const addressOk = preview ? preview.addressOk !== false && !crossBlocked : !crossBlocked;
-  const unitLabel = preview?.saleUnit === 'BOX' ? '箱' : '瓶';
   const minQty =
     preview?.minQty ??
     (isCross ? (preview?.city?.crossMinQty ?? 6) : (preview?.city?.localMinQty ?? 2));
@@ -192,8 +171,8 @@ export default function OrderConfirmPage() {
   function updateQuantity(next: number) {
     if (next < minQty) {
       const tip = isCross
-        ? `跨城配送至少购买 ${minQty}${unitLabel}`
+        ? `跨城配送至少购买 ${minQty} 瓶（1箱）`
-        : `同城配送至少购买 ${minQty}${unitLabel}`;
+        : `同城配送至少购买 ${minQty} 瓶`;
       toast(tip);
       setMsg(tip);
       if (next < 1) return;
@@ -216,7 +195,6 @@ export default function OrderConfirmPage() {
         productId,
         quantity,
         addressId,
-        ...(skuId ? { skuId } : {}),
         ...(clientLocation ? { clientLocation } : {}),
       },
     });
@@ -224,7 +202,6 @@ export default function OrderConfirmPage() {
       url: buildPayUrl({
         orderId: order.id,
         productId,
-        skuId: skuId || undefined,
         qty: String(quantity),
         addressId,
         cross: forceCross,
@@ -246,15 +223,15 @@ export default function OrderConfirmPage() {
       }
       if (!quantityOk) {
         const tip = isCross
-          ? `跨城配送至少购买 ${minQty}${unitLabel}`
+          ? `跨城配送至少购买 ${minQty} 瓶（1箱）`
-          : `同城配送至少购买 ${minQty}${unitLabel}`;
+          : `同城配送至少购买 ${minQty} 瓶`;
         setMsg(tip);
         toast(tip);
       }
       return;
     }
 
-    const returnPath = `/pages/order-confirm/index?productId=${productId}&qty=${quantity}&addressId=${addressId}${skuId ? `&skuId=${skuId}` : ''}${forceCross ? '&cross=1' : ''}`;
+    const returnPath = `/pages/order-confirm/index?productId=${productId}&qty=${quantity}&addressId=${addressId}${forceCross ? '&cross=1' : ''}`;
 
     if (!phonePromptSkipped.current) {
       try {
@@ -354,12 +331,6 @@ export default function OrderConfirmPage() {
           </View>
         ) : null}
 
-        {!isCross && addressOk && addressId && localHintHtml ? (
-          <View className="order-card">
-            <DeliveryHintHtml className="u-muted" html={localHintHtml} />
-          </View>
-        ) : null}
-
         {preview ? (
           <>
             <View className="order-card">
@@ -400,8 +371,8 @@ export default function OrderConfirmPage() {
               {!quantityOk ? (
                 <Text className="order-qty-hint">
                   {isCross
-                    ? `跨城配送至少购买 ${minQty}${unitLabel}，请调整数量`
+                    ? `跨城配送至少购买 ${minQty} 瓶（1箱），请调整数量`
-                    : `同城配送至少购买 ${minQty}${unitLabel}，请调整数量`}
+                    : `同城配送至少购买 ${minQty} 瓶，请调整数量`}
                 </Text>
               ) : null}
             </View>

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

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

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

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text } from '@tarojs/components';
 import '../../styles/order.css';
 import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
@@ -19,13 +19,13 @@ import { applyWechatLoginResult } from '../../lib/wechat-auth';
 import { isWechatEnv } from '../../lib/weixin';
 import { goLogin } from '../../lib/auth-nav';
 import { request, toast } from '../../lib/api';
-import payLogo from '../../assets/logo2.png';
 
 export default function PayPage() {
   const router = useRouter();
   const orderId = router.params.orderId ?? '';
   const [loading, setLoading] = useState(false);
   const [authLoading, setAuthLoading] = useState(false);
+  const [mockMode, setMockMode] = useState(true);
   const [needsWechatAuth, setNeedsWechatAuth] = useState(false);
   const [msg, setMsg] = useState('');
   const [orderNo, setOrderNo] = useState('');
@@ -39,6 +39,7 @@ export default function PayPage() {
   const refreshPayReadiness = useCallback(async () => {
     try {
       const [config, profile] = await Promise.all([fetchClientConfig(), fetchUserProfile()]);
+      setMockMode(config.mockPay);
       setNeedsWechatAuth(needsWechatAuthForPay(config, profile));
       return profile;
     } catch {
@@ -173,7 +174,7 @@ export default function PayPage() {
       <View className="sub-page-body">
         <View className="pay-status">
           <View className="pay-status-icon">
-            <Image className="pay-status-brand" src={payLogo} mode="aspectFit" />
+            <Text>¥</Text>
           </View>
           <Text className="pay-status-title">
             {needsWechatAuth ? '需完成微信授权' : '待支付'}
@@ -203,6 +204,12 @@ export default function PayPage() {
             <Text className="order-row-label">支付方式</Text>
             <Text className="order-row-value">微信支付</Text>
           </View>
+          <View className="order-row">
+            <Text className="order-row-label">说明</Text>
+            <Text className="order-row-value">
+              {mockMode ? 'Mock 模式由服务端直接标记已付款' : '将调起微信收银台'}
+            </Text>
+          </View>
         </View>
         {msg ? (
           <Text className="pay-wechat-auth-msg" style={{ marginTop: 12 }}>