Merge pull request 'Dev v3.5.6' (#39 ) from dev into main

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39
Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38 ) from dev_jacy into dev
2026-08-23 16:43:51 +08:00 · 2026-08-23 16:43:07 +08:00 · 2026-08-23 16:41:22 +08:00 · 2026-08-23 14:37:36 +08:00 · 2026-08-23 14:37:29 +08:00 · 2026-08-23 12:30:04 +08:00
179 changed files with 10439 additions and 3091 deletions
@@ -1,55 +0,0 @@
---
-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`
@@ -1,33 +1,11 @@
 ---
-description: Git 提交与 PR 协作规范
+description: 杜康提交 scope 与发版默认（生产）
 alwaysApply: true
 ---

-# Git 规范
+# Git / 发版（杜康专属）

-## 提交格式
-
-Conventional Commits，scope = 端或模块名：
-
-```
-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
+- Conventional Commits，scope = 端或模块：`feat(trade):`、`fix(redeem):`
+- 只说「发布/发版」→ 生产（`main` + `deploy-prod.sh`）；明确说「发测试」才 staging。流程见 `/dukang-release`
+- 改 API/表 → 同步 v3-PRD + v3编码手册 + `shared-types`
+- Prisma 迁移须 Review
@@ -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 表 → **只改本 OWNER 路径**
+2. 读 [`AGENTS.md`](../../AGENTS.md) OWNER 段 + 对应 `apps/` 或 `server/dukang-api/AGENTS.md` → **只改本 OWNER 路径**
 3. 有任务卡 ID → 配合 `dukang-task-card` skill 或查 preV1 §9 / V2 §七
 4. UI 任务 → `pages/ROUTE_MAP.md` + 对应 `pages/{端}/` 原型
 5. 编码前过一遍下方 Checklist
@@ -5,6 +5,7 @@ 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
@@ -4,6 +4,7 @@ description: >-
  杜康好客发布流程：dev→测试(staging)，main→生产；同机双栈。
  Use when the user says 发布、上传、deploy、上线、发版、发测试、发生产,
  or @杜康发布 / @dukang-release.
+disable-model-invocation: true
 ---

 # 杜康发布
@@ -4,6 +4,7 @@ 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
@@ -21,4 +21,8 @@ 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/
@@ -1,133 +1,37 @@
 # 杜康好客 · AGENTS.md

-> AI 编码入口。人类协作者仍读 [`agent.md`](./agent.md)；本文件供 Cursor / Codex / Copilot 等自动加载。
+> AI 编码入口。人类读 [`agent.md`](./agent.md)。启动、端口、测试账号见 [`README.md`](./README.md)。

-## 项目概览
+杜康酒业 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 原型，只读 |

-| 阶段 | 手册 | 说明 |
-|------|------|------|
-| **V3.0 唯一需求源** | [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) | 产品需求与三波交付（**只看这个**） |
-| **现状对照** | [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md) | 已完成 / 冲突 / 缺口审计 |
-| **V3 实现验收** | [`杜康好客-v3编码手册.md`](./杜康好客-v3编码手册.md) | 核销规则、分工、闭环 |
-| ~~V2 / preV1~~ | 历史参考（**已压缩**；V2 全文见 git 2026-08-06 前） | **不再作为需求依据** |
+前端：[`apps/AGENTS.md`](./apps/AGENTS.md)。后端模块/表 OWNER：[`server/dukang-api/AGENTS.md`](./server/dukang-api/AGENTS.md)。

-**禁止**：臆造 PRD 未定义规则；依赖 `doc/` 下过时文档；跨 OWNER 直写他人 Prisma 表。
+## 文档（冲突时）

-## 启动命令
-
-```bash
-# 基础设施
-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 冲突时忽略）
+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 参照

-> **V2 / preV1 手册不再作为需求依据。**
+**禁止**：臆造 PRD 未定义规则；依赖 `doc/` 过时文档；`apps/*` import `server/*`；跨模块 `prisma` 写他人表。V2 / preV1 手册不再作需求依据。

-## 团队与 OWNER 边界（2 人）
+## OWNER（2026-07 起暂由 jacy 代管全部）

-| 负责人 | Git 账号 | 职责 |
-|--------|----------|------|
-| **Jacy**（管理员） | `jacy-dukang` | C 端、admin-web、后端主模块、packages、Prisma 迁移主 Review |
-| **刘景尧** | `刘景尧` | 合伙人 H5、门店 H5、`store` / `redeem` 模块（**暂由 jacy-dukang 代管**） |
+`jacy-dukang` 可改 `apps/*`、`packages/*`、全部后端模块。逻辑边界仍按 A/B/C/D，便于子 Agent 隔离。Prisma 迁移由 jacy 主导。

-> **临时分工（2026-07）**：刘景尧任务暂由 `jacy-dukang` 全权负责；逻辑 OWNER B+D 路径可改，Prisma 迁移由 jacy 主导。
+- 跨模块只 inject 对方 **exported Service**
+- 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
@@ -137,38 +41,10 @@ C 端门店仅 status=OPEN
 订单 Tab：待付款 | 已付款 | 已完成
 ```

-**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`。
+微信：iOS H5 登录后禁止仅 SPA 跳转再扫码（`packages/weixin-sdk/GOTCHAS.md`）。小程序 `open-type` 按钮祖先禁止 `stopPropagation`；weapp 标题只用 `navigationBarTitleText`。`h5-partner` 与 `admin-web` 同端口 5175，勿同时开。

-## 环境与发版
+## 按需加载

-| 环境 | 分支 | 目录 | 端口 | 域名 |
-|------|------|------|------|------|
-| 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)
+- 编码 `/dukang-coding` · V3 需求 `/dukang-v3` · 发版 `/dukang-release`（只说「发版」= 生产）
+- 子 Agent：`/owner-a-user-trade` 等（见 `.cursor/agents/`）
+- DoD：验收项满足；不跨模块直写表；类型在 `shared-types`、规则在 `domain`；相关 lint/单测过
@@ -291,26 +291,21 @@ body:has(.big-screen-page),
  z-index: 1;
  flex: 1;
  min-height: 0;
+  width: 100%;
  display: flex;
  flex-direction: column;
-  padding: 0 8px;
+  padding: 0;
  overflow: hidden;
 }

 .big-screen-list-head,
 .big-screen-row {
  display: grid;
-  grid-template-columns: 208px 1fr 160px 200px;
+  grid-template-columns: minmax(180px, 18%) minmax(0, 1fr) minmax(140px, 16%) minmax(160px, 18%);
  align-items: center;
  column-gap: 16px;
-}
-
-.big-screen-list-head {
-  flex: 0 0 auto;
-  padding: 0 28px 10px 40px;
-  font-size: 15px;
-  color: rgba(170, 200, 230, 0.55);
-  letter-spacing: 2px;
+  width: 100%;
+  box-sizing: border-box;
 }

 .big-screen-list-body {
@@ -457,10 +452,20 @@ body:has(.big-screen-page),
 }

 .big-screen-empty {
+  position: absolute;
+  left: 0;
+  right: 0;
+  /* 全屏高度黄金分割点（≈0.382），略偏上 */
+  top: 38.2%;
+  transform: translateY(-50%);
+  z-index: 2;
  text-align: center;
-  color: rgba(255, 255, 255, 0.45);
-  padding: 48px 20px;
-  font-size: 18px;
+  color: rgba(145, 190, 230, 0.42);
+  padding: 0 40px;
+  font-size: 60px;
+  letter-spacing: 6px;
+  font-weight: 400;
+  pointer-events: none;
 }

 .big-screen-fx {
@@ -713,9 +718,8 @@ body:has(.big-screen-page),
  .big-screen-clock {
    font-size: 56px;
  }
-  .big-screen-list-head,
  .big-screen-row {
-    grid-template-columns: 172px 1fr 120px 160px;
+    grid-template-columns: minmax(140px, 20%) minmax(0, 1fr) minmax(110px, 16%) minmax(130px, 18%);
    font-size: 16px;
  }
  .big-screen-amount--6d {
@@ -0,0 +1,616 @@
+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>
+  );
+}
@@ -51,6 +51,7 @@ 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');
@@ -87,9 +88,37 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
  }, [open]);

  const selectedProduct = options?.products.find((p) => p.id === productId);
-  const allowOnline = selectedProduct ? selectedProduct.allowOnlinePurchase !== false : true;
-  const allowOnSite = !!selectedProduct?.allowOnSitePickup;
-  const allowCrossCity = selectedProduct ? selectedProduct.allowCrossCityDelivery !== false : true;
+  const skuOptions = (selectedProduct?.skus ?? []).filter((s) => s.status === 'ON_SALE');
+  const selectedSku =
+    skuOptions.find((s) => s.id === skuId) ||
+    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;
@@ -115,6 +144,7 @@ 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,
        }),
@@ -124,7 +154,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
        .finally(() => setPreviewLoading(false));
    }, 300);
    return () => window.clearTimeout(timer);
-  }, [open, productId, quantity, deliveryMode, region?.city, region?.district, step]);
+  }, [open, productId, skuId, quantity, deliveryMode, region?.city, region?.district, step]);

  useEffect(() => () => stopPoll(), []);

@@ -135,6 +165,8 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
    setRegionCodes([]);
    setAddressDetail('');
    setQuantity(2);
+    setProductId(undefined);
+    setSkuId(undefined);
    setPromoCodeId(undefined);
    setDeliveryMode('ADDRESS');
    setAutoReceive(false);
@@ -202,6 +234,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
      productId: productId!,
      quantity,
      promoCodeId: promoCodeId || undefined,
+      skuId: skuId || undefined,
    };

    setSubmitting(true);
@@ -317,7 +350,10 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
                loading={loadingOptions}
                placeholder="选择商品"
                value={productId}
-                onChange={setProductId}
+                onChange={(id) => {
+                  setProductId(id);
+                  setSkuId(undefined);
+                }}
                options={(options?.products ?? []).map((p) => ({
                  value: p.id,
                  label: `${p.name} · ${p.spec} · ¥${fmtMoney(p.price)}`,
@@ -325,7 +361,25 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
              />
            </Form.Item>

-            <Form.Item label="数量" required>
+            {skuOptions.length > 1 || selectedProduct?.specEnabled ? (
+              <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}
@@ -23,6 +23,11 @@ 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;
@@ -46,6 +51,15 @@ 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 ? (
@@ -0,0 +1,459 @@
+import { useEffect, useState } from 'react';
+import { Button, Image, Input, Modal, Space, Tag, Typography, message } from 'antd';
+import type {
+  StorePackageAuditDetailDto,
+  StorePackageItemDto,
+  StorePackageViewDto,
+} from '@dukang/shared-types';
+import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { notifyPackageAuditChanged } from '../lib/admin-events';
+import { fmtTime } from '../lib/constants';
+
+const HQ_PACKAGE_STATUS_LABELS: Record<string, string> = {
+  PENDING: '待审核',
+  APPROVED: '已通过',
+  REJECTED: '已驳回',
+};
+
+function packageKey(pkg: StorePackageItemDto | StorePackageViewDto, index: number) {
+  const name = String(pkg.name ?? '').trim();
+  return name ? `name:${name}` : `idx:${index}`;
+}
+
+function imageSignature(pkg: StorePackageItemDto | StorePackageViewDto) {
+  return normalizeStorePackageImageUrls(pkg).join('|');
+}
+
+type FieldChange = { label: string; old: string; now: string; kind: 'text' | 'value' };
+
+function diffText(a: string, b: string): Array<{ type: 'equal' | 'insert' | 'delete'; text: string }> {
+  const m = a.length;
+  const n = b.length;
+  const dp: number[][] = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i = m - 1; i >= 0; i--) {
+    for (let j = n - 1; j >= 0; j--) {
+      dp[i][j] = a[i] === b[j] ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1]);
+    }
+  }
+  const raw: Array<{ type: 'equal' | 'insert' | 'delete'; text: string }> = [];
+  let i = 0;
+  let j = 0;
+  while (i < m && j < n) {
+    if (a[i] === b[j]) {
+      raw.push({ type: 'equal', text: a[i] });
+      i++;
+      j++;
+    } else if (dp[i + 1][j] >= dp[i][j + 1]) {
+      raw.push({ type: 'delete', text: a[i] });
+      i++;
+    } else {
+      raw.push({ type: 'insert', text: b[j] });
+      j++;
+    }
+  }
+  while (i < m) raw.push({ type: 'delete', text: a[i++] });
+  while (j < n) raw.push({ type: 'insert', text: b[j++] });
+  const merged: Array<{ type: 'equal' | 'insert' | 'delete'; text: string }> = [];
+  for (const s of raw) {
+    const last = merged[merged.length - 1];
+    if (last && last.type === s.type) last.text += s.text;
+    else merged.push({ ...s });
+  }
+  return merged;
+}
+
+function fieldChanges(
+  live: StorePackageItemDto | StorePackageViewDto,
+  proposed: StorePackageItemDto | StorePackageViewDto,
+): FieldChange[] {
+  const changes: FieldChange[] = [];
+  const text = (v: string | number | null | undefined) => (v ?? '').toString().trim();
+  const pushText = (label: string, oldV: string, newV: string) => {
+    if (oldV !== newV) changes.push({ label, old: oldV, now: newV, kind: 'text' });
+  };
+  const pushValue = (label: string, oldV: string, newV: string) => {
+    if (oldV !== newV) changes.push({ label, old: oldV || '（空）', now: newV || '（空）', kind: 'value' });
+  };
+  pushValue('价格', `¥${text(live.price)}`, `¥${text(proposed.price)}`);
+  pushText('套餐名称', text(live.name), text(proposed.name));
+  pushText('菜品内容', text(live.dishes), text(proposed.dishes));
+  pushText('可用时间', text(live.usableTime), text(proposed.usableTime));
+  pushText('其他说明', text(live.otherNotes), text(proposed.otherNotes));
+  const liveImgs = normalizeStorePackageImageUrls(live);
+  const proposedImgs = normalizeStorePackageImageUrls(proposed);
+  if (imageSignature(live) !== imageSignature(proposed)) {
+    changes.push({ label: '图片', old: `${liveImgs.length} 张`, now: `${proposedImgs.length} 张`, kind: 'value' });
+  }
+  return changes;
+}
+
+function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto[]) {
+  const liveMap = new Map(live.map((p, i) => [packageKey(p, i), p]));
+  const proposedMap = new Map(proposed.map((p, i) => [packageKey(p, i), p]));
+  const keys = new Set([...liveMap.keys(), ...proposedMap.keys()]);
+  const rows: Array<{
+    key: string;
+    change: 'added' | 'removed' | 'changed' | 'unchanged';
+    live?: StorePackageViewDto;
+    proposed?: StorePackageItemDto;
+    changes?: FieldChange[];
+  }> = [];
+
+  for (const key of keys) {
+    const l = liveMap.get(key);
+    const p = proposedMap.get(key);
+    if (l && !p) {
+      rows.push({ key, change: 'removed', live: l });
+    } else if (!l && p) {
+      rows.push({ key, change: 'added', proposed: p });
+    } else if (l && p) {
+      const changed =
+        l.price !== p.price ||
+        l.dishes !== p.dishes ||
+        (l.usableTime ?? '') !== (p.usableTime ?? '') ||
+        (l.otherNotes ?? '') !== (p.otherNotes ?? '') ||
+        imageSignature(l) !== imageSignature(p);
+      rows.push({
+        key,
+        change: changed ? 'changed' : 'unchanged',
+        live: l,
+        proposed: p,
+        changes: changed ? fieldChanges(l, p) : undefined,
+      });
+    }
+  }
+  return rows;
+}
+
+const CHANGE_LABELS = {
+  added: { text: '新增', color: 'green' },
+  removed: { text: '删除', color: 'red' },
+  changed: { text: '变更', color: 'orange' },
+  unchanged: { text: '未变', color: 'default' },
+} as const;
+
+function TextDiff({ oldText, newText }: { oldText: string; newText: string }) {
+  const segs = diffText(oldText, newText);
+  return (
+    <div style={{ marginTop: 2 }}>
+      <div style={{ lineHeight: 1.6 }}>
+        <Typography.Text type="secondary">原：</Typography.Text>
+        {segs
+          .filter((s) => s.type !== 'insert')
+          .map((s, idx) =>
+            s.type === 'delete' ? (
+              <Typography.Text key={idx} delete style={{ color: '#cf1322' }}>
+                {s.text || '（空）'}
+              </Typography.Text>
+            ) : (
+              <Typography.Text key={idx}>{s.text}</Typography.Text>
+            ),
+          )}
+      </div>
+      <div style={{ lineHeight: 1.6 }}>
+        <Typography.Text type="secondary">新：</Typography.Text>
+        {segs
+          .filter((s) => s.type !== 'delete')
+          .map((s, idx) =>
+            s.type === 'insert' ? (
+              <Typography.Text key={idx} style={{ color: '#389e0d' }}>
+                {s.text || '（空）'}
+              </Typography.Text>
+            ) : (
+              <Typography.Text key={idx}>{s.text}</Typography.Text>
+            ),
+          )}
+      </div>
+    </div>
+  );
+}
+
+function PackageDetailCard({
+  title,
+  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;
+  return (
+    <div
+      style={{
+        marginBottom: 12,
+        padding: 12,
+        border: '1px solid #f0f0f0',
+        borderRadius: 8,
+        background: '#fafafa',
+      }}
+    >
+      <Space style={{ marginBottom: 8 }} wrap>
+        {title ? <Typography.Text type="secondary">{title}</Typography.Text> : null}
+        {meta ? <Tag color={meta.color}>{meta.text}</Tag> : null}
+      </Space>
+      <div style={{ marginBottom: 8 }}>
+        <strong>{pkg.name}</strong>
+        <span style={{ marginLeft: 8 }}>¥{pkg.price}</span>
+      </div>
+      <Typography.Paragraph className="admin-package-audit-text" style={{ marginBottom: 8 }}>
+        {pkg.dishes || '—'}
+      </Typography.Paragraph>
+      {pkg.usableTime ? (
+        <Typography.Paragraph type="secondary" className="admin-package-audit-text" style={{ marginBottom: 4 }}>
+          可用时间：{pkg.usableTime}
+        </Typography.Paragraph>
+      ) : null}
+      {pkg.otherNotes ? (
+        <Typography.Paragraph type="secondary" className="admin-package-audit-text" style={{ marginBottom: 8 }}>
+          其他说明：{pkg.otherNotes}
+        </Typography.Paragraph>
+      ) : null}
+      {images.length ? (
+        <Image.PreviewGroup>
+          <Space wrap size={8}>
+            {images.map((url) => (
+              <Image key={url} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
+            ))}
+          </Space>
+        </Image.PreviewGroup>
+      ) : (
+        <Typography.Text type="secondary">无套餐图片</Typography.Text>
+      )}
+      {changes && changes.length ? (
+        <div
+          style={{
+            marginTop: 8,
+            padding: 8,
+            background: '#fff7e6',
+            border: '1px solid #ffe7ba',
+            borderRadius: 6,
+          }}
+        >
+          <Typography.Text strong style={{ fontSize: 12 }}>
+            变更明细
+          </Typography.Text>
+          <ul style={{ margin: '6px 0 0', paddingLeft: 18 }}>
+            {changes.map((c) => (
+              <li key={c.label} style={{ marginBottom: 6 }}>
+                <Typography.Text type="secondary">{c.label}：</Typography.Text>
+                {c.kind === 'text' ? (
+                  <TextDiff oldText={c.old} newText={c.now} />
+                ) : (
+                  <>
+                    <Typography.Text delete type="secondary">
+                      {c.old}
+                    </Typography.Text>
+                    <Typography.Text type="secondary"> → </Typography.Text>
+                    <Typography.Text strong>{c.now}</Typography.Text>
+                  </>
+                )}
+              </li>
+            ))}
+          </ul>
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+export type StorePackageAuditPanelProps = {
+  requestId: string;
+  /** 是否在面板顶部显示通过/驳回（抽屉 extra 另有按钮时可关） */
+  showActions?: boolean;
+  fullscreen?: boolean;
+  onAudited?: () => void;
+  onDetailLoaded?: (detail: StorePackageAuditDetailDto | null) => void;
+};
+
+/** 套餐变更对比 + 通过/驳回（审核通知页与门店详情抽屉共用） */
+export default function StorePackageAuditPanel({
+  requestId,
+  showActions = true,
+  fullscreen = false,
+  onAudited,
+  onDetailLoaded,
+}: StorePackageAuditPanelProps) {
+  const [loading, setLoading] = useState(false);
+  const [detail, setDetail] = useState<StorePackageAuditDetailDto | null>(null);
+  const [rejectOpen, setRejectOpen] = useState(false);
+  const [rejectReason, setRejectReason] = useState('');
+  const [auditing, setAuditing] = useState(false);
+
+  async function load() {
+    setLoading(true);
+    try {
+      const data = await request<StorePackageAuditDetailDto>(`/admin/store-package-audits/${requestId}`);
+      setDetail(data);
+      onDetailLoaded?.(data);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载套餐审核详情失败');
+      setDetail(null);
+      onDetailLoaded?.(null);
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    void load();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [requestId]);
+
+  async function audit(action: 'APPROVE' | 'REJECT', reason?: string) {
+    if (!detail) return;
+    setAuditing(true);
+    try {
+      await request(`/admin/store-package-audits/${detail.id}/audit`, {
+        method: 'PUT',
+        body: JSON.stringify(action === 'REJECT' ? { action, rejectReason: reason } : { action }),
+      });
+      message.success(action === 'APPROVE' ? '套餐已通过' : '套餐已驳回');
+      notifyPackageAuditChanged();
+      onAudited?.();
+      await load();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '操作失败');
+    } finally {
+      setAuditing(false);
+    }
+  }
+
+  if (loading && !detail) {
+    return <Typography.Text type="secondary">加载套餐变更…</Typography.Text>;
+  }
+  if (!detail) {
+    return <Typography.Text type="secondary">暂无套餐审核详情</Typography.Text>;
+  }
+
+  const diffRows = diffPackages(detail.livePackages ?? [], detail.packages ?? []);
+  const changeByKey = new Map(diffRows.map((row) => [row.key, row.change]));
+  const changesByKey = new Map(diffRows.map((row) => [row.key, row.changes]));
+  const addedCount = diffRows.filter((r) => r.change === 'added').length;
+  const removedCount = diffRows.filter((r) => r.change === 'removed').length;
+  const changedCount = diffRows.filter((r) => r.change === 'changed').length;
+  const unchangedCount = diffRows.filter((r) => r.change === 'unchanged').length;
+
+  return (
+    <div>
+      <Space style={{ marginBottom: 12, width: '100%', justifyContent: 'space-between' }} wrap>
+        <Space wrap>
+          <Tag>{HQ_PACKAGE_STATUS_LABELS[detail.status] ?? detail.status}</Tag>
+          <Typography.Text type="secondary">
+            提交方：{detail.submitterType === 'PARTNER' ? '合伙人' : '门店'} · {fmtTime(detail.createdAt)}
+          </Typography.Text>
+        </Space>
+        {showActions && detail.status === 'PENDING' ? (
+          <Space>
+            <Button type="primary" loading={auditing} onClick={() => void audit('APPROVE')}>
+              通过套餐
+            </Button>
+            <Button
+              danger
+              loading={auditing}
+              onClick={() => {
+                setRejectReason('');
+                setRejectOpen(true);
+              }}
+            >
+              驳回套餐
+            </Button>
+          </Space>
+        ) : null}
+      </Space>
+      {detail.rejectReason ? (
+        <Typography.Paragraph type="danger">驳回原因：{detail.rejectReason}</Typography.Paragraph>
+      ) : null}
+      <Space direction="vertical" size={4} style={{ marginBottom: 12 }}>
+        <Typography.Text type="secondary">
+          线上已审核 {detail.livePackages?.length ?? 0} 条 · 待审核 {detail.packages?.length ?? 0} 条
+        </Typography.Text>
+        <Space wrap>
+          <Tag color="green">新增 {addedCount}</Tag>
+          <Tag color="red">删除 {removedCount}</Tag>
+          <Tag color="orange">变更 {changedCount}</Tag>
+          {unchangedCount ? <Tag>未变 {unchangedCount}</Tag> : null}
+        </Space>
+      </Space>
+      <div className="admin-package-audit-cols">
+        <div className="admin-package-audit-col">
+          <Typography.Title level={5} style={{ marginTop: 0 }}>
+            线上已审核套餐
+          </Typography.Title>
+          {(detail.livePackages ?? []).length ? (
+            (detail.livePackages ?? []).map((pkg, index) => (
+              <PackageDetailCard
+                key={`live-${packageKey(pkg, index)}`}
+                title={`套餐 ${index + 1}`}
+                pkg={pkg}
+                change={changeByKey.get(packageKey(pkg, index))}
+                imageSize={fullscreen ? 160 : 72}
+              />
+            ))
+          ) : (
+            <Typography.Text type="secondary">暂无线上套餐</Typography.Text>
+          )}
+        </div>
+        <div className="admin-package-audit-col">
+          <Typography.Title level={5} style={{ marginTop: 0 }}>
+            待审核套餐
+          </Typography.Title>
+          {(detail.packages ?? []).length ? (
+            (detail.packages ?? []).map((pkg, index) => (
+              <PackageDetailCard
+                key={`pending-${packageKey(pkg, index)}`}
+                title={`套餐 ${index + 1}`}
+                pkg={pkg}
+                change={changeByKey.get(packageKey(pkg, index))}
+                changes={changesByKey.get(packageKey(pkg, index))}
+                imageSize={fullscreen ? 160 : 72}
+              />
+            ))
+          ) : (
+            <Typography.Text type="secondary">暂无待审核套餐</Typography.Text>
+          )}
+        </div>
+      </div>
+
+      <Modal
+        title="驳回套餐变更"
+        open={rejectOpen}
+        confirmLoading={auditing}
+        onCancel={() => setRejectOpen(false)}
+        onOk={() => {
+          if (!rejectReason.trim()) {
+            message.warning('请填写驳回原因');
+            return;
+          }
+          void audit('REJECT', rejectReason.trim()).then(() => setRejectOpen(false));
+        }}
+      >
+        <Input.TextArea
+          rows={3}
+          value={rejectReason}
+          placeholder="驳回原因"
+          onChange={(e) => setRejectReason(e.target.value)}
+        />
+      </Modal>
+    </div>
+  );
+}
+
+/** 供门店详情抽屉 extra 调用 */
+export async function auditStorePackageRequest(
+  requestId: string,
+  action: 'APPROVE' | 'REJECT',
+  rejectReason?: string,
+) {
+  await request(`/admin/store-package-audits/${requestId}/audit`, {
+    method: 'PUT',
+    body: JSON.stringify(action === 'REJECT' ? { action, rejectReason } : { action }),
+  });
+  notifyPackageAuditChanged();
+}
@@ -196,10 +196,10 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
    '/benefit/ledgers': 'benefit',
    '/redeem-records': 'benefit',
    '/redeem-pending': 'benefit',
-    '/redeem/debug': 'benefit',
+    '/redeem/debug': 'benefit_debug',
    'deliveries-group': 'deliveries',
    '/deliveries': 'deliveries',
-    '/deliveries/xiaofeixia': 'deliveries',
+    '/deliveries/xiaofeixia': 'deliveries_debug',
    '/tickets': 'tickets',
    '/tickets/support': 'tech_support',
    'dev-plan-group': 'dev_plan',
@@ -195,6 +195,18 @@ export type AdminOrderRow = {
  quantity?: number;
  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 };
@@ -8,3 +8,19 @@ 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);
+}
@@ -1,5 +1,8 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type CSSProperties } from 'react';
 import { request } from '../lib/api';
+import sfxTier1 from '../assets/big-screen/celebrate-t1.mp3';
+import sfxTier2 from '../assets/big-screen/celebrate-t2.mp3';
+import sfxTier3 from '../assets/big-screen/celebrate-t3.mp3';

 export type BigScreenOrder = {
  id: string;
@@ -16,102 +19,60 @@ type AmountTier = 1 | 2 | 3;

 const POLL_MS = 3000;
 const ROW_MS = 2500;
+/** 不足此条数时重复填充，保证滚动连贯 */
+const MIN_SCROLL_ROWS = 10;
+const FX_DURATION_MS = 10_000;
 const WEEKDAYS = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-const TIER_DURATION: Record<AmountTier, number> = { 1: 3000, 2: 4500, 3: 6000 };

-const SEED_IDS = new Set(
-  ['seed-1', 'seed-2', 'seed-3', 'seed-4', 'seed-5', 'seed-6', 'seed-7', 'seed-8'],
-);
+const CELEBRATE_SFX: Record<AmountTier, string> = {
+  1: sfxTier1,
+  2: sfxTier2,
+  3: sfxTier3,
+};

-function seedPaidAt(h: number, m: number, s: number): string {
-  const d = new Date();
-  d.setHours(h, m, s, 0);
-  return d.toISOString();
+/** 浏览器自动播放策略：需用户手势后才能出声 */
+let audioUnlocked = false;
+const sharedAudio = typeof Audio !== 'undefined' ? new Audio() : null;
+
+function unlockCelebrateAudio() {
+  if (audioUnlocked || !sharedAudio) return;
+  sharedAudio.muted = true;
+  sharedAudio.src = CELEBRATE_SFX[1];
+  void sharedAudio
+    .play()
+    .then(() => {
+      sharedAudio.pause();
+      sharedAudio.currentTime = 0;
+      sharedAudio.muted = false;
+      audioUnlocked = true;
+    })
+    .catch(() => {
+      /* 等待下次手势 */
+    });
 }

-/** 发布会滚动列表垫底演示数据（不参与成交动效） */
-const BIG_SCREEN_SEED_ORDERS: BigScreenOrder[] = [
-  {
-    id: 'seed-1',
-    orderNo: 'DK-DEMO-001',
-    payAmount: 1288,
-    items: '杜康君酿 · 浓香型 × 6瓶',
-    createdAt: seedPaidAt(14, 28, 36),
-    paidAt: seedPaidAt(14, 28, 36),
-    userPhoneMasked: '138****8888',
-  },
-  {
-    id: 'seed-2',
-    orderNo: 'DK-DEMO-002',
-    payAmount: 688,
-    items: '杜康君酿 · 浓香型 × 2瓶',
-    createdAt: seedPaidAt(14, 22, 18),
-    paidAt: seedPaidAt(14, 22, 18),
-    userPhoneMasked: '139****6666',
-  },
-  {
-    id: 'seed-3',
-    orderNo: 'DK-DEMO-003',
-    payAmount: 1588,
-    items: '杜康典藏 · 礼盒装 × 2套',
-    createdAt: seedPaidAt(14, 15, 42),
-    paidAt: seedPaidAt(14, 15, 42),
-    userPhoneMasked: '136****9527',
-  },
-  {
-    id: 'seed-4',
-    orderNo: 'DK-DEMO-004',
-    payAmount: 520,
-    items: '杜康特曲 · 500ml × 4瓶',
-    createdAt: seedPaidAt(14, 8, 55),
-    paidAt: seedPaidAt(14, 8, 55),
-    userPhoneMasked: '135****3210',
-  },
-  {
-    id: 'seed-5',
-    orderNo: 'DK-DEMO-005',
-    payAmount: 268,
-    items: '杜康君酿 · 浓香型 × 1瓶',
-    createdAt: seedPaidAt(13, 56, 7),
-    paidAt: seedPaidAt(13, 56, 7),
-    userPhoneMasked: '137****1888',
-  },
-  {
-    id: 'seed-6',
-    orderNo: 'DK-DEMO-006',
-    payAmount: 999,
-    items: '杜康窖藏 · 珍藏版 × 3瓶',
-    createdAt: seedPaidAt(13, 48, 33),
-    paidAt: seedPaidAt(13, 48, 33),
-    userPhoneMasked: '133****7788',
-  },
-  {
-    id: 'seed-7',
-    orderNo: 'DK-DEMO-007',
-    payAmount: 188,
-    items: '杜康小酒 · 品鉴装 × 2瓶',
-    createdAt: seedPaidAt(13, 35, 21),
-    paidAt: seedPaidAt(13, 35, 21),
-    userPhoneMasked: '158****0099',
-  },
-  {
-    id: 'seed-8',
-    orderNo: 'DK-DEMO-008',
-    payAmount: 1200,
-    items: '杜康君酿 · 浓香型 × 5瓶',
-    createdAt: seedPaidAt(13, 22, 49),
-    paidAt: seedPaidAt(13, 22, 49),
-    userPhoneMasked: '186****5566',
-  },
-];
-
-function mergeDisplayItems(live: BigScreenOrder[]): BigScreenOrder[] {
-  if (!live.length) return [...BIG_SCREEN_SEED_ORDERS];
-  return [...live, ...BIG_SCREEN_SEED_ORDERS];
-}
-
-function isSeedOrder(order: BigScreenOrder): boolean {
-  return SEED_IDS.has(order.id);
+function playCelebrateSfx(tier: AmountTier): () => void {
+  if (!sharedAudio) return () => undefined;
+  try {
+    sharedAudio.pause();
+    sharedAudio.currentTime = 0;
+    sharedAudio.src = CELEBRATE_SFX[tier];
+    sharedAudio.volume = tier === 3 ? 0.85 : tier === 2 ? 0.75 : 0.65;
+    sharedAudio.muted = false;
+    void sharedAudio.play().catch(() => {
+      /* 未解锁时静默失败 */
+    });
+  } catch {
+    /* ignore */
+  }
+  return () => {
+    try {
+      sharedAudio.pause();
+      sharedAudio.currentTime = 0;
+    } catch {
+      /* ignore */
+    }
+  };
 }

 function pad(n: number) {
@@ -134,11 +95,20 @@ function formatOrderTime(iso: string): string {
  }
 }

+// function formatAmount(n: number): string {
+//   return Number(n || 0).toLocaleString('zh-CN', {
+//     minimumFractionDigits: 0,
+//     maximumFractionDigits: 0,
+//   });
+// }
+
 function formatAmount(n: number): string {
-  return Number(n || 0).toLocaleString('zh-CN', {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 0,
-  });
+  const num = Number(n || 0);
+  // 先保留两位小数，再分割处理
+  const fixed = num.toFixed(2);
+  const [intStr, decStr] = fixed.split('.');
+  const intFormatted = Number(intStr).toLocaleString('zh-CN');
+  return decStr === '00' ? intFormatted : `${intFormatted}.${decStr}`;
 }

 function amountCssClass(payAmount: number, base: string): string {
@@ -264,9 +234,13 @@ function CelebrateFx({ order, onDone }: { order: BigScreenOrder; onDone: () => v
  const [displayAmount, setDisplayAmount] = useState(tier === 3 ? 0 : order.payAmount);

  useEffect(() => {
-    const duration = TIER_DURATION[tier];
-    const timer = window.setTimeout(() => onDoneRef.current(), duration);
+    const timer = window.setTimeout(() => onDoneRef.current(), FX_DURATION_MS);
    return () => window.clearTimeout(timer);
+  }, [order.id]);
+
+  useEffect(() => {
+    const stop = playCelebrateSfx(tier);
+    return stop;
  }, [order.id, tier]);

  useEffect(() => {
@@ -299,7 +273,6 @@ function CelebrateFx({ order, onDone }: { order: BigScreenOrder; onDone: () => v
    let raf = 0;
    let last = performance.now();
    const started = performance.now();
-    const duration = TIER_DURATION[tier];
    const gravity = tier === 3 ? 0.18 : 0.14;
    const loop = (now: number) => {
      const dt = Math.min(32, now - last) / 16.6;
@@ -310,8 +283,12 @@ function CelebrateFx({ order, onDone }: { order: BigScreenOrder; onDone: () => v
        p.x += p.vx * dt;
        p.y += p.vy * dt;
        p.rot += p.vr * dt;
-        p.life -= (tier === 3 ? 0.0032 : 0.005) * dt;
-        if (p.rain && (p.y > canvas.clientHeight + 30 || p.life <= 0) && now - started < duration - 400) {
+        p.life -= (tier === 3 ? 0.002 : 0.003) * dt;
+        if (
+          p.rain &&
+          (p.y > canvas.clientHeight + 30 || p.life <= 0) &&
+          now - started < FX_DURATION_MS - 400
+        ) {
          p.x = Math.random() * canvas.clientWidth;
          p.y = -16 - Math.random() * 60;
          p.vx = (Math.random() - 0.5) * 1.4;
@@ -374,12 +351,9 @@ export default function BigScreenPage() {
  const queueRef = useRef<BigScreenOrder[]>([]);
  const celebratingRef = useRef(false);
  const viewportRef = useRef<HTMLDivElement | null>(null);
+  const dayKeyRef = useRef('');
  const [viewportH, setViewportH] = useState(0);

-  useEffect(() => {
-    for (const o of BIG_SCREEN_SEED_ORDERS) celebratedIdsRef.current.add(o.id);
-  }, []);
-
  const playNext = useCallback(() => {
    const next = queueRef.current.shift() ?? null;
    celebratingRef.current = !!next;
@@ -404,10 +378,22 @@ export default function BigScreenPage() {
  );

  const fetchData = useCallback(() => {
+    const now = new Date();
+    const todayKey = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}`;
+    if (dayKeyRef.current && dayKeyRef.current !== todayKey) {
+      seenIdsRef.current = null;
+      celebratedIdsRef.current = new Set();
+      queueRef.current = [];
+      celebratingRef.current = false;
+      setCelebrate(null);
+      setPaused(false);
+    }
+    dayKeyRef.current = todayKey;
+
    return request<{ items: BigScreenOrder[] }>('/admin/orders/big-screen?limit=2000')
      .then((d) => {
        const list = d.items ?? [];
-        setItems(mergeDisplayItems(list));
+        setItems(list);
        setLoadError('');
        const seen = seenIdsRef.current;
        if (!seen) {
@@ -421,7 +407,6 @@ export default function BigScreenPage() {
      })
      .catch((e) => {
        setLoadError(e instanceof Error ? e.message : '加载失败');
-        setItems(mergeDisplayItems([]));
      });
  }, [enqueueNew]);

@@ -431,6 +416,17 @@ export default function BigScreenPage() {
    return () => clearInterval(id);
  }, [fetchData]);

+  useEffect(() => {
+    unlockCelebrateAudio();
+    const unlock = () => unlockCelebrateAudio();
+    window.addEventListener('pointerdown', unlock, { once: true });
+    window.addEventListener('keydown', unlock, { once: true });
+    return () => {
+      window.removeEventListener('pointerdown', unlock);
+      window.removeEventListener('keydown', unlock);
+    };
+  }, []);
+
  useEffect(() => {
    const html = document.documentElement;
    const prevHtml = html.style.overflow;
@@ -457,7 +453,7 @@ export default function BigScreenPage() {
    if (!items.length) return [];
    const rowH = 80;
    const visible = Math.max(1, Math.ceil((viewportH || 480) / rowH));
-    const minCount = visible + 1;
+    const minCount = Math.max(MIN_SCROLL_ROWS, visible + 1);
    const unit: BigScreenOrder[] = [];
    while (unit.length < minCount) unit.push(...items);
    return unit;
@@ -466,8 +462,7 @@ export default function BigScreenPage() {
  const trackItems = useMemo(() => unitItems.concat(unitItems), [unitItems]);
  const marqueeMs = Math.max(unitItems.length, 1) * ROW_MS;
  const rolling = items.length > 0 && unitItems.length > 0;
-  const latestLive = items.find((o) => !isSeedOrder(o));
-  const latestId = latestLive?.id;
+  const latestId = items[0]?.id;

  return (
    <div className="big-screen-page">
@@ -496,16 +491,8 @@ export default function BigScreenPage() {
      <LiveClock />

      <div className="big-screen-list">
-        <div className="big-screen-list-head">
-          <span>下单金额</span>
-          <span>下单商品</span>
-          <span>付款时间</span>
-          <span>下单人</span>
-        </div>
        <div className="big-screen-list-body" ref={viewportRef}>
-          {items.length === 0 ? (
-            <div className="big-screen-empty">{loadError || '暂无订单'}</div>
-          ) : (
+          {items.length === 0 ? null : (
            <div
              className={`big-screen-track${rolling ? ' is-rolling' : ''}${paused ? ' is-paused' : ''}`}
              style={rolling ? ({ ['--marquee-ms']: `${marqueeMs}ms` } as CSSProperties) : undefined}
@@ -522,6 +509,10 @@ export default function BigScreenPage() {
        </div>
      </div>

+      {items.length === 0 ? (
+        <div className="big-screen-empty">{loadError || '当日暂无订单'}</div>
+      ) : null}
+
      {celebrate ? (
        <CelebrateFx
          key={celebrate.id}
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import {
  Button,
  Form,
+  Image,
  Input,
  Modal,
  Popconfirm,
@@ -18,6 +19,7 @@ import {
  DEV_PLAN_TASK_TYPE_LABELS,
  SUPPORT_TICKET_STATUS_LABELS,
  type DevPlanTaskDto,
+  type DevPlanTaskExportFormat,
  type DevPlanTaskStatusDto,
  type DevPlanTaskTypeDto,
  type DevPlanVersionDto,
@@ -25,7 +27,9 @@ 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';

 const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
  value: v,
@@ -56,6 +60,8 @@ 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 }>();
@@ -88,24 +94,30 @@ export default function DevPlanTasksPage() {

  function openCreate() {
    setEditing(null);
-    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined, attachmentUrls: [''] });
    setModalOpen(true);
  }

  function openEdit(row: DevPlanTaskDto) {
    setEditing(row);
-    form.setFieldsValue({ content: row.content, type: row.type, status: row.status });
+    form.setFieldsValue({
+      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),
+          body: JSON.stringify({ ...values, attachmentUrls }),
        });
        message.success('已更新');
      } else {
@@ -115,6 +127,7 @@ export default function DevPlanTasksPage() {
            content: values.content,
            type: values.type,
            supportTicketId: values.supportTicketId || undefined,
+            attachmentUrls,
          }),
        });
        message.success('已创建');
@@ -199,6 +212,34 @@ export default function DevPlanTasksPage() {
    }
  }

+  async function exportTasks(scope: 'filter' | 'selected') {
+    setExporting(true);
+    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 columns: ColumnsType<DevPlanTaskDto> = [
    { title: '任务号', dataIndex: 'taskNo', width: 160 },
    {
@@ -216,6 +257,22 @@ export default function DevPlanTasksPage() {
      ),
    },
    { 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 },
@@ -243,7 +300,24 @@ export default function DevPlanTasksPage() {
        <Typography.Title level={4} style={{ margin: 0 }}>
          开发计划 · 任务列表
        </Typography.Title>
-        <Space>
+        <Space wrap>
+          <Select
+            value={exportFormat}
+            style={{ width: 120 }}
+            onChange={setExportFormat}
+            options={[
+              { value: 'markdown', label: 'Markdown' },
+              { value: 'docx', label: 'Word' },
+              { value: 'xlsx', label: 'Excel' },
+              { value: 'pdf', label: 'PDF' },
+            ]}
+          />
+          <Button loading={exporting} disabled={!selectedRowKeys.length} onClick={() => void exportTasks('selected')}>
+            导出已勾选
+          </Button>
+          <Button loading={exporting} onClick={() => void exportTasks('filter')}>
+            导出全部筛选
+          </Button>
          <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
            批量编辑
          </Button>
@@ -333,6 +407,29 @@ 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>

@@ -1,4 +1,5 @@
-import { useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import {
  Button,
  Descriptions,
@@ -16,9 +17,11 @@ import {
 } 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,
@@ -34,6 +37,7 @@ type Row = {
  orderNo?: string;
  titleType: InvoiceTitleType;
  invoiceKind: InvoiceKind;
+  invoiceCategory?: InvoiceCategory;
  titleName: string;
  status: InvoiceStatus;
  overdue?: boolean;
@@ -53,6 +57,7 @@ type CreateFormValues = {
  orderNo: string;
  titleType: InvoiceTitleType;
  invoiceKind: InvoiceKind;
+  invoiceCategory?: InvoiceCategory;
  titleName: string;
  taxNo?: string;
  addressPhone?: string;
@@ -63,12 +68,22 @@ type CreateFormValues = {
 };

 export default function InvoicesPage() {
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [searchParams] = useSearchParams();
+  const initialStatus = searchParams.get('status')?.trim() || '';
+  const initialInvoiceNo = searchParams.get('invoiceNo')?.trim() || '';
+  const [filterForm] = Form.useForm();
+  const [filters, setFilters] = useState<Record<string, string>>(() => {
+    const init: Record<string, string> = {};
+    if (initialStatus) init.status = initialStatus;
+    if (initialInvoiceNo) init.invoiceNo = initialInvoiceNo;
+    return init;
+  });
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
    '/admin/invoices',
    () => {
      const qs = new URLSearchParams();
      if (filters.status) qs.set('status', filters.status);
+      if (filters.invoiceNo) qs.set('invoiceNo', filters.invoiceNo);
      return qs;
    },
    [filters],
@@ -81,12 +96,29 @@ export default function InvoicesPage() {
  const [createForm] = Form.useForm<CreateFormValues>();
  const invoiceKind = Form.useWatch('invoiceKind', createForm);
  const titleType = Form.useWatch('titleType', createForm);
+  const deepLinkOpenedRef = useRef(false);
+
+  useEffect(() => {
+    filterForm.setFieldsValue({
+      status: filters.status || undefined,
+      invoiceNo: filters.invoiceNo || undefined,
+    });
+  }, [filterForm, filters.invoiceNo, filters.status]);

  async function openDetail(id: string) {
    setDetail(await request(`/admin/invoices/${id}`));
    setDrawerOpen(true);
  }

+  useEffect(() => {
+    if (!initialInvoiceNo || deepLinkOpenedRef.current || loading) return;
+    const first = data?.items?.[0];
+    if (first && String(first.invoiceNo) === initialInvoiceNo) {
+      deepLinkOpenedRef.current = true;
+      void openDetail(first.id);
+    }
+  }, [data, initialInvoiceNo, loading]);
+
  async function issueWithFile(file: File) {
    if (!detail) return false;
    setUploading(true);
@@ -128,6 +160,7 @@ 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,
@@ -158,9 +191,17 @@ export default function InvoicesPage() {
    },
    {
      title: '票种',
-      width: 120,
+      width: 140,
      render: (_, r) => INVOICE_KIND_LABELS[r.invoiceKind] ?? r.invoiceKind,
    },
+    {
+      title: '类型',
+      width: 88,
+      render: (_, r) =>
+        r.invoiceCategory
+          ? INVOICE_CATEGORY_LABELS[r.invoiceCategory] ?? r.invoiceCategory
+          : '—',
+    },
    { title: '名称', dataIndex: 'titleName', ellipsis: true },
    {
      title: '状态',
@@ -205,6 +246,7 @@ export default function InvoicesPage() {
            createForm.setFieldsValue({
              titleType: 'PERSONAL',
              invoiceKind: 'NORMAL',
+              invoiceCategory: 'LIQUOR',
            });
            setCreateOpen(true);
          }}
@@ -213,6 +255,7 @@ export default function InvoicesPage() {
        </Button>
      </div>
      <Form
+        form={filterForm}
        layout="inline"
        style={{ marginBottom: 16 }}
        onFinish={(v) => {
@@ -231,6 +274,9 @@ export default function InvoicesPage() {
            ]}
          />
        </Form.Item>
+        <Form.Item name="invoiceNo" label="申请单号">
+          <Input allowClear placeholder="发票申请单号" />
+        </Form.Item>
        <Button type="primary" htmlType="submit">
          筛选
        </Button>
@@ -292,6 +338,11 @@ 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>
@@ -350,6 +401,18 @@ 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="抬头类型"
@@ -44,6 +44,13 @@ 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 = {
@@ -140,14 +147,30 @@ export default function LogisticsBillsPage() {
  }, [summaryPeriod]);

  function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
    Modal.confirm({
      title: '确认结算？',
-      content: `将确认 ${ids.length} 笔物流对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。充值模式将扣减余额，挂账模式标记已打款。`,
+      content: (
+        <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' });
+          await request(`/admin/logistics-bills/${ids[0]}/confirm`, { method: 'POST', body });
        } else {
          await request('/admin/logistics-bills/batch-confirm', {
            method: 'POST',
@@ -217,6 +240,7 @@ 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);

@@ -248,6 +272,18 @@ export default function LogisticsBillsPage() {
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
+    {
+      title: '收款户名',
+      width: 100,
+      ellipsis: true,
+      render: (_, r) => providerBank(r)?.bankAccountName || '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, r) => providerBank(r)?.bankAccountNo || '—',
+    },
    {
      title: '状态',
      dataIndex: 'status',
@@ -550,7 +586,31 @@ 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"
@@ -1,10 +1,12 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Link, useSearchParams } from 'react-router-dom';
 import {
  Alert,
  Button,
  Checkbox,
+  Col,
  Collapse,
+  DatePicker,
  Descriptions,
  Drawer,
  Form,
@@ -12,6 +14,7 @@ import {
  InputNumber,
  Modal,
  Radio,
+  Row,
  Select,
  Space,
  Table,
@@ -20,7 +23,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 { downloadBase64File } from '../lib/exportExcel';
 import {
  ADMIN_OPTIONS_PAGE_SIZE,
  DELIVERY_PROVIDER_LABELS,
@@ -130,6 +136,110 @@ type OrderDetail = AdminOrderRow & {

 type ShipMode = 'WAREHOUSE' | 'EXPRESS';

+type OrderExportScope = 'filter' | 'selected';
+type OrderExportFormat = 'xlsx' | 'pdf';
+
+type OrderExportFilters = {
+  orderNo?: string;
+  status?: 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 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;
+  if (filters.status) payload.status = filters.status;
+  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 [];
@@ -162,6 +272,8 @@ function warehouseToDefaults(wh: WarehouseOption, base?: ShipDefaults | null): S
 }

 export default function OrdersPage() {
+  const [searchParams] = useSearchParams();
+  const initialOrderNo = searchParams.get('orderNo')?.trim() || '';
  const [form] = Form.useForm();
  const [shipForm] = Form.useForm();
  const [logisticsForm] = Form.useForm();
@@ -172,6 +284,7 @@ export default function OrdersPage() {
  const [pageSize, setPageSize] = useState(20);
  const [detail, setDetail] = useState<OrderDetail | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
+  const deepLinkOpenedRef = useRef(false);
  const [redeemDetail, setRedeemDetail] = useState<Record<string, unknown> | null>(null);
  const [redeemDrawerOpen, setRedeemDrawerOpen] = useState(false);
  const [redeemDetailLoading, setRedeemDetailLoading] = useState(false);
@@ -189,8 +302,11 @@ 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)),
@@ -201,6 +317,21 @@ export default function OrdersPage() {
    request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
  }, []);

+  useEffect(() => {
+    if (initialOrderNo) {
+      form.setFieldsValue({ orderNo: initialOrderNo });
+    }
+  }, [form, initialOrderNo]);
+
+  useEffect(() => {
+    if (!initialOrderNo || deepLinkOpenedRef.current || loading) return;
+    const first = data?.items?.[0];
+    if (first && String(first.orderNo) === initialOrderNo) {
+      deepLinkOpenedRef.current = true;
+      void openDetail(first.id);
+    }
+  }, [data, initialOrderNo, loading]);
+
  async function openRedeemDetail(redeemId: string) {
    setRedeemDetailLoading(true);
    setRedeemDrawerOpen(true);
@@ -220,6 +351,7 @@ 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);
      if (values.status) qs.set('status', values.status);
      if (values.orderType) qs.set('orderType', values.orderType);
@@ -227,12 +359,15 @@ export default function OrdersPage() {
      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]);
+  }, [form, page, pageSize, initialOrderNo]);

  useEffect(() => {
    void load();
@@ -433,79 +568,93 @@ export default function OrdersPage() {
    }
  }

+  async function submitExport(scope: OrderExportScope) {
+    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 columns: ColumnsType<AdminOrderRow> = [
    {
-      title: '订单号',
-      dataIndex: 'orderNo',
-      width: 200,
-      render: (v, row) => (
-        <Space size={4}>
-          <span>{v}</span>
-          {row.isTest ? <Tag color="orange">测试</Tag> : null}
-        </Space>
+      title: '商品',
+      width: 240,
+      render: (_, row) => (
+        <div>
+          <Space size={4} wrap>
+            <span>{row.productName || '—'}</span>
+            {row.isTest ? <Tag color="orange">测试</Tag> : null}
+            {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
+            {row.orderType === 'PROXY' || row.isProxyOrder ? (
+              <Tag color="purple">代下单</Tag>
+            ) : null}
+          </Space>
+          <div>
+            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+              {[row.productSpec, row.quantity != null ? `×${row.quantity}` : null]
+                .filter(Boolean)
+                .join(' ')}
+            </Typography.Text>
+          </div>
+        </div>
      ),
    },
    {
-      title: '城市',
-      width: 90,
-      render: (_, row) => row.city?.name || '—',
+      title: '状态 / 实付',
+      width: 130,
+      render: (_, row) => (
+        <div>
+          <Tag color={ORDER_STATUS_COLORS[row.status] || 'default'}>
+            {ORDER_STATUS_LABELS[row.status] || row.status}
+          </Tag>
+          <div>¥{row.payAmount}</div>
+        </div>
+      ),
    },
    {
-      title: '商品',
-      width: 180,
-      ellipsis: true,
+      title: '好客权益',
+      width: 200,
+      render: (_, row) => formatBenefitBrief(row),
+    },
+    {
+      title: '收货信息',
+      width: 240,
      render: (_, row) => {
-        const name = row.productName || '—';
-        const qty = row.quantity != null ? ` ×${row.quantity}` : '';
+        const address = formatReceiverAddress(row);
        return (
-          <span title={row.productSpec ? `${name}（${row.productSpec}）` : name}>
-            {name}{qty}
-          </span>
+          <div>
+            <div>
+              {row.receiverName || '—'} {row.receiverPhone || ''}
+            </div>
+            {address ? (
+              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                {address}
+              </Typography.Text>
+            ) : null}
+          </div>
        );
      },
    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 140,
-      render: (s, row) => (
-        <Space size={4} wrap>
-          <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
-          {row.fulfillmentHold ? <Tag color="orange">大单待确认</Tag> : null}
-          {row.orderType === 'PROXY' || row.isProxyOrder ? (
-            <Tag color="purple" title={row.proxyPartnerName || undefined}>
-              代下单
-            </Tag>
-          ) : null}
-        </Space>
-      ),
-    },
-    {
-      title: '配送',
-      dataIndex: 'deliveryType',
-      width: 90,
-      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: '快递',
-      width: 100,
-      render: (_, row) => row.delivery?.trackingNo || row.delivery?.provider || '—',
-    },
    {
      title: '下单时间',
      dataIndex: 'createdAt',
      width: 170,
-      render: (v) => new Date(v).toLocaleString('zh-CN'),
+      render: fmtTime,
    },
    {
      title: '操作',
@@ -539,24 +688,15 @@ export default function OrdersPage() {

  return (
    <div>
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
        <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
-        <Space>
+        <Space size={12}>
          <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
          {canProxyOrder ? (
            <Button type="primary" onClick={() => setProxyOpen(true)}>
              代下单
            </Button>
          ) : null}
-          {canDeleteOrders ? (
-            <Button
-              danger
-              disabled={!selectedRowKeys.length}
-              onClick={() => setBatchDeleteOpen(true)}
-            >
-              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
-            </Button>
-          ) : null}
        </Space>
      </Space>

@@ -574,54 +714,115 @@ export default function OrdersPage() {
        />
      ) : null}

-      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
-        <Form.Item name="orderNo" label="订单号">
-          <Input placeholder="DK..." allowClear />
-        </Form.Item>
-        <Form.Item name="status" label="状态">
-          <Select allowClear style={{ width: 120 }} options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
-        </Form.Item>
-        <Form.Item name="orderType" label="类型">
-          <Select
-            allowClear
-            style={{ width: 120 }}
-            placeholder="全部"
-            options={[
-              { value: 'NORMAL', label: '普通订单' },
-              { value: 'PROXY', label: '代下单' },
-            ]}
-          />
-        </Form.Item>
-        <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="receiverPhone" label="收货手机">
-          <Input allowClear />
-        </Form.Item>
-        <Form.Item name="fulfillmentHold" label="大单拦截" valuePropName="checked">
-          <Select
-            allowClear
-            style={{ width: 140 }}
-            placeholder="全部"
-            options={[{ value: true, label: '仅待确认大单' }]}
-          />
-        </Form.Item>
-        <Form.Item name="excludeTest" valuePropName="checked">
-          <Checkbox>过滤测试账号</Checkbox>
-        </Form.Item>
-        <Form.Item>
-          <Space>
+      <Form form={form} layout="vertical" onFinish={() => { setPage(1); void load(); }}>
+        <Row gutter={[16, 8]}>
+          <Col xs={24} md={14} lg={12}>
+            <Form.Item label="下单日期" style={{ marginBottom: 12 }}>
+              <Space direction="vertical" size={8} style={{ width: '100%' }}>
+                <Form.Item name="dateRange" noStyle>
+                  <DatePicker.RangePicker allowClear style={{ width: '100%' }} />
+                </Form.Item>
+                <Space size={8} wrap>
+                  {DATE_PRESETS.map((preset) => (
+                    <Button
+                      key={preset.key}
+                      size="small"
+                      onClick={() => form.setFieldsValue({ dateRange: datePresetRange(preset.key) })}
+                    >
+                      {preset.label}
+                    </Button>
+                  ))}
+                </Space>
+              </Space>
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="status" label="状态" style={{ marginBottom: 12 }}>
+              <Select
+                allowClear
+                placeholder="全部"
+                options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+              />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="orderType" label="类型" style={{ marginBottom: 12 }}>
+              <Select allowClear placeholder="全部" options={ORDER_TYPE_OPTIONS} />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <Form.Item name="deliveryType" label="配送" style={{ marginBottom: 12 }}>
+              <Select allowClear placeholder="全部" options={DELIVERY_TYPE_OPTIONS} />
+            </Form.Item>
+          </Col>
+          <Col xs={12} sm={6} md={5} lg={3}>
+            <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>
-        </Form.Item>
+        </div>
      </Form>

      <Table
@@ -629,16 +830,18 @@ export default function OrdersPage() {
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
-        scroll={{ x: 1500 }}
-        rowSelection={canDeleteOrders ? {
+        scroll={{ x: 1100 }}
+        rowSelection={{
          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);
@@ -3,6 +3,8 @@ import {
  Button,
  Card,
  DatePicker,
+  Descriptions,
+  Drawer,
  Form,
  Input,
  Modal,
@@ -31,8 +33,22 @@ type Row = {
  periodStart: string;
  periodEnd: string;
  rejectReason?: string | null;
-  partner?: { companyName?: string; phone?: string };
-  partnerAccount?: { companyName?: string; phone?: string };
+  paymentRef?: string | null;
+  paidAt?: string | null;
+  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 };
@@ -77,6 +93,8 @@ 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}`)
@@ -127,17 +145,30 @@ export default function PartnerBillsPage() {
  }

  function markPaid(ids: string[], amountHint?: number) {
+    let paymentRef = '';
    Modal.confirm({
      title: '确认打款？',
-      content: `将标记 ${ids.length} 笔账单为已打款${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。`,
+      content: (
+        <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: JSON.stringify({ paymentRef: `PAY-${Date.now()}` }),
-          });
+          await request(`/admin/partner-bills/${ids[0]}/mark-paid`, { method: 'POST', body });
        } else {
          await request('/admin/partner-bills/batch-mark-paid', {
            method: 'POST',
@@ -182,6 +213,12 @@ 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 {
@@ -201,6 +238,7 @@ 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');
@@ -238,6 +276,18 @@ export default function PartnerBillsPage() {
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
+    {
+      title: '收款户名',
+      width: 100,
+      ellipsis: true,
+      render: (_, r) => partnerBank(r)?.bankAccountName || '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, r) => partnerBank(r)?.bankAccountNo || '—',
+    },
    {
      title: '状态',
      dataIndex: 'status',
@@ -259,6 +309,9 @@ 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])}>
              发送
@@ -465,6 +518,59 @@ 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>
  );
 }
@@ -12,6 +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';

 type ProductDetailContentDto = {
@@ -20,6 +21,22 @@ 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;
@@ -29,9 +46,15 @@ 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;
@@ -213,7 +236,33 @@ function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
  );
 }

-function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormInstance }) {
+function FulfillmentTags(row: {
+  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' && (
@@ -221,8 +270,13 @@ function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormIns
          <Form.Item label="SKU">
            <Input disabled placeholder="保存后自动生成" />
          </Form.Item>
-          <Form.Item name="barcode69" label="69码" rules={[{ required: true }]}>
-            <Input />
+          <Form.Item
+            name="barcode69"
+            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 }))} />
@@ -250,39 +304,47 @@ function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormIns
      <Form.Item name="sortOrder" label="排序">
        <InputNumber min={0} style={{ width: '100%' }} />
      </Form.Item>
-      <Form.Item
-        name="allowOnlinePurchase"
-        label="允许线上购买"
-        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}>
-        {() => (
+      {hideFulfillment ? (
+        <Typography.Paragraph type="secondary" style={{ marginBottom: 16 }}>
+          该商品有多种规格，履约（线上 / 跨城 / 现场）请到「规格与 SKU」中按规格设置。
+        </Typography.Paragraph>
+      ) : (
+        <>
          <Form.Item
-            name="allowCrossCityDelivery"
-            label="允许跨城配送"
+            name="allowOnlinePurchase"
+            label="允许线上购买"
            valuePropName="checked"
-            extra="须先开启线上购买"
+            extra="配送到址（同城）"
          >
            <Switch
              checkedChildren="开"
              unCheckedChildren="关"
-              disabled={!form.getFieldValue('allowOnlinePurchase')}
+              onChange={(checked) => {
+                if (!checked) form.setFieldsValue({ allowCrossCityDelivery: false });
+              }}
            />
          </Form.Item>
-        )}
-      </Form.Item>
-      <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
-        <Switch checkedChildren="开" unCheckedChildren="关" />
-      </Form.Item>
+          <Form.Item noStyle shouldUpdate={(prev, cur) => prev.allowOnlinePurchase !== cur.allowOnlinePurchase}>
+            {() => (
+              <Form.Item
+                name="allowCrossCityDelivery"
+                label="允许跨城配送"
+                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" />
@@ -326,12 +388,35 @@ export default function ProductsPage() {
  }

  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: 'spec', width: 120, ellipsis: true },
-    { title: '售价', dataIndex: 'price', width: 80, render: (v) => `¥${v}` },
-    { title: '权益额', dataIndex: 'benefitAmount', width: 80, render: (v) => `¥${v}` },
+    { title: '品名', dataIndex: 'name', width: 200, ellipsis: true },
+    {
+      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>
    ) },
@@ -342,23 +427,7 @@ 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) => (
@@ -371,7 +440,7 @@ export default function ProductsPage() {
          }}>编辑</Button>
          <Popconfirm
            title="确认删除该商品？"
-            description={`将永久删除「${row.name}」（${row.skuCode}），此操作不可恢复。`}
+            description={`将永久删除「${row.name}」，此操作不可恢复。`}
            okText="确认删除"
            cancelText="取消"
            okButtonProps={{ danger: true }}
@@ -384,6 +453,46 @@ export default function ProductsPage() {
    },
  ], [detail, editForm]);

+  const skuColumns: ColumnsType<SkuListRow> = useMemo(() => [
+    {
+      title: '规格',
+      dataIndex: 'specText',
+      width: 140,
+      ellipsis: true,
+      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, ellipsis: true },
+    { 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>
+      ),
+    },
+  ], []);
+
  return (
    <div>
      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
@@ -391,7 +500,9 @@ export default function ProductsPage() {
        <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
      </Space>
      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-        <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
+        <Form.Item name="name" label="名称">
+          <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>
@@ -400,17 +511,46 @@ export default function ProductsPage() {
        </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: 1320 }}
-        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)}
+      <Table
+        rowKey="id"
+        className="admin-table-nowrap"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1080 }}
+        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: 980 }}
+                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();
-            if (!v.allowOnlinePurchase && !v.allowOnSitePickup) {
+            const multiSku = Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1;
+            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);
@@ -420,13 +560,24 @@ 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="69码">{String(detail.barcode69)}</Descriptions.Item>
+              <Descriptions.Item label="默认 SKU">{String(detail.skuCode)}（系统生成）</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: '详情页',
@@ -437,6 +588,23 @@ 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>
          </>
@@ -1,4 +1,5 @@
-import { useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import { Button, Checkbox, Drawer, Form, Input, Select, Table, Tag, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { REDEEM_CHANNEL_LABELS, type RedeemChannel } from '@dukang/shared-types';
@@ -26,8 +27,14 @@ function maskPhone(phone: string | null | undefined) {
 }

 export default function RedeemRecordsPage() {
+  const [searchParams] = useSearchParams();
+  const initialRedeemNo = searchParams.get('redeemNo')?.trim() || '';
  const [form] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
+  const [filters, setFilters] = useState<Record<string, string | boolean>>(() => {
+    const init: Record<string, string | boolean> = {};
+    if (initialRedeemNo) init.redeemNo = initialRedeemNo;
+    return init;
+  });
  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
    '/admin/redeem-records',
    () => {
@@ -43,6 +50,11 @@ export default function RedeemRecordsPage() {
  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
  const [detailLoading, setDetailLoading] = useState(false);
+  const deepLinkOpenedRef = useRef(false);
+
+  useEffect(() => {
+    if (initialRedeemNo) form.setFieldsValue({ redeemNo: initialRedeemNo });
+  }, [form, initialRedeemNo]);

  async function openDetail(id: string) {
    setDetailLoading(true);
@@ -54,6 +66,15 @@ export default function RedeemRecordsPage() {
    }
  }

+  useEffect(() => {
+    if (!initialRedeemNo || deepLinkOpenedRef.current || loading) return;
+    const first = data?.items?.[0];
+    if (first && String(first.redeemNo) === initialRedeemNo) {
+      deepLinkOpenedRef.current = true;
+      void openDetail(first.id);
+    }
+  }, [data, initialRedeemNo, loading]);
+
  const columns: ColumnsType<Row> = [
    {
      title: '核销号',
@@ -44,6 +44,11 @@ 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 };
@@ -55,6 +60,11 @@ 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',
@@ -64,10 +74,13 @@ export default function StoreBillsPage() {
  const [searchParams] = useSearchParams();
  const initialKind = searchParams.get('kind') === 'WITHDRAW' ? 'WITHDRAW' : '';
  const initialStoreId = searchParams.get('storeId') || '';
+  const initialStatus =
+    searchParams.get('status')?.trim() ||
+    (initialKind === 'WITHDRAW' ? 'PENDING_REVIEW' : '');
  const [form] = Form.useForm();
  const [filters, setFilters] = useState<Record<string, string>>({
    kind: initialKind,
-    status: initialKind === 'WITHDRAW' ? 'PENDING_REVIEW' : '',
+    status: initialStatus,
    storeId: initialStoreId,
  });
  const [stores, setStores] = useState<StoreOption[]>([]);
@@ -115,14 +128,30 @@ export default function StoreBillsPage() {
  }, []);

  function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
    Modal.confirm({
      title: '确认打款？',
-      content: `将确认 ${ids.length} 笔 T+1 门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      content: (
+        <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' });
+          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
        } else {
          setBatchLoading(true);
          try {
@@ -244,7 +273,9 @@ export default function StoreBillsPage() {
      dataIndex: 'kind',
      width: 100,
      render: (k: StoreSettlementKind) => (
-        <Tag color={KIND_COLORS[k]}>{STORE_SETTLEMENT_KIND_LABELS[k] ?? k}</Tag>
+        <Tag color={KIND_COLORS[k]} style={{ minWidth: 72, textAlign: 'center' }}>
+          {STORE_SETTLEMENT_KIND_LABELS[k] ?? k}
+        </Tag>
      ),
    },
    {
@@ -268,6 +299,20 @@ export default function StoreBillsPage() {
    { 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,
+      ellipsis: true,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
+    },
    {
      title: '笔数',
      width: 80,
@@ -285,7 +330,9 @@ export default function StoreBillsPage() {
      dataIndex: 'status',
      width: 100,
      render: (s: string, row) => (
-        <Tag color={STATUS_COLORS[s] || 'default'}>{storeSettlementStatusLabel(row.kind, s)}</Tag>
+        <Tag color={settlementStatusColor(row.kind, s)}>
+          {storeSettlementStatusLabel(row.kind, s)}
+        </Tag>
      ),
    },
    {
@@ -336,7 +383,8 @@ export default function StoreBillsPage() {
          门店账单
        </Typography.Title>
        <Typography.Text type="secondary">
-          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口
+          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
+          「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
        </Typography.Text>
        {overdueSummary && overdueSummary.overdueCount > 0 ? (
          <Typography.Text type="danger">
@@ -500,7 +548,32 @@ 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>
@@ -20,20 +20,18 @@ import type {
  StoreInfoChangeFieldDiff,
  StoreInfoChangeRequestDto,
  StoreInfoChangeStatus,
-  StorePackageAuditDetailDto,
  StorePackageAuditSummaryDto,
  StorePackageChangeRequestDto,
  StorePackageChangeStatus,
-  StorePackageItemDto,
-  StorePackageViewDto,
 } from '@dukang/shared-types';
 import {
  STORE_INFO_CHANGE_STATUS_LABELS,
-  normalizeStorePackageImageUrls,
+  STORE_INFO_CHANGEABLE_FIELD_LABELS,
 } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
 import { notifyPackageAuditChanged } from '../lib/admin-events';
 import { fmtTime } from '../lib/constants';
+import StorePackageAuditPanel from '../components/StorePackageAuditPanel';

 const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
  PENDING: '待审核',
@@ -41,293 +39,80 @@ const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
  REJECTED: '已驳回',
 };

-function packageKey(pkg: StorePackageItemDto | StorePackageViewDto, index: number) {
-  const name = String(pkg.name ?? '').trim();
-  return name ? `name:${name}` : `idx:${index}`;
-}
-
-function imageSignature(pkg: StorePackageItemDto | StorePackageViewDto) {
-  return normalizeStorePackageImageUrls(pkg).join('|');
-}
-
-type FieldChange = { label: string; old: string; now: string; kind: 'text' | 'value' };
-
-/** 文本逐字差异：LCS 比对，产出 equal / delete / insert 段落，用于高亮具体变了哪些字 */
-function diffText(a: string, b: string): Array<{ type: 'equal' | 'insert' | 'delete'; text: string }> {
-  const m = a.length;
-  const n = b.length;
-  const dp: number[][] = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
-  for (let i = m - 1; i >= 0; i--) {
-    for (let j = n - 1; j >= 0; j--) {
-      dp[i][j] = a[i] === b[j] ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1]);
-    }
-  }
-  const raw: Array<{ type: 'equal' | 'insert' | 'delete'; text: string }> = [];
-  let i = 0;
-  let j = 0;
-  while (i < m && j < n) {
-    if (a[i] === b[j]) {
-      raw.push({ type: 'equal', text: a[i] });
-      i++;
-      j++;
-    } else if (dp[i + 1][j] >= dp[i][j + 1]) {
-      raw.push({ type: 'delete', text: a[i] });
-      i++;
-    } else {
-      raw.push({ type: 'insert', text: b[j] });
-      j++;
-    }
-  }
-  while (i < m) raw.push({ type: 'delete', text: a[i++] });
-  while (j < n) raw.push({ type: 'insert', text: b[j++] });
-  const merged: Array<{ type: 'equal' | 'insert' | 'delete'; text: string }> = [];
-  for (const s of raw) {
-    const last = merged[merged.length - 1];
-    if (last && last.type === s.type) last.text += s.text;
-    else merged.push({ ...s });
-  }
-  return merged;
-}
-
-/** 逐字段比较套餐内容，返回发生变化的字段明细（用于“变动的地方详细列出”） */
-function fieldChanges(
-  live: StorePackageItemDto | StorePackageViewDto,
-  proposed: StorePackageItemDto | StorePackageViewDto,
-): FieldChange[] {
-  const changes: FieldChange[] = [];
-  const text = (v: string | number | null | undefined) => (v ?? '').toString().trim();
-  const pushText = (label: string, oldV: string, newV: string) => {
-    if (oldV !== newV) changes.push({ label, old: oldV, now: newV, kind: 'text' });
-  };
-  const pushValue = (label: string, oldV: string, newV: string) => {
-    if (oldV !== newV) changes.push({ label, old: oldV || '（空）', now: newV || '（空）', kind: 'value' });
-  };
-  pushValue('价格', `¥${text(live.price)}`, `¥${text(proposed.price)}`);
-  pushText('套餐名称', text(live.name), text(proposed.name));
-  pushText('菜品内容', text(live.dishes), text(proposed.dishes));
-  pushText('可用时间', text(live.usableTime), text(proposed.usableTime));
-  pushText('其他说明', text(live.otherNotes), text(proposed.otherNotes));
-  const liveImgs = normalizeStorePackageImageUrls(live);
-  const proposedImgs = normalizeStorePackageImageUrls(proposed);
-  if (imageSignature(live) !== imageSignature(proposed)) {
-    changes.push({ label: '图片', old: `${liveImgs.length} 张`, now: `${proposedImgs.length} 张`, kind: 'value' });
-  }
-  return changes;
-}
-
-function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto[]) {
-  const liveMap = new Map(live.map((p, i) => [packageKey(p, i), p]));
-  const proposedMap = new Map(proposed.map((p, i) => [packageKey(p, i), p]));
-  const keys = new Set([...liveMap.keys(), ...proposedMap.keys()]);
-  const rows: Array<{
-    key: string;
-    change: 'added' | 'removed' | 'changed' | 'unchanged';
-    live?: StorePackageViewDto;
-    proposed?: StorePackageItemDto;
-    changes?: FieldChange[];
-  }> = [];
-
-  for (const key of keys) {
-    const l = liveMap.get(key);
-    const p = proposedMap.get(key);
-    if (l && !p) {
-      rows.push({ key, change: 'removed', live: l });
-    } else if (!l && p) {
-      rows.push({ key, change: 'added', proposed: p });
-    } else if (l && p) {
-      const changed =
-        l.price !== p.price ||
-        l.dishes !== p.dishes ||
-        (l.usableTime ?? '') !== (p.usableTime ?? '') ||
-        (l.otherNotes ?? '') !== (p.otherNotes ?? '') ||
-        imageSignature(l) !== imageSignature(p);
-      rows.push({
-        key,
-        change: changed ? 'changed' : 'unchanged',
-        live: l,
-        proposed: p,
-        changes: changed ? fieldChanges(l, p) : undefined,
-      });
-    }
-  }
-  return rows;
-}
-
-const CHANGE_LABELS = {
-  added: { text: '新增', color: 'green' },
-  removed: { text: '删除', color: 'red' },
-  changed: { text: '变更', color: 'orange' },
-  unchanged: { text: '未变', color: 'default' },
-} as const;
-
-/** 文本逐字差异渲染：原行红色删除线标出被删的字，新行绿色标出新增的字 */
-function TextDiff({ oldText, newText }: { oldText: string; newText: string }) {
-  const segs = diffText(oldText, newText);
-  return (
-    <div style={{ marginTop: 2 }}>
-      <div style={{ lineHeight: 1.6 }}>
-        <Typography.Text type="secondary">原：</Typography.Text>
-        {segs
-          .filter((s) => s.type !== 'insert')
-          .map((s, idx) =>
-            s.type === 'delete' ? (
-              <Typography.Text key={idx} delete style={{ color: '#cf1322' }}>
-                {s.text || '（空）'}
-              </Typography.Text>
-            ) : (
-              <Typography.Text key={idx}>{s.text}</Typography.Text>
-            ),
-          )}
-      </div>
-      <div style={{ lineHeight: 1.6 }}>
-        <Typography.Text type="secondary">新：</Typography.Text>
-        {segs
-          .filter((s) => s.type !== 'delete')
-          .map((s, idx) =>
-            s.type === 'insert' ? (
-              <Typography.Text key={idx} style={{ color: '#389e0d' }}>
-                {s.text || '（空）'}
-              </Typography.Text>
-            ) : (
-              <Typography.Text key={idx}>{s.text}</Typography.Text>
-            ),
-          )}
-      </div>
-    </div>
-  );
-}
-
-function PackageDetailCard({
-  title,
-  pkg,
-  change,
-  changes,
-}: {
-  title?: string;
-  pkg: StorePackageItemDto | StorePackageViewDto;
-  change?: keyof typeof CHANGE_LABELS;
-  changes?: FieldChange[];
-}) {
-  const images = normalizeStorePackageImageUrls(pkg);
-  const meta = change ? CHANGE_LABELS[change] : null;
-  return (
-    <div
-      style={{
-        marginBottom: 12,
-        padding: 12,
-        border: '1px solid #f0f0f0',
-        borderRadius: 8,
-        background: '#fafafa',
-      }}
-    >
-      <Space style={{ marginBottom: 8 }} wrap>
-        {title ? (
-          <Typography.Text type="secondary">{title}</Typography.Text>
-        ) : null}
-        {meta ? <Tag color={meta.color}>{meta.text}</Tag> : null}
-      </Space>
-      <div style={{ marginBottom: 8 }}>
-        <strong>{pkg.name}</strong>
-        <span style={{ marginLeft: 8 }}>¥{pkg.price}</span>
-      </div>
-      <Typography.Paragraph className="admin-package-audit-text" style={{ marginBottom: 8 }}>
-        {pkg.dishes || '—'}
-      </Typography.Paragraph>
-      {pkg.usableTime ? (
-        <Typography.Paragraph
-          type="secondary"
-          className="admin-package-audit-text"
-          style={{ marginBottom: 4 }}
-        >
-          可用时间：{pkg.usableTime}
-        </Typography.Paragraph>
-      ) : null}
-      {pkg.otherNotes ? (
-        <Typography.Paragraph
-          type="secondary"
-          className="admin-package-audit-text"
-          style={{ marginBottom: 8 }}
-        >
-          其他说明：{pkg.otherNotes}
-        </Typography.Paragraph>
-      ) : null}
-      {images.length ? (
-        <Image.PreviewGroup>
-          <Space wrap size={8}>
-            {images.map((url) => (
-              <Image
-                key={url}
-                src={url}
-                width={72}
-                height={72}
-                style={{ objectFit: 'cover', borderRadius: 4 }}
-              />
-            ))}
-          </Space>
-        </Image.PreviewGroup>
-      ) : (
-        <Typography.Text type="secondary">无套餐图片</Typography.Text>
-      )}
-      {changes && changes.length ? (
-        <div
-          style={{
-            marginTop: 8,
-            padding: 8,
-            background: '#fff7e6',
-            border: '1px solid #ffe7ba',
-            borderRadius: 6,
-          }}
-        >
-          <Typography.Text strong style={{ fontSize: 12 }}>
-            变更明细
-          </Typography.Text>
-          <ul style={{ margin: '6px 0 0', paddingLeft: 18 }}>
-            {changes.map((c) => (
-              <li key={c.label} style={{ marginBottom: 6 }}>
-                <Typography.Text type="secondary">{c.label}：</Typography.Text>
-                {c.kind === 'text' ? (
-                  <TextDiff oldText={c.old} newText={c.now} />
-                ) : (
-                  <>
-                    <Typography.Text delete type="secondary">
-                      {c.old}
-                    </Typography.Text>
-                    <Typography.Text type="secondary"> → </Typography.Text>
-                    <Typography.Text strong>{c.now}</Typography.Text>
-                  </>
-                )}
-              </li>
-            ))}
-          </ul>
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-const INFO_CHANGE_FIELD_LABELS: Record<string, string> = {
-  name: '门店名称',
-  contactPhone: '联系电话',
-  address: '详细地址',
-  intro: '门店简介',
-  benefitUsageRule: '权益券使用规则',
-  latitude: '纬度',
-  longitude: '经度',
-  openTime: '营业开始',
-  closeTime: '营业结束',
-  openTime2: '第二段开始',
-  closeTime2: '第二段结束',
-  avgPrice: '人均费用',
-};
-
 function fmtFieldValue(field: string, v: unknown): string {
  if (v == null || String(v).trim() === '') return '（空）';
  if (field === 'avgPrice' || field === 'latitude' || field === 'longitude') {
    return String(v);
  }
+  if (field === 'envPhotoUrls' && Array.isArray(v)) {
+    return `${v.length} 张`;
+  }
+  if (field === 'coverUrl') return '见对比图';
  return String(v);
 }

+function InfoChangeImageDiff({
+  field,
+  live,
+  proposed,
+  imageSize = 72,
+}: {
+  field: string;
+  live: unknown;
+  proposed: unknown;
+  imageSize?: number;
+}) {
+  const liveUrls =
+    field === 'coverUrl'
+      ? [String(live || '').trim()].filter(Boolean)
+      : Array.isArray(live)
+        ? live.map((u) => String(u || '').trim()).filter(Boolean)
+        : [];
+  const proposedUrls =
+    field === 'coverUrl'
+      ? [String(proposed || '').trim()].filter(Boolean)
+      : Array.isArray(proposed)
+        ? proposed.map((u) => String(u || '').trim()).filter(Boolean)
+        : [];
+
+  return (
+    <div style={{ display: 'flex', gap: 16, flexWrap: 'wrap' }}>
+      <div>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 6 }}>
+          变更前
+        </Typography.Text>
+        {liveUrls.length ? (
+          <Image.PreviewGroup>
+            <Space wrap size={8}>
+              {liveUrls.map((url) => (
+                <Image key={`live-${url}`} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
+              ))}
+            </Space>
+          </Image.PreviewGroup>
+        ) : (
+          <Typography.Text type="secondary">（空）</Typography.Text>
+        )}
+      </div>
+      <div>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 6 }}>
+          变更后
+        </Typography.Text>
+        {proposedUrls.length ? (
+          <Image.PreviewGroup>
+            <Space wrap size={8}>
+              {proposedUrls.map((url) => (
+                <Image key={`new-${url}`} src={url} width={imageSize} height={imageSize} style={{ objectFit: 'cover', borderRadius: 4 }} />
+              ))}
+            </Space>
+          </Image.PreviewGroup>
+        ) : (
+          <Typography.Text type="secondary">（空）</Typography.Text>
+        )}
+      </div>
+    </div>
+  );
+}
+
 function InfoChangeAuditPanel({
  initialRequestId,
 }: {
@@ -345,6 +130,7 @@ 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);
@@ -425,7 +211,7 @@ function InfoChangeAuditPanel({
      render: (_, row) =>
        row.changedFields?.length
          ? row.changedFields.map((f) => (
-              <Tag key={f}>{INFO_CHANGE_FIELD_LABELS[f] ?? f}</Tag>
+              <Tag key={f}>{STORE_INFO_CHANGEABLE_FIELD_LABELS[f as keyof typeof STORE_INFO_CHANGEABLE_FIELD_LABELS] ?? f}</Tag>
            ))
          : '—',
    },
@@ -503,25 +289,33 @@ function InfoChangeAuditPanel({

      <Drawer
        title={detail ? `${detail.storeName || detail.storeId} · 信息变更` : '信息变更详情'}
-        width={680}
+        width={infoFullscreen ? '100%' : 680}
        open={detailOpen}
-        onClose={() => setDetailOpen(false)}
+        onClose={() => {
+          setDetailOpen(false);
+          setInfoFullscreen(false);
+        }}
        extra={
-          detail?.status === 'PENDING' ? (
-            <Space>
-              <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
-              <Button
-                danger
-                onClick={() => {
-                  setActiveId(detail.id);
-                  setRejectReason('');
-                  setRejectOpen(true);
-                }}
-              >
-                驳回
-              </Button>
-            </Space>
-          ) : null
+          <Space>
+            <Button onClick={() => setInfoFullscreen((v) => !v)}>
+              {infoFullscreen ? '退出全屏' : '全屏查看'}
+            </Button>
+            {detail?.status === 'PENDING' ? (
+              <>
+                <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
+                <Button
+                  danger
+                  onClick={() => {
+                    setActiveId(detail.id);
+                    setRejectReason('');
+                    setRejectOpen(true);
+                  }}
+                >
+                  驳回
+                </Button>
+              </>
+            ) : null}
+          </Space>
        }
      >
        {detailLoading ? (
@@ -542,17 +336,26 @@ function InfoChangeAuditPanel({
                {detail.diffs.map((d) => (
                  <Descriptions.Item
                    key={d.field}
-                    label={INFO_CHANGE_FIELD_LABELS[d.field] ?? d.field}
+                    label={STORE_INFO_CHANGEABLE_FIELD_LABELS[d.field] ?? d.field}
                  >
-                    <span>
-                      <Typography.Text delete type="secondary">
-                        {fmtFieldValue(d.field, d.live)}
-                      </Typography.Text>
-                      <Typography.Text type="secondary"> → </Typography.Text>
-                      <Typography.Text strong>
-                        {fmtFieldValue(d.field, d.proposed)}
-                      </Typography.Text>
-                    </span>
+                    {d.field === 'coverUrl' || d.field === 'envPhotoUrls' ? (
+                      <InfoChangeImageDiff
+                        field={d.field}
+                        live={d.live}
+                        proposed={d.proposed}
+                        imageSize={infoFullscreen ? 160 : 72}
+                      />
+                    ) : (
+                      <span>
+                        <Typography.Text delete type="secondary">
+                          {fmtFieldValue(d.field, d.live)}
+                        </Typography.Text>
+                        <Typography.Text type="secondary"> → </Typography.Text>
+                        <Typography.Text strong>
+                          {fmtFieldValue(d.field, d.proposed)}
+                        </Typography.Text>
+                      </span>
+                    )}
                  </Descriptions.Item>
                ))}
              </Descriptions>
@@ -599,8 +402,9 @@ export default function StorePackageAuditsPage() {
  const [rejectReason, setRejectReason] = useState('');
  const [activeId, setActiveId] = useState<string | null>(null);
  const [detailOpen, setDetailOpen] = useState(false);
-  const [detailLoading, setDetailLoading] = useState(false);
-  const [detail, setDetail] = useState<StorePackageAuditDetailDto | null>(null);
+  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);
@@ -629,30 +433,23 @@ export default function StorePackageAuditsPage() {
    void reload(1, status);
  }, [status]);

-  // 从门店详情 / 门店列表跳转过来时，带 requestId 自动打开审核（对比）抽屉
  const [searchParams] = useSearchParams();
  const initialTab = searchParams.get('tab') === 'info' ? 'info' : 'package';
  const [activeTab, setActiveTab] = useState<string>(initialTab);
  const infoRequestId = searchParams.get('infoRequestId');
  useEffect(() => {
    const rid = searchParams.get('requestId');
-    if (rid) void openDetail(rid);
+    if (rid) {
+      setActiveRequestId(rid);
+      setDetailOpen(true);
+    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

-  async function openDetail(id: string) {
+  function openDetail(id: string) {
+    setActiveRequestId(id);
+    setDrawerTitle('套餐变更详情');
    setDetailOpen(true);
-    setDetailLoading(true);
-    setDetail(null);
-    try {
-      const data = await request<StorePackageAuditDetailDto>(`/admin/store-package-audits/${id}`);
-      setDetail(data);
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '加载详情失败');
-      setDetailOpen(false);
-    } finally {
-      setDetailLoading(false);
-    }
  }

  async function audit(id: string, action: 'APPROVE' | 'REJECT', reason?: string) {
@@ -672,14 +469,6 @@ export default function StorePackageAuditsPage() {
    }
  }

-  const diffRows = detail ? diffPackages(detail.livePackages ?? [], detail.packages ?? []) : [];
-  const changeByKey = new Map(diffRows.map((row) => [row.key, row.change]));
-  const changesByKey = new Map(diffRows.map((row) => [row.key, row.changes]));
-  const addedCount = diffRows.filter((r) => r.change === 'added').length;
-  const removedCount = diffRows.filter((r) => r.change === 'removed').length;
-  const changedCount = diffRows.filter((r) => r.change === 'changed').length;
-  const unchangedCount = diffRows.filter((r) => r.change === 'unchanged').length;
-
  const columns: ColumnsType<StorePackageChangeRequestDto> = [
    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
    {
@@ -702,7 +491,7 @@ export default function StorePackageAuditsPage() {
      title: '操作',
      render: (_, row) => (
        <Space>
-          <Button type="link" onClick={() => void openDetail(row.id)}>
+          <Button type="link" onClick={() => openDetail(row.id)}>
            查看变更
          </Button>
          {row.status === 'PENDING' ? (
@@ -781,90 +570,32 @@ export default function StorePackageAuditsPage() {
      />

      <Drawer
-        title={detail ? `${detail.storeName || detail.storeId} · 套餐变更` : '套餐变更详情'}
-        width={880}
+        title={drawerTitle}
+        width={packageFullscreen ? '100%' : 880}
        open={detailOpen}
-        onClose={() => setDetailOpen(false)}
+        onClose={() => {
+          setDetailOpen(false);
+          setPackageFullscreen(false);
+        }}
+        destroyOnClose
        extra={
-          detail?.status === 'PENDING' ? (
-            <Space>
-              <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
-              <Button
-                danger
-                onClick={() => {
-                  setActiveId(detail.id);
-                  setRejectReason('');
-                  setRejectOpen(true);
-                }}
-              >
-                驳回
-              </Button>
-            </Space>
-          ) : null
+          <Button onClick={() => setPackageFullscreen((v) => !v)}>
+            {packageFullscreen ? '退出全屏' : '全屏查看'}
+          </Button>
        }
      >
-        {detailLoading ? (
-          <Typography.Text type="secondary">加载中…</Typography.Text>
-        ) : detail ? (
-          <>
-            <Space style={{ marginBottom: 16 }} wrap>
-              <Tag>{HQ_PACKAGE_STATUS_LABELS[detail.status]}</Tag>
-              <Typography.Text type="secondary">
-                提交方：{detail.submitterType === 'PARTNER' ? '合伙人' : '门店'} · {fmtTime(detail.createdAt)}
-              </Typography.Text>
-            </Space>
-            {detail.rejectReason ? (
-              <Typography.Paragraph type="danger">驳回原因：{detail.rejectReason}</Typography.Paragraph>
-            ) : null}
-            <Space direction="vertical" size={4} style={{ marginBottom: 12 }}>
-              <Typography.Text type="secondary">
-                线上已审核 {detail.livePackages?.length ?? 0} 条 · 待审核 {detail.packages?.length ?? 0} 条
-              </Typography.Text>
-              <Space wrap>
-                <Tag color="green">新增 {addedCount}</Tag>
-                <Tag color="red">删除 {removedCount}</Tag>
-                <Tag color="orange">变更 {changedCount}</Tag>
-                {unchangedCount ? <Tag>未变 {unchangedCount}</Tag> : null}
-              </Space>
-            </Space>
-            <div className="admin-package-audit-cols">
-              <div className="admin-package-audit-col">
-                <Typography.Title level={5} style={{ marginTop: 0 }}>
-                  线上已审核套餐
-                </Typography.Title>
-                {(detail.livePackages ?? []).length ? (
-                  (detail.livePackages ?? []).map((pkg, index) => (
-                    <PackageDetailCard
-                      key={`live-${packageKey(pkg, index)}`}
-                      title={`套餐 ${index + 1}`}
-                      pkg={pkg}
-                      change={changeByKey.get(packageKey(pkg, index))}
-                    />
-                  ))
-                ) : (
-                  <Typography.Text type="secondary">暂无线上套餐</Typography.Text>
-                )}
-              </div>
-              <div className="admin-package-audit-col">
-                <Typography.Title level={5} style={{ marginTop: 0 }}>
-                  待审核套餐
-                </Typography.Title>
-                {(detail.packages ?? []).length ? (
-                  (detail.packages ?? []).map((pkg, index) => (
-                    <PackageDetailCard
-                      key={`pending-${packageKey(pkg, index)}`}
-                      title={`套餐 ${index + 1}`}
-                      pkg={pkg}
-                      change={changeByKey.get(packageKey(pkg, index))}
-                      changes={changesByKey.get(packageKey(pkg, index))}
-                    />
-                  ))
-                ) : (
-                  <Typography.Text type="secondary">暂无待审核套餐</Typography.Text>
-                )}
-              </div>
-            </div>
-          </>
+        {activeRequestId ? (
+          <StorePackageAuditPanel
+            requestId={activeRequestId}
+            fullscreen={packageFullscreen}
+            onAudited={() => {
+              setDetailOpen(false);
+              void reload(page, status);
+            }}
+            onDetailLoaded={(d) => {
+              if (d) setDrawerTitle(`${d.storeName || d.storeId} · 套餐变更`);
+            }}
+          />
        ) : null}
      </Drawer>

@@ -892,3 +623,4 @@ export default function StorePackageAuditsPage() {
    </div>
  );
 }
+
@@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
  Alert,
+  Badge,
  Button,
  Checkbox,
  Descriptions,
@@ -46,6 +47,9 @@ import TencentLocPickerModal from '../components/TencentLocPickerModal';
 import AdminStorePackagesSection, {
  type AdminStorePackagesHandle,
 } from '../components/AdminStorePackagesSection';
+import StorePackageAuditPanel, {
+  auditStorePackageRequest,
+} from '../components/StorePackageAuditPanel';

 const CREATE_STEPS = [
  { title: '基本信息' },
@@ -242,6 +246,8 @@ export default function StoresPage() {
  const [searchParams] = useSearchParams();
  const initialCityId = searchParams.get('cityId') ?? '';
  const initialPartnerId = searchParams.get('partnerId') ?? '';
+  const initialAuditStatus = searchParams.get('auditStatus') ?? '';
+  const initialStoreId = searchParams.get('storeId') ?? '';
  const [form] = Form.useForm();
  const [editForm] = Form.useForm();
  const [createForm] = Form.useForm<StoreCreateForm>();
@@ -249,6 +255,7 @@ export default function StoresPage() {
    const init: Record<string, string | boolean> = {};
    if (initialCityId) init.cityId = initialCityId;
    if (initialPartnerId) init.partnerId = initialPartnerId;
+    if (initialAuditStatus) init.auditStatus = initialAuditStatus;
    return init;
  });
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<StoreRow>(
@@ -270,7 +277,11 @@ export default function StoresPage() {
  const [filterPartners, setFilterPartners] = useState<PartnerOption[]>([]);
  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detailTab, setDetailTab] = useState('basic');
  const packagesRef = useRef<AdminStorePackagesHandle>(null);
+  const [packageRejectOpen, setPackageRejectOpen] = useState(false);
+  const [packageRejectReason, setPackageRejectReason] = useState('');
+  const [packageAuditing, setPackageAuditing] = useState(false);
  const [rejectOpen, setRejectOpen] = useState(false);
  const [rejectReason, setRejectReason] = useState('');
  const [auditing, setAuditing] = useState(false);
@@ -286,6 +297,7 @@ export default function StoresPage() {
  const [optionsLoading, setOptionsLoading] = useState(false);
  const [saving, setSaving] = useState(false);
  const [phoneMismatch, setPhoneMismatch] = useState<string | null>(null);
+  const deepLinkStoreOpenedRef = useRef(false);

  useEffect(() => {
    void request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -296,6 +308,12 @@ export default function StoresPage() {
      .catch(() => {});
  }, []);

+  useEffect(() => {
+    if (initialAuditStatus) {
+      form.setFieldsValue({ auditStatus: initialAuditStatus });
+    }
+  }, [form, initialAuditStatus]);
+
  useEffect(() => {
    const cityId = searchParams.get('cityId') ?? '';
    const partnerId = searchParams.get('partnerId') ?? '';
@@ -348,13 +366,18 @@ export default function StoresPage() {
      .map((n) => ({ value: n.id, label: n.name }));
  }, [categoryTree, editCategoryParentId]);

-  async function openStoreDetail(row: StoreRow) {
+  async function openStoreDetail(row: StoreRow, opts?: { tab?: string }) {
    const [d, cats] = await Promise.all([
      request<Record<string, unknown>>(`/admin/stores/${row.id}`),
      request<CategoryNode[]>('/admin/store-categories').catch(() => [] as CategoryNode[]),
    ]);
    setCategoryTree(Array.isArray(cats) ? cats : []);
-    setDetail(d);
+    setDetail({
+      ...d,
+      pendingPackageAuditId: row.pendingPackageAuditId ?? d.pendingPackageAuditId,
+      pendingInfoChangeId: row.pendingInfoChangeId ?? d.pendingInfoChangeId,
+    });
+    setDetailTab(opts?.tab || 'basic');
    const category = d.category && typeof d.category === 'object'
      ? (d.category as { id?: string; parentId?: string | null })
      : null;
@@ -441,6 +464,19 @@ export default function StoresPage() {
    setDrawerOpen(true);
  }

+  useEffect(() => {
+    if (!initialStoreId || deepLinkStoreOpenedRef.current || loading) return;
+    const row = data?.items?.find((s) => String(s.id) === initialStoreId);
+    if (row) {
+      deepLinkStoreOpenedRef.current = true;
+      void openStoreDetail(row);
+    } else if (data && (data.items?.length ?? 0) >= 0) {
+      // 列表无该店时仍尝试直拉详情
+      deepLinkStoreOpenedRef.current = true;
+      void openStoreDetail({ id: initialStoreId } as StoreRow);
+    }
+  }, [data, initialStoreId, loading]);
+
  async function saveStoreDetail() {
    if (!detail) return;
    setSaving(true);
@@ -776,22 +812,13 @@ export default function StoresPage() {
          <Button type="link" size="small" onClick={() => void openStoreDetail(row)}>详情</Button>
          <Button type="link" size="small" onClick={() => navigate(`/store-ratings?storeId=${row.id}`)}>评价</Button>
          {row.pendingPackageAuditId ? (
-            <>
-              <Button
-                type="link"
-                size="small"
-                onClick={() => navigate(`/store-package-audits?requestId=${row.pendingPackageAuditId}`)}
-              >
-                审核套餐
-              </Button>
-              <Button
-                type="link"
-                size="small"
-                onClick={() => navigate(`/store-package-audits?requestId=${row.pendingPackageAuditId}`)}
-              >
-                对比
-              </Button>
-            </>
+            <Button
+              type="link"
+              size="small"
+              onClick={() => void openStoreDetail(row, { tab: 'packages' })}
+            >
+              审核套餐
+            </Button>
          ) : null}
          {row.pendingInfoChangeId ? (
            <>
@@ -903,7 +930,7 @@ export default function StoresPage() {
          },
        }}
      />
-      <Drawer title="门店详情" width={760} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Drawer title="门店详情" width={880} open={drawerOpen} onClose={() => setDrawerOpen(false)}
        extra={detail && (
          <Space wrap>
            {String(detail.auditStatus || '') === 'PENDING' || String(detail.auditStatus || '') === 'REJECTED' ? (
@@ -940,6 +967,41 @@ export default function StoresPage() {
                </Button>
              </>
            ) : null}
+            {detail.pendingPackageAuditId ? (
+              <>
+                <Button
+                  type="primary"
+                  ghost
+                  loading={packageAuditing}
+                  onClick={async () => {
+                    setPackageAuditing(true);
+                    try {
+                      await auditStorePackageRequest(String(detail.pendingPackageAuditId), 'APPROVE');
+                      message.success('套餐已通过');
+                      setDetail({ ...detail, pendingPackageAuditId: null });
+                      void reload();
+                    } catch (e) {
+                      message.error(e instanceof Error ? e.message : '套餐审核失败');
+                    } finally {
+                      setPackageAuditing(false);
+                    }
+                  }}
+                >
+                  通过套餐
+                </Button>
+                <Button
+                  danger
+                  ghost
+                  loading={packageAuditing}
+                  onClick={() => {
+                    setPackageRejectReason('');
+                    setPackageRejectOpen(true);
+                  }}
+                >
+                  驳回套餐
+                </Button>
+              </>
+            ) : null}
            <Select value={String(detail.status)} style={{ width: 120 }}
              options={Object.entries(STORE_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
              onChange={async (status) => {
@@ -954,6 +1016,8 @@ export default function StoresPage() {
        {detail && (
          <Form form={editForm} layout="vertical">
            <Tabs
+              activeKey={detailTab}
+              onChange={setDetailTab}
              destroyInactiveTabPane={false}
              items={[
                {
@@ -1202,15 +1266,76 @@ export default function StoresPage() {
                },
                {
                  key: 'packages',
-                  label: '套餐',
+                  label: detail.pendingPackageAuditId ? (
+                    <Badge dot offset={[4, 0]}>
+                      套餐
+                    </Badge>
+                  ) : (
+                    '套餐'
+                  ),
                  forceRender: true,
-                  children: <AdminStorePackagesSection ref={packagesRef} storeId={String(detail.id)} />,
+                  children: (
+                    <>
+                      {detail.pendingPackageAuditId ? (
+                        <div style={{ marginBottom: 24 }}>
+                          <Typography.Title level={5} style={{ marginTop: 0 }}>
+                            待审核套餐变更
+                          </Typography.Title>
+                          <StorePackageAuditPanel
+                            requestId={String(detail.pendingPackageAuditId)}
+                            showActions
+                            onAudited={() => {
+                              setDetail({ ...detail, pendingPackageAuditId: null });
+                              void reload();
+                            }}
+                          />
+                        </div>
+                      ) : null}
+                      <AdminStorePackagesSection ref={packagesRef} storeId={String(detail.id)} />
+                    </>
+                  ),
                },
              ]}
            />
          </Form>
        )}
      </Drawer>
+      <Modal
+        title="驳回套餐变更"
+        open={packageRejectOpen}
+        confirmLoading={packageAuditing}
+        onCancel={() => setPackageRejectOpen(false)}
+        onOk={async () => {
+          if (!detail?.pendingPackageAuditId) return;
+          if (!packageRejectReason.trim()) {
+            message.warning('请填写驳回原因');
+            return;
+          }
+          setPackageAuditing(true);
+          try {
+            await auditStorePackageRequest(
+              String(detail.pendingPackageAuditId),
+              'REJECT',
+              packageRejectReason.trim(),
+            );
+            message.success('套餐已驳回');
+            setPackageRejectOpen(false);
+            setDetail({ ...detail, pendingPackageAuditId: null });
+            void reload();
+          } catch (e) {
+            message.error(e instanceof Error ? e.message : '套餐驳回失败');
+          } finally {
+            setPackageAuditing(false);
+          }
+        }}
+      >
+        <Input.TextArea
+          rows={3}
+          value={packageRejectReason}
+          placeholder="驳回原因"
+          onChange={(e) => setPackageRejectReason(e.target.value)}
+        />
+      </Modal>
      <Modal
        title="新建门店"
        open={createOpen}
@@ -218,8 +218,13 @@ 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: [{ content: summary || detail!.title, type: mapSupportTicketTypeToDevPlanTask(detail!.ticketType) }],
+      tasks: [{
+        content: summary || detail!.title,
+        type: mapSupportTicketTypeToDevPlanTask(detail!.ticketType),
+        attachmentUrls: ticketUrls,
+      }],
      dispatchToWecom: localStorage.getItem(DISPATCH_WECOM_STORAGE_KEY) !== 'false',
      dispatchSupplement: DEFAULT_DISPATCH_SUPPLEMENT,
    });
@@ -364,7 +369,11 @@ export default function SupportTicketsPage() {
        body: JSON.stringify({
          decision: 'APPROVE',
          note: note?.trim() || undefined,
-          tasks: values.tasks.map((t) => ({ content: t.content.trim(), type: t.type })),
+          tasks: values.tasks.map((t) => ({
+            content: t.content.trim(),
+            type: t.type,
+            attachmentUrls: t.attachmentUrls?.length ? t.attachmentUrls : detail!.attachmentUrls,
+          })),
          dispatchToWecom: !!values.dispatchToWecom,
          dispatchSupplement: values.dispatchSupplement?.trim() || undefined,
        }),
@@ -249,15 +249,70 @@ export default function SystemSettingsPage() {

  const collapseItems = useMemo(() => {
    if (!meta) return [];
-    return meta.groups.map((group) => ({
-      key: group.key,
-      label: group.label,
-      forceRender: true,
-      children: (
-        <div style={{ maxWidth: 720 }}>
-          {meta.fields
-            .filter((f) => f.group === group.key)
-            .map((f) =>
+    const SHARE_SUBGROUP_LABELS: Record<string, string> = {
+      global: '全局',
+      home: '首页',
+      stores: '门店列表',
+      storeDetail: '门店详情',
+      benefit: '权益页',
+      mine: '我的',
+      productDetail: '商品详情',
+      orderDetail: '订单详情',
+    };
+    const SHARE_SUBGROUP_ORDER = [
+      'global',
+      'home',
+      'stores',
+      'storeDetail',
+      'benefit',
+      'mine',
+      'productDetail',
+      'orderDetail',
+    ];
+
+    return meta.groups.map((group) => {
+      const fields = meta.fields.filter((f) => f.group === group.key);
+      const hasSubgroups = fields.some((f) => f.subgroup);
+
+      let children: ReactNode;
+      if (group.key === 'wechat_mini_share' && hasSubgroups) {
+        const bySub = new Map<string, SystemConfigFieldMeta[]>();
+        for (const f of fields) {
+          const sk = f.subgroup || 'global';
+          if (!bySub.has(sk)) bySub.set(sk, []);
+          bySub.get(sk)!.push(f);
+        }
+        const orderedKeys = [
+          ...SHARE_SUBGROUP_ORDER.filter((k) => bySub.has(k)),
+          ...[...bySub.keys()].filter((k) => !SHARE_SUBGROUP_ORDER.includes(k)),
+        ];
+        children = (
+          <Collapse
+            defaultActiveKey={[]}
+            items={orderedKeys.map((sk) => ({
+              key: sk,
+              label: SHARE_SUBGROUP_LABELS[sk] || sk,
+              forceRender: true,
+              children: (
+                <div style={{ maxWidth: 720 }}>
+                  {(bySub.get(sk) ?? []).map((f) =>
+                    renderField(
+                      f,
+                      meta.configuredSecrets,
+                      f.key === 'MOCK_SMS' && mockSmsEnabled ? (
+                        <MockSmsCodePanel codes={meta.mockSmsCodes ?? []} loading={loading} />
+                      ) : undefined,
+                    ),
+                  )}
+                </div>
+              ),
+            }))}
+          />
+        );
+      } else {
+        children = (
+          <div style={{ maxWidth: 720 }}>
+            {fields.map((f) =>
              renderField(
                f,
                meta.configuredSecrets,
@@ -266,9 +321,17 @@ export default function SystemSettingsPage() {
                ) : undefined,
              ),
            )}
-        </div>
-      ),
-    }));
+          </div>
+        );
+      }
+
+      return {
+        key: group.key,
+        label: group.label,
+        forceRender: true,
+        children,
+      };
+    });
  }, [meta, mockSmsEnabled, loading]);

  async function onSave() {
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import {
  Avatar,
  Button,
@@ -13,6 +13,7 @@ import {
  Space,
  Switch,
  Table,
+  Tabs,
  Tag,
  Typography,
  message,
@@ -21,8 +22,13 @@ import type { ColumnsType } from 'antd/es/table';
 import {
  WECOM_PUSH_CONDITION_GROUPS,
  WECOM_PUSH_CONDITION_LABELS,
+  WECOM_TEMPLATE_EVENT_KEYS,
+  WECOM_TEMPLATE_EVENT_LABELS,
+  WECOM_TEMPLATE_PLACEHOLDERS,
  type WecomMessagePushDto,
  type WecomPushCondition,
+  type WecomPushTemplateDto,
+  type WecomTemplateEventKey,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
@@ -78,7 +84,7 @@ function WecomPushConditionPicker({
  );
 }

-export default function WecomMessagePushesPage() {
+function PushRoutesTab() {
  const [filterForm] = Form.useForm();
  const [form] = Form.useForm<FormValues>();
  const [filters, setFilters] = useState<Record<string, string>>({});
@@ -257,11 +263,9 @@ export default function WecomMessagePushesPage() {
  ];

  return (
-    <div>
-      <Typography.Title level={4}>企微机器人 · 消息推送</Typography.Title>
+    <>
      <Typography.Paragraph type="secondary">
-        配置群机器人 Webhook 多实例，按推送条件分发运营告警、技术支持工单、开发任务派发等消息。运行时不再读取
-        .env 中的 Webhook URL。
+        配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。
      </Typography.Paragraph>

      <Form
@@ -332,10 +336,10 @@ export default function WecomMessagePushesPage() {
      >
        <Form form={form} layout="vertical">
          <Form.Item name="name" label="名称" rules={[{ required: true, message: '请填写名称' }]}>
-            <Input placeholder="如：运营告警" />
+            <Input placeholder="如：业务待办通知群" />
          </Form.Item>
          <Form.Item name="avatarUrl" label="头像（HQ 列表展示）">
-            <OssUpload />
+            <OssUpload bizType="WECOM_BOT_AVATAR" />
          </Form.Item>
          <Form.Item
            name="webhookUrl"
@@ -400,6 +404,208 @@ export default function WecomMessagePushesPage() {
          </Descriptions>
        ) : null}
      </Modal>
+    </>
+  );
+}
+
+function TemplatesTab() {
+  const [templates, setTemplates] = useState<WecomPushTemplateDto[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [eventKey, setEventKey] = useState<WecomTemplateEventKey>('order.paid');
+  const [form] = Form.useForm<{ title: string; body: string; handleLabel: string }>();
+  const [saving, setSaving] = useState(false);
+  const [testing, setTesting] = useState(false);
+  const [preview, setPreview] = useState('');
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      const list = await request<WecomPushTemplateDto[]>('/admin/wecom-push-templates');
+      setTemplates(list);
+      setEventKey((prev) => {
+        const current = list.find((t) => t.eventKey === prev) ?? list[0];
+        if (current) {
+          form.setFieldsValue({
+            title: current.title,
+            body: current.body,
+            handleLabel: current.handleLabel,
+          });
+          return current.eventKey;
+        }
+        return prev;
+      });
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载模板失败');
+    } finally {
+      setLoading(false);
+    }
+  }, [form]);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  function selectEvent(key: WecomTemplateEventKey) {
+    setEventKey(key);
+    const row = templates.find((t) => t.eventKey === key);
+    if (row) {
+      form.setFieldsValue({
+        title: row.title,
+        body: row.body,
+        handleLabel: row.handleLabel,
+      });
+      setPreview('');
+    }
+  }
+
+  async function save() {
+    const values = await form.validateFields();
+    setSaving(true);
+    try {
+      const updated = await request<WecomPushTemplateDto>(
+        `/admin/wecom-push-templates/${eventKey}`,
+        {
+          method: 'PUT',
+          body: JSON.stringify(values),
+        },
+      );
+      message.success('模板已保存');
+      setTemplates((prev) => prev.map((t) => (t.eventKey === eventKey ? updated : t)));
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function reset() {
+    setSaving(true);
+    try {
+      const updated = await request<WecomPushTemplateDto>(
+        `/admin/wecom-push-templates/${eventKey}/reset`,
+        { method: 'POST', body: '{}' },
+      );
+      message.success('已恢复默认文案');
+      form.setFieldsValue({
+        title: updated.title,
+        body: updated.body,
+        handleLabel: updated.handleLabel,
+      });
+      setTemplates((prev) => prev.map((t) => (t.eventKey === eventKey ? updated : t)));
+      setPreview('');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '恢复失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function testSend() {
+    setTesting(true);
+    try {
+      const res = await request<{ ok: boolean; message: string; preview: string }>(
+        `/admin/wecom-push-templates/${eventKey}/test`,
+        { method: 'POST', body: '{}' },
+      );
+      setPreview(res.preview || '');
+      message.success(res.message || '已发送');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '测试失败');
+    } finally {
+      setTesting(false);
+    }
+  }
+
+  const placeholders = WECOM_TEMPLATE_PLACEHOLDERS[eventKey] ?? [];
+
+  return (
+    <>
+      <Typography.Paragraph type="secondary">
+        每种业务事件全站一份文案，使用 {'{{orderNo}}'} 等形式占位。快链由系统注入 {'{{handleUrl}}'}
+        ；须在「推送路由」中勾选对应条件并配置 Webhook 才会发出。
+      </Typography.Paragraph>
+
+      <Space align="start" style={{ width: '100%' }} size={24} wrap>
+        <div style={{ minWidth: 200 }}>
+          <Typography.Text strong>事件</Typography.Text>
+          <div style={{ marginTop: 8 }}>
+            {WECOM_TEMPLATE_EVENT_KEYS.map((k) => (
+              <div key={k} style={{ marginBottom: 4 }}>
+                <Button
+                  type={k === eventKey ? 'primary' : 'text'}
+                  size="small"
+                  onClick={() => selectEvent(k)}
+                  block
+                  style={{ textAlign: 'left' }}
+                >
+                  {WECOM_TEMPLATE_EVENT_LABELS[k]}
+                </Button>
+              </div>
+            ))}
+          </div>
+        </div>
+
+        <div style={{ flex: 1, minWidth: 360 }}>
+          <Form form={form} layout="vertical" disabled={loading}>
+            <Form.Item name="title" label="标题（管理用）" rules={[{ required: true }]}>
+              <Input />
+            </Form.Item>
+            <Form.Item
+              name="body"
+              label="正文（企微 markdown）"
+              rules={[{ required: true }]}
+              extra={`可用占位符：${placeholders.map((p) => `{{${p}}}`).join(' ')}`}
+            >
+              <Input.TextArea rows={12} style={{ fontFamily: 'monospace' }} />
+            </Form.Item>
+            <Form.Item name="handleLabel" label="快链按钮文案" rules={[{ required: true }]}>
+              <Input placeholder="去处理" />
+            </Form.Item>
+            <Space wrap>
+              <Button type="primary" loading={saving} onClick={() => void save()}>
+                保存
+              </Button>
+              <Popconfirm title="恢复代码默认文案？将覆盖当前编辑" onConfirm={() => void reset()}>
+                <Button loading={saving}>恢复默认</Button>
+              </Popconfirm>
+              <Button loading={testing} onClick={() => void testSend()}>
+                用示例数据测试推送
+              </Button>
+            </Space>
+          </Form>
+
+          {preview ? (
+            <div style={{ marginTop: 16 }}>
+              <Typography.Text strong>预览</Typography.Text>
+              <pre
+                style={{
+                  marginTop: 8,
+                  padding: 12,
+                  background: '#f5f5f5',
+                  whiteSpace: 'pre-wrap',
+                  borderRadius: 8,
+                }}
+              >
+                {preview}
+              </pre>
+            </div>
+          ) : null}
+        </div>
+      </Space>
+    </>
+  );
+}
+
+export default function WecomMessagePushesPage() {
+  return (
+    <div>
+      <Typography.Title level={4}>企微机器人 · 消息推送</Typography.Title>
+      <Tabs
+        items={[
+          { key: 'routes', label: '推送路由', children: <PushRoutesTab /> },
+          { key: 'templates', label: '通知模板', children: <TemplatesTab /> },
+        ]}
+      />
    </div>
  );
 }
@@ -37,6 +37,13 @@ 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 = {
@@ -127,14 +134,30 @@ export default function WineryBillsPage() {
    (profile?.permissionKeys ?? []).includes('system_settings_winery_bank');

  function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
    Modal.confirm({
      title: '确认打款？',
-      content: `将确认 ${ids.length} 笔酒厂对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      content: (
+        <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' });
+          await request(`/admin/winery-bills/${ids[0]}/confirm`, { method: 'POST', body });
        } else {
          await request('/admin/winery-bills/batch-confirm', {
            method: 'POST',
@@ -399,7 +422,31 @@ 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>
@@ -0,0 +1,6 @@
+/// <reference types="vite/client" />
+
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
@@ -17,6 +17,11 @@ type Props = {
  accept?: string;
  /** 计量单位文案，如「张」「个」 */
  unit?: string;
+  /**
+   * stack：缩略图 + 下方独立上传按钮（合同等）
+   * grid：九宫格，末尾「+」格上传，无独立大按钮（环境图）
+   */
+  variant?: 'stack' | 'grid';
 };

 function isCancelError(msg: string): boolean {
@@ -42,6 +47,7 @@ export default function MultiOssUploadField({
  label,
  accept = 'image/*',
  unit = '张',
+  variant = 'stack',
 }: Props) {
  const inputRef = useRef<HTMLInputElement>(null);
  const pickingRef = useRef(false);
@@ -53,6 +59,7 @@ export default function MultiOssUploadField({
  const onChangeRef = useRef(onChange);
  const remaining = Math.max(0, maxCount - urls.length);
  const inWechat = isWechatEnv();
+  const isGrid = variant === 'grid';

  useEffect(() => {
    urlsRef.current = urls;
@@ -126,11 +133,78 @@ export default function MultiOssUploadField({
    }
  }

+  function openPicker() {
+    if (inWechat) void pickWechat();
+    else inputRef.current?.click();
+  }
+
  function removeAt(index: number) {
    if (disabled) return;
    onChange?.(urls.filter((_, i) => i !== index));
  }

+  const thumb = (url: string, index: number) => (
+    <div key={`${url}-${index}`} className={isGrid ? 'partner-upload-grid-thumb' : undefined} style={isGrid ? undefined : { position: 'relative', width: 88, height: 88 }}>
+      {isPdf(url) ? (
+        <a
+          href={url}
+          target="_blank"
+          rel="noreferrer"
+          style={{
+            display: 'flex',
+            width: isGrid ? '100%' : 88,
+            height: isGrid ? '100%' : 88,
+            flexDirection: 'column',
+            alignItems: 'center',
+            justifyContent: 'center',
+            gap: 2,
+            borderRadius: 8,
+            border: '1px solid rgba(0,0,0,0.08)',
+            background: '#f7f7f7',
+            fontSize: 12,
+          }}
+        >
+          <span className="material-symbols-outlined text-primary" style={{ fontSize: 26 }}>
+            description
+          </span>
+          <span className="text-muted">PDF</span>
+        </a>
+      ) : (
+        <img
+          src={url}
+          alt=""
+          style={{
+            width: isGrid ? '100%' : 88,
+            height: isGrid ? '100%' : 88,
+            objectFit: 'cover',
+            borderRadius: isGrid ? 12 : 8,
+            display: 'block',
+          }}
+        />
+      )}
+      {!disabled ? (
+        <button
+          type="button"
+          className="partner-packages-remove"
+          style={{
+            position: 'absolute',
+            top: 2,
+            right: 2,
+            margin: 0,
+            padding: '2px 6px',
+            fontSize: 12,
+            background: 'rgba(0,0,0,0.55)',
+            color: '#fff',
+            borderRadius: 4,
+          }}
+          onClick={() => removeAt(index)}
+        >
+          删
+        </button>
+      ) : null}
+    </div>
+  );
+
  return (
    <div className="partner-oss-upload">
      <input
@@ -146,86 +220,49 @@ export default function MultiOssUploadField({
        }}
      />

-      {urls.length > 0 ? (
-        <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginBottom: 8 }}>
-          {urls.map((url, index) => (
-            <div key={`${url}-${index}`} style={{ position: 'relative', width: 88, height: 88 }}>
-              {isPdf(url) ? (
-                <a
-                  href={url}
-                  target="_blank"
-                  rel="noreferrer"
-                  style={{
-                    display: 'flex',
-                    width: 88,
-                    height: 88,
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    gap: 2,
-                    borderRadius: 8,
-                    border: '1px solid rgba(0,0,0,0.08)',
-                    background: '#f7f7f7',
-                    fontSize: 12,
-                  }}
-                >
-                  <span className="material-symbols-outlined text-primary" style={{ fontSize: 26 }}>
-                    description
-                  </span>
-                  <span className="text-muted">PDF</span>
-                </a>
-              ) : (
-                <img
-                  src={url}
-                  alt=""
-                  style={{ width: 88, height: 88, objectFit: 'cover', borderRadius: 8 }}
-                />
-              )}
-              {!disabled ? (
-                <button
-                  type="button"
-                  className="partner-packages-remove"
-                  style={{
-                    position: 'absolute',
-                    top: 2,
-                    right: 2,
-                    margin: 0,
-                    padding: '2px 6px',
-                    fontSize: 12,
-                    background: 'rgba(0,0,0,0.55)',
-                    color: '#fff',
-                    borderRadius: 4,
-                  }}
-                  onClick={() => removeAt(index)}
-                >
-                  删
-                </button>
-              ) : null}
-            </div>
-          ))}
+      {isGrid ? (
+        <div className="partner-upload-grid">
+          {urls.map((url, index) => thumb(url, index))}
+          {remaining > 0 && !disabled ? (
+            <button
+              type="button"
+              className="partner-upload-dashed partner-upload-dashed--compact"
+              disabled={uploading}
+              onClick={openPicker}
+              aria-label={uploading ? '上传中' : `添加${unit}（${urls.length}/${maxCount}）`}
+            >
+              <span className="material-symbols-outlined text-primary" style={{ fontSize: 28 }}>
+                {uploading ? 'hourglass_top' : 'add'}
+              </span>
+            </button>
+          ) : null}
        </div>
-      ) : null}
-
-      <button
-        type="button"
-        className="partner-upload-dashed partner-upload-dashed--compact"
-        disabled={disabled || uploading || remaining <= 0}
-        onClick={() => {
-          if (inWechat) void pickWechat();
-          else inputRef.current?.click();
-        }}
-      >
-        <span className="material-symbols-outlined text-primary" style={{ fontSize: 28 }}>
-          {uploading ? 'hourglass_top' : 'add_a_photo'}
-        </span>
-        <span className="text-primary" style={{ fontWeight: 500 }}>
-          {uploading
-            ? '上传中…'
-            : remaining <= 0
-              ? `已达上限 ${maxCount}${unit}`
-              : label ?? `批量上传（${urls.length}/${maxCount}）`}
-        </span>
-      </button>
+      ) : (
+        <>
+          {urls.length > 0 ? (
+            <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginBottom: 8 }}>
+              {urls.map((url, index) => thumb(url, index))}
+            </div>
+          ) : null}
+          <button
+            type="button"
+            className="partner-upload-dashed partner-upload-dashed--compact"
+            disabled={disabled || uploading || remaining <= 0}
+            onClick={openPicker}
+          >
+            <span className="material-symbols-outlined text-primary" style={{ fontSize: 28 }}>
+              {uploading ? 'hourglass_top' : 'add_a_photo'}
+            </span>
+            <span className="text-primary" style={{ fontWeight: 500 }}>
+              {uploading
+                ? '上传中…'
+                : remaining <= 0
+                  ? `已达上限 ${maxCount}${unit}`
+                  : label ?? `批量上传（${urls.length}/${maxCount}）`}
+            </span>
+          </button>
+        </>
+      )}
      {error ? (
        <p className="partner-form-error" role="alert">
          {error}
@@ -58,6 +58,7 @@ 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);
@@ -156,9 +157,37 @@ export default function ProxyOrderPage() {
  ]);

  const selectedProduct = options?.products.find((p) => p.id === productId);
-  const allowOnline = selectedProduct ? selectedProduct.allowOnlinePurchase !== false : true;
-  const allowOnSite = !!selectedProduct?.allowOnSitePickup;
-  const allowCrossCity = selectedProduct ? selectedProduct.allowCrossCityDelivery !== false : true;
+  const skuOptions = (selectedProduct?.skus ?? []).filter((s) => s.status === 'ON_SALE');
+  const selectedSku =
+    skuOptions.find((s) => s.id === skuId) ||
+    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;
@@ -184,6 +213,7 @@ export default function ProxyOrderPage() {
          productId,
          quantity,
          deliveryMode,
+          skuId: skuId || undefined,
          receiverCity: deliveryMode === 'ADDRESS' ? region?.city || undefined : undefined,
          receiverDistrict: deliveryMode === 'ADDRESS' ? region?.district || undefined : undefined,
        }),
@@ -200,7 +230,7 @@ export default function ProxyOrderPage() {
        .finally(() => setPreviewLoading(false));
    }, 300);
    return () => clearTimeout(timer);
-  }, [productId, quantity, deliveryMode, region?.city, region?.district]);
+  }, [productId, skuId, quantity, deliveryMode, region?.city, region?.district]);

  function validateForm(): string | null {
    if (!/^1\d{10}$/.test(phone.trim())) return '请输入有效手机号';
@@ -359,6 +389,7 @@ export default function ProxyOrderPage() {
      productId,
      quantity,
      promoCodeId: promoCodeId || undefined,
+      skuId: skuId || undefined,
    };

    setSubmitting(true);
@@ -524,8 +555,35 @@ 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>
+              <label className="partner-form-label">
+                {selectedSku?.saleUnit === 'BOX' ? '数量（箱）' : '数量（瓶）'}
+              </label>
              <div className="partner-input-wrap">
                <input
                  className="partner-input"
@@ -1007,9 +1007,9 @@ export default function StoreCreatePage() {
            <MultiOssUploadField
              bizType="STORE_ENV"
              maxCount={20}
+              variant="grid"
              value={form.envPhotoUrls.map((u) => u.trim()).filter(Boolean)}
              onChange={(urls) => setForm((prev) => ({ ...prev, envPhotoUrls: urls.length ? urls : [''] }))}
-              label={`批量上传（${form.envPhotoUrls.map((u) => u.trim()).filter(Boolean).length}/20）`}
            />
          </section>

@@ -56,7 +56,6 @@ export default function StoreDetailPage() {
  const [status, setStatus] = useState<StoreStatusValue>('OPEN');
  const [statusSaving, setStatusSaving] = useState(false);
  const [saving, setSaving] = useState(false);
-  const [mediaSaving, setMediaSaving] = useState(false);
  const [mapPickerOpen, setMapPickerOpen] = useState(false);
  const [actionError, setActionError] = useState('');
  const [closeConfirmOpen, setCloseConfirmOpen] = useState(false);
@@ -159,32 +158,133 @@ export default function StoreDetailPage() {
    }
  }

-  async function saveBasic() {
+  function mediaChanged(): boolean {
+    if (!store) return false;
+    const nextCover = coverUrl.trim();
+    const origCover = String(store.coverUrl || '').trim();
+    if (nextCover !== origCover) return true;
+    const nextEnv = uniqueEnvUrls(envPhotoUrls);
+    const origEnv = uniqueEnvUrls(
+      Array.isArray(store.media)
+        ? (store.media as Array<{ url?: string; bizType?: string }>)
+            .filter((m) => m.bizType === 'ENV')
+            .map((m) => String(m.url || ''))
+        : [],
+    );
+    if (nextEnv.length !== origEnv.length) return true;
+    return nextEnv.some((u, i) => u !== origEnv[i]);
+  }
+
+  function basicChanged(): boolean {
+    if (!store) return false;
+    const liveContact = String(store.contactPhone || store.phone || '').trim();
+    const liveIntro = String(store.intro || '').trim();
+    const liveRuleRaw = String(store.benefitUsageRule || '').trim();
+    const liveRule = liveRuleRaw && !/^null$/i.test(liveRuleRaw) ? liveRuleRaw : '';
+    const liveLat =
+      store.latitude != null && store.latitude !== '' ? String(store.latitude) : '';
+    const liveLng =
+      store.longitude != null && store.longitude !== '' ? String(store.longitude) : '';
+    return (
+      form.name.trim() !== String(store.name || '').trim() ||
+      form.contactPhone.trim() !== liveContact ||
+      form.address.trim() !== String(store.address || '').trim() ||
+      form.intro.trim() !== liveIntro ||
+      form.benefitUsageRule.trim() !== liveRule ||
+      form.latitude.trim() !== liveLat ||
+      form.longitude.trim() !== liveLng
+    );
+  }
+
+  async function saveChanges() {
    if (!id || saving || status === 'CLOSED') return;
    const auditStatus = String(store?.auditStatus || 'APPROVED').toUpperCase();
    if (auditStatus === 'PENDING') {
      setActionError('门店审核中，暂不可修改资料');
      return;
    }
+
+    const wantMedia = mediaChanged();
+    const wantBasic = basicChanged();
+    if (!wantMedia && !wantBasic) {
+      setActionError('没有检测到需要变更的字段');
+      return;
+    }
+
+    const nextCover = coverUrl.trim();
+    const nextEnv = uniqueEnvUrls(envPhotoUrls);
+    if (wantMedia) {
+      if (!nextCover) {
+        setActionError('请上传门头照');
+        return;
+      }
+      if (nextEnv.length < MIN_ENV_PHOTO_COUNT) {
+        setActionError(`请上传至少 ${MIN_ENV_PHOTO_COUNT} 张环境照片`);
+        return;
+      }
+    }
+
    setSaving(true);
    setActionError('');
    try {
-      // v3.5.1 #5：基本信息变更走「提交变更」审核流，由总部审核通过后覆盖门店
-      await submitStoreInfoChangeRequest(id, {
-        name: form.name.trim(),
-        contactPhone: form.contactPhone.trim(),
-        address: form.address.trim(),
-        intro: form.intro.trim(),
-        benefitUsageRule: form.benefitUsageRule.trim() || null,
-        ...(form.latitude.trim() && form.longitude.trim()
-          ? {
-              latitude: Number(form.latitude),
-              longitude: Number(form.longitude),
-            }
-          : {}),
-      });
+      // 入驻被驳回：直写 media/basic 并重提门店审核；已通过门店：统一走信息变更审核
+      if (auditStatus === 'REJECTED') {
+        if (wantMedia) {
+          const data = await request<Record<string, unknown>>('PARTNER_H5', `/partner/stores/${id}/media`, {
+            method: 'PUT',
+            body: JSON.stringify({
+              coverUrl: nextCover,
+              envPhotoUrls: nextEnv,
+            }),
+          });
+          applyStore(data);
+        }
+        if (wantBasic) {
+          const data = await request<Record<string, unknown>>('PARTNER_H5', `/partner/stores/${id}/basic`, {
+            method: 'PUT',
+            body: JSON.stringify({
+              name: form.name.trim(),
+              contactPhone: form.contactPhone.trim(),
+              address: form.address.trim(),
+              intro: form.intro.trim(),
+              benefitUsageRule: form.benefitUsageRule.trim() || null,
+              ...(form.latitude.trim() && form.longitude.trim()
+                ? {
+                    latitude: Number(form.latitude),
+                    longitude: Number(form.longitude),
+                  }
+                : {}),
+            }),
+          });
+          applyStore(data);
+        }
+        toastSuccess('已重新提交审核');
+        return;
+      }
+
+      const fields: Record<string, unknown> = {};
+      if (wantBasic) {
+        fields.name = form.name.trim();
+        fields.contactPhone = form.contactPhone.trim();
+        fields.address = form.address.trim();
+        fields.intro = form.intro.trim();
+        fields.benefitUsageRule = form.benefitUsageRule.trim() || null;
+        if (form.latitude.trim() && form.longitude.trim()) {
+          fields.latitude = Number(form.latitude);
+          fields.longitude = Number(form.longitude);
+        }
+      }
+      if (wantMedia) {
+        fields.coverUrl = nextCover;
+        fields.envPhotoUrls = nextEnv;
+      }
+      await submitStoreInfoChangeRequest(id, fields);
      setPendingInfoChange(true);
-      toastSuccess('变更已提交，等待总部审核');
+      toastSuccess(
+        wantMedia
+          ? '变更已提交（含门头照/环境图），总部审核通过后生效'
+          : '变更已提交，等待总部审核',
+      );
    } catch (e) {
      setActionError(e instanceof Error ? e.message : '提交失败');
    } finally {
@@ -192,42 +292,6 @@ export default function StoreDetailPage() {
    }
  }

-  async function saveMedia() {
-    if (!id || mediaSaving || status === 'CLOSED') return;
-    const auditStatus = String(store?.auditStatus || 'APPROVED').toUpperCase();
-    if (auditStatus === 'PENDING') {
-      setActionError('门店审核中，暂不可修改资料');
-      return;
-    }
-    const nextCover = coverUrl.trim();
-    const nextEnv = uniqueEnvUrls(envPhotoUrls);
-    if (!nextCover) {
-      setActionError('请上传门头照');
-      return;
-    }
-    if (nextEnv.length < MIN_ENV_PHOTO_COUNT) {
-      setActionError(`请上传至少 ${MIN_ENV_PHOTO_COUNT} 张环境照片`);
-      return;
-    }
-    setMediaSaving(true);
-    setActionError('');
-    try {
-      const data = await request<Record<string, unknown>>('PARTNER_H5', `/partner/stores/${id}/media`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          coverUrl: nextCover,
-          envPhotoUrls: nextEnv,
-        }),
-      });
-      applyStore(data);
-      toastSuccess(auditStatus === 'REJECTED' ? '照片已更新并重新提交审核' : '照片已更新');
-    } catch (e) {
-      setActionError(e instanceof Error ? e.message : '照片更新失败');
-    } finally {
-      setMediaSaving(false);
-    }
-  }
-
  if (loadError) {
    return (
      <div className="partner-detail-page partner-home--flush-top">
@@ -445,27 +509,13 @@ export default function StoreDetailPage() {
            </span>
          </div>
          {canMutate && !readOnly ? (
-            <>
-              <MultiOssUploadField
-                bizType="STORE_ENV"
-                maxCount={20}
-                value={uniqueEnvUrls(envPhotoUrls)}
-                onChange={(urls) => setEnvPhotoUrls(urls.length ? urls : [''])}
-                label={`批量上传环境照（${uniqueEnvUrls(envPhotoUrls).length}/20）`}
-              />
-              <button
-                type="button"
-                className="partner-btn-outline"
-                style={{ width: '100%', marginTop: 16 }}
-                disabled={mediaSaving}
-                onClick={() => void saveMedia()}
-              >
-                <span className="material-symbols-outlined" style={{ fontSize: 18, verticalAlign: 'middle', marginRight: 4 }}>
-                  upload
-                </span>
-                {mediaSaving ? '上传中…' : '重新上传照片'}
-              </button>
-            </>
+            <MultiOssUploadField
+              bizType="STORE_ENV"
+              maxCount={20}
+              variant="grid"
+              value={uniqueEnvUrls(envPhotoUrls)}
+              onChange={(urls) => setEnvPhotoUrls(urls.length ? urls : [''])}
+            />
          ) : envPhotos.length > 0 ? (
            <div className="partner-photo-grid">
              {envPhotos.map((url, index) => (
@@ -495,7 +545,7 @@ export default function StoreDetailPage() {
      <footer className="partner-save-footer">
        <button type="button" className="partner-save-cancel" onClick={() => navigate('/stores')}>返回</button>
        {canMutate && (
-        <button type="button" className="partner-save-submit" onClick={() => void saveBasic()} disabled={readOnly || saving}>
+        <button type="button" className="partner-save-submit" onClick={() => void saveChanges()} disabled={readOnly || saving}>
          <span className="material-symbols-outlined">send</span>
          {saving ? '提交中…' : '提交变更'}
        </button>
@@ -1622,10 +1622,19 @@ nav.app-tabbar .app-tabbar-label {
  gap: 8px;
 }

+.partner-upload-grid-thumb {
+  position: relative;
+  aspect-ratio: 1;
+  width: 100%;
+  border-radius: 12px;
+  overflow: hidden;
+}
+
 .partner-upload-grid .partner-upload-dashed {
  aspect-ratio: 1;
  padding: 12px;
  font-size: 10px;
+  width: 100%;
 }

 .partner-upload-dashed--compact {
@@ -1,6 +1,7 @@
 import { useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { request } from '../lib/api';
+import { toastError, toastSuccess } from '../lib/toast';
 import { uploadRedeemPendingPhoto } from '../lib/upload';
 import { isWechatEnv, weixinSdk } from '../lib/weixin';
 import type { RedeemPendingSubmitResult } from '@dukang/shared-types';
@@ -18,25 +19,22 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
  const [previewUrl, setPreviewUrl] = useState('');
  const [photoResourceId, setPhotoResourceId] = useState('');
  const [result, setResult] = useState<RedeemPendingSubmitResult | null>(null);
-  const [msg, setMsg] = useState('');
  const [showAlbumFallback, setShowAlbumFallback] = useState(false);

  async function handleFile(file: File) {
    setUploading(true);
-    setMsg('');
    try {
      const registered = await uploadRedeemPendingPhoto(file);
      setPhotoResourceId(registered.id);
      setPreviewUrl(registered.url);
    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '上传失败');
+      toastError(e instanceof Error ? e.message : '上传失败');
    } finally {
      setUploading(false);
    }
  }

  async function pickPhoto() {
-    setMsg('');
    if (isWechatEnv()) {
      try {
        setUploading(true);
@@ -51,7 +49,7 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
      } catch (e) {
        const text = e instanceof Error ? e.message : '选图失败';
        if (!/cancel/i.test(text)) {
-          setMsg(`${text}，可改从系统相册选择`);
+          toastError(`${text}，可改从系统相册选择`);
          setShowAlbumFallback(true);
          inputRef.current?.click();
        }
@@ -65,11 +63,10 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)

  async function submitPending() {
    if (!photoResourceId) {
-      setMsg('请先拍摄或上传核销码照片');
+      toastError('请先拍摄或上传核销码照片');
      return;
    }
    setSubmitting(true);
-    setMsg('');
    try {
      const res = await request<RedeemPendingSubmitResult>('SHOP_H5', '/shop/redeem/pending', {
        method: 'POST',
@@ -81,7 +78,7 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
      });
      setResult(res);
    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '提交失败');
+      toastError(e instanceof Error ? e.message : '提交失败');
    } finally {
      setSubmitting(false);
    }
@@ -89,8 +86,8 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)

  function copyText(text: string) {
    void navigator.clipboard?.writeText(text).then(
-      () => setMsg('已复制'),
-      () => setMsg('复制失败，请手动长按复制'),
+      () => toastSuccess('已复制'),
+      () => toastError('复制失败，请手动长按复制'),
    );
  }

@@ -169,8 +166,6 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
          </div>
        </>
      )}
-
-      {msg && <p className="shop-redeem-error" style={{ marginTop: 12 }}>{msg}</p>}
    </section>
  );
 }
@@ -0,0 +1,53 @@
+import { createContext, useCallback, useContext, useEffect, useRef, useState, type ReactNode } from 'react';
+import { registerShopToastListener, type ShopToastVariant } from '../lib/toast';
+
+type ShopToastContextValue = {
+  showToast: (message: string, variant?: ShopToastVariant) => void;
+};
+
+const ShopToastContext = createContext<ShopToastContextValue | null>(null);
+
+export function ShopToastProvider({ children }: { children: ReactNode }) {
+  const [toast, setToast] = useState('');
+  const [variant, setVariant] = useState<ShopToastVariant>('error');
+  const timerRef = useRef<number | null>(null);
+
+  const showToast = useCallback((message: string, nextVariant: ShopToastVariant = 'error') => {
+    if (timerRef.current) window.clearTimeout(timerRef.current);
+    setVariant(nextVariant);
+    setToast(message);
+    timerRef.current = window.setTimeout(() => {
+      setToast('');
+      timerRef.current = null;
+    }, nextVariant === 'error' ? 2800 : 2000);
+  }, []);
+
+  useEffect(() => {
+    registerShopToastListener(showToast);
+    return () => {
+      registerShopToastListener(null);
+      if (timerRef.current) window.clearTimeout(timerRef.current);
+    };
+  }, [showToast]);
+
+  return (
+    <ShopToastContext.Provider value={{ showToast }}>
+      {children}
+      {toast ? (
+        <div
+          className={`shop-float-toast${variant === 'error' ? ' shop-float-toast--error' : ''}`}
+          role="alert"
+          aria-live="assertive"
+        >
+          {toast}
+        </div>
+      ) : null}
+    </ShopToastContext.Provider>
+  );
+}
+
+export function useShopToast(): ShopToastContextValue {
+  const ctx = useContext(ShopToastContext);
+  if (!ctx) throw new Error('useShopToast 必须在 ShopToastProvider 内使用');
+  return ctx;
+}
@@ -0,0 +1,27 @@
+/** 把接口里的金额（number / 数字字符串 / Prisma Decimal 残影）转成有限数字 */
+export function toMoneyNumber(value: unknown): number {
+  if (typeof value === 'number') return Number.isFinite(value) ? value : 0;
+  if (typeof value === 'string' && value.trim()) {
+    const n = Number(value);
+    return Number.isFinite(n) ? n : 0;
+  }
+  if (value && typeof value === 'object') {
+    const o = value as { toNumber?: () => number; toString?: () => string; d?: unknown };
+    if (typeof o.toNumber === 'function') {
+      const n = Number(o.toNumber());
+      if (Number.isFinite(n)) return n;
+    }
+    if (typeof o.toString === 'function' && o.toString !== Object.prototype.toString) {
+      const n = Number(o.toString());
+      if (Number.isFinite(n)) return n;
+    }
+  }
+  return 0;
+}
+
+export function formatMoney(n: number) {
+  return toMoneyNumber(n).toLocaleString('zh-CN', {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  });
+}
@@ -0,0 +1,23 @@
+export type ShopToastVariant = 'success' | 'error';
+
+type ShopToastListener = (message: string, variant: ShopToastVariant) => void;
+
+let listener: ShopToastListener | null = null;
+
+export function registerShopToastListener(fn: ShopToastListener | null) {
+  listener = fn;
+}
+
+export function showShopToast(message: string, variant: ShopToastVariant = 'error') {
+  const text = message.trim();
+  if (!text || !listener) return;
+  listener(text, variant);
+}
+
+export function toastError(message: string) {
+  showShopToast(message, 'error');
+}
+
+export function toastSuccess(message: string) {
+  showShopToast(message, 'success');
+}
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { getRouterBasename } from '@dukang/weixin-sdk';
 import { StoreSessionProvider } from './contexts/StoreSessionContext';
+import { ShopToastProvider } from './contexts/ShopToastContext';
 import { installClientErrorReporting } from '@dukang/client-logging';
 import App from './App';
 import { apiBase } from './lib/api';
@@ -19,7 +20,9 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
  <React.StrictMode>
    <BrowserRouter basename={getRouterBasename()}>
      <StoreSessionProvider>
-        <App />
+        <ShopToastProvider>
+          <App />
+        </ShopToastProvider>
      </StoreSessionProvider>
    </BrowserRouter>
  </React.StrictMode>,
@@ -9,6 +9,7 @@ import { isIosDevice, isScanPermissionWarmupError } from '@dukang/weixin-sdk';
 import { useStoreSession } from '../contexts/StoreSessionContext';

 import { request } from '../lib/api';
+import { formatMoney, toMoneyNumber } from '../lib/money';

 import { parseRedeemTokenFromScan } from '../lib/redeem-scan';

@@ -46,14 +47,6 @@ import { trackStore } from '../lib/analytics';



-function formatMoney(n: number) {
-
-  return n.toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
-
-}
-
-
-
 function formatScanError(e: unknown, opts?: { afterAuth?: boolean }): string {

  const msg = e instanceof Error ? e.message : '扫码失败，请重试';
@@ -476,7 +469,7 @@ export default function HomePage() {

                <span style={{ fontSize: 18 }}>¥</span>

-                {formatMoney(Number(dash?.todayAmount || 0))}
+                {formatMoney(toMoneyNumber(dash?.todayAmount))}

              </p>

@@ -596,7 +589,7 @@ export default function HomePage() {

                </div>

-                <p className="shop-home-record-amount">¥{formatMoney(Number(r.amount))}</p>
+                <p className="shop-home-record-amount">¥{formatMoney(toMoneyNumber(r.amount))}</p>

              </div>

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import type { RedeemPhoneDirectPrepareResult } from '@dukang/shared-types';
 import { request } from '../lib/api';
+import { toastError, toastSuccess } from '../lib/toast';
 import { useStorePageView } from '../lib/usePageView';

 function formatAmount(n: number) {
@@ -17,7 +18,6 @@ export default function PhoneRedeemPage() {
  const [prepared, setPrepared] = useState<RedeemPhoneDirectPrepareResult | null>(null);
  const [storeName, setStoreName] = useState('');
  const [storeClosed, setStoreClosed] = useState(false);
-  const [msg, setMsg] = useState('');
  const [loading, setLoading] = useState(false);
  const [confirmCooldown, setConfirmCooldown] = useState(0);
  const [showOpenModal, setShowOpenModal] = useState(false);
@@ -41,11 +41,10 @@ export default function PhoneRedeemPage() {
  async function prepareDirectRedeem() {
    const value = Number(amount);
    if (!Number.isFinite(value) || value <= 0) {
-      setMsg('请输入有效核销金额');
+      toastError('请输入有效核销金额');
      return;
    }
    setLoading(true);
-    setMsg('');
    try {
      const result = await request<RedeemPhoneDirectPrepareResult>('SHOP_H5', '/shop/redeem/phone/prepare-direct', {
        method: 'POST',
@@ -54,10 +53,10 @@ export default function PhoneRedeemPage() {
      setPrepared(result);
      setConfirmCode('');
      setConfirmCooldown(60);
-      setMsg(`验证码已发送至 ${result.maskedPhone}，验证成功后将直接核销`);
+      toastSuccess(`验证码已发送至 ${result.maskedPhone}，验证成功后将直接核销`);
    } catch (e) {
      setPrepared(null);
-      setMsg(e instanceof Error ? e.message : '发送验证码失败');
+      toastError(e instanceof Error ? e.message : '发送验证码失败');
    } finally {
      setLoading(false);
    }
@@ -65,7 +64,7 @@ export default function PhoneRedeemPage() {

  async function sendConfirmSms() {
    if (!/^1\d{10}$/.test(phone.trim())) {
-      setMsg('请输入正确的手机号');
+      toastError('请输入正确的手机号');
      return;
    }
    if (storeClosed) {
@@ -88,7 +87,7 @@ export default function PhoneRedeemPage() {
      await prepareDirectRedeem();
    } catch (e) {
      setShowOpenModal(false);
-      setMsg(e instanceof Error ? e.message : '开启营业失败');
+      toastError(e instanceof Error ? e.message : '开启营业失败');
    } finally {
      setOpening(false);
    }
@@ -96,15 +95,14 @@ export default function PhoneRedeemPage() {

  async function confirmRedeem() {
    if (!prepared) {
-      setMsg('请先发送核销验证码');
+      toastError('请先发送核销验证码');
      return;
    }
    if (!confirmCode.trim()) {
-      setMsg('请输入确认验证码');
+      toastError('请输入确认验证码');
      return;
    }
    setLoading(true);
-    setMsg('');
    try {
      const result = await request<Record<string, unknown>>('SHOP_H5', '/shop/redeem/phone/confirm', {
        method: 'POST',
@@ -118,7 +116,7 @@ export default function PhoneRedeemPage() {
        state: { result, storeName, user: prepared.user },
      });
    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '核销失败');
+      toastError(e instanceof Error ? e.message : '核销失败');
    } finally {
      setLoading(false);
    }
@@ -225,8 +223,6 @@ export default function PhoneRedeemPage() {
            >
              {loading ? '正在核销…' : `确认核销 ¥${formatAmount(amountValue || 0)}`}
            </button>
-
-            {msg && <p className="shop-redeem-error">{msg}</p>}
          </div>
        </section>
      </main>
@@ -2,15 +2,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { REDEEM_CHANNEL_LABELS, type RedeemChannel, type RedeemStatsDto } from '@dukang/shared-types';
 import { request } from '../lib/api';
+import { formatMoney, toMoneyNumber } from '../lib/money';
 import { useStorePageView } from '../lib/usePageView';

 type RangeKey = 'today' | '7d' | '30d';
 type StatusFilter = 'all' | 'pending' | 'paid';

-function formatMoney(n: number) {
-  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-}
-
 function inRange(dateStr: string, range: RangeKey) {
  const d = new Date(dateStr);
  const now = new Date();
@@ -85,8 +82,8 @@ export default function RecordsPage() {
  }, [records, range, statusFilter]);

  const summary = useMemo(() => {
-    const totalAmount = filtered.reduce((s, r) => s + Number(r.amount || 0), 0);
-    const totalSettle = filtered.reduce((s, r) => s + Number(r.settleAmount || 0), 0);
+    const totalAmount = filtered.reduce((s, r) => s + toMoneyNumber(r.amount), 0);
+    const totalSettle = filtered.reduce((s, r) => s + toMoneyNumber(r.settleAmount), 0);
    const rate = totalAmount > 0 ? Math.round((totalSettle / totalAmount) * 100) : 60;
    return { totalAmount, totalSettle, rate };
  }, [filtered]);
@@ -181,8 +178,8 @@ export default function RecordsPage() {
        ) : (
          <div className="shop-records-list">
            {filtered.map((r) => {
-              const amount = Number(r.amount || 0);
-              const settle = Number(r.settleAmount || 0);
+              const amount = toMoneyNumber(r.amount);
+              const settle = toMoneyNumber(r.settleAmount);
              const payout = r.payout as { paidAt?: string | null; status?: string } | undefined;
              const paid = Boolean(payout?.paidAt) || payout?.status === 'PAID' || Boolean(r.paidAt);
              const paidAt = payout?.paidAt || (typeof r.paidAt === 'string' ? r.paidAt : null);
@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import WeakNetFallbackPanel from '../components/WeakNetFallbackPanel';
 import { request } from '../lib/api';
 import { reportRedeemFailure } from '../lib/redeem-failure';
+import { toastError } from '../lib/toast';
 import { useStorePageView } from '../lib/usePageView';

 function formatAmount(n: number) {
@@ -22,7 +23,6 @@ export default function RedeemConfirmPage() {
  const navigate = useNavigate();
  const [searchParams] = useSearchParams();
  const [token, setToken] = useState('');
-  const [msg, setMsg] = useState('');
  const [loading, setLoading] = useState(false);
  const [storeName, setStoreName] = useState('');
  const [preview, setPreview] = useState<Preview | null>(null);
@@ -61,10 +61,9 @@ export default function RedeemConfirmPage() {
        body: JSON.stringify({ token }),
      });
      setPreview(p);
-      setMsg('');
    } catch (e) {
      setPreview(null);
-      setMsg(e instanceof Error ? e.message : '无法预览核销码');
+      toastError(e instanceof Error ? e.message : '无法预览核销码');
      const report = await reportRedeemFailure(token, 'preview', e);
      if (report?.thresholdReached) {
        setFailCount(report.failCount);
@@ -82,11 +81,10 @@ export default function RedeemConfirmPage() {

  async function doConfirm() {
    if (!token.trim()) {
-      setMsg('请先扫码获取核销码');
+      toastError('请先扫码获取核销码');
      return;
    }
    setLoading(true);
-    setMsg('');
    try {
      const result = await request<Record<string, unknown>>('SHOP_H5', '/shop/redeem/confirm', {
        method: 'POST',
@@ -95,7 +93,7 @@ export default function RedeemConfirmPage() {
      sessionStorage.setItem('lastRedeemResult', JSON.stringify(result));
      navigate('/redeem/success', { state: { result, storeName, user: preview?.user } });
    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '核销失败');
+      toastError(e instanceof Error ? e.message : '核销失败');
      const report = await reportRedeemFailure(token, 'confirm', e);
      if (report?.thresholdReached) {
        setFailCount(report.failCount);
@@ -126,13 +124,12 @@ export default function RedeemConfirmPage() {
      });
      setStoreClosed(false);
      setShowOpenModal(false);
-      setMsg('');
      // 开张后重新拉取预览（门店已 OPEN，后端不再拦截），再继续核销
      await loadPreview();
      await doConfirm();
    } catch (e) {
      setShowOpenModal(false);
-      setMsg(e instanceof Error ? e.message : '开启营业失败');
+      toastError(e instanceof Error ? e.message : '开启营业失败');
    } finally {
      setOpening(false);
    }
@@ -217,8 +214,6 @@ export default function RedeemConfirmPage() {
              )}
            </div>

-            {msg && <p className="shop-redeem-error">{msg}</p>}
-
            {!showWeakNet && (
              <>
                <button
@@ -1,10 +1,7 @@
 import { useEffect, useMemo } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { notifyRedeemSuccess } from '../lib/useRedeemSuccessBus';
-
-function formatAmount(n: number) {
-  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-}
+import { formatMoney, toMoneyNumber } from '../lib/money';

 export default function RedeemSuccessPage() {
  const navigate = useNavigate();
@@ -24,7 +21,7 @@ export default function RedeemSuccessPage() {
  const storeName = (location.state as { storeName?: string })?.storeName || '当前门店';
  const user = (location.state as { user?: { nickname?: string; phone?: string; userNo?: string } })?.user;
  const userLabel = user?.nickname || user?.phone || '—';
-  const amount = Number(result?.amount ?? 0);
+  const amount = toMoneyNumber(result?.amount);
  const redeemNo = String(result?.redeemNo || '—');
  const createdAt = result?.createdAt
    ? new Date(String(result.createdAt)).toLocaleString('zh-CN')
@@ -52,7 +49,7 @@ export default function RedeemSuccessPage() {
          <span className="material-symbols-outlined">check_circle</span>
        </div>
        <h2 className="shop-success-title">核销成功</h2>
-        <p className="shop-success-amount">¥ {formatAmount(amount)}</p>
+        <p className="shop-success-amount">¥ {formatMoney(amount)}</p>
        <p className="shop-success-sub">已入账到余额</p>
        <p className="shop-success-note">核销成功，账单通知已发送至老板手机</p>
      </section>
@@ -8,15 +8,12 @@ import {
 } from '@dukang/shared-types';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { request } from '../lib/api';
+import { formatMoney, toMoneyNumber } from '../lib/money';
 import { useStorePageView } from '../lib/usePageView';
 import { useRedeemSuccessListener } from '../lib/useRedeemSuccessBus';

 type StatusFilter = 'all' | StoreWithdrawStatus;

-function formatMoney(n: number) {
-  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-}
-
 export default function WithdrawPage() {
  useStorePageView('store_withdraw_view');
  const navigate = useNavigate();
@@ -113,13 +110,13 @@ export default function WithdrawPage() {
            <div>
              <p className="shop-records-summary-label">可提未出账余额</p>
              <p className="shop-records-summary-value">
-                ¥ {formatMoney(summary?.availableAmount ?? 0)}
+                ¥ {formatMoney(toMoneyNumber(summary?.availableAmount))}
              </p>
            </div>
            <div>
              <p className="shop-records-summary-label">今日剩余额度</p>
              <p className="shop-records-summary-value">
-                ¥ {formatMoney(summary?.remainingDailyLimit ?? 0)}
+                ¥ {formatMoney(toMoneyNumber(summary?.remainingDailyLimit))}
              </p>
            </div>
          </div>
@@ -209,7 +206,7 @@ export default function WithdrawPage() {
                  <div className="shop-record-amounts">
                    <div>
                      <p className="shop-record-amount-label">提现金额</p>
-                      <p className="shop-record-amount-value red">¥{formatMoney(Number(r.amount))}</p>
+                      <p className="shop-record-amount-value red">¥{formatMoney(toMoneyNumber(r.amount))}</p>
                    </div>
                    <div>
                      <p className="shop-record-amount-label">明细笔数</p>
@@ -3190,3 +3190,26 @@ header:has(> .app-page-title:only-child),
  box-shadow: none !important;
 }

+.shop-float-toast {
+  position: fixed;
+  top: 28%;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 10020;
+  max-width: min(320px, calc(100vw - 40px));
+  padding: 12px 20px;
+  border-radius: 10px;
+  background: rgba(0, 0, 0, 0.78);
+  color: #fff;
+  font-size: 15px;
+  line-height: 1.5;
+  text-align: center;
+  pointer-events: none;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.18);
+}
+
+.shop-float-toast--error {
+  background: rgba(166, 29, 36, 0.92);
+}
+
+
@@ -1,6 +1,6 @@
 {
  "name": "@dukang/mini-user",
-  "version": "3.4.15",
+  "version": "3.5.4",
  "private": true,
  "description": "杜康好客 · C 端用户微信小程序（Taro）",
  "scripts": {
@@ -54,3 +54,71 @@ body::-webkit-scrollbar,
  padding-bottom: 0 !important;
  bottom: 0 !important;
 }
+
+.benefit-figure {
+  display: inline-flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 4px;
+  line-height: 1;
+  vertical-align: middle;
+}
+
+.benefit-figure-prefix,
+.benefit-figure-value {
+  line-height: 1;
+  font-family: inherit;
+  font-size: inherit;
+  font-weight: inherit;
+  color: inherit;
+}
+
+.benefit-figure-icon {
+  display: block;
+  flex-shrink: 0;
+}
+
+.benefit-figure--sm {
+  gap: 2px;
+}
+
+.benefit-figure--sm .benefit-figure-icon {
+  width: 12px;
+  height: 12px;
+}
+
+.benefit-figure--md .benefit-figure-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.benefit-figure--lg .benefit-figure-icon {
+  width: 20px;
+  height: 20px;
+}
+
+.benefit-figure--xl {
+  gap: 6px;
+}
+
+.benefit-figure--xl .benefit-figure-icon {
+  width: 28px;
+  height: 28px;
+}
+
+.mu-float-toast {
+  position: fixed;
+  top: 28%;
+  left: 10%;
+  right: 10%;
+  z-index: 10020;
+  padding: 12px 20px;
+  border-radius: 10px;
+  background: rgba(0, 0, 0, 0.78);
+  color: #fff;
+  font-size: 15px;
+  line-height: 1.5;
+  text-align: center;
+  pointer-events: none;
+  box-sizing: border-box;
+}
@@ -0,0 +1,27 @@
+import { Image, Text, View } from '@tarojs/components';
+import iconStoreBenefit from '../assets/icons/store-benefit.png';
+
+type BenefitFigureSize = 'sm' | 'md' | 'lg' | 'xl';
+
+type BenefitFigureProps = {
+  value: string;
+  size?: BenefitFigureSize;
+  prefix?: string;
+  className?: string;
+};
+
+/** 好客权益金额：门店核销图标 + 数字，替代人民币符号 */
+export default function BenefitFigure({
+  value,
+  size = 'md',
+  prefix = '',
+  className = '',
+}: BenefitFigureProps) {
+  return (
+    <View className={`benefit-figure benefit-figure--${size} ${className}`.trim()}>
+      {prefix ? <Text className="benefit-figure-prefix">{prefix}</Text> : null}
+      <Image className="benefit-figure-icon" src={iconStoreBenefit} mode="aspectFit" />
+      <Text className="benefit-figure-value">{value}</Text>
+    </View>
+  );
+}
@@ -1,17 +1,20 @@
-import { Text } from '@tarojs/components';
+import { Text, View } from '@tarojs/components';

 type CouponBadgeProps = {
  amount: number | string;
  label?: string;
 };

-/** Taro 友好版权益角标（对齐 shared-ui CouponBadge） */
+/** 首页商品角标：纯文案「享{amount}好客权益」（无门店图标） */
 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 (
-    <Text className="coupon-badge">
-      享 ¥{display} {label}
-    </Text>
+    <View className="coupon-badge">
+      <Text>
+        享{display}
+        {label}
+      </Text>
+    </View>
  );
 }
@@ -0,0 +1,32 @@
+import { useEffect, useRef, useState } from 'react';
+import { CoverView, View } from '@tarojs/components';
+import { registerFloatingToastListener } from '../lib/floating-toast';
+
+const TOAST_MS = 2600;
+
+export default function FloatingToastHost() {
+  const [text, setText] = useState('');
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  useEffect(() => {
+    return registerFloatingToastListener((message) => {
+      if (timerRef.current) clearTimeout(timerRef.current);
+      setText(message);
+      timerRef.current = setTimeout(() => {
+        setText('');
+        timerRef.current = null;
+      }, TOAST_MS);
+    });
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      if (timerRef.current) clearTimeout(timerRef.current);
+    };
+  }, []);
+
+  if (!text) return null;
+
+  const Box = process.env.TARO_ENV === 'weapp' ? CoverView : View;
+  return <Box className="mu-float-toast">{text}</Box>;
+}
@@ -1,5 +1,6 @@
 import type { PropsWithChildren, ReactNode } from 'react';
 import { View } from '@tarojs/components';
+import FloatingToastHost from './FloatingToastHost';
 import { pageShellCssVars, useNavBarMetrics } from '../lib/nav-bar';

 type PageShellVariant = 'tab' | 'scroll' | 'sub' | 'plain';
@@ -35,6 +36,7 @@ export default function PageShell({
  return (
    <View className={classes} style={pageShellCssVars(metrics)}>
      {children as ReactNode}
+      <FloatingToastHost />
    </View>
  );
 }
@@ -14,6 +14,8 @@ type ProductCarouselProps = {
   *   依赖 swiper 原生 auto-height：海报有多高，轮播就有多高，无裁切。
   */
  imageFit?: 'cover' | 'contain' | 'adaptive';
+  /** 预览相册（默认等于 images）；门店详情可传入封面+环境图合并列表 */
+  previewUrls?: string[];
 };

 /** 商品/门店轮播（对齐 h5 ProductCarousel 三变体） */
@@ -23,6 +25,7 @@ export default function ProductCarousel({
  variant = 'detail',
  previewable = false,
  imageFit = 'cover',
+  previewUrls,
 }: ProductCarouselProps) {
  const slides = images.length > 0 ? images : [''];
  const [activeIndex, setActiveIndex] = useState(0);
@@ -33,10 +36,10 @@ export default function ProductCarousel({
  const wrapClass = `${prefix}-wrap${isContain ? ` ${prefix}-wrap--contain` : ''}${isAdaptive ? ` ${prefix}-wrap--adaptive` : ''}`;

  function previewAt(index: number) {
-    const urls = slides.filter(Boolean);
-    if (!urls.length) return;
-    const current = slides[index] || urls[0];
-    Taro.previewImage({ current, urls }).catch(() => undefined);
+    const album = (previewUrls?.length ? previewUrls : slides).filter(Boolean);
+    if (!album.length) return;
+    const current = slides[index] || album[0];
+    Taro.previewImage({ current, urls: album }).catch(() => undefined);
  }

  return (
@@ -4,6 +4,7 @@ import { forceReloadAfterAccountMerge } from './auth-nav';
 import { resetStoresSessionBootstrap } from './stores-session';
 import { resetHomeCatalogBootstrap } from './home-catalog-session';
 import { reportClientValidationError } from './client-error';
+import { showFloatingToast } from './floating-toast';

 function resolveApiBase(): string {
  const origin =
@@ -126,7 +127,13 @@ export async function request<T = unknown>(path: string, options: ReqOptions = {
 }

 export function toast(title: string, icon: 'success' | 'error' | 'none' = 'none') {
-  Taro.showToast({ title, icon, duration: 1800 });
+  const text = title.trim();
+  if (!text) return;
+  if (icon !== 'success' && showFloatingToast(text)) {
+    void Taro.hideToast();
+    return;
+  }
+  Taro.showToast({ title: text, icon, duration: 1800 });
 }

 export type SessionPayload = {
@@ -1,5 +1,6 @@
 export type CheckoutContext = {
  productId?: string;
+  skuId?: string;
  qty?: string;
  addressId?: string;
  cross?: boolean;
@@ -9,6 +10,7 @@ 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');
@@ -36,12 +38,14 @@ 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');
@@ -51,6 +55,7 @@ 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',
@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 import { fetchClientConfig } from './pay-wechat';

 /** 与 package.json version 同步，供服务端 minClientVersion 比对 */
-export const APP_VERSION = '3.4.15';
+export const APP_VERSION = '3.5.4';

 export const APP_VERSION_LABEL = `v${APP_VERSION}`;

@@ -0,0 +1,18 @@
+type FloatingToastListener = (message: string) => void;
+
+const listeners = new Set<FloatingToastListener>();
+
+export function registerFloatingToastListener(fn: FloatingToastListener) {
+  listeners.add(fn);
+  return () => {
+    listeners.delete(fn);
+  };
+}
+
+/** 已有页面宿主时返回 true，否则调用方应回退到原生 toast */
+export function showFloatingToast(message: string): boolean {
+  const text = message.trim();
+  if (!text || listeners.size === 0) return false;
+  listeners.forEach((fn) => fn(text));
+  return true;
+}
@@ -1,7 +1,26 @@
 /** 金额展示（不依赖 Intl / toLocaleString，兼容微信小程序） */
+export function toMoneyNumber(amount: unknown): number {
+  if (typeof amount === 'number') return Number.isFinite(amount) ? amount : 0;
+  if (typeof amount === 'string' && amount.trim()) {
+    const n = Number(amount);
+    return Number.isFinite(n) ? n : 0;
+  }
+  if (amount && typeof amount === 'object') {
+    const o = amount as { toNumber?: () => number; toString?: () => string };
+    if (typeof o.toNumber === 'function') {
+      const n = Number(o.toNumber());
+      if (Number.isFinite(n)) return n;
+    }
+    if (typeof o.toString === 'function' && o.toString !== Object.prototype.toString) {
+      const n = Number(o.toString());
+      if (Number.isFinite(n)) return n;
+    }
+  }
+  return 0;
+}
+
 export function formatMoney(amount: number | string): string {
-  const n = typeof amount === 'number' ? amount : Number(amount);
-  if (!Number.isFinite(n)) return '0.00';
+  const n = toMoneyNumber(amount);
  const fixed = n.toFixed(2);
  const [intPart, dec] = fixed.split('.');
  const withComma = intPart.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
@@ -82,8 +82,10 @@ function sceneConfig(scene?: ShareScene): MiniShareSceneConfig {
 }

 /**
- * 组装页面分享：场景配置优先；空字段用 dynamic → 默认分享。
- * orderDetail 标题支持 {productName}。
+ * 组装页面分享。
+ * - productDetail / storeDetail：title 与 imageUrl 固定用业务字段（不被 HQ 场景配置覆盖）
+ * - 其它场景：场景配置优先；空字段用 dynamic → 默认分享
+ * - orderDetail 标题支持 {productName}
 */
 export function buildSceneSharePayload(
  scene: ShareScene,
@@ -98,23 +100,33 @@ export function buildSceneSharePayload(
 ): PageSharePayload {
  const def = getShareRuntimeSync().default;
  const sc = sceneConfig(scene);
-  let title = (sc.title || '').trim();
-  if (title && options?.titleVars) {
-    const vars = options.titleVars;
-    const missingRequired = Object.entries(vars).some(
-      ([key, value]) => title.includes(`{${key}}`) && !(value != null && String(value).trim()),
-    );
-    title = missingRequired ? '' : applyShareTitleTemplate(title, vars);
-  }
-  if (!title) {
+  const preferEntity = scene === 'productDetail' || scene === 'storeDetail';
+
+  let title: string;
+  if (preferEntity) {
    title = (options?.dynamicTitle || '').trim() || def.title;
+  } else {
+    title = (sc.title || '').trim();
+    if (title && options?.titleVars) {
+      const vars = options.titleVars;
+      const missingRequired = Object.entries(vars).some(
+        ([key, value]) => title.includes(`{${key}}`) && !(value != null && String(value).trim()),
+      );
+      title = missingRequired ? '' : applyShareTitleTemplate(title, vars);
+    }
+    if (!title) {
+      title = (options?.dynamicTitle || '').trim() || def.title;
+    }
  }
+
  const desc = (sc.desc || '').trim() || (options?.dynamicDesc || '').trim() || def.desc;
-  const imgUrl =
-    (sc.imageUrl || '').trim() ||
-    (options?.dynamicImageUrl || '').trim() ||
-    def.imageUrl ||
-    getDefaultShareImageUrl();
+  const imgUrl = preferEntity
+    ? (options?.dynamicImageUrl || '').trim() || def.imageUrl || getDefaultShareImageUrl()
+    : (sc.imageUrl || '').trim() ||
+      (options?.dynamicImageUrl || '').trim() ||
+      def.imageUrl ||
+      getDefaultShareImageUrl();
+
  return {
    title,
    desc,
@@ -97,23 +97,33 @@ export function buildSceneSharePayload(
 ): PageSharePayload {
  const def = getShareRuntimeSync().default;
  const sc = sceneConfig(scene);
-  let title = (sc.title || '').trim();
-  if (title && options?.titleVars) {
-    const vars = options.titleVars;
-    const missingRequired = Object.entries(vars).some(
-      ([key, value]) => title.includes(`{${key}}`) && !(value != null && String(value).trim()),
-    );
-    title = missingRequired ? '' : applyShareTitleTemplate(title, vars);
-  }
-  if (!title) {
+  const preferEntity = scene === 'productDetail' || scene === 'storeDetail';
+
+  let title: string;
+  if (preferEntity) {
    title = (options?.dynamicTitle || '').trim() || def.title;
+  } else {
+    title = (sc.title || '').trim();
+    if (title && options?.titleVars) {
+      const vars = options.titleVars;
+      const missingRequired = Object.entries(vars).some(
+        ([key, value]) => title.includes(`{${key}}`) && !(value != null && String(value).trim()),
+      );
+      title = missingRequired ? '' : applyShareTitleTemplate(title, vars);
+    }
+    if (!title) {
+      title = (options?.dynamicTitle || '').trim() || def.title;
+    }
  }
+
  const desc = (sc.desc || '').trim() || (options?.dynamicDesc || '').trim() || def.desc;
-  const imgUrl =
-    (sc.imageUrl || '').trim() ||
-    (options?.dynamicImageUrl || '').trim() ||
-    def.imageUrl ||
-    getDefaultShareImageUrl();
+  const imgUrl = preferEntity
+    ? (options?.dynamicImageUrl || '').trim() || def.imageUrl || getDefaultShareImageUrl()
+    : (sc.imageUrl || '').trim() ||
+      (options?.dynamicImageUrl || '').trim() ||
+      def.imageUrl ||
+      getDefaultShareImageUrl();
+
  return {
    title,
    desc,
@@ -4,6 +4,7 @@ import Taro, { useDidShow, usePullDownRefresh, useShareAppMessage, useShareTimel
 import PageShell from '../../components/PageShell';
 import WechatShareReady from '../../components/WechatShareReady';
 import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar';
+import BenefitFigure from '../../components/BenefitFigure';
 import { goLogin } from '../../lib/auth-nav';
 import { isLoggedIn, request, toast } from '../../lib/api';
 import { navBarStyle, tabNavContentStyle, useNavBarMetrics } from '../../lib/nav-bar';
@@ -150,10 +151,11 @@ export default function BenefitPage() {
              <View>
                <Text className="benefit-hero-label">当前好客权益余额</Text>
                <View className="benefit-hero-amount">
-                  <Text className="benefit-hero-symbol">¥</Text>
-                  <Text className="benefit-hero-value">
-                    {summary ? formatMoney(summary.totalBalance) : '--'}
-                  </Text>
+                  <BenefitFigure
+                    value={summary ? formatMoney(summary.totalBalance) : '--'}
+                    size="xl"
+                    className="benefit-hero-value"
+                  />
                </View>
              </View>
              <View className="benefit-hero-logo">
@@ -193,16 +195,19 @@ export default function BenefitPage() {
                  <View className="benefit-coupon-notch benefit-coupon-notch--right" />
                  <View className="benefit-coupon-head">
                    <Text className="benefit-coupon-name">{c.sourceProduct || '好客权益'}</Text>
-                    <Text className="benefit-coupon-balance">¥{formatMoney(c.balance)}</Text>
+                    <BenefitFigure value={formatMoney(c.balance)} size="md" className="benefit-coupon-balance" />
                  </View>
                  <Text className="benefit-coupon-no">NO. {c.couponNo}</Text>
                  <View className="benefit-progress">
                    <View className="benefit-progress-bar" style={{ width: `${usagePercent(c)}%` }} />
                  </View>
                  <View className="benefit-coupon-footer">
-                    <Text className="benefit-coupon-meta">
-                      已用 ¥{formatMoney(c.usedAmount)} / 总额 ¥{formatMoney(c.totalAmount)}
-                    </Text>
+                    <View className="benefit-coupon-meta">
+                      <Text>已用</Text>
+                      <BenefitFigure value={formatMoney(c.usedAmount)} size="sm" />
+                      <Text>/ 总额</Text>
+                      <BenefitFigure value={formatMoney(c.totalAmount)} size="sm" />
+                    </View>
                    <Text
                      className="benefit-coupon-btn"
                      onClick={() =>
@@ -226,7 +231,12 @@ export default function BenefitPage() {
                <View className="benefit-coupon-notch benefit-coupon-notch--right" />
                <View className="benefit-coupon-head">
                  <Text className="benefit-coupon-name">{r.storeName || '门店核销'}</Text>
-                  <Text className="benefit-coupon-balance">-¥{formatMoney(Number(r.amount))}</Text>
+                  <BenefitFigure
+                    prefix="-"
+                    value={formatMoney(Number(r.amount))}
+                    size="md"
+                    className="benefit-coupon-balance"
+                  />
                </View>
                <Text className="benefit-coupon-no">NO. {r.redeemNo}</Text>
                <View className="benefit-coupon-footer">
@@ -7,9 +7,9 @@ import SubPageHeader from '../../components/SubPageHeader';
 import { request, toast } from '../../lib/api';
 import { usePageView } from '../../lib/usePageView';
 import {
-  INVOICE_KIND_LABELS,
+  INVOICE_CATEGORY_LABELS,
  INVOICE_TITLE_TYPE_LABELS,
-  type InvoiceKind,
+  type InvoiceCategory,
  type UserInvoiceTitleDto,
 } from '@dukang/shared-types';

@@ -42,7 +42,8 @@ export default function InvoiceApplyPage() {

  const [titles, setTitles] = useState<UserInvoiceTitleDto[]>([]);
  const [selectedId, setSelectedId] = useState('');
-  const [invoiceKind, setInvoiceKind] = useState<InvoiceKind>('NORMAL');
+  const [invoiceCategory, setInvoiceCategory] = useState<InvoiceCategory>('LIQUOR');
+  const [remark, setRemark] = useState('');
  const [emailOverride, setEmailOverride] = useState('');
  const [phoneOverride, setPhoneOverride] = useState('');
  const [loading, setLoading] = useState(true);
@@ -103,19 +104,17 @@ 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,
+          invoiceKind: 'NORMAL',
+          invoiceCategory,
          email,
          phone,
+          remark: remark.trim() || undefined,
        },
      });
      toast('发票申请已提交', 'success');
@@ -192,20 +191,26 @@ export default function InvoiceApplyPage() {
        ) : null}

        {canApply ? (
-          <View className="invoice-title-field" style={{ marginBottom: 16 }}>
-            <Text className="invoice-title-label">发票类型</Text>
-            <View className="invoice-title-type-row">
-              {(['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 className="invoice-title-field" style={{ marginBottom: 16 }}>
+              <Text className="invoice-title-label">发票类型</Text>
+              <Text className="invoice-kind-static">增值税普通发票</Text>
            </View>
-          </View>
+            <View className="invoice-title-field" style={{ marginBottom: 16 }}>
+              <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 ? (
@@ -258,7 +263,11 @@ export default function InvoiceApplyPage() {

        {canApply && selected && !selected.email ? (
          <View className="invoice-title-field" style={{ marginTop: 16 }}>
-            <Text className="invoice-title-label">接收邮箱</Text>
+            <Text className="invoice-title-label">
+              <Text className="invoice-title-star">*</Text>
+              接收邮箱
+              <Text className="invoice-title-label-hint">必填</Text>
+            </Text>
            <Input
              className="invoice-title-input"
              placeholder="电子发票将发送至此邮箱"
@@ -279,6 +288,19 @@ 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 ? (
@@ -26,6 +26,24 @@ 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,
@@ -120,6 +138,15 @@ 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 = {
@@ -152,6 +179,10 @@ 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',
@@ -241,7 +272,7 @@ export default function InvoiceTitlesPage() {
            </Text>

            <View className="invoice-title-field">
-              <Text className="invoice-title-label">抬头类型</Text>
+              <FieldLabel required>抬头类型</FieldLabel>
              <View className="invoice-title-type-row">
                {(['PERSONAL', 'ENTERPRISE'] as InvoiceTitleType[]).map((tp) => (
                  <Text
@@ -258,7 +289,7 @@ export default function InvoiceTitlesPage() {
            </View>

            <View className="invoice-title-field">
-              <Text className="invoice-title-label">抬头名称</Text>
+              <FieldLabel required>抬头名称</FieldLabel>
              <Input
                className="invoice-title-input"
                maxlength={128}
@@ -270,7 +301,7 @@ export default function InvoiceTitlesPage() {

            {draft.titleType === 'ENTERPRISE' ? (
              <View className="invoice-title-field">
-                <Text className="invoice-title-label">税号</Text>
+                <FieldLabel required>税号</FieldLabel>
                <Input
                  className="invoice-title-input"
                  maxlength={32}
@@ -282,11 +313,13 @@ export default function InvoiceTitlesPage() {
            ) : null}

            <View className="invoice-title-field">
-              <Text className="invoice-title-label">接收邮箱</Text>
+              <FieldLabel required hint="必填，电子发票将发送至此">
+                接收邮箱
+              </FieldLabel>
              <Input
                className="invoice-title-input"
                maxlength={128}
-                placeholder="电子发票将发送至此邮箱"
+                placeholder="请填写邮箱（必填）"
                value={draft.email || ''}
                onInput={(e) => setDraft({ ...draft, email: e.detail.value })}
              />
@@ -311,7 +344,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 })}
                  />
@@ -321,7 +354,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 })}
                  />
@@ -9,6 +9,7 @@ import PageShell from '../../components/PageShell';
 import TabMainHeader from '../../components/TabMainHeader';
 import WechatShareReady from '../../components/WechatShareReady';
 import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar';
+import BenefitFigure from '../../components/BenefitFigure';
 import { goLogin } from '../../lib/auth-nav';
 import { bindWechatForUser } from '../../lib/wechat-auth';
 import {
@@ -447,8 +448,7 @@ export default function MinePage() {
            <View>
              <Text className="mine-asset-label">好客权益余额</Text>
              <View className="mine-asset-amount">
-                <Text className="mine-asset-currency">¥</Text>
-                <Text className="mine-asset-value">{formatMoney(benefitBalance)}</Text>
+                <BenefitFigure value={formatMoney(benefitBalance)} size="lg" className="mine-asset-value" />
              </View>
            </View>
            <Text
@@ -10,6 +10,7 @@ import { ensurePayReady } from '../../lib/pay-ready';
 import { fetchUserProfile } from '../../lib/pay-wechat';
 import { request, toast } from '../../lib/api';
 import { getProductMainImage } from '../../lib/product-images';
+import BenefitFigure from '../../components/BenefitFigure';

 type PreviewProduct = {
  id: string;
@@ -31,12 +32,14 @@ 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 [quantity, setQuantity] = useState(Math.max(2, Number(router.params.qty || 2)));
+  const skuId = router.params.skuId ?? '';
+  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);
@@ -49,7 +52,7 @@ export default function OrderConfirmPickupPage() {
    setPreviewLoading(true);
    request<OrderPreview>('/trade/orders/preview', {
      method: 'POST',
-      data: { productId, quantity, onSitePickup: true },
+      data: { productId, quantity, onSitePickup: true, ...(skuId ? { skuId } : {}) },
    })
      .then((data) => {
        if (!cancelled) {
@@ -69,15 +72,16 @@ export default function OrderConfirmPickupPage() {
    return () => {
      cancelled = true;
    };
-  }, [productId, quantity]);
+  }, [productId, skuId, 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} 瓶`;
+      const tip = `现场提货至少购买 ${minQty}${unitLabel}`;
      toast(tip);
      setMsg(tip);
      if (next < 1) return;
@@ -90,12 +94,13 @@ export default function OrderConfirmPickupPage() {
  async function doSubmit() {
    const order = await request<{ id: string }>('/trade/orders', {
      method: 'POST',
-      data: { productId, quantity, onSitePickup: true },
+      data: { productId, quantity, onSitePickup: true, ...(skuId ? { skuId } : {}) },
    });
    Taro.redirectTo({
      url: buildPayUrl({
        orderId: order.id,
        productId,
+        skuId: skuId || undefined,
        qty: String(quantity),
      }),
    });
@@ -231,7 +236,11 @@ export default function OrderConfirmPickupPage() {
              </View>
              <View className="order-row">
                <Text className="order-row-label">好客权益</Text>
-                <Text className="order-row-value--price">¥{Number(preview.benefitAmount).toFixed(2)}</Text>
+                <BenefitFigure
+                  value={Number(preview.benefitAmount).toFixed(2)}
+                  size="sm"
+                  className="order-row-value--price"
+                />
              </View>
              <View className="order-row">
                <Text className="order-row-label">运费</Text>
@@ -13,6 +13,7 @@ import { fetchUserProfile } from '../../lib/pay-wechat';
 import { request, toast } from '../../lib/api';
 import { canCrossCity, isCrossCityAddress } from '../../lib/product-fulfillment';
 import { getProductMainImage } from '../../lib/product-images';
+import BenefitFigure from '../../components/BenefitFigure';

 type Address = {
  id: string;
@@ -53,6 +54,9 @@ type OrderPreview = {
  minQty?: number;
  allowCrossCityDelivery?: boolean;
  allowOnlinePurchase?: boolean;
+  skuId?: string;
+  saleUnit?: 'BOTTLE' | 'BOX';
+  bottlesPerUnit?: number;
 };

 const CROSS_CITY_BLOCK_MSG = '该商品不支持跨城配送，请更换为开城城市内的收货地址';
@@ -65,6 +69,7 @@ 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[]>([]);
@@ -95,11 +100,12 @@ export default function OrderConfirmPage() {
    if (!productId) return;
    let cancelled = false;
    setPreviewLoading(true);
-    const body: { productId: string; quantity: number; addressId?: string } = {
+    const body: { productId: string; quantity: number; addressId?: string; skuId?: string } = {
      productId,
      quantity,
    };
    if (addressId) body.addressId = addressId;
+    if (skuId) body.skuId = skuId;

    request<OrderPreview>('/trade/orders/preview', { method: 'POST', data: body })
      .then((data) => {
@@ -138,7 +144,7 @@ export default function OrderConfirmPage() {
    return () => {
      cancelled = true;
    };
-  }, [productId, quantity, addressId]);
+  }, [productId, skuId, quantity, addressId]);

  const selectedAddress = useMemo(
    () => addresses.find((a) => String(a.id) === addressId),
@@ -156,6 +162,7 @@ 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));
@@ -170,8 +177,8 @@ export default function OrderConfirmPage() {
  function updateQuantity(next: number) {
    if (next < minQty) {
      const tip = isCross
-        ? `跨城配送至少购买 ${minQty} 瓶（1箱）`
-        : `同城配送至少购买 ${minQty} 瓶`;
+        ? `跨城配送至少购买 ${minQty}${unitLabel}`
+        : `同城配送至少购买 ${minQty}${unitLabel}`;
      toast(tip);
      setMsg(tip);
      if (next < 1) return;
@@ -194,6 +201,7 @@ export default function OrderConfirmPage() {
        productId,
        quantity,
        addressId,
+        ...(skuId ? { skuId } : {}),
        ...(clientLocation ? { clientLocation } : {}),
      },
    });
@@ -201,6 +209,7 @@ export default function OrderConfirmPage() {
      url: buildPayUrl({
        orderId: order.id,
        productId,
+        skuId: skuId || undefined,
        qty: String(quantity),
        addressId,
        cross: forceCross,
@@ -222,15 +231,15 @@ export default function OrderConfirmPage() {
      }
      if (!quantityOk) {
        const tip = isCross
-          ? `跨城配送至少购买 ${minQty} 瓶（1箱）`
-          : `同城配送至少购买 ${minQty} 瓶`;
+          ? `跨城配送至少购买 ${minQty}${unitLabel}`
+          : `同城配送至少购买 ${minQty}${unitLabel}`;
        setMsg(tip);
        toast(tip);
      }
      return;
    }

-    const returnPath = `/pages/order-confirm/index?productId=${productId}&qty=${quantity}&addressId=${addressId}${forceCross ? '&cross=1' : ''}`;
+    const returnPath = `/pages/order-confirm/index?productId=${productId}&qty=${quantity}&addressId=${addressId}${skuId ? `&skuId=${skuId}` : ''}${forceCross ? '&cross=1' : ''}`;

    if (!phonePromptSkipped.current) {
      try {
@@ -370,8 +379,8 @@ export default function OrderConfirmPage() {
              {!quantityOk ? (
                <Text className="order-qty-hint">
                  {isCross
-                    ? `跨城配送至少购买 ${minQty} 瓶（1箱），请调整数量`
-                    : `同城配送至少购买 ${minQty} 瓶，请调整数量`}
+                    ? `跨城配送至少购买 ${minQty}${unitLabel}，请调整数量`
+                    : `同城配送至少购买 ${minQty}${unitLabel}，请调整数量`}
                </Text>
              ) : null}
            </View>
@@ -384,7 +393,11 @@ export default function OrderConfirmPage() {
              </View>
              <View className="order-row">
                <Text className="order-row-label">好客权益</Text>
-                <Text className="order-row-value--price">¥{preview.benefitAmount.toFixed(2)}</Text>
+                <BenefitFigure
+                  value={preview.benefitAmount.toFixed(2)}
+                  size="sm"
+                  className="order-row-value--price"
+                />
              </View>
              <View className="order-row">
                <Text className="order-row-label">运费</Text>
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { View, Text } from '@tarojs/components';
+import { View, Text, Image } 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,7 +39,6 @@ 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 {
@@ -174,7 +173,7 @@ export default function PayPage() {
      <View className="sub-page-body">
        <View className="pay-status">
          <View className="pay-status-icon">
-            <Text>¥</Text>
+            <Image className="pay-status-brand" src={payLogo} mode="aspectFit" />
          </View>
          <Text className="pay-status-title">
            {needsWechatAuth ? '需完成微信授权' : '待支付'}
@@ -204,12 +203,6 @@ 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 }}>
@@ -8,11 +8,12 @@ import Taro, {
  useShareAppMessage,
  useShareTimeline,
 } from '@tarojs/taro';
-import type { ProductDetailContentDto } from '@dukang/shared-types';
+import type { ProductDetailContentDto, ProductSkuDto, ProductSpecAttrDto } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
 import WechatShareReady from '../../components/WechatShareReady';
+import BenefitFigure from '../../components/BenefitFigure';
 import { goLogin } from '../../lib/auth-nav';
 import { ensurePayReady } from '../../lib/pay-ready';
 import { isLoggedIn, request, toast } from '../../lib/api';
@@ -46,8 +47,39 @@ type Product = ProductImageSource & {
  allowOnSitePickup?: boolean;
  allowOnlinePurchase?: boolean;
  allowCrossCityDelivery?: boolean;
+  specEnabled?: boolean;
+  specAttrs?: ProductSpecAttrDto[];
+  skus?: ProductSkuDto[];
+  defaultSkuId?: string;
+  saleUnit?: 'BOTTLE' | 'BOX';
 };

+function findSku(
+  skus: ProductSkuDto[],
+  selected: Record<string, string>,
+  attrs: ProductSpecAttrDto[],
+): ProductSkuDto | undefined {
+  const valueIds = attrs.map((a) => selected[a.id]).filter(Boolean);
+  if (valueIds.length !== attrs.length) return undefined;
+  const key = [...valueIds].sort().join('_');
+  return skus.find((s) => [...s.specValueIds].sort().join('_') === key);
+}
+
+function isValueAvailable(
+  skus: ProductSkuDto[],
+  attrs: ProductSpecAttrDto[],
+  selected: Record<string, string>,
+  attrId: string,
+  valueId: string,
+): boolean {
+  const trial = { ...selected, [attrId]: valueId };
+  const partialIds = attrs.map((a) => trial[a.id]).filter(Boolean);
+  return skus.some((s) => {
+    if (s.status !== 'ON_SALE') return false;
+    return partialIds.every((id) => s.specValueIds.includes(id));
+  });
+}
+
 export default function ProductDetailPage() {
  const router = useRouter();
  const productId = router.params.id ?? '';
@@ -57,6 +89,7 @@ export default function ProductDetailPage() {
  );
  const [product, setProduct] = useState<Product | null>(null);
  const [headerSolid, setHeaderSolid] = useState(false);
+  const [selected, setSelected] = useState<Record<string, string>>({});

  usePageScroll(({ scrollTop }) => {
    setHeaderSolid(scrollTop > 100);
@@ -71,7 +104,25 @@ export default function ProductDetailPage() {
          toast('商品不存在或暂未开放');
          return;
        }
-        setProduct(normalizeFulfillmentFlags(p));
+        const normalized = normalizeFulfillmentFlags(p);
+        setProduct(normalized);
+        const attrs = p.specAttrs ?? [];
+        const skus = p.skus ?? [];
+        const def =
+          skus.find((s) => s.id === p.defaultSkuId) ||
+          skus.find((s) => s.isDefault && s.status === 'ON_SALE') ||
+          skus.find((s) => s.status === 'ON_SALE') ||
+          skus[0];
+        if (def && attrs.length) {
+          const next: Record<string, string> = {};
+          for (const attr of attrs) {
+            const hit = attr.values.find((v) => def.specValueIds.includes(v.id));
+            if (hit) next[attr.id] = hit.id;
+          }
+          setSelected(next);
+        } else {
+          setSelected({});
+        }
      })
      .catch((e) => {
        setProduct(null);
@@ -83,20 +134,53 @@ export default function ProductDetailPage() {
    loadProduct();
  }, [loadProduct]);

-  // 登录后返回详情须带 token 重拉，否则白名单商品会一直空白
  useDidShow(() => {
    loadProduct();
  });

+  const attrs = product?.specAttrs ?? [];
+  const skus = product?.skus ?? [];
+  const specEnabled = !!(product?.specEnabled && attrs.length > 0);
+  const activeSku = useMemo(() => {
+    if (!product) return undefined;
+    if (!specEnabled) {
+      return (
+        skus.find((s) => s.id === product.defaultSkuId) ||
+        skus.find((s) => s.isDefault) ||
+        skus.find((s) => s.status === 'ON_SALE') ||
+        skus[0]
+      );
+    }
+    return findSku(skus, selected, attrs);
+  }, [product, specEnabled, skus, selected, attrs]);
+
+  const displayPrice = activeSku ? Number(activeSku.price) : Number(product?.price ?? 0);
+  const displayBenefit = activeSku
+    ? Number(activeSku.benefitAmount)
+    : Number(product?.benefitDisplay ?? product?.benefitAmount ?? product?.price ?? 0);
+  const fulfillment = activeSku
+    ? {
+        allowOnlinePurchase: activeSku.allowOnlinePurchase,
+        allowCrossCityDelivery: activeSku.allowCrossCityDelivery,
+        allowOnSitePickup: activeSku.allowOnSitePickup,
+      }
+    : product;
+  const carouselImages = (() => {
+    const base = getProductCarouselImages(product);
+    const skuImg = activeSku?.imageUrl?.trim();
+    if (!skuImg) return base;
+    return [skuImg, ...base.filter((url) => url !== skuImg)];
+  })();
+
  const sharePayload = useMemo(
    () =>
      buildSceneSharePayload('productDetail', {
        path: `/pages/product-detail/index?id=${productId}`,
        dynamicTitle: product?.name,
        dynamicDesc: product?.subtitle,
-        dynamicImageUrl: product ? getProductMainImage(product) : undefined,
+        dynamicImageUrl: (activeSku?.imageUrl?.trim() || (product ? getProductMainImage(product) : undefined)),
      }),
-    [product, productId],
+    [product, productId, activeSku],
  );

  useShareAppMessage(() => toWeappShareMessage(sharePayload));
@@ -117,9 +201,23 @@ export default function ProductDetailPage() {
    Taro.switchTab({ url: '/pages/home/index' });
  }

+  function ensureSkuSelected(): string | null {
+    if (!specEnabled) return activeSku?.id ?? product?.defaultSkuId ?? null;
+    if (!activeSku || activeSku.status !== 'ON_SALE') {
+      toast('请选择完整规格');
+      return null;
+    }
+    return activeSku.id;
+  }
+
  async function goBuy() {
    if (!productId) return;
-    const returnPath = `/pages/order-confirm/index?productId=${productId}&qty=2`;
+    const skuId = ensureSkuSelected();
+    if (specEnabled && !skuId) return;
+    const qty = activeSku?.saleUnit === 'BOX' ? 1 : 2;
+    const qs = [`productId=${productId}`, `qty=${qty}`];
+    if (skuId) qs.push(`skuId=${skuId}`);
+    const returnPath = `/pages/order-confirm/index?${qs.join('&')}`;
    if (!isLoggedIn()) {
      goLogin(returnPath);
      return;
@@ -131,7 +229,12 @@ export default function ProductDetailPage() {

  async function goOnSitePickup() {
    if (!productId) return;
-    const returnPath = `/pages/order-confirm-pickup/index?productId=${productId}&qty=1`;
+    const skuId = ensureSkuSelected();
+    if (specEnabled && !skuId) return;
+    const qty = activeSku?.saleUnit === 'BOX' ? 1 : 1;
+    const qs = [`productId=${productId}`, `qty=${qty}`];
+    if (skuId) qs.push(`skuId=${skuId}`);
+    const returnPath = `/pages/order-confirm-pickup/index?${qs.join('&')}`;
    if (!isLoggedIn()) {
      goLogin(returnPath);
      return;
@@ -150,10 +253,8 @@ export default function ProductDetailPage() {
    );
  }

-  const allowOnline = canBuyOnline(product);
-  const allowOnSite = canPickupOnSite(product);
-  const benefit = Number(product.benefitDisplay ?? product.benefitAmount ?? product.price);
-  const carouselImages = getProductCarouselImages(product);
+  const allowOnline = canBuyOnline(fulfillment ?? {});
+  const allowOnSite = canPickupOnSite(fulfillment ?? {});
  const detailImages = getProductDetailImages(product);
  const detail = product.detailContent ?? {};
  const features = detail.features ?? [];
@@ -176,12 +277,45 @@ export default function ProductDetailPage() {
        <View className="product-detail-info">
          <View className="product-detail-price">
            <Text className="product-detail-price-symbol">¥</Text>
-            <Text className="product-detail-price-value">{Number(product.price).toFixed(2)}</Text>
+            <Text className="product-detail-price-value">{displayPrice.toFixed(2)}</Text>
          </View>
          <Text className="product-detail-name">{product.name}</Text>
          {product.subtitle ? (
            <Text className="product-detail-subtitle">{product.subtitle}</Text>
          ) : null}
+          {activeSku?.specText ? (
+            <Text className="product-detail-subtitle">{activeSku.specText}</Text>
+          ) : null}
+
+          {specEnabled ? (
+            <View className="product-detail-specs">
+              {attrs.map((attr) => (
+                <View key={attr.id} className="product-detail-spec-row">
+                  <Text className="product-detail-spec-label">{attr.name}</Text>
+                  <View className="product-detail-spec-chips">
+                    {attr.values.map((val) => {
+                      const active = selected[attr.id] === val.id;
+                      const available = isValueAvailable(skus, attrs, selected, attr.id, val.id);
+                      return (
+                        <View
+                          key={val.id}
+                          className={`product-detail-spec-chip${active ? ' is-active' : ''}${
+                            available ? '' : ' is-disabled'
+                          }`}
+                          onClick={() => {
+                            if (!available) return;
+                            setSelected((prev) => ({ ...prev, [attr.id]: val.id }));
+                          }}
+                        >
+                          <Text className="product-detail-spec-chip-text">{val.name}</Text>
+                        </View>
+                      );
+                    })}
+                  </View>
+                </View>
+              ))}
+            </View>
+          ) : null}

          <View className="product-detail-promo">
            <View className="product-detail-promo-glow" />
@@ -189,10 +323,10 @@ export default function ProductDetailPage() {
              <View className="product-detail-promo-icon">
                <Text className="product-detail-promo-icon-text">惠</Text>
              </View>
-              <Text className="product-detail-promo-title">
-                买杜康美酒 · 享全城好客礼遇
-                <Text className="product-detail-promo-amount"> ¥{benefit}</Text>
-              </Text>
+              <View className="product-detail-promo-title">
+                <Text>买杜康美酒 · 享全城好客礼遇</Text>
+                <BenefitFigure value={String(displayBenefit)} size="sm" className="product-detail-promo-amount" />
+              </View>
            </View>
            <Text className="product-detail-promo-desc">
              购酒即享本城专属好客权益，为您安排一场地道饭局。权益金可直接用于本地签约门店消费，到店享用，醇香美酒配佳肴。
@@ -8,6 +8,7 @@ import RedeemQrCode from '../../components/RedeemQrCode';
 import SubPageHeader from '../../components/SubPageHeader';
 import { request, toast } from '../../lib/api';
 import { formatMoney } from '../../lib/money';
+import BenefitFigure from '../../components/BenefitFigure';

 const POLL_INTERVAL_MS = 2500;
 const LAST_REDEEM_RECORD_KEY = 'lastRedeemRecordId';
@@ -154,7 +155,7 @@ export default function RedeemCodePage() {
            <Text className="redeem-timer-label">失效倒计时</Text>
          </View>
          <Text className="u-muted">待核销金额</Text>
-          <Text className="redeem-code-amount">¥ {formatMoney(amount)}</Text>
+          <BenefitFigure value={formatMoney(amount)} size="lg" className="redeem-code-amount" />
          {token ? (
            <View className="redeem-code-token-wrap" onClick={onTokenTap}>
              <Text className="redeem-code-token-label">核销码编号（供追查）</Text>
@@ -6,7 +6,8 @@ import PageShell from '../../components/PageShell';
 import SubPageHeader from '../../components/SubPageHeader';
 import { request, toast } from '../../lib/api';
 import { formatShanghaiDateTime } from '../../lib/datetime';
-import { formatMoney } from '../../lib/money';
+import { formatMoney, toMoneyNumber } from '../../lib/money';
+import BenefitFigure from '../../components/BenefitFigure';

 const LAST_REDEEM_RESULT_KEY = 'lastRedeemResult';

@@ -66,7 +67,7 @@ export default function RedeemSuccessPage() {
    }
  }, []);

-  const amount = Number(record?.amount ?? router.params.amount ?? 0);
+  const amount = toMoneyNumber(record?.amount ?? router.params.amount);
  const storeName = record?.storeName || '门店';
  const redeemNo = record?.redeemNo || '—';
  const redeemedAt = formatChinaDateTime(record?.createdAt);
@@ -119,7 +120,7 @@ export default function RedeemSuccessPage() {
          <Text>✓</Text>
        </View>
        <Text className="redeem-success-title">核销成功</Text>
-        <Text className="redeem-success-amount">¥ {formatMoney(amount)}</Text>
+        <BenefitFigure value={formatMoney(amount)} size="lg" className="redeem-success-amount" />
        <Text className="redeem-success-desc">已在 {storeName} 完成核销</Text>

        <View className="redeem-success-details">
@@ -7,6 +7,7 @@ import SubPageHeader from '../../components/SubPageHeader';
 import { goLogin } from '../../lib/auth-nav';
 import { isLoggedIn, request, toast } from '../../lib/api';
 import { formatMoney } from '../../lib/money';
+import BenefitFigure from '../../components/BenefitFigure';

 type BenefitSummary = {
  totalBalance: number;
@@ -103,7 +104,7 @@ export default function RedeemPage() {
      return;
    }
    if (value > redeemableMax) {
-      toast(couponId ? '核销金额不能超过该权益可用余额' : '超出可用余额');
+      toast(couponId ? '核销金额不能超过该权益可用余额' : '核销金额不能超过可用余额');
      return;
    }

@@ -134,9 +135,11 @@ export default function RedeemPage() {
          <Text className="redeem-hero-label">
            {couponId ? '当前权益可用余额' : '可用余额'}
          </Text>
-          <Text className="redeem-hero-amount">
-            ¥{redeemableMax > 0 ? formatMoney(redeemableMax) : '--'}
-          </Text>
+          <BenefitFigure
+            value={redeemableMax > 0 ? formatMoney(redeemableMax) : '--'}
+            size="xl"
+            className="redeem-hero-amount"
+          />
        </View>
        <View className="redeem-input-wrap">
          <Input
@@ -153,9 +156,10 @@ export default function RedeemPage() {
          />
        </View>
        <View className="redeem-amount-foot">
-          <Text className="redeem-amount-hint">
-            最高可核销 ¥{formatMoney(redeemableMax)}
-          </Text>
+          <View className="redeem-amount-hint">
+            <Text>最高可核销</Text>
+            <BenefitFigure value={formatMoney(redeemableMax)} size="sm" />
+          </View>
          <Text className="redeem-fill-max" onClick={fillMaxAmount}>
            全部核销
          </Text>
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text, Image, ScrollView } from '@tarojs/components';
 import '../../styles/store-detail.css';
 import Taro, {
  useDidShow,
@@ -16,6 +16,7 @@ import ShareNavButton from '../../components/ShareNavButton';
 import StoreRedeemMarquee from '../../components/StoreRedeemMarquee';
 import WechatShareReady from '../../components/WechatShareReady';
 import { request, toast } from '../../lib/api';
+import { toMoneyNumber } from '../../lib/money';
 import { maskPhone, toDialablePhone } from '../../lib/phone';
 import { track } from '../../lib/analytics';
 import { formatShanghaiDateTime } from '../../lib/datetime';
@@ -116,9 +117,8 @@ function formatPackagePriceYuan(price: string | number) {
  return n.toFixed(2).replace(/\.?0+$/, '');
 }

-function formatRedeemAmountYuan(amount: number | string) {
-  const n = typeof amount === 'number' ? amount : Number(amount);
-  if (!Number.isFinite(n)) return '0';
+function formatRedeemAmountYuan(amount: unknown) {
+  const n = toMoneyNumber(amount);
  if (Math.abs(n - Math.round(n)) < 1e-9) return String(Math.round(n));
  return n.toFixed(2).replace(/\.?0+$/, '');
 }
@@ -323,6 +323,8 @@ export default function StoreDetailPage() {

  const envPhotos = envPhotoUrls(store);
  const heroImages = uniqueUrls([store.coverUrl, ...(store.carouselUrls || [])]);
+  /** 预览相册：封面 + 环境图（去重），页面展示仍分开 */
+  const previewAlbum = uniqueUrls([store.coverUrl, ...envPhotos]);
  const packages = store.packages ?? [];

  const intro = store.intro?.trim() || '';
@@ -337,10 +339,12 @@ export default function StoreDetailPage() {
  }

  function previewEnv(index: number) {
-    if (!envPhotos.length) return;
+    const current = envPhotos[index];
+    if (!current) return;
+    const urls = previewAlbum.length ? previewAlbum : envPhotos;
    Taro.previewImage({
-      current: envPhotos[index],
-      urls: envPhotos,
+      current,
+      urls,
    }).catch(() => toast('无法预览图片'));
  }

@@ -362,6 +366,7 @@ export default function StoreDetailPage() {
          variant="store"
          previewable
          imageFit="contain"
+          previewUrls={previewAlbum}
        />
      </View>

@@ -439,17 +444,19 @@ export default function StoreDetailPage() {
        </View>
      ) : null}

-      {intro ? (
+      {benefitRule ? (
        <View className="store-detail-section">
-          <Text className="store-detail-section-title">门店详情</Text>
-          <Text className="store-detail-intro">{intro}</Text>
+          <Text className="store-detail-section-title store-detail-section-title--rule">使用规则</Text>
+          <Text className="store-detail-intro">{benefitRule}</Text>
        </View>
      ) : null}

-      {benefitRule ? (
+      {intro ? (
        <View className="store-detail-section">
-          <Text className="store-detail-section-title">好客权益券使用规则</Text>
-          <Text className="store-detail-intro">{benefitRule}</Text>
+          <Text className="store-detail-section-title">门店详情</Text>
+          <ScrollView className="store-detail-intro-scroll" scrollY showScrollbar>
+            <Text className="store-detail-intro">{intro}</Text>
+          </ScrollView>
        </View>
      ) : null}

@@ -98,7 +98,7 @@

 .benefit-hero-amount {
  display: flex;
-  align-items: baseline;
+  align-items: center;
  color: var(--color-heritage-red);
 }

@@ -109,6 +109,8 @@
 }

 .benefit-hero-value {
+  display: inline-flex;
+  align-items: center;
  font-family: var(--font-headline);
  font-size: 40px;
  font-weight: 700;
@@ -216,6 +218,10 @@
  color: var(--color-heritage-red);
 }

+.benefit-coupon-meta .benefit-figure {
+  color: inherit;
+}
+
 .benefit-coupon-no {
  display: block;
  font-size: 11px;
@@ -244,6 +250,10 @@
 }

 .benefit-coupon-meta {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 2px;
  font-size: 12px;
  color: var(--color-subtle-gray);
 }
@@ -304,6 +304,7 @@
  position: relative;
  display: inline-flex;
  align-items: center;
+  gap: 2px;
  background: var(--color-aged-amber);
  color: var(--color-on-secondary-container);
  padding: 2px 8px;
@@ -153,6 +153,30 @@
  margin-bottom: 6px;
 }

+.invoice-title-star {
+  color: #c62828;
+  margin-right: 2px;
+  font-weight: 600;
+}
+
+.invoice-title-label-hint {
+  margin-left: 6px;
+  font-size: 12px;
+  color: #c62828;
+  font-weight: 500;
+}
+
+.invoice-kind-static {
+  display: block;
+  font-size: 15px;
+  color: var(--color-on-surface, #1a1a1a);
+  line-height: 44px;
+  padding: 0 12px;
+  background: var(--color-surface, #fafafa);
+  border: 1px solid var(--color-outline, #ddd);
+  border-radius: 8px;
+}
+
 .invoice-title-input {
  width: 100%;
  height: 44px;
@@ -215,7 +215,7 @@

 .mine-asset-amount {
  display: flex;
-  align-items: baseline;
+  align-items: center;
  color: var(--color-heritage-red);
 }

@@ -226,6 +226,8 @@
 }

 .mine-asset-value {
+  display: inline-flex;
+  align-items: center;
  font-family: var(--font-headline);
  font-size: 24px;
  font-weight: 700;
@@ -215,6 +215,8 @@
 }

 .order-row-value--price {
+  display: inline-flex;
+  align-items: center;
  color: var(--color-heritage-red);
  font-weight: 700;
 }
@@ -486,16 +488,20 @@
 }

 .pay-status-icon {
-  width: 72px;
-  height: 72px;
+  width: 88px;
+  height: 88px;
  border-radius: 50%;
-  background: rgba(166, 29, 36, 0.08);
-  color: var(--color-heritage-red);
-  font-size: 36px;
+  background: #f7f4ee;
  display: flex;
  align-items: center;
  justify-content: center;
  margin: 0 auto 16px;
+  overflow: hidden;
+}
+
+.pay-status-brand {
+  width: 72px;
+  height: 72px;
 }

 .pay-status-title {
@@ -130,6 +130,7 @@

 .product-detail-promo {
  position: relative;
+  margin-top: 8px;
  padding: 16px;
  border-radius: var(--radius-lg);
  background: linear-gradient(135deg, #fff9e6 0%, #fff0c2 100%);
@@ -175,6 +176,10 @@

 .product-detail-promo-title {
  flex: 1;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 4px;
  font-family: var(--font-headline);
  font-size: 16px;
  font-weight: 700;
@@ -184,6 +189,7 @@

 .product-detail-promo-amount {
  color: var(--color-heritage-red);
+  font-weight: 700;
 }

 .product-detail-promo-desc {
@@ -370,3 +376,53 @@
  font-size: 16px;
  font-weight: 700;
 }
+
+.product-detail-specs {
+  margin: 16px 0 28px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.product-detail-spec-row {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.product-detail-spec-label {
+  font-size: 13px;
+  color: var(--color-on-surface-variant, #666);
+}
+
+.product-detail-spec-chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.product-detail-spec-chip {
+  padding: 6px 14px;
+  border-radius: 8px;
+  background: #f5f5f5;
+  border: 1px solid transparent;
+}
+
+.product-detail-spec-chip.is-active {
+  background: rgba(166, 29, 36, 0.08);
+  border-color: var(--color-heritage-red);
+}
+
+.product-detail-spec-chip.is-disabled {
+  opacity: 0.35;
+}
+
+.product-detail-spec-chip-text {
+  font-size: 13px;
+  color: #333;
+}
+
+.product-detail-spec-chip.is-active .product-detail-spec-chip-text {
+  color: var(--color-heritage-red);
+  font-weight: 600;
+}
@@ -24,6 +24,9 @@
 }

 .redeem-hero-amount {
+  display: flex;
+  align-items: center;
+  justify-content: center;
  font-family: var(--font-headline);
  font-size: 36px;
  font-weight: 700;
@@ -92,6 +95,10 @@
 }

 .redeem-amount-hint {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 2px;
  font-size: 12px;
  color: var(--color-subtle-gray);
  line-height: 1.4;
@@ -279,7 +286,9 @@
 }

 .redeem-code-amount {
-  display: block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
  font-family: var(--font-headline);
  font-size: 28px;
  font-weight: 700;
@@ -350,8 +359,9 @@
 }

 .redeem-success-amount {
-  display: block;
-  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
  font-family: var(--font-headline);
  font-size: 28px;
  font-weight: 700;
@@ -211,6 +211,17 @@
  color: var(--color-on-surface);
 }

+.store-detail-section-title--rule {
+  color: var(--color-heritage-red, #a61d24);
+}
+
+.store-detail-intro-scroll {
+  max-height: 168px;
+  height: 168px;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
 .store-detail-env-grid {
  display: flex;
  flex-direction: column;
@@ -1,77 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const crypto = require('crypto');
-const path = process.argv[2] || '/opt/dukang/server/dukang-api/.env.production';
-
-function stripQuotes(s) {
-  const t = s.trim();
-  if ((t.startsWith('"') && t.endsWith('"')) || (t.startsWith("'") && t.endsWith("'"))) {
-    return t.slice(1, -1);
-  }
-  return t;
-}
-
-function parseEnvValue(text, key) {
-  const re = new RegExp(`^${key}=(.*)$`, 'm');
-  const m = text.match(re);
-  if (!m) return null;
-  return stripQuotes(m[1]);
-}
-
-function tryKey(name, key) {
-  const literalN = (key.match(/\\n/g) || []).length;
-  const realN = (key.match(/\n/g) || []).length;
-  const hasBegin = /BEGIN (RSA )?PRIVATE KEY/.test(key);
-  try {
-    crypto.createPrivateKey(key);
-    console.log(`${name}: OK begin=${hasBegin} literalN=${literalN} realN=${realN} len=${key.length}`);
-    return true;
-  } catch (e) {
-    console.log(
-      `${name}: FAIL ${e.message} begin=${hasBegin} literalN=${literalN} realN=${realN} len=${key.length} head=${JSON.stringify(key.slice(0, 48))}`,
-    );
-    return false;
-  }
-}
-
-const text = fs.readFileSync(path, 'utf8');
-const raw = parseEnvValue(text, 'WX_MCH_PRIVATE_KEY');
-if (!raw) {
-  console.log('MISSING WX_MCH_PRIVATE_KEY in', path);
-  process.exit(1);
-}
-
-console.log('file=', path);
-console.log('MOCK_PAY=', parseEnvValue(text, 'MOCK_PAY'));
-console.log('WX_MINI_APP_ID=', parseEnvValue(text, 'WX_MINI_APP_ID'));
-console.log('WX_APP_ID=', parseEnvValue(text, 'WX_APP_ID'));
-console.log('WX_MCH_ID=', parseEnvValue(text, 'WX_MCH_ID'));
-console.log('WX_PAY_NOTIFY_URL=', parseEnvValue(text, 'WX_PAY_NOTIFY_URL'));
-
-const variants = {
-  as_is: raw,
-  unescape_n: raw.replace(/\\n/g, '\n'),
-  unescape_twice: raw.replace(/\\\\n/g, '\\n').replace(/\\n/g, '\n'),
-  strip_cr_unesc: raw.replace(/\\n/g, '\n').replace(/\r/g, ''),
-  // dotenv style sometimes leaves surrounding quotes in process.env
-  quoted_unesc: stripQuotes(raw).replace(/\\n/g, '\n'),
-};
-
-let ok = false;
-for (const [name, key] of Object.entries(variants)) {
-  if (tryKey(name, key)) ok = true;
-}
-
-// also simulate dotenv load
-try {
-  const dotenv = require('dotenv');
-  const parsed = dotenv.parse(text);
-  const fromDotenv = parsed.WX_MCH_PRIVATE_KEY || '';
-  console.log('dotenv_raw_literalN=', (fromDotenv.match(/\\n/g) || []).length, 'realN=', (fromDotenv.match(/\n/g) || []).length);
-  tryKey('dotenv_as_is', fromDotenv);
-  tryKey('dotenv_unescape', fromDotenv.replace(/\\n/g, '\n'));
-} catch (e) {
-  console.log('dotenv skip', e.message);
-}
-
-process.exit(ok ? 0 : 2);
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-# 为 api.lingshivip.cn 申请 DNS 证书并启用 HTTPS
-set -euo pipefail
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-SSL_DIR="/etc/nginx/ssl/api.lingshivip.cn"
-NGINX_CONF="/etc/nginx/conf.d/dukang-lingshivip.conf"
-
-mkdir -p "$SSL_DIR" /var/www/certbot/.well-known/acme-challenge
-
-echo "==> 1. 发起 DNS 验证（需先在 DNSPod 添加 TXT 记录）"
-~/.acme.sh/acme.sh --issue -d api.lingshivip.cn --dns \
-  --yes-I-know-dns-manual-mode-enough-go-ahead-please \
-  --server letsencrypt || true
-
-echo ""
-echo "请在 DNSPod 添加上述 TXT 记录后，执行："
-echo "  $0 --renew"
-echo ""
-
-if [[ "${1:-}" != "--renew" ]]; then
-  exit 0
-fi
-
-echo "==> 2. 继续 DNS 验证并签发证书"
-~/.acme.sh/acme.sh --renew -d api.lingshivip.cn --yes-I-know-dns-manual-mode-enough-go-ahead-please
-
-echo "==> 3. 安装证书到 nginx 目录"
-install -m 644 ~/.acme.sh/api.lingshivip.cn_ecc/fullchain.cer "$SSL_DIR/fullchain.cer"
-install -m 600 ~/.acme.sh/api.lingshivip.cn_ecc/api.lingshivip.cn.key "$SSL_DIR/api.lingshivip.cn.key"
-
-echo "==> 4. 更新 nginx 并重载"
-cp "$SCRIPT_DIR/nginx-lingshivip.conf" "$NGINX_CONF"
-python3 - <<'PY'
-from pathlib import Path
-p = Path("/etc/nginx/conf.d/dukang-lingshivip.conf")
-text = p.read_text()
-old = """    location / {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-}
-
-# API 独立域名 HTTPS"""
-new = """    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-# API 独立域名 HTTPS"""
-if old not in text:
-    raise SystemExit("nginx api http redirect patch failed")
-p.write_text(text.replace(old, new, 1))
-PY
-
-nginx -t
-systemctl reload nginx
-
-echo "==> 5. 健康检查"
-curl -sf -o /dev/null -w "api-https:%{http_code}\n" https://api.lingshivip.cn/api/v1/health
-echo "==> api.lingshivip.cn HTTPS 已启用"
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-# runxian.top 裸域名申请 Let's Encrypt 并启用 HTTPS
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-DOMAIN=runxian.top
-EMAIL="${CERTBOT_EMAIL:-admin@runxian.top}"
-
-echo "==> 检查 DNS: $DOMAIN"
-ip="$(dig +short "$DOMAIN" A @223.5.5.5 | tail -1)"
-if [[ -z "$ip" ]]; then
-  echo "ERROR: $DOMAIN 无 A 记录，请先在 DNS 添加指向本机公网 IP（当前服务器: $(curl -sf ifconfig.me || echo unknown)）"
-  exit 1
-fi
-echo "  $DOMAIN -> $ip"
-
-mkdir -p /var/www/certbot /var/log/nginx/dukang
-
-# 若尚未有证书，先部署仅 HTTP 的配置以便 ACME 校验
-if [[ ! -f /etc/letsencrypt/live/runxian.top/fullchain.pem ]]; then
-  echo "==> 临时 HTTP 配置（用于 ACME）..."
-  cat > /etc/nginx/conf.d/dukang-runxian-apex.conf <<'EOF'
-server {
-    listen 80;
-    server_name runxian.top;
-    root /opt/dukang-haoke/public;
-    index index.html;
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-    location ~ ^/MP_verify_.*\.txt$ {
-        default_type text/plain;
-        access_log off;
-    }
-    location / {
-        try_files $uri $uri/ =404;
-    }
-}
-EOF
-  nginx -t
-  systemctl reload nginx
-fi
-
-echo "==> 申请证书..."
-certbot certonly --webroot -w /var/www/certbot \
-  --cert-name runxian.top \
-  -d runxian.top \
-  --non-interactive --agree-tos -m "$EMAIL"
-
-echo "==> 切换 HTTPS 配置..."
-install -m 644 "$SCRIPT_DIR/nginx-runxian-apex.conf" /etc/nginx/conf.d/dukang-runxian-apex.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> 验证..."
-code="$(curl -sf -o /dev/null -w '%{http_code}' "https://$DOMAIN/MP_verify_ayPJ4CQqbUcec3jX.txt" || echo fail)"
-echo "  https://$DOMAIN/MP_verify_ayPJ4CQqbUcec3jX.txt -> $code"
-echo "==> runxian.top HTTPS 已启用"
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-# 为杜康 runxian.top 申请 Let's Encrypt 并切换 HTTPS 配置
-# 三端 H5 统一入口 user.runxian.top/{user,shop,partner}/
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-DOMAINS=(
-  user.runxian.top
-  shop.runxian.top
-  partner.runxian.top
-  webadmin.runxian.top
-  dkapi.runxian.top
-)
-
-echo "==> 检查 DNS 解析到本机..."
-for d in "${DOMAINS[@]}"; do
-  ip="$(dig +short "$d" @223.5.5.5 | tail -1)"
-  if [[ -z "$ip" ]]; then
-    echo "ERROR: $d 无 A 记录，请先在 DNS 添加指向本机公网 IP"
-    exit 1
-  fi
-  echo "  $d -> $ip"
-done
-
-mkdir -p /var/www/certbot /var/log/nginx/dukang
-
-echo "==> 申请证书..."
-certbot certonly --webroot -w /var/www/certbot \
-  --cert-name user.runxian.top \
-  -d user.runxian.top \
-  -d shop.runxian.top \
-  -d partner.runxian.top \
-  -d webadmin.runxian.top \
-  -d dkapi.runxian.top \
-  --non-interactive --agree-tos -m admin@runxian.top || {
-  echo "certbot 失败，请确认 DNS 已生效且 80 端口可从公网访问"
-  exit 1
-}
-
-echo "==> 切换 nginx HTTPS 配置..."
-install -m 644 "$SCRIPT_DIR/nginx-runxian-dukang-ssl.conf" /etc/nginx/conf.d/dukang-runxian.conf
-nginx -t
-systemctl reload nginx
-
-echo "==> 验证..."
-for url in \
-  https://user.runxian.top/user/ \
-  https://user.runxian.top/shop/ \
-  https://user.runxian.top/partner/ \
-  https://shop.runxian.top/ \
-  https://webadmin.runxian.top/ \
-  https://dkapi.runxian.top/api/v1/health; do
-  code="$(curl -sf -o /dev/null -w '%{http_code}' "$url" || echo fail)"
-  echo "  $url -> $code"
-done
-
-echo "==> runxian.top 杜康域名 HTTPS 已启用（H5 统一入口 user.runxian.top）"
@@ -1,33 +0,0 @@
-map $host $dukang_h5_port {
-    user.ai-mirror.xyz    8091;
-    shop.ai-mirror.xyz    8092;
-    partner.ai-mirror.xyz 8093;
-}
-
-# HTTP — 证书申请期间先提供 HTTP 服务
-server {
-    listen 80;
-    server_name user.ai-mirror.xyz shop.ai-mirror.xyz partner.ai-mirror.xyz;
-
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_h5_port;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
@@ -1,54 +0,0 @@
-# 杜康好客 H5 三端 — ai-mirror.xyz
-# API 内部端口 8090；H5 分别 8091/8092/8093
-
-map $host $dukang_h5_port {
-    user.ai-mirror.xyz    8091;
-    shop.ai-mirror.xyz    8092;
-    partner.ai-mirror.xyz 8093;
-}
-
-# HTTP → HTTPS
-server {
-    listen 80;
-    server_name user.ai-mirror.xyz shop.ai-mirror.xyz partner.ai-mirror.xyz;
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name user.ai-mirror.xyz shop.ai-mirror.xyz partner.ai-mirror.xyz;
-
-    access_log /var/log/nginx/dukang/access.log main;
-    error_log  /var/log/nginx/dukang/error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.ai-mirror.xyz/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.ai-mirror.xyz/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_h5_port;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
@@ -1,105 +0,0 @@
-# 证书申请期间 — lingshivip.cn HTTP（api HTTPS 证书就绪后换 nginx-lingshivip.conf）
-
-map $host $dukang_lingshi_port {
-    user.lingshivip.cn     8091;
-    shop.lingshivip.cn     8092;
-    partner.lingshivip.cn  8093;
-    admin.lingshivip.cn    8094;
-}
-
-server {
-    listen 80;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 80;
-    server_name api.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-}
-
-server {
-    listen 80;
-    server_name admin.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    access_log /var/log/nginx/dukang/lingshi.access.log main;
-    error_log  /var/log/nginx/dukang/lingshi.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.lingshivip.cn/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.lingshivip.cn/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_lingshi_port;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
@@ -1,135 +0,0 @@
-# 杜康好客 — lingshivip.cn 五端 + API
-# API 8090；H5 8091/8092/8093；admin-web 8094
-
-map $host $dukang_lingshi_port {
-    user.lingshivip.cn     8091;
-    shop.lingshivip.cn     8092;
-    partner.lingshivip.cn  8093;
-    admin.lingshivip.cn    8094;
-}
-
-# HTTP → HTTPS（H5 三端）
-server {
-    listen 80;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-# API：证书就绪前 HTTP 直连；就绪后改走 HTTPS server
-server {
-    listen 80;
-    server_name api.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-}
-
-# admin 待 DNS + 证书就绪前先走 HTTP
-server {
-    listen 80;
-    server_name admin.lingshivip.cn;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
-
-# API 独立域名 HTTPS（证书：/etc/nginx/ssl/api.lingshivip.cn/）
-server {
-    listen 443 ssl;
-    server_name api.lingshivip.cn;
-
-    access_log /var/log/nginx/dukang/lingshi-api.access.log main;
-    error_log  /var/log/nginx/dukang/lingshi-api.error.log warn;
-
-    ssl_certificate     /etc/nginx/ssl/api.lingshivip.cn/fullchain.cer;
-    ssl_certificate_key /etc/nginx/ssl/api.lingshivip.cn/api.lingshivip.cn.key;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location / {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name user.lingshivip.cn shop.lingshivip.cn partner.lingshivip.cn;
-
-    access_log /var/log/nginx/dukang/lingshi.access.log main;
-    error_log  /var/log/nginx/dukang/lingshi.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.lingshivip.cn/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.lingshivip.cn/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:$dukang_lingshi_port;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
@@ -1,53 +0,0 @@
-# runxian.top 裸域名 — 静态公共资源（微信域名校验等）
-# HTTP: 保留 MP_verify + ACME；其余跳转 HTTPS
-# HTTPS: deploy/enable-runxian-apex-ssl.sh 申请证书后启用
-
-server {
-    listen 80;
-    server_name runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-apex.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-apex.error.log warn;
-
-    root /opt/dukang-haoke/public;
-    index index.html;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        default_type text/plain;
-        access_log off;
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-apex.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-apex.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    root /opt/dukang-haoke/public;
-    index index.html;
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        default_type text/plain;
-        access_log off;
-    }
-
-    location / {
-        try_files $uri $uri/ =404;
-    }
-}
@@ -1,218 +0,0 @@
-# 杜康好客 — runxian.top HTTPS
-# 执行: deploy/enable-runxian-dukang-ssl.sh
-# 三端 H5 统一入口 user.runxian.top/{user,shop,partner}/
-
-server {
-    listen 80;
-    server_name user.runxian.top shop.runxian.top partner.runxian.top m.runxian.top;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://user.runxian.top$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name m.runxian.top;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-
-    return 301 https://user.runxian.top$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name user.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-h5.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-h5.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location ~ ^/MP_verify_.*\.txt$ {
-        root /opt/dukang-haoke/apps/mini-user/dist;
-        default_type text/plain;
-        access_log off;
-    }
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location = / {
-        return 302 /user/;
-    }
-
-    # Taro 路由页是 /pages/xxx/index；补全短路径，避免 UniversalRouter 404 白屏
-    location ~ ^/user/pages/([^/]+)/?$ {
-        return 302 /user/pages/$1/index$is_args$args;
-    }
-
-    location /user/ {
-        rewrite ^/user/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8091;
-        proxy_http_version 1.1;
-        # serve 若仍发出绝对 Location:/pages/...，补回 /user 前缀
-        proxy_redirect / /user/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /shop/ {
-        rewrite ^/shop/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8092;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /partner/ {
-        rewrite ^/partner/(.*)$ /$1 break;
-        proxy_pass http://127.0.0.1:8093;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    # 旧 C 端根路径书签（无 /user 前缀）→ /user/...
-    location / {
-        return 302 /user$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name shop.runxian.top;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-
-    return 301 https://user.runxian.top/shop$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name partner.runxian.top;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-
-    return 301 https://user.runxian.top/partner$request_uri;
-}
-
-server {
-    listen 80;
-    server_name dkapi.runxian.top;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    include /opt/dukang-haoke/deploy/nginx-deploy-webhook.conf;
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name dkapi.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-api.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-api.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    include /opt/dukang-haoke/deploy/nginx-deploy-webhook.conf;
-
-    location / {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-}
-
-server {
-    listen 80;
-    server_name webadmin.runxian.top;
-
-    location ^~ /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-        default_type "text/plain";
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name webadmin.runxian.top;
-
-    access_log /var/log/nginx/dukang/runxian-admin.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-admin.error.log warn;
-
-    ssl_certificate     /etc/letsencrypt/live/user.runxian.top/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/user.runxian.top/privkey.pem;
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-
-    client_max_body_size 20m;
-
-    location /api/ {
-        proxy_pass http://127.0.0.1:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8094;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jacy	fa69ced448	Merge pull request 'Dev v3.5.6' (#39 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39	2026-08-23 16:43:51 +08:00
jacy	a144a35c3d	Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38	2026-08-23 16:43:07 +08:00
jacy	7e12eb3ca6	v3.5.6版本迭代 CI / verify (pull_request) Waiting to run Details	2026-08-23 16:41:22 +08:00
jacy	608e3e5ec5	整理发布脚本	2026-08-23 14:37:36 +08:00
jacy	d98b0aefb0	整理上下文	2026-08-23 14:37:29 +08:00
jacy	18c5abea79	Merge pull request 'v3.5.5版本合并' (#37 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/37	2026-08-23 12:30:04 +08:00
jacy	012626f6bd	Merge pull request 'v3.5.5版本上传' (#36 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36	2026-08-23 12:29:33 +08:00
jacy	22cd00da42	v3.5.5版本上传 CI / verify (pull_request) Waiting to run Details	2026-08-23 12:26:57 +08:00
jacy	5d4ed566de	merge(dev): HQ product list as SPU with expandable SKUs CI / verify (push) Has been cancelled Details	2026-08-21 23:52:41 +08:00
jacy	3004a65b35	Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev	2026-08-21 23:52:37 +08:00
jacy	f9161368e1	feat(admin): show HQ product list as SPU with expandable SKUs Group catalog rows by product, add paid bottle sales, and keep multi-SKU fulfillment on SKU rows only. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-21 23:52:28 +08:00
jacy	8a061f085f	提交v3.5.4 版本号小程序	2026-08-21 17:49:53 +08:00
jacy	b20e566a65	logo3	2026-08-21 17:39:11 +08:00
jacy	5fdddae41c	merge(dev): v3.5.4 规格主图与门店使用规则 CI / verify (push) Has been cancelled Details	2026-08-21 17:37:20 +08:00
jacy	7d2e4ef57e	merge(dev_jacy): v3.5.4 规格主图与门店使用规则	2026-08-21 17:37:09 +08:00
jacy	4d434c9c67	v3.5.4 规格主图、门店使用规则与收银台 logo Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-21 17:36:53 +08:00
jacy	22c0b03a47	Merge pull request 'Dev' (#35 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/35	2026-08-21 16:24:07 +08:00
jacy	73fd27bdf6	Merge pull request 'v3.5.4版本提交，修改api' (#34 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/34	2026-08-21 16:23:54 +08:00
jacy	62e61a9e63	v3.5.4版本提交，修改api CI / verify (pull_request) Has been cancelled Details	2026-08-21 16:22:53 +08:00
jacy	f2d03e2595	Merge pull request 'v3.5.4' (#33 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/33	2026-08-21 15:50:30 +08:00
jacy	cd9696bc1c	Merge pull request 'v3.5.4版本提交' (#32 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/32	2026-08-21 15:50:07 +08:00
jacy	a01217539c	v3.5.4版本提交 CI / verify (pull_request) Has been cancelled Details	2026-08-21 15:48:15 +08:00
jacy	0c28c204b2	Merge pull request 'Dev' (#31 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/31	2026-08-20 20:23:20 +08:00
jacy	b5d4f8b27c	Merge pull request 'v3.5.3版本更新2' (#30 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/30	2026-08-20 20:23:03 +08:00
jacy	26334ed072	v3.5.3版本更新2 CI / verify (pull_request) Has been cancelled Details	2026-08-20 20:09:05 +08:00
jacy	9a80f0f8d6	Merge pull request 'v3.5.3版本更新1' (#29 ) from dev_jacy into dev Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/29	2026-08-20 18:55:43 +08:00
jacy	e7f49a9639	Merge pull request 'v3.5.3版本更新1' (#28 ) from dev_jacy into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/28	2026-08-20 18:55:18 +08:00
jacy	fc2e5b65de	v3.5.3版本更新1 CI / verify (pull_request) Has been cancelled Details	2026-08-20 18:54:15 +08:00
jacy	f941dcf072	Merge pull request 'Dev' (#27 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/27	2026-08-20 15:06:24 +08:00
jacy	e8b585e623	Merge pull request '增加音效逻辑' (#26 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/26	2026-08-20 15:06:07 +08:00
jacy	ee493823bf	增加音效逻辑 CI / verify (pull_request) Has been cancelled Details	2026-08-20 15:04:54 +08:00
jacy	5702266276	Merge pull request 'Dev jacy' (#25 ) from dev_jacy into dev Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/25	2026-08-20 13:43:29 +08:00
jacy	3382d36a6c	Merge pull request 'Dev jacy 大屏优化' (#24 ) from dev_jacy into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/24	2026-08-20 13:43:06 +08:00
jacy	8b5bb6a981	大屏显示优化 CI / verify (pull_request) Has been cancelled Details	2026-08-20 13:41:50 +08:00
jacy	0a36188b35	调整优化大屏	2026-08-20 12:55:11 +08:00
jacy	9b8e3f1347	Merge pull request 'v3.5.2 大屏调整' (#23 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/23	2026-08-20 12:01:21 +08:00
jacy	a8a37fbc4a	Merge pull request 'v3.5.2 大屏调整' (#22 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/22	2026-08-20 12:00:57 +08:00
jacy	6cf66c722c	v3.5.2 大屏调整 CI / verify (pull_request) Has been cancelled Details	2026-08-20 11:58:15 +08:00