Merge pull request 'v3.4.18' (#17) from dev into main

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

.cursor/rules/frontend-h5.mdc

@@ -39,6 +39,9 @@ src/
 
 ## UI 约束
 
+- 使用 shared-ui CSS 变量与组件，勿各端自造设计 token
+- **mini-user 微信 `openType` Button**：祖先禁止 `e.stopPropagation()`（Taro→`catchtap`，选头像/手机号等会静默失效）；遮罩与 sheet 拆开绑关闭。见 `.cursor/rules/mini-user-weapp-opentype.mdc`
+
 - C 端订单 **5 Tab**（含 pending_ship）
 - 门店列表仅 `OPEN` 状态
 - 原型 `pages/` 只读；路由对照 `pages/ROUTE_MAP.md`

.cursor/rules/mini-user-weapp-opentype.mdc

@@ -0,0 +1,46 @@
+---
+description: 微信小程序 open-type 按钮踩坑 — 禁止祖先 catchtap / stopPropagation
+globs: apps/mini-user/**/*.{tsx,ts,css,scss}
+alwaysApply: false
+---
+
+# mini-user · 微信 open-type 硬规则
+
+## 禁止（必踩坑）
+
+**现象**：`Button openType="chooseAvatar" | getPhoneNumber | getUserInfo | share | contact"` 点击无反应、无回调。
+
+**根因**：祖先节点上的 `onClick={(e) => e.stopPropagation()}` 在 Taro 微信端会编译成 **`catchtap`**，拦截子级 `button` 的原生 open-type 能力。
+
+```tsx
+// ❌ 弹层内容上 stopPropagation — 内部 chooseAvatar 会失效
+<View className="mask" onClick={close}>
+  <View className="sheet" onClick={(e) => e.stopPropagation()}>
+    <Button openType="chooseAvatar" onChooseAvatar={...}>选头像</Button>
+  </View>
+</View>
+```
+
+## 正确写法
+
+遮罩与内容拆开：只在 **backdrop** 上关弹层，**sheet 不要**绑 stopPropagation / catchtap。
+
+```tsx
+// ✅
+<View className="mask">
+  <View className="backdrop" onClick={close} />
+  <View className="sheet">
+    <Button openType="chooseAvatar" plain hoverClass="none" onChooseAvatar={...}>
+      ...
+    </Button>
+  </View>
+</View>
+```
+
+## 附加
+
+- `Button` 内 `Image` / 文案加 `pointer-events: none`（或父级 `> * { pointer-events: none }`），避免抢触摸
+- 同类能力：`getPhoneNumber`、`contact`、`share` 同样忌祖先 `catchtap`
+- 详情见知识库「C 端 · 踩坑 · chooseAvatar」
+
+参照实现：`apps/mini-user/src/pages/mine/index.tsx` 资料弹层。

.cursor/skills/dukang-coding/reference-frontend.md

@@ -13,7 +13,7 @@
 
 > **h5-partner 与 admin-web 端口同为 5175**，勿同时 `dev:partner` + `dev:admin`。
 
-Vite 代理：`/api` → `localhost:3000`。
+Vite 代理：`/api` → `localhost:3010`（可用 `VITE_API_TARGET` 覆盖）。
 
 ## 共享包
 

.workbuddy/memory/2026-08-12.md

@@ -0,0 +1,45 @@
+# 2026-08-12 工作记录
+
+## 杜康好客 · 三项功能需求落地（dev_jacy 分支）
+
+### 需求1：管理端用户列表增加好客权益金额列
+- 后端 `server/dukang-api/src/modules/ops/admin-users.service.ts`：
+  - 新增常量 `BENEFIT_STAT_STATUSES = ['ACTIVE','USED_UP']`、`UserBenefitStat` 类型、`EMPTY_BENEFIT_STAT`、`toAmount()`。
+  - `list()` / `detail()` 均调用新增私有方法 `loadBenefitStats(userIds)`，用 `benefitCoupon.groupBy({ by:['userId'], where:{status:{in:[...BENEFIT_STAT_STATUSES]}}, _sum:{totalAmount,usedAmount,balance} })` 批量聚合，避免 N+1。
+  - `mapAdminUserRow` 增加 `benefit` 参数并展开到返回对象。统计口径与 C 端 `listCoupons` 一致（排除 VOID）。
+- 前端 `apps/admin-web/src/lib/api.ts`：`AdminUserRow` 增加 `benefitTotalAmount?/benefitUsedAmount?/benefitBalance?: number`。
+- 前端 `apps/admin-web/src/pages/UsersPage.tsx`：新增「剩余权益/已用权益/累计权益」三列（右对齐、可排序，scroll x 改为 1830），详情抽屉 Descriptions 增加「好客权益」项。
+
+### 需求2：管理端门店入驻合同支持多图上传
+- 新建共享工具 `server/dukang-api/src/common/store-media/contract-urls.util.ts`：`MAX_CONTRACT_FILES=20`、`normalizeContractUrls(urls?, legacy?)`、`contractMediaType(url)`（.pdf→FILE 否则 IMAGE）。
+- 后端 `admin-stores.service.ts`：import 上述工具；create（645 行）/ update（451 行）路径由单条 `contractUrl` 改为遍历建立多条 `bizType:'CONTRACT'` 记录（`sortOrder:i`、`mediaType` 按扩展名判定）。
+- DTO `admin-mutate.dto.ts`：`contractUrl?:string` 标记 `@deprecated`，新增 `contractUrls?:string[]`（`@IsArray @IsString({each:true}) @ArrayMaxSize(20)`）。
+- 前端 `apps/admin-web/src/lib/storeCreate.ts`：`StoreCreateForm.contractUrl?:string` → `contractUrls?:string[]`。
+- `MultiImageUpload.tsx`：新增 `isPdf()`、`FilePdfOutlined`、PDF 缩略图卡片、`buttonText` prop。
+- `StoresPage.tsx`：编辑抽屉 + 创建 step1 表单均改用 `MultiImageUpload`（name=contractUrls, maxCount=20, accept=image/*,.pdf, buttonText="批量上传合同"），回显/保存 payload 改为 `contractUrls:string[]`。
+
+### 需求3：合伙人 H5 门店入驻合同支持多图上传
+
+## 发布流水线（同一会话，22:45 后）
+
+完整跑通 dukang-release 标准流程：`dev_jacy` → push → merge `dev` → merge `main` → 发生产。
+- 提交 `8805335` feat(ops,store,partner): 用户权益列 + 门店合同多图上传（13 文件，356+/59-）
+- `dev_jacy` push → `origin/dev_jacy`(8805335)
+- merge `dev_jacy`→`dev` → `491f03e`，push `origin/dev`
+- merge `dev`→`main` → `4a0e184`，push `origin/main`
+- `deploy/deploy-prod.sh -- --skip-db`（无 Prisma schema 变更，故 --skip-db）→ `DEPLOY_EXIT=0`，`==> 发版完成 (production)`
+- 生产 PM2 全 online：`dukang-api`(8090) / admin-web / h5-partner / h5-shop / h5-user；健康检查 `api:200` `mini-user(h5):200`；版本记录 commit=4a0e184
+
+### 踩坑/注意
+- `git checkout main` 时本机工作树出现 `server/dukang-api` 大量 `D`（误删）假象：实为 sandbox 下 checkout 未刷新工作树，非仓库损坏。用 `git checkout -f main` 重新填充即恢复；`origin/main` 始终正确（ls-remote 核对 4a0e184）。
+- 提交/合并后 `git status` 报 "ahead of origin by N" 为本地 tracking ref 陈旧，非真实分歧（ls-remote 已核对远程三分支均含本次提交）。
+- 仅提交 13 个需求文件 + 新建 `server/dukang-api/src/common/store-media/`，已排除 `.workbuddy/` 与 `fix_acl.ps1`。
+- 发布命令在 sandbox 下直接运行 SSH 部署成功（未强制禁用沙箱）。
+- `apps/h5-partner/src/lib/storeDraft.ts`：`StoreDraftForm.contractUrl:string` → `contractUrls:string[]`；`defaultStoreForm` 改为 `contractUrls:[]`；新增 `MAX_CONTRACT_COUNT=20`；`normalizeStoreDraftForm` 新增 `contractUrls` 计算（兼容旧 `contractUrl` 迁移为数组，去重限 20）；`validateStoreStep2` 参数/校验改为 `contractUrls`，不足 1 张返回「请上传签约合同」。
+- `MultiOssUploadField.tsx`：新增 `accept?`、`unit?` props，`isPdf()`，PDF 缩略图卡片。
+- `StoreCreatePage.tsx`：签约合同区块 `OssUploadField` → `MultiOssUploadField`（value=`form.contractUrls ?? []`, maxCount=MAX_CONTRACT_COUNT, unit="个", accept="image/*,.pdf"）；提交体 `contractUrl` → `contractUrls`，新增 `const contractUrls = Array.from(new Set(...)).slice(0, MAX_CONTRACT_COUNT)`；envPhotoUrls slice 上限由 3 改为 20。修正了渲染块误用未定义变量 `contractUrls`（已改为从 form 读取）。
+
+### 验证
+- 后端 `npx tsc --noEmit`（server/dukang-api）通过，exit 0。
+- admin-web / h5-partner 使用 `git stash` 基线对比法：本次改动**未引入任何新类型错误**（现存错误均为预存在基线问题：css module 声明、`import.meta.env`、过期 config 类型、TabLayout `end`、staff `staffRole` 等）。
+- 向后兼容：旧 `contractUrl` 字段保留并标记 deprecated，H5 草稿旧数据自动迁移；避免破坏现有 API 客户端。

.workbuddy/memory/2026-08-16.md

@@ -0,0 +1,79 @@
+# 2026-08-16
+
+## 新增：线上库同步本地 CLI 工具
+- 文件：`deploy/sync-prod-db-to-local.sh`（新建，未提交）
+- 用途：将生产库 `dukang_prod`（阿里云 RDS `rm-bp139andp1aa385i9.mysql.rds.aliyuncs.com:3306`，用户 `dukangadmin`）同步到本地 Docker MySQL `dukang_haoke`（localhost:6016 / 容器内 `dukang-v1-mysql`，root/root）。
+- 原理：SSH 隧道借道 `dukang-server`（`-L 6018:rds:3306`）→ 本地无 mysql 客户端，故在 `dukang-v1-mysql` 容器内跑 mysqldump/mysql，经 `host.docker.internal:TUNNEL_PORT` 连隧道；管道直导，不落临时文件。
+- 安全：默认先 `docker exec mysqldump` 备份本地到 `deploy/backups/`；需 `--yes` 跳过交互确认；`--dry-run` 只读远端 DATABASE_URL 并打印计划。
+- 远端凭据从 `/opt/dukang/server/dukang-api/.env.production` 的 DATABASE_URL 运行时解析（密码经 `MYSQL_PWD` 环境变量传入，避免命令行暴露）。
+- 已知限制：不支持密码含 `@`；prod DB 名与本地不同（dukang_prod→dukang_haoke）靠 mysqldump 不带 `--databases` 实现库名映射。
+- 状态：仅跑通 `--dry-run`，未执行真实同步（待用户确认，因会覆盖本地库并拉取生产数据）。
+
+## 修复：首次同步失败的根因
+- 失败现象：`mysqldump` 退出码 2，提示 `本地库可能处于不一致状态`（工具自身的失败兜底提示）。
+- 真实根因有两条：
+  1. **密码解析错误**：生产 DB 密码含 `@` 字符（`passHasAt=true`）。原 bash 解析用「第一个 @」切分 userinfo/host，把密码里 `@` 之后的部分截断，导致 Access denied。
+     修复：改为在服务端用 `new URL()` 解析，base64 回传各字段（user/host/port/db/password），本地 `base64 -d` 还原，彻底免疫 `@`/`:`/`$` 等特殊字符。服务端 auth 测试 `authTestStatus=0` 验证密码正确。
+  2. **权限不足**：`dukangadmin`（应用库用户）无 `RELOAD`/`FLUSH_TABLES` 权限。`--single-transaction` 仍会触发全局 `FLUSH TABLES` → Access denied。
+     修复：`mysqldump` 改用 `--lock-tables=0`（不发起 FTWRL）+ `--set-gtid-purged=OFF`（RDS 启用 GTID，否则本地恢复会报 GTID_PURGED 错误），并保留 `--skip-routines --skip-events --column-statistics=0 --no-tablespaces --add-drop-table --skip-triggers --no-create-db`。
+- 验证：结构导出（--no-data）在 4 组 flag 中仅 `--lock-tables=0` / `--skip-lock-tables`（不含 --single-transaction）退出 0。
+- 现工具已修正并实际执行同步（--yes，先自动备份本地到 deploy/backups/）。
+- 注意：`--lock-tables=0` 无事务一致性快照；生产库在线写入期间导出可能有极小不一致，但恢复时 mysqldump 自带 `FOREIGN_KEY_CHECKS=0`，_dev 库可接受。若需完全一致快照，可给 dukangadmin 授 RELOAD 后用 --single-transaction。
+
+## 修改：套餐审核导航样式恢复一致
+- 文件：`apps/admin-web/src/layouts/AdminLayout.tsx` 的 `attachPackageAuditBadge`（`/store-package-audits` 项）。
+- 诉求演变：用户先要求「文字恒为白色」→ 后改为「不要单独处理，保持与子菜单一致，只是多一个待审徽章图标」。
+- 最终实现：label 改为 `<span style={{display:'inline-flex',gap:6}}>套餐审核{pendingCount>0 && <Badge count size="small"/>}</span>`。文字无强制颜色，随菜单主题继承 normal/hover/selected 颜色；徽章仅 pendingCount>0 时作为图标提示，不参与着色。
+
+## 发布流水线（本次收尾，含之前未上线的 8+1 文件）
+- 背景：此前「联系电话脱敏+套餐多行输入+同步工具」等 9 文件 commit `8de4179` 已 push dev_jacy/dev/main，但**生产发布失败**（deploy.env 丢失导致 `未配置 DEPLOY_HOST`）。
+- 修复发布：`deploy.env` 是 gitignore 的本地密钥文件，已丢失不可找回；改用 SSH 别名 `dukang-server`（~/.ssh/config：HostName 47.110.129.57 / User root / IdentityFile pem）覆盖：`bash deploy/deploy-prod.sh --host dukang-server -- --skip-db`。
+- 关键排查：`origin/*` 本地缓存 ref 多次陈旧（误报 ahead/behind），必须以 `git ls-remote` 为准。本次真实远端：dev_jacy=8de4179、dev=c05cd0e、main=bac5c7a，与本地一致，无丢失。
+- 本次提交：`bafb342` fix(admin) 套餐审核样式 → push dev_jacy → merge dev(`0bfc19b`) → merge main(`029fd69`) → push。
+- 发布结果：`DEPLOY_EXIT=0`，`==> 发版完成 (production)`，健康检查 api:200 / mini-user(h5):200，系统版本记录 commit `029fd69`。
+- 提示：以后若想恢复标准 `bash deploy/deploy-prod.sh`（不带 --host），需重建 `deploy/deploy.env`（从 `deploy.env.example` 复制，填入 DEPLOY_HOST=47.110.129.57 等；该文件 gitignore，勿提交）。
+
+## 排查：h5-partner 本地 /login 调 /partner/me 报 401
+- 现象：`http://localhost:5176/login` 启动后控制台报 `GET /api/v1/partner/me 401 (Unauthorized)`。
+- 结论：**不是 bug，是登录页的「过期 token 探测」**。链路：Vite 代理 `/api`→`localhost:3010`（正常）；后端返回 `{"code":401,"message":"Missing token"}`（说明后端在线、代理通）。`ensureSession()`（api.ts:244）只在 localStorage 有 token 时才打 `/partner/me`；无 token 直接返回未登录。所以 401 来自之前测试残留的失效 token → 前端静默清除并展示登录表单，不崩、不弹错。刷新页面（token 已清）即不再出现。
+- 本地登录方式（关键，README 已过期）：
+  - `MOCK_SMS=true`（.env），短信走 mock，不连运营商；固定码 `MOCK_SMS_FIXED_CODE` 默认 `999888`（README 写的 123456 已不准）。
+  - README 的测试号 `13700000001` **不在本地同步库**；本地 `partner_account` 共 9 个，可用真实号如 `18049821889`(Jacy) / `13073729990`(queen)（均 ACTIVE）。
+  - 流程：填真实合伙人手机号 → 获取验证码 → **验证码打印在 `pnpm dev:api` 后端终端**（`Mock SMS → 180****8889 code=XXXXXX`）→ 填码登录。
+  - 注意 h5-partner 默认 5175，本次因 5175 被占自动落到 5176，代理是路径匹配不受影响。
+
+## 发布：v3.4.17 门店套餐审核快捷入口 上生产
+- 提交 `1c91e6b`（dev_jacy 上，含后端 admin-stores.service.ts + AdminStorePackagesSection/StorePackageAuditsPage/StoresPage 三前端 + 开发计划文档）。
+- 流水线：直接快进推送（避免 git checkout 工作树不刷新）：`git push origin dev_jacy` + `dev_jacy:dev` + `dev_jacy:main`，三分支统一到 `1c91e6b`；本地 `git branch -f dev/main origin/*` 同步。
+- 部署：`bash deploy/deploy-prod.sh --host dukang-server -- --skip-db`（后端仅给列表响应加字段，无 schema 变更，故 skip-db）。
+- 结果：`DEPLOY_EXIT=0`，新 tag `v3.4.17`，全部应用构建通过，PM2 重启 dukang-api/h5-shop/h5-partner/admin-web（另拉起 h5-user），健康检查 api:200 / mini-user(h5):200，系统版本记录 commit `1c91e6b`。
+
+## 发布：v3.4.18 套餐变更对比逐字段列出变动明细
+- 需求：套餐变更对比「将变动的地方详细列出来」（之前只给「新增/删除/变更/未变」粗粒度标记，不列具体字段）。
+- 改动仅在 `apps/admin-web/src/pages/StorePackageAuditsPage.tsx`：
+  - 新增 `fieldChanges(live, proposed)`：逐字段比对 价格/套餐名称/菜品内容/可用时间/其他说明/图片，产出 `label+旧值→新值` 明细。
+  - `diffPackages` 给「变更」行附 `changes`。
+  - `PackageDetailCard` 在「待审核」卡片底部渲染「变更明细」块（旧值删除线 → 新值加粗，橙色块）。
+  - 抽屉顶部加「新增 X · 删除 Y · 变更 Z · 未变 W」汇总条。
+- 提交 `bbd7e52`（feat(admin) 套餐变更对比逐字段列出变动明细），快进推送 dev_jacy/dev/main。
+- 部署：`bash deploy/deploy-prod.sh --host dukang-server -- --skip-db`（无 schema 变更）。
+- 结果：构建通过、PM2 重启 admin-web 等、健康检查 api:200 / mini-user(h5):200，系统版本记录 commit `bbd7e52`（无精确 tag，记 tag=-，无害）。
+- 已知局限：配对按「套餐名称」(空则索引) 位置匹配；若套餐被**改名**，会误判为「删除旧名+新增新名」而非「变更」，故名称变更不会出现在逐字段明细里。
+
+## 优化：套餐变更对比·逐字差异 + 文档并入 v3.4.17
+- 需求：变动明细要能**定位到文本中具体哪些字变了（逐字检查）**，且把开发计划文档合并到 v3.4.17 文档里（不再单独留 v3.4.18 文档）。
+- 代码改动（仍仅 `StorePackageAuditsPage.tsx`）：
+  - `diffText(a,b)`：LCS 动态规划 (`dp[i][j]`)+回溯，产出 `equal/delete/insert` 段落并合并相邻同类型；`O(|a|·|b|)`，字段长度可控。
+  - `TextDiff({oldText,newText})`：两行渲染——「原：」红删线标被删字、「新：」绿标新增字。
+  - `FieldChange` 增加 `kind: 'text'|'value'`：价格/图片走 `旧→新`；套餐名称/菜品内容/可用时间/其他说明走 `TextDiff` 逐字高亮。
+  - `杜康好客-v3.4.17-门店套餐审核快捷入口.md` 新增第 F 节「套餐变更对比·逐字段/逐字明细」，并把原先 v3.4.18 的字段级说明并入，删去独立 v3.4.18 文档计划。
+- 提交 `ecd9973`，快进推送 dev_jacy/dev/main，部署 `--host dukang-server -- --skip-db`。
+- 结果：构建通过、健康检查 api:200 / mini-user(h5):200，系统版本记录 commit `ecd9973`（tag=-，无害）。
+- 验证要点：开任一「变更」套餐的待审核卡片 → 底部「变更明细」→ 菜品/说明等文本以红删+绿增逐字呈现。
+
+## 优化：h5-partner 门店详情·门店套餐「编辑套餐」按钮
+- 需求：按钮**缩小、靠最右侧、保持美观**。根因：`.partner-btn-outline` 是整行大按钮(`flex:1; height:48px; font-size:16px`)，放在卡片标题右侧会被拉伸成大块。
+- 改动：`apps/h5-partner/src/styles.css` 新增 `.partner-btn-outline--compact`（`flex:none; height:30px; padding:0 14px; font-size:13px; font-weight:500; border-radius:var(--radius-sm); color:var(--color-primary)`，hover 用 `color-mix` 8% 底色）；`StoreDetailPage.tsx:288` 的「编辑套餐」按钮加该类（父级 `space-between` 已保证贴右）。
+- 提交 `69e201f`，快进推送 dev_jacy/dev/main，部署 `--host dukang-server -- --skip-db`。
+- 结果：构建通过、PM2 重启 h5-partner、健康检查 api:200 / mini-user(h5):200，系统版本记录 commit `69e201f`（tag=-，无害）。
+- 注意：`StoreDetailPage.tsx:311` 有个历史遗留 TS 错误（`status === 'CLOSED'` 类型无重叠），与本改动无关，未动。

.workbuddy/memory/2026-08-17.md

@@ -0,0 +1,70 @@
+# 2026-08-17 工作日志
+
+## 杜康好客 v3.4.18 门店体验与登录态优化（含 F 项）
+
+### 已实现并发布
+- **A** mini-user 门店座机脱敏：改 `apps/mini-user/src/lib/phone.ts` 的 `maskPhone` 座机分支，中间四位 `****`（保留区号+首2+末2）。
+- **B** 套餐详情图 1/5 计数 + 自动轮播：`ProductCarousel.tsx` detail 变体加 autoplay(3.5s) + 右下角 `1/N` 计数。
+- **C** 合伙人暂停禁止登录：`auth.service.ts` 三处非 ACTIVE 抛「该账号已暂停使用，请联系客服人员」；`h5-partner/LoginPage.tsx` 同步文案；复用 `DISABLED` 枚举，无迁移。
+- **D** 门店端提现/筛选栏留白对齐：`h5-shop/styles.css` 补 `--space-page`。
+- **E** 休息中核销→是否开启营业：`PhoneRedeemPage`/`RedeemConfirmPage` 弹「是否开启营业？」，确认调 `PUT /shop/store/status` 开张后继续。
+- **F（本次新增）** 门店套餐图片自适应完整显示：`ProductCarousel` 新增 `imageFit="adaptive"`（`mode="widthFix"` + 按真实比例动态算 Swiper 高度），`product-detail.css` 加 `.detail-carousel-wrap--adaptive` 覆盖固定 1:1 裁剪；仅 `store-package-detail` 使用。根因：原 `.detail-carousel-wrap` 固定 `aspect-ratio:1` + `overflow:hidden` + `aspectFill` 裁掉非正方形图。
+
+### 发布状态
+- 文档：`杜康好客-v3.4.18-门店体验与登录态优化.md`（含 A–F 范围、实现位置、验收清单）。
+- git：本地 `dev_jacy` 提交 v3.4.18 各功能 + F 修复；已 `git push origin dev_jacy:main`（干净快进 `984dec7..18147e1`）。
+- 生产部署：后台运行 `deploy/deploy-prod.sh --host dukang-server`（/opt/dukang, main）。SSH 配置主机 `dukang-server` 即生产机；`deploy.env` 缺失，用 `--host` 覆盖。
+
+### 注意
+- 本次 git 发布前曾遇 origin/main 比本地新、working tree 异常删除 503 文件（已 `reset --hard HEAD` 还原，提交完好）；最终 fetch 后确认本地领先可快进，安全发布。
+- 四端 tsc 仅余项目既有环境类报错（CSS 导入/ImportMeta.env），本次改动文件无新增类型错误。
+
+### F 项方案 A 改写（22:18）
+- 放弃手算高度逻辑（SelectorQuery + onLoad 测自然宽高），改用 swiper 原生 `autoHeight`：海报有多高轮播就有多高，无裁切。
+- `ProductCarousel.tsx`：删 `wrapWidth`/`imgHeights`/`handleImageLoad`/`swiperStyle`，adaptive 模式加 `autoHeight={isAdaptive}`，image 保持 `mode="widthFix"`。
+- `product-detail.css`：`.detail-carousel-wrap--adaptive` 覆盖（删 `aspect-ratio:1`/`overflow:hidden`），并给 `.detail-carousel`/`.detail-carousel-item`/`.detail-carousel-image` 在 adaptive 下 `height:auto`。
+- 已提交 `cd1e9ae` 并 `git push origin dev_jacy:main`（干净快进 `18147e1..cd1e9ae`）。
+- 重要：F 是原生微信小程序端改动，服务器部署只覆盖 H5-user 构建；真机小程序用户需经「微信开发者工具上传 + 微信审核」才能生效。
+
+### E 项缺陷修复（22:46 测试不通过）
+- **根因**：门店非 OPEN 时，后端 `redeem.service.ts:loadOpenStoreAccount`（previewRedeem/confirmRedeem 共用）抛「门店未营业」，导致 `RedeemConfirmPage` 的 `preview` 拉取失败 → `preview` 为 null → 「确认核销」按钮 `disabled={!preview}` → 点击不了 → 开张弹窗永远不触发。手机号路径因弹窗在「发送验证码」时触发故未暴露。
+- **修复**：`RedeemConfirmPage` 把 preview 拉取抽成 `loadPreview()`；确认按钮改为 `disabled={loading || (!preview && !storeClosed)}`（闭店时仍可点→弹框）；`openStoreAndContinue` 开张成功后 `await loadPreview()` 再 `doConfirm()`。
+- 弹窗文案对齐需求：「门店目前休息中无法核销，是否开启营业」（两页 modal title=门店休息中 / desc=该句；内联提示改为「门店目前休息中无法核销，开启营业后可继续」）。
+- 提交 `3ac008a`，`git push origin dev_jacy:main`（快进 `cd1e9ae..3ac008a`），生产重新部署中（deploy-prod.sh --host dukang-server）。
+- 注意：后端 `updateShopStatus` 对 CLOSED(永久关闭) 门店拒绝开张（抛「门店已永久关闭...」），属预期；需求针对 闭店/休息中(PAUSED) 场景，OK。
+
+### E 项方案二次修正（23:00 用户纠正：前置到点击扫码）
+- **用户新要求**：门店 PAUSED 时，**点击「扫码核销」按钮那一刻就弹窗**，而不是扫完码进确认页才弹。
+- **改动**：`apps/h5-shop/src/pages/HomePage.tsx`（门店端首页）。
+  - 复用 dashboard 已加载的 `status`（`dash?.store?.status`，L384 `status = String(store?.status||'')`）。
+  - `handleScan()` 开头：`if (status !== 'OPEN') { setShowOpenModal(true); return; }` —— 不进入 isWechatEnv/scanQrCode 流程。
+  - 新增 `openStoreAndContinue()`：`PUT /shop/store/status {OPEN}`，成功后 `loadDashboard()` 刷新状态（开关/扫码按钮同步），用户可再次点击扫码。
+  - 弹窗复用全局 `.shop-redeem-modal` 样式（与确认页一致），文案「门店目前休息中无法核销，是否开启营业？」。
+  - `RedeemConfirmPage` 的弹窗保留为带码直入确认页的兜底。
+- 提交 `c0d04ee`，`git push origin dev_jacy:main`（快进 `3ac008a..c0d04ee`），生产重新部署中（deploy-prod.sh --host dukang-server）。文档 E 节已同步更新方案描述。
+
+### C 项缺陷修复（合伙人端 DISABLED 仍登录 - 微信路径）
+- **现象**：手机号(短信)路径已正确拦截（login 前先 `POST /partner/auth/phone/check` 校验非 ACTIVE 即拒），但**微信 OAuth 路径**报错被吞 → 用户无任何提示。
+- **根因**：`apps/h5-partner/src/contexts/PartnerSessionContext.tsx` L118 `catch { stripOAuthParamsFromLocation(); }` 把微信回调里 `processPartnerWechatOAuthCallback` 抛出的「该账号已暂停使用」错误吞掉。
+- **修复**：`catch (e) { stripOAuthParamsFromLocation(); toastError(e); }`（`toastError` 从 `@/lib/toast` 引入），让微信登录被暂停时同样弹「该账号已暂停使用，请联系客服人员」。
+- 提交 `5ca9aa0`，`git push origin dev_jacy:main`（快进 `c0d04ee..5ca9aa0`）。
+- 生产部署完成（deploy-prod.sh --host dukang-server, 38s）：dukang-api 200、各 h5/partner 服务 online。mini-user(h5) 健康检查 FAIL 与本次无关（非 v3.4.18 改动范围，本次改 native 小程序 + h5-shop + h5-partner）。
+- **验收状态**：A/B/C/D/E/F 全部提交并发布生产；C 项的短信 + 微信两条路径拦截逻辑均已落地，建议真机/微信环境复测一次确认 toast 文案展示。
+
+### C 项双拦截增强（23:37 用户要求“两个都要拦”）
+- **澄清**：city 合伙人有两个独立状态字段，别混：
+  - `partner_account.status`（AccountStatus: ACTIVE/DISABLED）= **登录账号启用态**，feature 原拦截查的就是它（子账号自身）。
+  - `partner_account.bindingStatus`（CityPartnerStatus: ACTIVE/PAUSED）= **城市合伙人绑定态**，主账号为准；子账号取父主账号的此字段。
+- **需求**：子账号 `status=DISABLED` 与 主账号 `bindingStatus=PAUSED` **都要拦**。
+- **实现**：`auth.service.ts` 新增统一闸门 `assertPartnerAccountActive(account)`（L313），同时拦上述两种；替换三处旧校验：`assertPartnerAccountByPhone`(L334) / `loginPartner`(L1086) / `loginPartnerWechat`(L1748)。
+  - 自身非 ACTIVE → 「该账号已暂停使用，请联系客服人员」
+  - 主账号 bindingStatus 非 ACTIVE → 「该合伙人合作已暂停，请联系客服人员」
+- **文档**：`杜康好客-v3.4.18-...md` C 节重写为双拦截；顶部范围表 + 验收清单同步。
+- 提交 `48d6900`，`git push origin dev_jacy:main`（快进 `5ca9aa0..48d6900`），生产部署完成（task I2mWSU, 37s）：commit=48d6900、api 200、各服务 online。
+- **生产实测双拦截均生效**：
+  - `status=DISABLED`（id=7 临时翻转→测试→已还原 ACTIVE）：`phone/check` 返回 400「该账号已暂停使用，请联系客服人员」；还原后 201 ok:true。
+  - `bindingStatus=PAUSED`（18049821889 等 3 个主账号）：`phone/check` 返回 400「该合伙人合作已暂停，请联系客服人员」（修复前为 200 ok:true）。
+  - 库内 status!=ACTIVE 数量=0；binding_status!=ACTIVE 数量=3（均为主账号 PAUSED）。
+- **遗留未提交文件（非本次改动，需用户决策）**：
+  - `apps/h5-shop/src/styles.css`：`shop-records-status-chips` 由 `padding:0` → `padding-bottom:10px`（D 项后续微调，未提交）。
+  - `apps/mini-user/src/styles/product-detail.css`：工作区版本把方案A（`aspect-ratio:auto`/`height:auto`）改回固定 4:3（`aspect-ratio:1.33`/`height:100%`），与已上线方案A矛盾，疑似另一轮实验性改动。已与用户确认前**暂不提交**。

AGENTS.md

@@ -28,7 +28,7 @@ pnpm db:generate && pnpm db:validate
 cd server/dukang-api && npx prisma db push && pnpm prisma:seed
 
 # 开发（分终端）
-pnpm dev:api      # http://localhost:3000/api/v1
+pnpm dev:api      # http://localhost:3010/api/v1
 pnpm dev:user     # :5173
 pnpm dev:shop     # :5174
 pnpm dev:partner  # :5175
@@ -137,11 +137,14 @@ 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`。
+
 ## 环境与发版
 
 | 环境 | 分支 | 目录 | 端口 | 域名 |
 |------|------|------|------|------|
-| local | `dev_jacy` | 本机 Docker 6016/6017 | API `:3000` | — |
+| 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` |
 

apps/AGENTS.md

@@ -22,6 +22,7 @@ V2 规划中的 `mini-partner` / `mini-hq` 非 V3 主交付。
 - 禁止 import `server/` 或另一个 `apps/*` 的源码
 - UI 共享组件优先 `@dukang/shared-ui`
 - C 端订单列表 **3 Tab**：`待付款 | 已付款 | 已完成`（Tab key: `pending_pay` / `paid` / `completed`）
+- **mini-user 微信 open-type**：含 `chooseAvatar` / `getPhoneNumber` 等的 `Button`，祖先禁止 `stopPropagation`（会编成 `catchtap` 导致点击无反应）；见知识库 C 端踩坑、`.cursor/rules/mini-user-weapp-opentype.mdc`
 
 ## 新页面 workflow
 

apps/admin-web/package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^5.5.1",
+    "@dukang/domain": "workspace:*",
     "@dukang/shared-types": "workspace:*",
     "@dukang/shared-ui": "workspace:*",
     "antd": "^5.22.0",

apps/admin-web/src/App.tsx

@@ -46,6 +46,7 @@ import PartnerLogsPage from './pages/PartnerLogsPage';
 import WechatBindingsPage from './pages/WechatBindingsPage';
 import HqPermissionsPage from './pages/HqPermissionsPage';
 import SystemSettingsPage from './pages/SystemSettingsPage';
+import TestWhitelistPage from './pages/TestWhitelistPage';
 import WecomBotsPage from './pages/WecomBotsPage';
 import WecomMessagePushesPage from './pages/WecomMessagePushesPage';
 import WecomBotLogsPage from './pages/WecomBotLogsPage';
@@ -136,6 +137,7 @@ export default function App() {
         <Route path="/deliveries" element={<DeliveriesPage />} />
         <Route path="/deliveries/xiaofeixia" element={<XiaofeixiaTestPage />} />
         <Route path="/hq-permissions" element={<HqPermissionsPage />} />
+        <Route path="/test-whitelist" element={<TestWhitelistPage />} />
         <Route path="/system-settings" element={<SystemSettingsPage />} />
         <Route path="/hq-accounts" element={<HqAccountsPage />} />
       </Route>

apps/admin-web/src/admin.css

@@ -86,3 +86,21 @@ body,
 .admin-table-nowrap .ant-table-cell-ellipsis {
   white-space: nowrap;
 }
+
+.admin-package-audit-cols {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 16px;
+  align-items: start;
+}
+
+.admin-package-audit-col {
+  min-width: 0;
+}
+
+.admin-package-audit-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+  overflow: visible;
+  max-width: none;
+}

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

@@ -1,253 +1,381 @@
-import { useEffect, useState } from 'react';
+import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { Alert, Button, Form, Input, InputNumber, Modal, Space, Typography, message } from 'antd';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
-import type { StorePackageItemDto } from '@dukang/shared-types';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import type { StorePackageItemDto, StorePackagesResponse } from '@dukang/shared-types';
+import { STORE_PACKAGE_IMAGE_MAX_COUNT, STORE_PACKAGE_MAX_COUNT, normalizeStorePackageImageUrls } from '@dukang/shared-types';
 import { request } from '../lib/api';
-import OssUpload from './OssUpload';
+import { PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
+import PackageImagesUpload from './PackageImagesUpload';
+
 type PackageRow = StorePackageItemDto;
 
+export type AdminStorePackagesHandle = {
+  /** 套餐已加载时写入；加载中则跳过，避免空数据覆盖线上套餐 */
+  saveIfLoaded: (opts?: { quiet?: boolean }) => Promise<{ skipped: boolean }>;
+};
+
 function emptyRow(index = 0): PackageRow {
-  return { name: '', price: '0', dishes: '', usableTime: '', otherNotes: '', imageUrl: '', sortOrder: index };
+  return {
+    name: '',
+    price: '0',
+    dishes: '',
+    usableTime: '',
+    otherNotes: '',
+    imageUrl: '',
+    imageUrls: [],
+    sortOrder: index,
+  };
 }
 
-export default function AdminStorePackagesSection({ storeId }: { storeId: string }) {
-  const [items, setItems] = useState<PackageRow[]>([emptyRow()]);
-  const [collapsed, setCollapsed] = useState<Record<number, boolean>>({});
-  const [loading, setLoading] = useState(true);
-  const [saving, setSaving] = useState(false);
+const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId: string }>(
+  function AdminStorePackagesSection({ storeId }, ref) {
+    const [items, setItems] = useState<PackageRow[]>([emptyRow()]);
+    const [collapsed, setCollapsed] = useState<Record<number, boolean>>({});
+    const [loading, setLoading] = useState(true);
+    const [saving, setSaving] = useState(false);
+    const [pendingRequest, setPendingRequest] = useState<StorePackagesResponse['pendingRequest']>(null);
+    const itemsRef = useRef(items);
+    const loadingRef = useRef(loading);
+    const navigate = useNavigate();
 
-  useEffect(() => {
-    setLoading(true);
-    request<{ live: PackageRow[] }>(`/admin/stores/${storeId}/packages`)
-      .then((data) => {
+    useEffect(() => {
+      itemsRef.current = items;
+    }, [items]);
+
+    useEffect(() => {
+      loadingRef.current = loading;
+    }, [loading]);
+
+    useEffect(() => {
+      setLoading(true);
+      setPendingRequest(null);
+      request<StorePackagesResponse>(`/admin/stores/${storeId}/packages`)
+        .then((data) => {
+          setPendingRequest(data.pendingRequest ?? null);
+          setItems(
+            data.live?.length
+              ? data.live.map((p, i) => {
+                  const imageUrls = normalizeStorePackageImageUrls(p);
+                  return {
+                    ...p,
+                    price: String(p.price),
+                    imageUrl: imageUrls[0] ?? '',
+                    imageUrls,
+                    sortOrder: i,
+                  };
+                })
+              : [],
+          );
+        })
+        .catch((e) => message.error(e instanceof Error ? e.message : '加载套餐失败'))
+        .finally(() => setLoading(false));
+    }, [storeId]);
+
+    // 在审核页完成审核后，自动刷新本页「有待审核套餐」提醒
+    useEffect(() => {
+      const onChanged = () => {
+        request<StorePackagesResponse>(`/admin/stores/${storeId}/packages`)
+          .then((data) => setPendingRequest(data.pendingRequest ?? null))
+          .catch(() => undefined);
+      };
+      window.addEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
+      return () => window.removeEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
+    }, [storeId]);
+
+    function goAudit() {
+      if (pendingRequest) navigate(`/store-package-audits?requestId=${pendingRequest.id}`);
+    }
+
+    const pendingReminder =
+      pendingRequest && pendingRequest.status === 'PENDING' ? (
+        <Alert
+          type="warning"
+          showIcon
+          style={{ marginBottom: 16 }}
+          message="该门店有待审核套餐"
+          description={
+            <Space>
+              <Button size="small" type="primary" onClick={goAudit}>
+                审核
+              </Button>
+              <Button size="small" onClick={goAudit}>
+                对比
+              </Button>
+            </Space>
+          }
+        />
+      ) : null;
+
+    function updateAt(index: number, patch: Partial<PackageRow>) {
+      setItems((prev) => prev.map((item, i) => (i === index ? { ...item, ...patch } : item)));
+    }
+
+    function addRow() {
+      if (items.length >= STORE_PACKAGE_MAX_COUNT) return;
+      setItems((prev) => [...prev, emptyRow(prev.length)]);
+    }
+
+    function removeAt(index: number) {
+      const run = () => {
+        setItems((prev) => {
+          const next = prev.filter((_, i) => i !== index).map((item, i) => ({ ...item, sortOrder: i }));
+          return next.length ? next : [];
+        });
+        setCollapsed((prev) => {
+          const next: Record<number, boolean> = {};
+          Object.entries(prev).forEach(([k, v]) => {
+            const i = Number(k);
+            if (i < index) next[i] = v;
+            else if (i > index) next[i - 1] = v;
+          });
+          return next;
+        });
+      };
+      if (items.length === 1) {
+        Modal.confirm({
+          title: '清空门店套餐',
+          content: '删除最后一条套餐后，该门店将无展示套餐，确认继续？',
+          okText: '确认删除',
+          cancelText: '取消',
+          onOk: run,
+        });
+        return;
+      }
+      run();
+    }
+
+    function toggleCollapse(index: number) {
+      setCollapsed((prev) => ({ ...prev, [index]: !prev[index] }));
+    }
+
+    async function save(opts?: { quiet?: boolean }) {
+      const currentItems = itemsRef.current;
+      const filled = currentItems
+        .map((item, index) => {
+          const imageUrls = normalizeStorePackageImageUrls(item);
+          return {
+            name: item.name.trim(),
+            price: item.price.trim(),
+            dishes: item.dishes.trim(),
+            usableTime: item.usableTime?.trim() || null,
+            otherNotes: item.otherNotes?.trim() || null,
+            imageUrl: imageUrls[0] ?? null,
+            imageUrls,
+            sortOrder: index,
+          };
+        })
+        // 允许整店无套餐：忽略空白占位行（默认 price=0 不算已填）
+        .filter((item) => {
+          const hasText = !!(item.name || item.dishes || item.usableTime || item.otherNotes);
+          const hasImages = item.imageUrls.length > 0;
+          const hasNonZeroPrice = item.price !== '' && Number(item.price) !== 0;
+          return hasText || hasImages || hasNonZeroPrice;
+        });
+
+      for (let i = 0; i < filled.length; i++) {
+        const item = filled[i];
+        if (!item.name) {
+          message.warning(`第 ${i + 1} 条套餐名称不能为空`);
+          throw new Error('套餐校验失败');
+        }
+        if (!item.dishes) {
+          message.warning(`第 ${i + 1} 条套餐菜品不能为空`);
+          throw new Error('套餐校验失败');
+        }
+        const price = Number(item.price);
+        if (!Number.isFinite(price) || price < 0) {
+          message.warning(`第 ${i + 1} 条套餐价格须为非负数字`);
+          throw new Error('套餐校验失败');
+        }
+        if ((item.imageUrls?.length ?? 0) > STORE_PACKAGE_IMAGE_MAX_COUNT) {
+          message.warning(`第 ${i + 1} 条套餐图片最多 ${STORE_PACKAGE_IMAGE_MAX_COUNT} 张`);
+          throw new Error('套餐校验失败');
+        }
+      }
+
+      setSaving(true);
+      try {
+        const data = await request<{ live: PackageRow[] }>(`/admin/stores/${storeId}/packages`, {
+          method: 'PUT',
+          body: JSON.stringify({
+            packages: filled.map((p) => ({ ...p, price: Number(p.price).toFixed(2) })),
+          }),
+        });
+        if (!opts?.quiet) message.success('套餐已保存并生效');
         setItems(
           data.live?.length
-            ? data.live.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i }))
-            : [emptyRow()],
+            ? data.live.map((p, i) => {
+                const imageUrls = normalizeStorePackageImageUrls(p);
+                return {
+                  ...p,
+                  price: String(p.price),
+                  imageUrl: imageUrls[0] ?? '',
+                  imageUrls,
+                  sortOrder: i,
+                };
+              })
+            : [],
         );
-      })
-      .catch((e) => message.error(e instanceof Error ? e.message : '加载套餐失败'))
-      .finally(() => setLoading(false));
-  }, [storeId]);
-
-  function updateAt(index: number, patch: Partial<PackageRow>) {
-    setItems((prev) => prev.map((item, i) => (i === index ? { ...item, ...patch } : item)));
-  }
-
-  function addRow() {
-    if (items.length >= STORE_PACKAGE_MAX_COUNT) return;
-    setItems((prev) => [...prev, emptyRow(prev.length)]);
-  }
-
-  function removeAt(index: number) {
-    const run = () => {
-      setItems((prev) => {
-        const next = prev.filter((_, i) => i !== index).map((item, i) => ({ ...item, sortOrder: i }));
-        return next.length ? next : [];
-      });
-      setCollapsed((prev) => {
-        const next: Record<number, boolean> = {};
-        Object.entries(prev).forEach(([k, v]) => {
-          const i = Number(k);
-          if (i < index) next[i] = v;
-          else if (i > index) next[i - 1] = v;
-        });
-        return next;
-      });
-    };
-    if (items.length === 1) {
-      Modal.confirm({
-        title: '清空门店套餐',
-        content: '删除最后一条套餐后，该门店将无展示套餐，确认继续？',
-        okText: '确认删除',
-        cancelText: '取消',
-        onOk: run,
-      });
-      return;
-    }
-    run();
-  }
-  function toggleCollapse(index: number) {
-    setCollapsed((prev) => ({ ...prev, [index]: !prev[index] }));
-  }
-
-  async function save() {
-    const filled = items
-      .map((item, index) => ({
-        name: item.name.trim(),
-        price: item.price.trim(),
-        dishes: item.dishes.trim(),
-        usableTime: item.usableTime?.trim() || null,
-        otherNotes: item.otherNotes?.trim() || null,
-        imageUrl: item.imageUrl?.trim() || null,
-        sortOrder: index,
-      }))
-      .filter((item) => item.name || item.dishes || item.price);
-
-    for (let i = 0; i < filled.length; i++) {
-      const item = filled[i];
-      if (!item.name) {
-        message.warning(`第 ${i + 1} 条套餐名称不能为空`);
-        return;
-      }
-      if (!item.dishes) {
-        message.warning(`第 ${i + 1} 条套餐菜品不能为空`);
-        return;
-      }
-      const price = Number(item.price);
-      if (!Number.isFinite(price) || price < 0) {
-        message.warning(`第 ${i + 1} 条套餐价格须为非负数字`);
-        return;
+      } catch (e) {
+        if (!opts?.quiet) message.error(e instanceof Error ? e.message : '保存失败');
+        throw e;
+      } finally {
+        setSaving(false);
       }
     }
 
-    setSaving(true);
-    try {
-      await request(`/admin/stores/${storeId}/packages`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          packages: filled.map((p) => ({ ...p, price: Number(p.price).toFixed(2) })),
-        }),
-      });
-      message.success('套餐已保存并生效');
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '保存失败');
-    } finally {
-      setSaving(false);
+    useImperativeHandle(ref, () => ({
+      saveIfLoaded: async (opts) => {
+        if (loadingRef.current) return { skipped: true };
+        await save(opts);
+        return { skipped: false };
+      },
+    }));
+
+    if (loading) {
+      return <Typography.Text type="secondary">加载套餐中…</Typography.Text>;
     }
-  }
 
-  if (loading) {
-    return <Typography.Text type="secondary">加载套餐中…</Typography.Text>;
-  }
+    if (!items.length) {
+      return (
+        <Form layout="vertical" requiredMark={false}>
+          <Alert type="info" showIcon style={{ marginBottom: 16 }} message="该门店暂无套餐，可添加或保存为空。" />
+          {pendingReminder}
+          <Button onClick={addRow} style={{ marginBottom: 16 }}>
+            添加套餐
+          </Button>
+          <Button type="primary" loading={saving} onClick={() => void save().catch(() => undefined)}>
+            保存套餐
+          </Button>
+        </Form>
+      );
+    }
 
-  if (!items.length) {
     return (
       <Form layout="vertical" requiredMark={false}>
-        <Alert type="info" showIcon style={{ marginBottom: 16 }} message="该门店暂无套餐，可添加或保存为空。" />
-        <Button onClick={addRow} style={{ marginBottom: 16 }}>
-          添加套餐
-        </Button>
-        <Button type="primary" loading={saving} onClick={() => void save()}>
+        {pendingReminder}
+        <Alert
+          type="info"
+          showIcon
+          style={{ marginBottom: 16 }}
+          message={`总部直存立即生效，无需审核。同一门店最多 ${STORE_PACKAGE_MAX_COUNT} 条套餐。`}
+        />
+
+        {items.map((item, index) => {
+          const isCollapsed = !!collapsed[index];
+          const displayName = item.name.trim() || `套餐 ${index + 1}`;
+          return (
+            <div
+              key={index}
+              style={{
+                marginBottom: 16,
+                padding: 16,
+                border: '1px solid #f0f0f0',
+                borderRadius: 8,
+                background: '#fafafa',
+              }}
+            >
+              <Space style={{ width: '100%', justifyContent: 'space-between', marginBottom: isCollapsed ? 0 : 12 }}>
+                <Button
+                  type="text"
+                  icon={isCollapsed ? <DownOutlined /> : <UpOutlined />}
+                  onClick={() => toggleCollapse(index)}
+                  style={{ paddingLeft: 0, height: 'auto' }}
+                >
+                  <Typography.Title level={5} style={{ margin: 0 }}>
+                    {displayName}
+                  </Typography.Title>
+                </Button>
+                {items.length > 0 ? (
+                  <Button type="link" danger onClick={() => removeAt(index)}>
+                    删除
+                  </Button>
+                ) : null}
+              </Space>
+
+              {!isCollapsed ? (
+                <>
+                  <Form.Item label="套餐名称" required style={{ marginBottom: 12 }}>
+                    <Input
+                      placeholder="如：套餐A"
+                      value={item.name}
+                      onChange={(e) => updateAt(index, { name: e.target.value })}
+                    />
+                  </Form.Item>
+
+                  <Form.Item label="价格（元）" required style={{ marginBottom: 12 }}>
+                    <InputNumber
+                      min={0}
+                      precision={2}
+                      style={{ width: '100%' }}
+                      addonAfter="元"
+                      placeholder="198"
+                      value={item.price === '' ? undefined : Number(item.price)}
+                      onChange={(v) => updateAt(index, { price: v != null ? String(v) : '' })}
+                    />
+                  </Form.Item>
+
+                  <Form.Item label="菜品" required style={{ marginBottom: 12 }}>
+                    <Input.TextArea
+                      rows={2}
+                      placeholder="红烧肉、红烧鱼、油焖茄子"
+                      value={item.dishes}
+                      onChange={(e) => updateAt(index, { dishes: e.target.value })}
+                    />
+                  </Form.Item>
+
+                  <Form.Item label="使用时间" style={{ marginBottom: 12 }}>
+                    <Input.TextArea
+                      rows={2}
+                      placeholder="节假日除外"
+                      value={item.usableTime || ''}
+                      onChange={(e) => updateAt(index, { usableTime: e.target.value })}
+                    />
+                  </Form.Item>
+
+                  <Form.Item label="套餐图片" style={{ marginBottom: 12 }}>
+                    <PackageImagesUpload
+                      value={normalizeStorePackageImageUrls(item)}
+                      onChange={(imageUrls) =>
+                        updateAt(index, {
+                          imageUrls,
+                          imageUrl: imageUrls[0] ?? '',
+                        })
+                      }
+                    />
+                  </Form.Item>
+
+                  <Form.Item label="其他说明" style={{ marginBottom: 0 }}>
+                    <Input.TextArea
+                      rows={2}
+                      placeholder="不可叠加"
+                      value={item.otherNotes || ''}
+                      onChange={(e) => updateAt(index, { otherNotes: e.target.value })}
+                    />
+                  </Form.Item>
+                </>
+              ) : null}
+            </div>
+          );
+        })}
+
+        {items.length < STORE_PACKAGE_MAX_COUNT ? (
+          <Button onClick={addRow} style={{ marginBottom: 16 }}>
+            添加套餐
+          </Button>
+        ) : null}
+
+        <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
+          上传套餐图后请点右上角「保存修改」（会连同套餐一起保存），或点下方「保存套餐」。仅上传不保存，刷新会丢失。
+        </Typography.Paragraph>
+
+        <Button type="primary" loading={saving} onClick={() => void save().catch(() => undefined)}>
           保存套餐
         </Button>
       </Form>
     );
-  }
+  },
+);
 
-  return (    <Form layout="vertical" requiredMark={false}>
-      <Alert
-        type="info"
-        showIcon
-        style={{ marginBottom: 16 }}
-        message={`总部直存立即生效，无需审核。同一门店最多 ${STORE_PACKAGE_MAX_COUNT} 条套餐。`}
-      />
-
-      {items.map((item, index) => {
-        const isCollapsed = !!collapsed[index];
-        const displayName = item.name.trim() || `套餐 ${index + 1}`;
-        return (
-          <div
-            key={index}
-            style={{
-              marginBottom: 16,
-              padding: 16,
-              border: '1px solid #f0f0f0',
-              borderRadius: 8,
-              background: '#fafafa',
-            }}
-          >
-            <Space style={{ width: '100%', justifyContent: 'space-between', marginBottom: isCollapsed ? 0 : 12 }}>
-              <Button
-                type="text"
-                icon={isCollapsed ? <DownOutlined /> : <UpOutlined />}
-                onClick={() => toggleCollapse(index)}
-                style={{ paddingLeft: 0, height: 'auto' }}
-              >
-                <Typography.Title level={5} style={{ margin: 0 }}>
-                  {displayName}
-                </Typography.Title>
-              </Button>
-              {items.length > 0 ? (
-                <Button type="link" danger onClick={() => removeAt(index)}>
-                  删除
-                </Button>
-              ) : null}            </Space>
-
-            {!isCollapsed ? (
-              <>
-                <Form.Item label="套餐名称" required style={{ marginBottom: 12 }}>
-                  <Input
-                    placeholder="如：套餐A"
-                    value={item.name}
-                    onChange={(e) => updateAt(index, { name: e.target.value })}
-                  />
-                </Form.Item>
-
-                <Form.Item label="价格（元）" required style={{ marginBottom: 12 }}>
-                  <InputNumber
-                    min={0}
-                    precision={2}
-                    style={{ width: '100%' }}
-                    addonAfter="元"
-                    placeholder="198"
-                    value={item.price === '' ? undefined : Number(item.price)}
-                    onChange={(v) => updateAt(index, { price: v != null ? String(v) : '' })}
-                  />
-                </Form.Item>
-
-                <Form.Item label="菜品" required style={{ marginBottom: 12 }}>
-                  <Input.TextArea
-                    rows={2}
-                    placeholder="红烧肉、红烧鱼、油焖茄子"
-                    value={item.dishes}
-                    onChange={(e) => updateAt(index, { dishes: e.target.value })}
-                  />
-                </Form.Item>
-
-                <Form.Item label="使用时间" style={{ marginBottom: 12 }}>
-                  <Input
-                    placeholder="节假日除外"
-                    value={item.usableTime || ''}
-                    onChange={(e) => updateAt(index, { usableTime: e.target.value })}
-                  />
-                </Form.Item>
-
-                <Form.Item label="套餐图片" style={{ marginBottom: 12 }}>
-                  <OssUpload
-                    bizType="STORE_PACKAGE"
-                    mediaType="IMAGE"
-                    value={item.imageUrl || undefined}
-                    onChange={(url) => updateAt(index, { imageUrl: url })}
-                  />
-                </Form.Item>
-
-                <Form.Item label="其他说明" style={{ marginBottom: 0 }}>                  <Input
-                    placeholder="不可叠加"
-                    value={item.otherNotes || ''}
-                    onChange={(e) => updateAt(index, { otherNotes: e.target.value })}
-                  />
-                </Form.Item>
-              </>
-            ) : null}
-          </div>
-        );
-      })}
-
-      {items.length < STORE_PACKAGE_MAX_COUNT ? (
-        <Button onClick={addRow} style={{ marginBottom: 16 }}>
-          添加套餐
-        </Button>
-      ) : null}
-
-      <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
-        修改后点击下方按钮保存，C 端将立即展示生效套餐。
-      </Typography.Paragraph>
-
-      <Button type="primary" loading={saving} onClick={() => void save()}>
-        保存套餐
-      </Button>
-    </Form>
-  );
-}
+export default AdminStorePackagesSection;

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

@@ -1,6 +1,5 @@
-import { Button, Form, Space, Typography } from 'antd';
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import OssUpload from './OssUpload';
+import { Typography } from 'antd';
+import MultiImageUpload from './MultiImageUpload';
 
 type Props = {
   name?: string;
@@ -8,42 +7,35 @@ type Props = {
   bizType?: string;
   /** 最多可添加张数；不传则不限制 */
   maxCount?: number;
+  /** Form.Item 注入 */
+  value?: string[];
+  onChange?: (urls: string[]) => void;
 };
 
+/**
+ * 商品详情/轮播等多图列表。
+ * 可直接包在 Form.Item 下（value/onChange），也可用 Form.List 的 name 外层再包 Form.Item。
+ */
 export default function DetailImageUrlList({
-  name = 'detailImageUrls',
   label,
   bizType = 'DETAIL',
   maxCount,
+  value,
+  onChange,
 }: Props) {
   return (
     <>
-      {maxCount != null && (
-        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
-          最多 {maxCount} 张{label}
-        </Typography.Text>
-      )}
-      <Form.List name={name}>
-        {(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={bizType} mediaType="IMAGE" />
-                </Form.Item>
-                {fields.length > 1 && (
-                  <MinusCircleOutlined onClick={() => remove(field.name)} style={{ marginTop: 8 }} />
-                )}
-              </Space>
-            ))}
-            {(!maxCount || fields.length < maxCount) && (
-              <Button type="dashed" onClick={() => add('')} block icon={<PlusOutlined />}>
-                添加{label}
-              </Button>
-            )}
-          </>
-        )}
-      </Form.List>
+      <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
+        {label}：支持批量上传{maxCount != null ? `，最多 ${maxCount} 张` : ''}
+      </Typography.Text>
+      <MultiImageUpload
+        bizType={bizType}
+        mediaType="IMAGE"
+        maxCount={maxCount}
+        value={value}
+        onChange={onChange}
+        tip={`支持一次选择多张${label}`}
+      />
     </>
   );
 }

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

@@ -0,0 +1,215 @@
+import { useEffect, useRef, useState } from 'react';
+import { Button, Image, Space, Typography, Upload, message } from 'antd';
+import { UploadOutlined, DeleteOutlined, FilePdfOutlined } from '@ant-design/icons';
+import type { UploadProps } from 'antd';
+import { uploadFileToOss, type OssMediaType } from '../lib/upload';
+
+type Props = {
+  value?: string[];
+  onChange?: (urls: string[]) => void;
+  bizType: string;
+  mediaType?: OssMediaType;
+  /** 最多张数；不传则不限制 */
+  maxCount?: number;
+  tip?: string;
+  accept?: string;
+  /** 上传按钮文案，默认「批量上传图片」 */
+  buttonText?: string;
+};
+
+function normalizeUrls(value?: string[]) {
+  return (value ?? []).map((u) => String(u || '').trim()).filter(Boolean);
+}
+
+function isPdf(url: string) {
+  return /\.pdf(\?|$)/i.test(url);
+}
+
+/**
+ * 多图批量上传（一次可选多张），用于套餐图 / 环境照 / 商品详情图等。
+ * Form.Item 直接绑定 string[]。
+ */
+export default function MultiImageUpload({
+  value,
+  onChange,
+  bizType,
+  mediaType = 'IMAGE',
+  maxCount,
+  tip,
+  accept = 'image/*',
+  buttonText = '批量上传图片',
+}: Props) {
+  const urls = normalizeUrls(value);
+  const urlsRef = useRef(urls);
+  const onChangeRef = useRef(onChange);
+  const [uploading, setUploading] = useState(false);
+  const batchBuf = useRef<File[]>([]);
+  const batchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const uploadChain = useRef(Promise.resolve());
+
+  useEffect(() => {
+    urlsRef.current = urls;
+  }, [urls]);
+
+  useEffect(() => {
+    onChangeRef.current = onChange;
+  }, [onChange]);
+
+  useEffect(() => {
+    return () => {
+      if (batchTimer.current) clearTimeout(batchTimer.current);
+    };
+  }, []);
+
+  const remaining = maxCount != null ? Math.max(0, maxCount - urls.length) : Number.POSITIVE_INFINITY;
+  const canAdd = remaining > 0;
+
+  async function uploadBatch(files: File[]) {
+    const current = urlsRef.current;
+    const room = maxCount != null ? Math.max(0, maxCount - current.length) : files.length;
+    const picked = files.slice(0, room);
+    if (!picked.length) {
+      message.warning(maxCount != null ? `最多 ${maxCount} 张` : '无法上传');
+      return;
+    }
+    if (files.length > picked.length) {
+      message.warning(`已达上限，仅上传前 ${picked.length} 张`);
+    }
+
+    setUploading(true);
+    const appended: string[] = [];
+    let fail = 0;
+    try {
+      for (const file of picked) {
+        try {
+          const result = await uploadFileToOss(file, { bizType, mediaType });
+          appended.push(result.url);
+        } catch {
+          fail += 1;
+        }
+      }
+      if (appended.length) {
+        // 始终基于最新列表追加，避免并行上传互相覆盖
+        const next = [...urlsRef.current, ...appended];
+        urlsRef.current = next;
+        onChangeRef.current?.(next);
+        message.success(`成功上传 ${appended.length} 张${fail ? `，失败 ${fail} 张` : ''}`);
+      } else if (fail) {
+        message.error('上传失败');
+      }
+    } finally {
+      setUploading(false);
+    }
+  }
+
+  function enqueueUploadBatch(files: File[]) {
+    uploadChain.current = uploadChain.current
+      .then(() => uploadBatch(files))
+      .catch(() => undefined);
+  }
+
+  function flushBatch() {
+    if (batchTimer.current) {
+      clearTimeout(batchTimer.current);
+      batchTimer.current = null;
+    }
+    if (!batchBuf.current.length) return;
+    const files = [...batchBuf.current];
+    batchBuf.current = [];
+    enqueueUploadBatch(files);
+  }
+
+  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
+    batchBuf.current.push(file as File);
+    // 多选时 beforeUpload 可能逐文件触发；短防抖合并成一次批量
+    if (batchTimer.current) clearTimeout(batchTimer.current);
+    batchTimer.current = setTimeout(() => {
+      flushBatch();
+    }, 80);
+    return false;
+  };
+
+  function removeAt(index: number) {
+    const next = urlsRef.current.filter((_, i) => i !== index);
+    urlsRef.current = next;
+    onChangeRef.current?.(next);
+  }
+
+  return (
+    <Space direction="vertical" style={{ width: '100%' }} size="middle">
+      <Typography.Text type="secondary">
+        {tip ??
+          (maxCount != null
+            ? `最多 ${maxCount} 张，支持一次选择多张批量上传`
+            : '支持一次选择多张批量上传')}
+        {maxCount != null ? `（已选 ${urls.length}/${maxCount}）` : urls.length ? `（已选 ${urls.length}）` : ''}
+      </Typography.Text>
+
+      {urls.length > 0 ? (
+        <Image.PreviewGroup>
+          <Space wrap size={12}>
+            {urls.map((url, index) => (
+              <div key={`${url}-${index}`} style={{ position: 'relative', width: 96 }}>
+                {isPdf(url) ? (
+                  <a
+                    href={url}
+                    target="_blank"
+                    rel="noreferrer"
+                    style={{
+                      display: 'flex',
+                      width: 96,
+                      height: 96,
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                      flexDirection: 'column',
+                      gap: 4,
+                      borderRadius: 6,
+                      border: '1px solid #f0f0f0',
+                      background: '#fafafa',
+                      fontSize: 12,
+                    }}
+                  >
+                    <FilePdfOutlined style={{ fontSize: 24, color: '#cf1322' }} />
+                    <span>PDF</span>
+                  </a>
+                ) : (
+                  <Image
+                    src={url}
+                    width={96}
+                    height={96}
+                    style={{ objectFit: 'cover', borderRadius: 6, border: '1px solid #f0f0f0' }}
+                  />
+                )}
+                <Button
+                  type="text"
+                  danger
+                  size="small"
+                  icon={<DeleteOutlined />}
+                  onClick={() => removeAt(index)}
+                  style={{
+                    position: 'absolute',
+                    top: 0,
+                    right: 0,
+                    background: 'rgba(255,255,255,0.85)',
+                  }}
+                />
+              </div>
+            ))}
+          </Space>
+        </Image.PreviewGroup>
+      ) : null}
+
+      <Upload
+        accept={accept}
+        multiple
+        showUploadList={false}
+        beforeUpload={beforeUpload}
+        disabled={uploading || !canAdd}
+      >
+        <Button icon={<UploadOutlined />} loading={uploading} disabled={!canAdd}>
+          {canAdd ? buttonText : '已达上限'}
+        </Button>
+      </Upload>
+    </Space>
+  );
+}

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

@@ -0,0 +1,185 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  Button,
+  Descriptions,
+  Drawer,
+  Empty,
+  Image,
+  Space,
+  Spin,
+  Timeline,
+  Typography,
+  message,
+} from 'antd';
+import type { OrderTrackDto, OrderTrackNodeDto } from '@dukang/shared-types';
+import { isXfxProviderCode } from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { DELIVERY_PROVIDER_LABELS, fmtTime } from '../lib/constants';
+
+type Props = {
+  open: boolean;
+  orderId: string | null;
+  orderNo?: string | null;
+  orderStatus?: string | null;
+  onClose: () => void;
+};
+
+function providerLabel(provider?: string | null, company?: string | null) {
+  if (company) return company;
+  if (!provider) return '—';
+  if (DELIVERY_PROVIDER_LABELS[provider]) return DELIVERY_PROVIDER_LABELS[provider];
+  if (isXfxProviderCode(provider)) return '小飞侠';
+  return provider;
+}
+
+function sortOldestFirst(nodes: OrderTrackNodeDto[]) {
+  return [...nodes].sort((a, b) => {
+    const ta = new Date(a.createTime).getTime();
+    const tb = new Date(b.createTime).getTime();
+    if (Number.isNaN(ta) && Number.isNaN(tb)) return 0;
+    if (Number.isNaN(ta)) return 1;
+    if (Number.isNaN(tb)) return -1;
+    return ta - tb;
+  });
+}
+
+export default function OrderTrackDrawer({
+  open,
+  orderId,
+  orderNo,
+  orderStatus,
+  onClose,
+}: Props) {
+  const [loading, setLoading] = useState(false);
+  const [track, setTrack] = useState<OrderTrackDto | null>(null);
+
+  const load = useCallback(async () => {
+    if (!orderId) return;
+    setLoading(true);
+    try {
+      const data = await request<OrderTrackDto>(`/admin/orders/${orderId}/track`);
+      setTrack(data);
+    } catch (e) {
+      setTrack(null);
+      message.error(e instanceof Error ? e.message : '加载路由失败');
+    } finally {
+      setLoading(false);
+    }
+  }, [orderId]);
+
+  useEffect(() => {
+    if (!open || !orderId) {
+      setTrack(null);
+      return;
+    }
+    void load();
+  }, [open, orderId, load]);
+
+  const nodes = useMemo(
+    () => (track?.nodes?.length ? sortOldestFirst(track.nodes) : []),
+    [track?.nodes],
+  );
+  const timelineComplete = ['PENDING_RECEIVE', 'DELIVERED', 'COMPLETED'].includes(
+    orderStatus || '',
+  );
+
+  return (
+    <Drawer
+      title="物流路由"
+      width={520}
+      open={open}
+      onClose={onClose}
+      extra={
+        <Button onClick={() => void load()} loading={loading} disabled={!orderId}>
+          刷新
+        </Button>
+      }
+    >
+      <Spin spinning={loading}>
+        {(orderNo || track?.trackingNo || track?.provider) && (
+          <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
+            {orderNo ? <Descriptions.Item label="订单号">{orderNo}</Descriptions.Item> : null}
+            <Descriptions.Item label="配送方式">
+              {providerLabel(track?.provider, track?.logisticsCompany)}
+            </Descriptions.Item>
+            <Descriptions.Item label="运单号">{track?.trackingNo || '—'}</Descriptions.Item>
+            {track?.manualQueryUrl ? (
+              <Descriptions.Item label="物流查询">
+                <a href={track.manualQueryUrl} target="_blank" rel="noreferrer">
+                  打开物流查询
+                </a>
+              </Descriptions.Item>
+            ) : null}
+            {track?.estimatedArrival?.arriveTime ? (
+              <Descriptions.Item label="预计送达">
+                {fmtTime(track.estimatedArrival.arriveTime)}
+                {track.estimatedArrival.siteName
+                  ? `（${track.estimatedArrival.siteName}）`
+                  : ''}
+              </Descriptions.Item>
+            ) : null}
+          </Descriptions>
+        )}
+
+        {track?.signPhotoUrls && track.signPhotoUrls.length > 0 ? (
+          <div style={{ marginBottom: 16 }}>
+            <Typography.Title level={5} style={{ marginTop: 0 }}>
+              签收照片
+            </Typography.Title>
+            <Image.PreviewGroup>
+              <Space wrap>
+                {track.signPhotoUrls.map((url) => (
+                  <Image
+                    key={url}
+                    src={url}
+                    width={96}
+                    height={96}
+                    style={{ objectFit: 'cover', borderRadius: 6 }}
+                  />
+                ))}
+              </Space>
+            </Image.PreviewGroup>
+          </div>
+        ) : null}
+
+        <Typography.Title level={5} style={{ marginTop: 0 }}>
+          物流动态
+        </Typography.Title>
+        {nodes.length > 0 ? (
+          <Timeline
+            items={nodes.map((node, index) => {
+              const isLatest = index === nodes.length - 1;
+              return {
+                color: isLatest ? (timelineComplete ? 'green' : 'blue') : 'gray',
+                children: (
+                  <div>
+                    {node.statusName ? (
+                      <Typography.Text strong style={{ display: 'block' }}>
+                        {node.statusName}
+                      </Typography.Text>
+                    ) : null}
+                    <Typography.Text style={{ display: 'block', whiteSpace: 'pre-wrap' }}>
+                      {node.trackInfo || '—'}
+                    </Typography.Text>
+                    <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                      {fmtTime(node.createTime)}
+                    </Typography.Text>
+                  </div>
+                ),
+              };
+            })}
+          />
+        ) : (
+          <Empty
+            image={Empty.PRESENTED_IMAGE_SIMPLE}
+            description={
+              track?.manualQueryUrl
+                ? '暂无实时路由节点，可使用上方物流查询链接'
+                : '暂无路由信息，请稍后刷新'
+            }
+          />
+        )}
+      </Spin>
+    </Drawer>
+  );
+}

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

@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import { Button, Image, Input, Space, Upload, message } from 'antd';
-import { UploadOutlined } from '@ant-design/icons';
+import { Button, Image, Input, Modal, Space, Upload, message } from 'antd';
+import { EyeOutlined, FilePdfOutlined, UploadOutlined } from '@ant-design/icons';
 import type { UploadProps } from 'antd';
 import { uploadFileToOss, type OssMediaType, type UploadFileResult } from '../lib/upload';
 
@@ -15,6 +15,14 @@ type OssUploadProps = {
   placeholder?: string;
 };
 
+function isImageUrl(url: string) {
+  return /\.(png|jpe?g|gif|webp|bmp|svg)(\?|#|$)/i.test(url);
+}
+
+function isPdfUrl(url: string) {
+  return /\.pdf(\?|#|$)/i.test(url);
+}
+
 export default function OssUpload({
   value,
   onChange,
@@ -25,6 +33,7 @@ export default function OssUpload({
   placeholder = '上传后自动填入，或手动粘贴 URL',
 }: OssUploadProps) {
   const [uploading, setUploading] = useState(false);
+  const [pdfPreviewOpen, setPdfPreviewOpen] = useState(false);
 
   const resolvedAccept =
     accept ?? (mediaType === 'VIDEO' ? 'video/*' : mediaType === 'FILE' ? undefined : 'image/*');
@@ -47,6 +56,57 @@ export default function OssUpload({
     }
   };
 
+  const filePreview =
+    value && mediaType === 'FILE' ? (
+      isImageUrl(value) ? (
+        <Image src={value} width={120} height={120} style={{ objectFit: 'cover', borderRadius: 4 }} />
+      ) : isPdfUrl(value) ? (
+        <Space direction="vertical" size={8}>
+          <div
+            style={{
+              width: 120,
+              height: 120,
+              borderRadius: 4,
+              border: '1px solid #f0f0f0',
+              background: '#fafafa',
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'center',
+              justifyContent: 'center',
+              gap: 8,
+              color: '#cf1322',
+            }}
+          >
+            <FilePdfOutlined style={{ fontSize: 36 }} />
+            <span style={{ fontSize: 12, color: 'rgba(0,0,0,0.45)' }}>PDF 合同</span>
+          </div>
+          <Space wrap>
+            <Button type="link" size="small" icon={<EyeOutlined />} onClick={() => setPdfPreviewOpen(true)}>
+              预览
+            </Button>
+            <Button type="link" size="small" href={value} target="_blank" rel="noreferrer">
+              新窗口打开
+            </Button>
+          </Space>
+          <Modal
+            title="签约合同预览"
+            open={pdfPreviewOpen}
+            onCancel={() => setPdfPreviewOpen(false)}
+            footer={null}
+            width="90vw"
+            styles={{ body: { height: '75vh', padding: 0 } }}
+            destroyOnClose
+          >
+            <iframe title="合同 PDF 预览" src={value} style={{ width: '100%', height: '100%', border: 0 }} />
+          </Modal>
+        </Space>
+      ) : (
+        <Button type="link" href={value} target="_blank" rel="noreferrer" style={{ paddingLeft: 0 }}>
+          打开已上传文件
+        </Button>
+      )
+    ) : null;
+
   return (
     <Space direction="vertical" style={{ width: '100%' }} size="small">
       {value && mediaType === 'IMAGE' && (
@@ -55,6 +115,7 @@ export default function OssUpload({
       {value && mediaType === 'VIDEO' && (
         <video src={value} controls style={{ maxWidth: '100%', maxHeight: 160, borderRadius: 4 }} />
       )}
+      {filePreview}
       <Space wrap>
         <Upload
           accept={resolvedAccept}

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

@@ -0,0 +1,21 @@
+import { STORE_PACKAGE_IMAGE_MAX_COUNT } from '@dukang/shared-types';
+import MultiImageUpload from './MultiImageUpload';
+
+type Props = {
+  value?: string[];
+  onChange?: (urls: string[]) => void;
+};
+
+/** 套餐多图：批量上传，最多 STORE_PACKAGE_IMAGE_MAX_COUNT 张 */
+export default function PackageImagesUpload({ value, onChange }: Props) {
+  return (
+    <MultiImageUpload
+      bizType="STORE_PACKAGE"
+      mediaType="IMAGE"
+      maxCount={STORE_PACKAGE_IMAGE_MAX_COUNT}
+      value={value}
+      onChange={onChange}
+      tip={`套餐图片最多 ${STORE_PACKAGE_IMAGE_MAX_COUNT} 张，支持批量选择上传，可逐张删除`}
+    />
+  );
+}

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

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { Outlet, useLocation, useNavigate } from 'react-router-dom';
-import { Layout, Menu, Typography, Button, Space } from 'antd';
+import { Layout, Menu, Typography, Button, Space, Badge } from 'antd';
 import type { MenuProps } from 'antd';
 import {
   RobotOutlined,
@@ -23,6 +23,7 @@ import {
 import { hasAnySystemSettingsPermission } from '@dukang/shared-types';
 import { clearAuth, request, type HqProfile } from '../lib/api';
 import { bindAdminEllipsisTitle } from '../lib/ellipsis-title';
+import { PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
 
 const { Header, Sider, Content } = Layout;
 
@@ -146,6 +147,7 @@ const MENU_ITEMS: MenuProps['items'] = [
     ],
   },
   { key: '/hq-permissions', icon: <LockOutlined />, label: '权限分配' },
+  { key: '/test-whitelist', icon: <SafetyOutlined />, label: '白名单管理' },
   { key: '/system-settings', icon: <SettingOutlined />, label: '系统设置' },
   { key: '/hq-accounts', icon: <SafetyOutlined />, label: 'HQ账户' },
 ];
@@ -215,6 +217,7 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/logs/third-party': 'logs',
     '/logs/domain-events': 'logs',
     '/hq-permissions': 'hq_permissions',
+    '/test-whitelist': 'test_whitelist',
     '/system-settings': 'system_settings_any',
     '/hq-accounts': 'hq_accounts',
   };
@@ -241,6 +244,31 @@ function filterMenuItems(items: MenuProps['items'], permissionKeys: string[]): M
     .filter(Boolean) as MenuProps['items'];
 }
 
+function attachPackageAuditBadge(items: MenuProps['items'], pendingCount: number): MenuProps['items'] {
+  if (!items) return items;
+  return items.map((item) => {
+    if (!item || typeof item !== 'object' || !('key' in item)) return item;
+    if ('children' in item && Array.isArray(item.children)) {
+      return {
+        ...item,
+        children: attachPackageAuditBadge(item.children as MenuProps['items'], pendingCount),
+      } as MenuItem;
+    }
+    if (String(item.key) === '/store-package-audits') {
+      return {
+        ...item,
+        label: (
+          <span style={{ display: 'inline-flex', alignItems: 'center', gap: 6 }}>
+            套餐审核
+            {pendingCount > 0 && <Badge count={pendingCount} size="small" />}
+          </span>
+        ),
+      } as MenuItem;
+    }
+    return item;
+  });
+}
+
 const IS_STAGING = import.meta.env.VITE_APP_ENV === 'staging';
 
 export default function AdminLayout() {
@@ -248,11 +276,28 @@ export default function AdminLayout() {
   const location = useLocation();
   const contentRef = useRef<HTMLDivElement>(null);
   const [profile, setProfile] = useState<HqProfile | null>(null);
+  const [packagePendingCount, setPackagePendingCount] = useState(0);
+
+  function refreshPackagePendingCount() {
+    request<{ pendingCount: number }>('/admin/store-package-audits/summary')
+      .then((data) => setPackagePendingCount(data.pendingCount ?? 0))
+      .catch(() => {});
+  }
 
   useEffect(() => {
     request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
   }, []);
 
+  useEffect(() => {
+    refreshPackagePendingCount();
+  }, [location.pathname]);
+
+  useEffect(() => {
+    const onChanged = () => refreshPackagePendingCount();
+    window.addEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
+    return () => window.removeEventListener(PACKAGE_AUDIT_CHANGED_EVENT, onChanged);
+  }, []);
+
   useEffect(() => {
     contentRef.current?.scrollTo({ top: 0, left: 0 });
   }, [location.pathname]);
@@ -271,10 +316,12 @@ export default function AdminLayout() {
     : location.pathname;
 
   const menuItems = useMemo(() => {
-    if (!profile) return MENU_ITEMS;
-    if (profile.adminRole === 'SUPER_ADMIN') return MENU_ITEMS;
-    return filterMenuItems(MENU_ITEMS, profile.permissionKeys ?? []);
-  }, [profile]);
+    const base =
+      !profile || profile.adminRole === 'SUPER_ADMIN'
+        ? MENU_ITEMS
+        : filterMenuItems(MENU_ITEMS, profile.permissionKeys ?? []);
+    return attachPackageAuditBadge(base, packagePendingCount);
+  }, [profile, packagePendingCount]);
 
   return (
     <Layout style={{ height: '100vh', overflow: 'hidden' }}>

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

@@ -0,0 +1,5 @@
+export const PACKAGE_AUDIT_CHANGED_EVENT = 'admin:package-audit-changed';
+
+export function notifyPackageAuditChanged() {
+  window.dispatchEvent(new Event(PACKAGE_AUDIT_CHANGED_EVENT));
+}

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

@@ -167,6 +167,13 @@ export type AdminUserRow = {
   sourceLabel: string | null;
   createdAt: string;
   orderCount: number;
+  isTest?: boolean;
+  /** 好客权益·累计获得（含已使用，不含退款作废） */
+  benefitTotalAmount?: number;
+  /** 好客权益·已使用（已核销） */
+  benefitUsedAmount?: number;
+  /** 好客权益·剩余未使用 */
+  benefitBalance?: number;
 };
 
 export type AdminOrderItem = {
@@ -199,6 +206,7 @@ export type AdminOrderRow = {
   isProxyOrder?: boolean;
   proxyPartnerName?: string | null;
   proxyPartnerPhone?: string | null;
+  isTest?: boolean;
   user?: { id: string; userNo: string; phone: string | null; nickname: string | null };
   delivery?: {
     provider: string;

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

@@ -140,10 +140,29 @@ export function fmtTime(v?: string | null) {
   return v ? new Date(v).toLocaleString('zh-CN') : '—';
 }
 
-/** 手机号脱敏展示：138****5678；空值返回 — */
+/** 联系电话脱敏：手机 138****5678；座机 0379-****888；空值返回 — */
 export function maskPhone(phone?: string | null): string {
-  const raw = String(phone ?? '').trim();
+  const raw = String(phone ?? '').trim().replace(/\s+/g, '');
   if (!raw) return '—';
+  if (/^1[3-9]\d{9}$/.test(raw)) {
+    const digits = raw.replace(/\D/g, '');
+    return `${digits.slice(0, 3)}****${digits.slice(-4)}`;
+  }
+  if (/^0\d{2,3}-?\d{7,8}(-\d{1,6})?$/.test(raw)) {
+    const extMatch = raw.match(/-(\d{1,6})$/);
+    const hasExt = !!extMatch && raw.indexOf('-') !== raw.lastIndexOf('-');
+    const ext = hasExt ? extMatch![1] : '';
+    const main = hasExt ? raw.slice(0, -(ext.length + 1)) : raw;
+    const digits = main.replace(/\D/g, '');
+    const areaLen = digits.startsWith('01') || digits.startsWith('02') ? 3 : 4;
+    const area = digits.slice(0, areaLen);
+    const local = digits.slice(areaLen);
+    const keepTail = Math.min(4, Math.max(2, local.length - 4));
+    const maskedLocal =
+      local.length <= 4 ? '*'.repeat(local.length) : `${'*'.repeat(local.length - keepTail)}${local.slice(-keepTail)}`;
+    const joiner = main.includes('-') ? '-' : '';
+    return ext ? `${area}${joiner}${maskedLocal}-${ext}` : `${area}${joiner}${maskedLocal}`;
+  }
   const digits = raw.replace(/\D/g, '');
   if (digits.length >= 11) {
     return `${digits.slice(0, 3)}****${digits.slice(-4)}`;

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

@@ -1,3 +1,5 @@
+import { isStoreContactPhone, STORE_CONTACT_PHONE_HINT } from '@dukang/domain';
+
 export type StoreCreateForm = {
   partnerAccountId: string;
   cityId: string;
@@ -15,6 +17,8 @@ export type StoreCreateForm = {
   longitude?: number | null;
   intro?: string;
   benefitUsageRule?: string;
+  /** 对外联系电话（店长）；可与登录号不同，支持座机 */
+  contactPhone?: string;
   openTime?: string;
   closeTime?: string;
   openTime2?: string;
@@ -22,11 +26,13 @@ export type StoreCreateForm = {
   avgPrice?: number | null;
   coverUrl?: string;
   envPhotoUrls?: string[];
-  contractUrl?: string;
+  /** 签约合同，支持多张照片 / PDF */
+  contractUrls?: string[];
   bankAccountName: string;
   bankAccountNo: string;
   bankBranch: string;
   settlementRate?: number;
+  sortOrder?: number;
   visibilityWhitelistEnabled?: boolean;
   visibilityPhones?: string[];
 };
@@ -57,6 +63,7 @@ export function validateStoreCreateStep1(
     | 'openTime2'
     | 'closeTime2'
     | 'avgPrice'
+    | 'contactPhone'
   >,
 ): string | null {
   if (!form.partnerAccountId) return '请选择开城合伙人';
@@ -66,6 +73,8 @@ export function validateStoreCreateStep1(
   if (!form.name?.trim()) return '请填写门店名称';
   if (!form.phone?.trim()) return '请填写门店手机号';
   if (!PHONE_RE.test(form.phone.trim())) return '门店手机号须为11位手机号';
+  const contactPhone = form.contactPhone?.trim();
+  if (contactPhone && !isStoreContactPhone(contactPhone)) return STORE_CONTACT_PHONE_HINT;
   if (!form.address?.trim()) return '请填写详细地址';
 
   const openTime = String(form.openTime || '').trim();

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

@@ -59,6 +59,7 @@ type Row = {
   accountCount: number;
   subAccounts?: SubRow[];
   createdAt: string;
+  isTest?: boolean;
 };
 
 type PartnerDetail = Row & {
@@ -124,14 +125,15 @@ export default function CityPartnersPage() {
   const [createForm] = Form.useForm();
   const [subForm] = Form.useForm();
   const [subEditForm] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
     '/admin/partners',
     () => {
       const qs = new URLSearchParams();
-      if (filters.companyName) qs.set('companyName', filters.companyName);
-      if (filters.phone) qs.set('phone', filters.phone);
-      if (filters.cityId) qs.set('cityId', filters.cityId);
+      if (filters.companyName) qs.set('companyName', String(filters.companyName));
+      if (filters.phone) qs.set('phone', String(filters.phone));
+      if (filters.cityId) qs.set('cityId', String(filters.cityId));
+      if (filters.excludeTest) qs.set('excludeTest', 'true');
       return qs;
     },
     [filters],
@@ -270,7 +272,18 @@ export default function CityPartnersPage() {
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
     { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
-    { title: '主账号姓名', dataIndex: 'name', width: 100, ellipsis: true },
+    {
+      title: '主账号姓名',
+      dataIndex: 'name',
+      width: 120,
+      ellipsis: true,
+      render: (v, row) => (
+        <Space size={4}>
+          <span>{v}</span>
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
+        </Space>
+      ),
+    },
     { title: '登录手机', dataIndex: 'phone', width: 120 },
     {
       title: '管辖',
@@ -387,6 +400,9 @@ export default function CityPartnersPage() {
         <Form.Item name="phone" label="手机">
           <Input allowClear placeholder="登录手机" />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item>
           <Space>
             <Button type="primary" htmlType="submit">

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

@@ -3,13 +3,26 @@ import {
   Button, Descriptions, Drawer, Form, Input, Space, Table, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
+import OrderTrackDrawer from '../components/OrderTrackDrawer';
 import { request } from '../lib/api';
 import { ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 
 type Row = {
-  id: string; provider: string; trackingNo: string | null; providerOrderNo: string | null; updatedAt: string;
-  order?: { orderNo: string; status: string; receiverName: string; receiverPhone: string; deliveryType: string };
+  id: string;
+  orderId: string;
+  provider: string;
+  trackingNo: string | null;
+  providerOrderNo: string | null;
+  updatedAt: string;
+  order?: {
+    id: string;
+    orderNo: string;
+    status: string;
+    receiverName: string;
+    receiverPhone: string;
+    deliveryType: string;
+  };
 };
 
 export default function DeliveriesPage() {
@@ -29,6 +42,22 @@ export default function DeliveriesPage() {
   );
   const [detail, setDetail] = useState<Row | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
+  const [trackOpen, setTrackOpen] = useState(false);
+  const [trackOrderId, setTrackOrderId] = useState<string | null>(null);
+  const [trackOrderNo, setTrackOrderNo] = useState<string | null>(null);
+  const [trackOrderStatus, setTrackOrderStatus] = useState<string | null>(null);
+
+  function openTrack(row: Row) {
+    const orderId = row.orderId || row.order?.id;
+    if (!orderId) {
+      message.warning('缺少关联订单，无法查询路由');
+      return;
+    }
+    setTrackOrderId(orderId);
+    setTrackOrderNo(row.order?.orderNo ?? null);
+    setTrackOrderStatus(row.order?.status ?? null);
+    setTrackOpen(true);
+  }
 
   const columns: ColumnsType<Row> = [
     { title: '订单号', dataIndex: ['order', 'orderNo'], width: 170 },
@@ -39,14 +68,17 @@ export default function DeliveriesPage() {
     { title: '收货人', dataIndex: ['order', 'receiverName'], width: 90 },
     { title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
     {
-      title: '操作', width: 80,
+      title: '操作', width: 140,
       render: (_, row) => (
-        <Button type="link" size="small" onClick={async () => {
-          const d = await request<Row>(`/admin/deliveries/${row.id}`);
-          setDetail(d);
-          editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
-          setDrawerOpen(true);
-        }}>编辑</Button>
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => openTrack(row)}>路由</Button>
+          <Button type="link" size="small" onClick={async () => {
+            const d = await request<Row>(`/admin/deliveries/${row.id}`);
+            setDetail(d);
+            editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
+            setDrawerOpen(true);
+          }}>编辑</Button>
+        </Space>
       ),
     },
   ];
@@ -87,9 +119,22 @@ export default function DeliveriesPage() {
               <Form.Item name="providerOrderNo" label="第三方单号"><Input /></Form.Item>
               <Form.Item name="trackingNo" label="运单号"><Input /></Form.Item>
             </Form>
+            <Button
+              style={{ marginTop: 8 }}
+              onClick={() => openTrack(detail)}
+            >
+              查看路由
+            </Button>
           </>
         )}
       </Drawer>
+      <OrderTrackDrawer
+        open={trackOpen}
+        orderId={trackOrderId}
+        orderNo={trackOrderNo}
+        orderStatus={trackOrderStatus}
+        onClose={() => setTrackOpen(false)}
+      />
     </div>
   );
 }

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

@@ -3,6 +3,7 @@ import { Link } from 'react-router-dom';
 import {
   Alert,
   Button,
+  Checkbox,
   Collapse,
   Descriptions,
   Drawer,
@@ -30,6 +31,7 @@ import {
 } from '../lib/constants';
 import { FULFILLMENT_HOLD_REASON_LABELS } from '@dukang/shared-types';
 import ProxyOrderModal from '../components/ProxyOrderModal';
+import OrderTrackDrawer from '../components/OrderTrackDrawer';
 
 type ShipDefaults = {
   provider: string;
@@ -186,6 +188,7 @@ export default function OrdersPage() {
   const [shipMode, setShipMode] = useState<ShipMode>('EXPRESS');
   const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
   const [proxyOpen, setProxyOpen] = useState(false);
+  const [trackOpen, setTrackOpen] = useState(false);
   const canDeleteOrders = (profile?.permissionKeys ?? []).includes('orders_delete');
   const canProxyOrder = (profile?.permissionKeys ?? []).includes('orders');
 
@@ -223,6 +226,7 @@ export default function OrdersPage() {
       if (values.cityId) qs.set('cityId', values.cityId);
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
       if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true');
+      if (values.excludeTest) qs.set('excludeTest', 'true');
       const res = await request<Paginated<AdminOrderRow>>(`/admin/orders?${qs}`);
       setData(res);
     } finally {
@@ -430,7 +434,17 @@ export default function OrdersPage() {
   }
 
   const columns: ColumnsType<AdminOrderRow> = [
-    { title: '订单号', dataIndex: 'orderNo', width: 180 },
+    {
+      title: '订单号',
+      dataIndex: 'orderNo',
+      width: 200,
+      render: (v, row) => (
+        <Space size={4}>
+          <span>{v}</span>
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
+        </Space>
+      ),
+    },
     {
       title: '城市',
       width: 90,
@@ -598,6 +612,9 @@ export default function OrdersPage() {
             options={[{ value: true, label: '仅待确认大单' }]}
           />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item>
           <Space>
             <Button type="primary" htmlType="submit">查询</Button>
@@ -859,7 +876,20 @@ export default function OrdersPage() {
             </Descriptions>
 
             {detail.delivery && (
-              <Descriptions column={1} bordered size="small" title="配送" style={{ marginTop: 16 }}>
+              <Descriptions
+                column={1}
+                bordered
+                size="small"
+                title={
+                  <Space>
+                    <span>配送</span>
+                    <Button type="link" size="small" style={{ padding: 0 }} onClick={() => setTrackOpen(true)}>
+                      查看路由
+                    </Button>
+                  </Space>
+                }
+                style={{ marginTop: 16 }}
+              >
                 <Descriptions.Item label="快递公司">
                   {detail.delivery.logisticsCompany ||
                     DELIVERY_PROVIDER_LABELS[detail.delivery.provider] ||
@@ -1232,6 +1262,14 @@ export default function OrdersPage() {
           void openDetail(order.id);
         }}
       />
+
+      <OrderTrackDrawer
+        open={trackOpen}
+        orderId={detail?.id ?? null}
+        orderNo={detail?.orderNo}
+        orderStatus={detail?.status}
+        onClose={() => setTrackOpen(false)}
+      />
     </div>
   );
 }

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

@@ -34,7 +34,7 @@ function mapToForm(d: Record<string, unknown>) {
   const row = d as Row;
   return {
     ...row,
-    detailImageUrls: row.detailImageUrls?.length ? row.detailImageUrls : [''],
+    detailImageUrls: row.detailImageUrls?.length ? row.detailImageUrls : [],
     features: row.features?.length
       ? row.features
       : [{ icon: 'star', title: '', desc: '' }],
@@ -68,12 +68,14 @@ function buildPayload(v: TemplateFormValues) {
 function TemplateContentFields() {
   return (
     <>
-      <Typography.Text type="secondary">模板详情长图（套用商品时可逐张修改）</Typography.Text>
-      <DetailImageUrlList
-        label="详情图"
-        bizType="DETAIL_TEMPLATE"
-        maxCount={TEMPLATE_MAX_DETAIL_IMAGES}
-      />
+      <Typography.Text type="secondary">模板详情长图（套用商品时可逐张修改，支持批量上传）</Typography.Text>
+      <Form.Item name="detailImageUrls" style={{ marginBottom: 0 }}>
+        <DetailImageUrlList
+          label="详情图"
+          bizType="DETAIL_TEMPLATE"
+          maxCount={TEMPLATE_MAX_DETAIL_IMAGES}
+        />
+      </Form.Item>
       <Divider />
       <Form.Item name="storyTitle" label="故事标题">
         <Input placeholder="如：千年杜康 · 唯有此处" />
@@ -228,7 +230,7 @@ export default function ProductDetailTemplatesPage() {
       }} width={640}>
         <Form form={createForm} layout="vertical" initialValues={{
           status: 'ACTIVE', sortOrder: 0,
-          detailImageUrls: [''],
+          detailImageUrls: [],
           features: [{ icon: 'water_drop', title: '', desc: '' }],
         }}>
           <Form.Item name="code" label="编码" rules={[{ required: true }]} extra="唯一标识，如 dukang-classic">

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

@@ -1,4 +1,4 @@
-import { useMemo, useRef, useState } from 'react';
+import { useMemo, useState } from 'react';
 import {
   Button, Descriptions, Divider, Drawer, Form, Input, InputNumber, Modal, Popconfirm, Select, Space,
   Switch, Table, Tabs, Tag, Typography, message,
@@ -9,6 +9,7 @@ import { request } from '../lib/api';
 import { AROMA_TYPE_LABELS, PRODUCT_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
+import MultiImageUpload from '../components/MultiImageUpload';
 import DetailImageUrlList from '../components/DetailImageUrlList';
 import ProductDetailTemplatePicker from '../components/ProductDetailTemplatePicker';
 import type { FormInstance } from 'antd/es/form';
@@ -67,21 +68,14 @@ type ProductFormValues = {
   features?: Array<{ icon?: string; title?: string; desc?: string }>;
 };
 
-type UserPickRow = {
-  id: string;
-  phone?: string | null;
-  nickname?: string | null;
-  userNo?: string;
-};
-
 function mapDetailToForm(d: Record<string, unknown>) {
   const detail = (d.detailContent ?? {}) as ProductDetailContentDto;
   const row = d as Row;
   return {
     ...d,
     coverUrl: (d as { mainImageUrl?: string }).mainImageUrl,
-    carouselUrls: (row.carouselUrls?.length ? row.carouselUrls : ['']) as string[],
-    detailImageUrls: (row.detailImageUrls?.length ? row.detailImageUrls : ['']) as string[],
+    carouselUrls: (row.carouselUrls?.length ? row.carouselUrls : []) as string[],
+    detailImageUrls: (row.detailImageUrls?.length ? row.detailImageUrls : []) as string[],
     allowOnlinePurchase: row.allowOnlinePurchase !== false,
     allowCrossCityDelivery: row.allowOnlinePurchase === false ? false : row.allowCrossCityDelivery !== false,
     allowOnSitePickup: !!row.allowOnSitePickup,
@@ -112,10 +106,6 @@ function buildProductPayload(v: ProductFormValues) {
     features: features.length ? features : undefined,
   };
 
-  const visibilityPhones = (v.visibilityPhones ?? [])
-    .map((p) => String(p || '').replace(/\D/g, '').trim())
-    .filter(Boolean);
-
   return {
     barcode69: v.barcode69,
     name: v.name,
@@ -131,7 +121,6 @@ function buildProductPayload(v: ProductFormValues) {
     allowCrossCityDelivery:
       v.allowOnlinePurchase === false ? false : v.allowCrossCityDelivery !== false,
     visibilityWhitelistEnabled: !!v.visibilityWhitelistEnabled,
-    visibilityPhones,
     coverUrl: v.coverUrl,
     carouselUrls,
     detailImageUrls,
@@ -141,25 +130,13 @@ function buildProductPayload(v: ProductFormValues) {
 
 function ImageUrlList({ name, label, bizType }: { name: string; label: string; bizType: string }) {
   return (
-    <Form.List name={name}>
-      {(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={bizType} mediaType="IMAGE" />
-              </Form.Item>
-              {fields.length > 1 && (
-                <MinusCircleOutlined onClick={() => remove(field.name)} style={{ marginTop: 8 }} />
-              )}
-            </Space>
-          ))}
-          <Button type="dashed" onClick={() => add('')} block icon={<PlusOutlined />}>
-            添加{label}
-          </Button>
-        </>
-      )}
-    </Form.List>
+    <Form.Item name={name} style={{ marginBottom: 0 }}>
+      <MultiImageUpload
+        bizType={bizType}
+        mediaType="IMAGE"
+        tip={`${label}支持一次选择多张批量上传`}
+      />
+    </Form.Item>
   );
 }
 
@@ -168,11 +145,13 @@ function ProductDetailFields({ form, aromaType }: { form: FormInstance; aromaTyp
     <>
       <ProductDetailTemplatePicker form={form} aromaType={aromaType} />
       <Divider />
-      <Typography.Text type="secondary">详情页轮播（CAROUSEL，单张最大 10MB）</Typography.Text>
+      <Typography.Text type="secondary">详情页轮播（CAROUSEL，支持批量上传，单张最大 10MB）</Typography.Text>
       <ImageUrlList name="carouselUrls" label="轮播图" bizType="CAROUSEL" />
       <Divider />
-      <Typography.Text type="secondary">详情长图（DETAIL，可逐张修改，单张最大 10MB）</Typography.Text>
-      <DetailImageUrlList label="详情图" bizType="DETAIL" />
+      <Typography.Text type="secondary">详情长图（DETAIL，支持批量上传，单张最大 10MB）</Typography.Text>
+      <Form.Item name="detailImageUrls" style={{ marginBottom: 0 }}>
+        <DetailImageUrlList label="详情图" bizType="DETAIL" />
+      </Form.Item>
       <Divider />
       <Form.Item name="storyTitle" label="故事标题">
         <Input placeholder="如：千年杜康 · 唯有此处" />
@@ -213,33 +192,6 @@ function ProductDetailFields({ form, aromaType }: { form: FormInstance; aromaTyp
 }
 
 function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
-  const [userOptions, setUserOptions] = useState<UserPickRow[]>([]);
-  const [userSearching, setUserSearching] = useState(false);
-  const searchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  async function searchUsers(keyword: string) {
-    const q = keyword.trim();
-    if (searchTimer.current) clearTimeout(searchTimer.current);
-    if (!q) {
-      setUserOptions([]);
-      return;
-    }
-    searchTimer.current = setTimeout(() => {
-      void (async () => {
-        setUserSearching(true);
-        try {
-          const qs = new URLSearchParams({ page: '1', pageSize: '20', phone: q });
-          const res = await request<{ items: UserPickRow[] }>(`/admin/users?${qs}`);
-          setUserOptions((res.items ?? []).filter((u) => !!u.phone));
-        } catch {
-          setUserOptions([]);
-        } finally {
-          setUserSearching(false);
-        }
-      })();
-    }, 300);
-  }
-
   const enabled = Form.useWatch('visibilityWhitelistEnabled', form);
 
   return (
@@ -248,46 +200,14 @@ function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
         name="visibilityWhitelistEnabled"
         label="可见白名单"
         valuePropName="checked"
-        extra="开启后仅名单内手机号在 C 端可见/可购，用于在线测试"
+        extra="开启后仅全局测试白名单内手机号在 C 端可见/可购，用于在线测试"
       >
         <Switch checkedChildren="开" unCheckedChildren="关" />
       </Form.Item>
       {enabled ? (
-        <>
-          <Form.Item
-            name="visibilityPhones"
-            label="白名单手机号"
-            rules={[{ required: true, message: '请至少添加一个手机号' }]}
-            extra="可直接输入多个手机号回车添加，或从下方用户库选择"
-          >
-            <Select
-              mode="tags"
-              tokenSeparators={[',', ' ', '，', ';', '；']}
-              placeholder="输入手机号后回车"
-              style={{ width: '100%' }}
-            />
-          </Form.Item>
-          <Form.Item label="从用户库添加">
-            <Select
-              showSearch
-              filterOption={false}
-              placeholder="按手机号搜索用户"
-              loading={userSearching}
-              options={userOptions.map((u) => ({
-                value: u.phone!,
-                label: `${u.phone}${u.nickname ? ` · ${u.nickname}` : ''}${u.userNo ? `（${u.userNo}）` : ''}`,
-              }))}
-              onSearch={searchUsers}
-              onSelect={(phone: string) => {
-                const cur = (form.getFieldValue('visibilityPhones') as string[] | undefined) ?? [];
-                if (!cur.includes(phone)) {
-                  form.setFieldsValue({ visibilityPhones: [...cur, phone] });
-                }
-              }}
-              notFoundContent={userSearching ? '搜索中…' : '输入手机号搜索'}
-            />
-          </Form.Item>
-        </>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 16 }}>
+          可见手机号见白名单管理
+        </Typography.Text>
       ) : null}
     </>
   );
@@ -419,8 +339,8 @@ export default function ProductsPage() {
       title: '白名单',
       dataIndex: 'visibilityWhitelistEnabled',
       width: 90,
-      render: (v: boolean, row) =>
-        v ? <Tag color="orange">限{row.visibilityPhones?.length ?? 0}人</Tag> : <Tag>公开</Tag>,
+      render: (v: boolean) =>
+        v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
     {
       title: '履约',
@@ -539,7 +459,7 @@ export default function ProductsPage() {
           aromaType: 'QINGXIANG', status: 'DRAFT', sortOrder: 0,
           allowOnlinePurchase: true, allowCrossCityDelivery: true, allowOnSitePickup: false,
           visibilityWhitelistEnabled: false, visibilityPhones: [],
-          carouselUrls: [''], detailImageUrls: [''],
+          carouselUrls: [], detailImageUrls: [],
           features: [{ icon: 'water_drop', title: '', desc: '' }],
         }}>
           <Tabs items={[

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

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Button, Drawer, Form, Input, Select, Table, Tag, Typography } from 'antd';
+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';
 import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
@@ -14,6 +14,7 @@ type Row = {
   settleAmount: number;
   channel?: RedeemChannel;
   createdAt: string;
+  isTest?: boolean;
   user?: { userNo: string; phone: string | null; nickname?: string | null };
   store?: { name: string; cityName: string };
   coupon?: { couponNo: string };
@@ -26,14 +27,15 @@ function maskPhone(phone: string | null | undefined) {
 
 export default function RedeemRecordsPage() {
   const [form] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
   const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
     '/admin/redeem-records',
     () => {
       const qs = new URLSearchParams();
-      if (filters.redeemNo) qs.set('redeemNo', filters.redeemNo);
-      if (filters.storeId) qs.set('storeId', filters.storeId);
-      if (filters.channel) qs.set('channel', filters.channel);
+      if (filters.redeemNo) qs.set('redeemNo', String(filters.redeemNo));
+      if (filters.storeId) qs.set('storeId', String(filters.storeId));
+      if (filters.channel) qs.set('channel', String(filters.channel));
+      if (filters.excludeTest) qs.set('excludeTest', 'true');
       return qs;
     },
     [filters],
@@ -53,7 +55,21 @@ export default function RedeemRecordsPage() {
   }
 
   const columns: ColumnsType<Row> = [
-    { title: '核销号', dataIndex: 'redeemNo', width: 180 },
+    {
+      title: '核销号',
+      dataIndex: 'redeemNo',
+      width: 200,
+      render: (v, row) => (
+        <span>
+          {v}
+          {row.isTest ? (
+            <Tag color="orange" style={{ marginLeft: 6 }}>
+              测试
+            </Tag>
+          ) : null}
+        </span>
+      ),
+    },
     {
       title: '方式',
       dataIndex: 'channel',
@@ -124,6 +140,9 @@ export default function RedeemRecordsPage() {
             ]}
           />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item>
           <Button type="primary" htmlType="submit">
             查询

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

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import {
-  Button, Descriptions, Drawer, Form, Input, Modal, Popconfirm, Select, Space, Table, Tag, Typography, message,
+  Button, Checkbox, Descriptions, Drawer, Form, Input, Modal, Popconfirm, Select, Space, Table, Tag, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { request, type Paginated } from '../lib/api';
@@ -15,6 +15,7 @@ type Row = {
   name: string;
   status: string;
   createdAt: string;
+  isTest?: boolean;
   storeCount?: number;
   staffCount?: number;
   bankAccountName?: string | null;
@@ -30,13 +31,14 @@ type StoreOption = { id: string; name: string };
 export default function StoreAccountsPage() {
   const [form] = Form.useForm();
   const [createForm] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
     '/admin/store-accounts',
     () => {
       const qs = new URLSearchParams();
-      if (filters.phone) qs.set('phone', filters.phone);
-      if (filters.status) qs.set('status', filters.status);
+      if (filters.phone) qs.set('phone', String(filters.phone));
+      if (filters.status) qs.set('status', String(filters.status));
+      if (filters.excludeTest) qs.set('excludeTest', 'true');
       return qs;
     },
     [filters],
@@ -73,7 +75,17 @@ export default function StoreAccountsPage() {
   }
 
   const columns: ColumnsType<Row> = [
-    { title: '姓名', dataIndex: 'name', width: 100 },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      width: 120,
+      render: (v, row) => (
+        <Space size={4}>
+          <span>{v}</span>
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
+        </Space>
+      ),
+    },
     { title: '手机', dataIndex: 'phone', width: 120 },
     {
       title: '绑定门店',
@@ -162,6 +174,9 @@ export default function StoreAccountsPage() {
             options={Object.entries(ACCOUNT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
           />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
       <Table

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

@@ -1,7 +1,10 @@
 import { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import {
+  Badge,
   Button,
   Drawer,
+  Image,
   Input,
   Modal,
   Space,
@@ -13,19 +16,97 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import type {
   StorePackageAuditDetailDto,
+  StorePackageAuditSummaryDto,
   StorePackageChangeRequestDto,
+  StorePackageChangeStatus,
   StorePackageItemDto,
   StorePackageViewDto,
 } from '@dukang/shared-types';
-import { STORE_PACKAGE_CHANGE_STATUS_LABELS } from '@dukang/shared-types';
+import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
+import { notifyPackageAuditChanged } from '../lib/admin-events';
 import { fmtTime } from '../lib/constants';
 
+const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, 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' };
+
+/** 文本逐字差异：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]));
@@ -35,6 +116,7 @@ function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto
     change: 'added' | 'removed' | 'changed' | 'unchanged';
     live?: StorePackageViewDto;
     proposed?: StorePackageItemDto;
+    changes?: FieldChange[];
   }> = [];
 
   for (const key of keys) {
@@ -49,8 +131,15 @@ function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto
         l.price !== p.price ||
         l.dishes !== p.dishes ||
         (l.usableTime ?? '') !== (p.usableTime ?? '') ||
-        (l.otherNotes ?? '') !== (p.otherNotes ?? '');
-      rows.push({ key, change: changed ? 'changed' : 'unchanged', live: l, proposed: p });
+        (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;
@@ -63,12 +152,158 @@ const CHANGE_LABELS = {
   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>
+  );
+}
+
 export default function StorePackageAuditsPage() {
   const [loading, setLoading] = useState(false);
   const [items, setItems] = useState<StorePackageChangeRequestDto[]>([]);
   const [total, setTotal] = useState(0);
   const [page, setPage] = useState(1);
   const [status, setStatus] = useState<string>('PENDING');
+  const [pendingCount, setPendingCount] = useState(0);
   const [rejectOpen, setRejectOpen] = useState(false);
   const [rejectReason, setRejectReason] = useState('');
   const [activeId, setActiveId] = useState<string | null>(null);
@@ -84,12 +319,14 @@ export default function StorePackageAuditsPage() {
         pageSize: '20',
       });
       if (nextStatus) qs.set('status', nextStatus);
-      const data = await request<Paginated<StorePackageChangeRequestDto>>(
-        `/admin/store-package-audits?${qs}`,
-      );
+      const [data, summary] = await Promise.all([
+        request<Paginated<StorePackageChangeRequestDto>>(`/admin/store-package-audits?${qs}`),
+        request<StorePackageAuditSummaryDto>('/admin/store-package-audits/summary'),
+      ]);
       setItems(data.items);
       setTotal(data.total);
       setPage(data.page);
+      setPendingCount(summary.pendingCount ?? 0);
     } catch (e) {
       message.error(e instanceof Error ? e.message : '加载失败');
     } finally {
@@ -101,6 +338,14 @@ export default function StorePackageAuditsPage() {
     void reload(1, status);
   }, [status]);
 
+  // 从门店详情 / 门店列表跳转过来时，带 requestId 自动打开审核（对比）抽屉
+  const [searchParams] = useSearchParams();
+  useEffect(() => {
+    const rid = searchParams.get('requestId');
+    if (rid) void openDetail(rid);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   async function openDetail(id: string) {
     setDetailOpen(true);
     setDetailLoading(true);
@@ -126,6 +371,7 @@ export default function StorePackageAuditsPage() {
       });
       message.success(action === 'APPROVE' ? '已通过' : '已驳回');
       setDetailOpen(false);
+      notifyPackageAuditChanged();
       void reload(page, status);
     } catch (e) {
       message.error(e instanceof Error ? e.message : '操作失败');
@@ -133,54 +379,12 @@ export default function StorePackageAuditsPage() {
   }
 
   const diffRows = detail ? diffPackages(detail.livePackages ?? [], detail.packages ?? []) : [];
-
-  const diffColumns: ColumnsType<(typeof diffRows)[number]> = [
-    {
-      title: '变更',
-      dataIndex: 'change',
-      width: 72,
-      render: (v: keyof typeof CHANGE_LABELS) => {
-        const meta = CHANGE_LABELS[v];
-        return <Tag color={meta.color}>{meta.text}</Tag>;
-      },
-    },
-    {
-      title: '当前线上',
-      render: (_, row) =>
-        row.live ? (
-          <div>
-            <div><strong>{row.live.name}</strong> · ¥{row.live.price}</div>
-            <Typography.Text type="secondary">{row.live.dishes}</Typography.Text>
-            {row.live.usableTime ? (
-              <div><Typography.Text type="secondary">可用：{row.live.usableTime}</Typography.Text></div>
-            ) : null}
-            {row.live.otherNotes ? (
-              <div><Typography.Text type="secondary">备注：{row.live.otherNotes}</Typography.Text></div>
-            ) : null}
-          </div>
-        ) : (
-          '—'
-        ),
-    },
-    {
-      title: '申请变更',
-      render: (_, row) =>
-        row.proposed ? (
-          <div>
-            <div><strong>{row.proposed.name}</strong> · ¥{row.proposed.price}</div>
-            <Typography.Text type="secondary">{row.proposed.dishes}</Typography.Text>
-            {row.proposed.usableTime ? (
-              <div><Typography.Text type="secondary">可用：{row.proposed.usableTime}</Typography.Text></div>
-            ) : null}
-            {row.proposed.otherNotes ? (
-              <div><Typography.Text type="secondary">备注：{row.proposed.otherNotes}</Typography.Text></div>
-            ) : null}
-          </div>
-        ) : (
-          '—'
-        ),
-    },
-  ];
+  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 },
@@ -188,7 +392,7 @@ export default function StorePackageAuditsPage() {
       title: '状态',
       dataIndex: 'status',
       render: (v: StorePackageChangeRequestDto['status']) => (
-        <Tag>{STORE_PACKAGE_CHANGE_STATUS_LABELS[v] ?? v}</Tag>
+        <Tag>{HQ_PACKAGE_STATUS_LABELS[v] ?? v}</Tag>
       ),
     },
     {
@@ -238,7 +442,15 @@ export default function StorePackageAuditsPage() {
       <Space style={{ marginBottom: 16 }}>
         {(['PENDING', 'APPROVED', 'REJECTED', ''] as const).map((s) => (
           <Button key={s || 'all'} type={status === s ? 'primary' : 'default'} onClick={() => setStatus(s)}>
-            {s ? STORE_PACKAGE_CHANGE_STATUS_LABELS[s as keyof typeof STORE_PACKAGE_CHANGE_STATUS_LABELS] : '全部'}
+            {s === 'PENDING' ? (
+              <Badge count={pendingCount} size="small" offset={[8, -2]}>
+                {HQ_PACKAGE_STATUS_LABELS.PENDING}
+              </Badge>
+            ) : s ? (
+              HQ_PACKAGE_STATUS_LABELS[s]
+            ) : (
+              '全部'
+            )}
           </Button>
         ))}
       </Space>
@@ -257,7 +469,7 @@ export default function StorePackageAuditsPage() {
 
       <Drawer
         title={detail ? `${detail.storeName || detail.storeId} · 套餐变更` : '套餐变更详情'}
-        width={720}
+        width={880}
         open={detailOpen}
         onClose={() => setDetailOpen(false)}
         extra={
@@ -282,8 +494,8 @@ export default function StorePackageAuditsPage() {
           <Typography.Text type="secondary">加载中…</Typography.Text>
         ) : detail ? (
           <>
-            <Space style={{ marginBottom: 16 }}>
-              <Tag>{STORE_PACKAGE_CHANGE_STATUS_LABELS[detail.status]}</Tag>
+            <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>
@@ -291,16 +503,54 @@ export default function StorePackageAuditsPage() {
             {detail.rejectReason ? (
               <Typography.Paragraph type="danger">驳回原因：{detail.rejectReason}</Typography.Paragraph>
             ) : null}
-            <Typography.Paragraph type="secondary">
-              线上 {detail.livePackages?.length ?? 0} 条 → 申请 {detail.packages?.length ?? 0} 条
-            </Typography.Paragraph>
-            <Table
-              size="small"
-              rowKey="key"
-              columns={diffColumns}
-              dataSource={diffRows}
-              pagination={false}
-            />
+            <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>
           </>
         ) : null}
       </Drawer>

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

@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Alert,
   Button,
+  Checkbox,
   Descriptions,
   Drawer,
   Form,
@@ -22,11 +23,11 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import type { FormInstance } from 'antd/es/form';
-import { FilePdfOutlined, LinkOutlined, EnvironmentOutlined } from '@ant-design/icons';
+import { EnvironmentOutlined } from '@ant-design/icons';
+import { isStoreContactPhone, STORE_CONTACT_PHONE_HINT } from '@dukang/domain';
 import { request, type Paginated } from '../lib/api';
 import {
   ADMIN_OPTIONS_PAGE_SIZE,
-  RESOURCE_BIZ_TYPE_LABELS,
   STORE_AUDIT_STATUS_LABELS,
   STORE_STATUS_LABELS,
   fmtTime,
@@ -40,8 +41,11 @@ import { useAdminList } from '../lib/useAdminList';
 import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
 import OssUpload from '../components/OssUpload';
+import MultiImageUpload from '../components/MultiImageUpload';
 import TencentLocPickerModal from '../components/TencentLocPickerModal';
-import AdminStorePackagesSection from '../components/AdminStorePackagesSection';
+import AdminStorePackagesSection, {
+  type AdminStorePackagesHandle,
+} from '../components/AdminStorePackagesSection';
 
 const CREATE_STEPS = [
   { title: '基本信息' },
@@ -81,18 +85,6 @@ type StoreMediaItem = {
   url?: string | null;
 };
 
-function isImageMedia(url: string, mediaType?: string) {
-  if (mediaType === 'IMAGE') return true;
-  if (mediaType === 'VIDEO' || mediaType === 'FILE') {
-    return /\.(png|jpe?g|gif|webp|bmp|heic)(\?|#|$)/i.test(url);
-  }
-  return /\.(png|jpe?g|gif|webp|bmp|heic)(\?|#|$)/i.test(url);
-}
-
-function isPdfUrl(url: string) {
-  return /\.pdf(\?|#|$)/i.test(url);
-}
-
 function collectMediaUrls(detail: Record<string, unknown>) {
   const media = Array.isArray(detail.media) ? (detail.media as StoreMediaItem[]) : [];
   const byType = (bizType: string) =>
@@ -118,195 +110,50 @@ function collectMediaUrls(detail: Record<string, unknown>) {
   };
 }
 
-function StoreAuditMediaSection({ detail }: { detail: Record<string, unknown> }) {
-  const { covers, envs, contracts } = collectMediaUrls(detail);
-  const [pdfUrl, setPdfUrl] = useState<string | null>(null);
-  const gallery = [...covers, ...envs].filter((item) => isImageMedia(item.url, item.mediaType));
-
-  if (covers.length === 0 && envs.length === 0 && contracts.length === 0) {
-    return (
-      <Alert
-        type="warning"
-        showIcon
-        style={{ marginBottom: 16 }}
-        message="暂无门头照 / 环境照 / 签约合同，请谨慎审核"
-      />
-    );
-  }
-
+function StoreAuditMediaEditor() {
   return (
     <div style={{ marginBottom: 16 }}>
-      <Typography.Title level={5} style={{ marginTop: 0, marginBottom: 12 }}>
-        审核材料
-      </Typography.Title>
-
-      {(covers.length > 0 || envs.length > 0) && (
-        <div style={{ marginBottom: 16 }}>
-          <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
-            门头照 / 环境照（点击可放大浏览）
-          </Typography.Text>
-          <Image.PreviewGroup>
-            <Space wrap size={12}>
-              {gallery.map((item) => (
-                <div key={item.id} style={{ textAlign: 'center' }}>
-                  <Image
-                    src={item.url}
-                    width={112}
-                    height={84}
-                    style={{ objectFit: 'cover', borderRadius: 6, border: '1px solid #f0f0f0' }}
-                  />
-                  <div style={{ fontSize: 12, color: '#8c8c8c', marginTop: 4 }}>
-                    {covers.some((c) => c.id === item.id) ? '门头照' : '环境照'}
-                  </div>
-                </div>
-              ))}
-            </Space>
-          </Image.PreviewGroup>
-        </div>
-      )}
-
-      {contracts.length > 0 && (
-        <div>
-          <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
-            签约合同
-          </Typography.Text>
-          <Space direction="vertical" size={12} style={{ width: '100%' }}>
-            {contracts.map((item, index) => {
-              const imageLike = isImageMedia(item.url, item.mediaType);
-              const pdf = isPdfUrl(item.url);
-              return (
-                <div
-                  key={item.id || `${item.url}-${index}`}
-                  style={{
-                    display: 'flex',
-                    gap: 12,
-                    alignItems: 'center',
-                    padding: 12,
-                    border: '1px solid #f0f0f0',
-                    borderRadius: 8,
-                    background: '#fafafa',
-                  }}
-                >
-                  {imageLike ? (
-                    <Image.PreviewGroup>
-                      <Image
-                        src={item.url}
-                        width={96}
-                        height={72}
-                        style={{ objectFit: 'cover', borderRadius: 6 }}
-                      />
-                    </Image.PreviewGroup>
-                  ) : (
-                    <div
-                      style={{
-                        width: 96,
-                        height: 72,
-                        borderRadius: 6,
-                        background: '#fff',
-                        border: '1px dashed #d9d9d9',
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'center',
-                        color: '#cf1322',
-                      }}
-                    >
-                      <FilePdfOutlined style={{ fontSize: 28 }} />
-                    </div>
-                  )}
-                  <Space direction="vertical" size={4} style={{ flex: 1, minWidth: 0 }}>
-                    <Typography.Text strong>
-                      {RESOURCE_BIZ_TYPE_LABELS.CONTRACT || '合同'}
-                      {contracts.length > 1 ? ` ${index + 1}` : ''}
-                    </Typography.Text>
-                    <Typography.Text type="secondary" ellipsis style={{ maxWidth: '100%' }}>
-                      {item.url}
-                    </Typography.Text>
-                    <Space wrap>
-                      {imageLike ? (
-                        <Typography.Text type="secondary">点击缩略图放大查看</Typography.Text>
-                      ) : null}
-                      {pdf ? (
-                        <Button type="link" size="small" style={{ padding: 0 }} onClick={() => setPdfUrl(item.url)}>
-                          页内预览 PDF
-                        </Button>
-                      ) : null}
-                      <Button
-                        type="link"
-                        size="small"
-                        icon={<LinkOutlined />}
-                        style={{ padding: 0 }}
-                        href={item.url}
-                        target="_blank"
-                        rel="noreferrer"
-                      >
-                        新窗口打开
-                      </Button>
-                    </Space>
-                  </Space>
-                </div>
-              );
-            })}
-          </Space>
-        </div>
-      )}
-
-      <Modal
-        title="合同预览"
-        open={!!pdfUrl}
-        onCancel={() => setPdfUrl(null)}
-        width={900}
-        footer={[
-          <Button key="open" href={pdfUrl || undefined} target="_blank" rel="noreferrer">
-            新窗口打开
-          </Button>,
-          <Button key="close" type="primary" onClick={() => setPdfUrl(null)}>
-            关闭
-          </Button>,
-        ]}
-        destroyOnClose
+      <Alert
+        type="info"
+        showIcon
+        style={{ marginBottom: 16 }}
+        message="可替换或删除门头照 / 环境照 / 签约合同，点击右上角「保存修改」后生效。环境照、签约合同均最多 20 张。套餐请在「套餐」页签编辑，同样由「保存修改」一并提交。"
+      />
+      <Form.Item name="coverUrl" label="门头照">
+        <OssUpload bizType="STORE_TITLE" mediaType="IMAGE" />
+      </Form.Item>
+      <Form.Item
+        name="envPhotoUrls"
+        label="环境照片"
+        extra="建议至少 3 张；支持批量上传，最多 20 张。可逐张删除后保存。"
       >
-        {pdfUrl ? (
-          <iframe
-            title="合同 PDF 预览"
-            src={pdfUrl}
-            style={{ width: '100%', height: '70vh', border: 'none', borderRadius: 8 }}
-          />
-        ) : null}
-      </Modal>
+        <MultiImageUpload
+          bizType="STORE_ENV"
+          mediaType="IMAGE"
+          maxCount={20}
+          tip="环境照支持一次选择多张批量上传"
+        />
+      </Form.Item>
+      <Form.Item
+        name="contractUrls"
+        label="签约合同"
+        style={{ marginTop: 16 }}
+        extra="支持多张合同照片（如首页、盖章页），也可上传 PDF，最多 20 个。"
+      >
+        <MultiImageUpload
+          bizType="STORE_CONTRACT"
+          mediaType="FILE"
+          accept="image/*,.pdf"
+          maxCount={20}
+          buttonText="批量上传合同"
+          tip="合同支持一次选择多张照片批量上传，最多 20 个"
+        />
+      </Form.Item>
     </div>
   );
 }
 
-type UserPickRow = { id: string; phone?: string | null; nickname?: string | null; userNo?: string | null };
-
 function StoreVisibilityWhitelistFields({ form }: { form: FormInstance }) {
-  const [userOptions, setUserOptions] = useState<UserPickRow[]>([]);
-  const [userSearching, setUserSearching] = useState(false);
-  const searchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  async function searchUsers(keyword: string) {
-    const q = keyword.trim();
-    if (searchTimer.current) clearTimeout(searchTimer.current);
-    if (!q) {
-      setUserOptions([]);
-      return;
-    }
-    searchTimer.current = setTimeout(() => {
-      void (async () => {
-        setUserSearching(true);
-        try {
-          const qs = new URLSearchParams({ page: '1', pageSize: '20', phone: q });
-          const res = await request<{ items: UserPickRow[] }>(`/admin/users?${qs}`);
-          setUserOptions((res.items ?? []).filter((u) => !!u.phone));
-        } catch {
-          setUserOptions([]);
-        } finally {
-          setUserSearching(false);
-        }
-      })();
-    }, 300);
-  }
-
   const enabled = Form.useWatch('visibilityWhitelistEnabled', form);
 
   return (
@@ -315,46 +162,14 @@ function StoreVisibilityWhitelistFields({ form }: { form: FormInstance }) {
         name="visibilityWhitelistEnabled"
         label="可见白名单"
         valuePropName="checked"
-        extra="开启后仅名单内手机号在 C 端可见，用于在线测试"
+        extra="开启后仅全局测试白名单内手机号在 C 端可见，用于在线测试"
       >
         <Switch checkedChildren="开" unCheckedChildren="关" />
       </Form.Item>
       {enabled ? (
-        <>
-          <Form.Item
-            name="visibilityPhones"
-            label="白名单手机号"
-            rules={[{ required: true, message: '请至少添加一个手机号' }]}
-            extra="可直接输入多个手机号回车添加，或从下方用户库选择"
-          >
-            <Select
-              mode="tags"
-              tokenSeparators={[',', ' ', '，', ';', '；']}
-              placeholder="输入手机号后回车"
-              style={{ width: '100%' }}
-            />
-          </Form.Item>
-          <Form.Item label="从用户库添加">
-            <Select
-              showSearch
-              filterOption={false}
-              placeholder="按手机号搜索用户"
-              loading={userSearching}
-              options={userOptions.map((u) => ({
-                value: u.phone!,
-                label: `${u.phone}${u.nickname ? ` · ${u.nickname}` : ''}${u.userNo ? `（${u.userNo}）` : ''}`,
-              }))}
-              onSearch={searchUsers}
-              onSelect={(phone: string) => {
-                const cur = (form.getFieldValue('visibilityPhones') as string[] | undefined) ?? [];
-                if (!cur.includes(phone)) {
-                  form.setFieldsValue({ visibilityPhones: [...cur, phone] });
-                }
-              }}
-              notFoundContent={userSearching ? '搜索中…' : '输入手机号搜索'}
-            />
-          </Form.Item>
-        </>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 16 }}>
+          可见手机号见白名单管理
+        </Typography.Text>
       ) : null}
     </>
   );
@@ -375,6 +190,9 @@ type StoreRow = {
   createdAt: string;
   visibilityWhitelistEnabled?: boolean;
   visibilityPhones?: string[];
+  /** 该门店当前待审核套餐变更的 requestId（无则为空） */
+  pendingPackageAuditId?: string | null;
+  isTest?: boolean;
   cityRef?: { name: string; code: string };
   partner?: { id?: string; companyName?: string | null; name?: string | null; phone?: string | null };
   account?: {
@@ -391,6 +209,7 @@ type StoreRow = {
   closeTime2?: string | null;
   avgPrice?: number | null;
   settlementRate?: number;
+  sortOrder?: number;
   category?: { id: string; name: string; parentId?: string | null } | null;
 };
 
@@ -424,8 +243,8 @@ export default function StoresPage() {
   const [form] = Form.useForm();
   const [editForm] = Form.useForm();
   const [createForm] = Form.useForm<StoreCreateForm>();
-  const [filters, setFilters] = useState<Record<string, string>>(() => {
-    const init: Record<string, string> = {};
+  const [filters, setFilters] = useState<Record<string, string | boolean>>(() => {
+    const init: Record<string, string | boolean> = {};
     if (initialCityId) init.cityId = initialCityId;
     if (initialPartnerId) init.partnerId = initialPartnerId;
     return init;
@@ -434,12 +253,13 @@ export default function StoresPage() {
     '/admin/stores',
     () => {
       const qs = new URLSearchParams();
-      if (filters.name) qs.set('name', filters.name);
-      if (filters.status) qs.set('status', filters.status);
-      if (filters.auditStatus) qs.set('auditStatus', filters.auditStatus);
-      if (filters.phone) qs.set('phone', filters.phone);
-      if (filters.cityId) qs.set('cityId', filters.cityId);
-      if (filters.partnerId) qs.set('partnerId', filters.partnerId);
+      if (filters.name) qs.set('name', String(filters.name));
+      if (filters.status) qs.set('status', String(filters.status));
+      if (filters.auditStatus) qs.set('auditStatus', String(filters.auditStatus));
+      if (filters.phone) qs.set('phone', String(filters.phone));
+      if (filters.cityId) qs.set('cityId', String(filters.cityId));
+      if (filters.partnerId) qs.set('partnerId', String(filters.partnerId));
+      if (filters.excludeTest) qs.set('excludeTest', 'true');
       return qs;
     },
     [filters],
@@ -448,6 +268,7 @@ export default function StoresPage() {
   const [filterPartners, setFilterPartners] = useState<PartnerOption[]>([]);
   const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
+  const packagesRef = useRef<AdminStorePackagesHandle>(null);
   const [rejectOpen, setRejectOpen] = useState(false);
   const [rejectReason, setRejectReason] = useState('');
   const [auditing, setAuditing] = useState(false);
@@ -562,12 +383,18 @@ export default function StoresPage() {
       account?.phone ||
       (typeof d.phone === 'string' ? d.phone : undefined);
     const storePhone = typeof d.phone === 'string' ? d.phone : undefined;
+    const contactPhone =
+      (typeof d.contactPhone === 'string' && d.contactPhone.trim()) ||
+      storePhone ||
+      loginPhone ||
+      '';
     const phoneMismatchNow = !!(loginPhone && storePhone && loginPhone !== storePhone);
     setPhoneMismatch(phoneMismatchNow ? String(loginPhone) : null);
     editForm.setFieldsValue({
       name: d.name,
-      // 以门店手机号为准保存；若与账号登录号不一致，保存时会强制同步到登录账号
-      phone: storePhone || loginPhone,
+      // 登录手机号（老板）；与 StoreAccount 同步
+      phone: loginPhone || storePhone,
+      contactPhone,
       intro: d.intro,
       benefitUsageRule:
         d.benefitUsageRule != null &&
@@ -576,6 +403,15 @@ export default function StoresPage() {
           ? String(d.benefitUsageRule)
           : '',
       coverUrl: d.coverUrl,
+      envPhotoUrls: (() => {
+        const { envs } = collectMediaUrls(d);
+        const urls = envs.map((item) => item.url).filter(Boolean);
+        return urls;
+      })(),
+      contractUrls: (() => {
+        const { contracts } = collectMediaUrls(d);
+        return contracts.map((item) => item.url).filter(Boolean);
+      })(),
       province: d.province,
       city: d.cityName,
       district: d.district,
@@ -597,6 +433,8 @@ export default function StoresPage() {
       visibilityPhones: Array.isArray(d.visibilityPhones)
         ? (d.visibilityPhones as string[])
         : [],
+      isTest: !!d.isTest,
+      sortOrder: d.sortOrder != null ? Number(d.sortOrder) : 0,
     });
     setDrawerOpen(true);
   }
@@ -614,7 +452,14 @@ export default function StoresPage() {
       const payload = {
         name: v.name,
         phone: v.phone,
-        coverUrl: v.coverUrl,
+        contactPhone: String(v.contactPhone || '').trim() || v.phone,
+        coverUrl: v.coverUrl ?? '',
+        envPhotoUrls: Array.isArray(v.envPhotoUrls)
+          ? v.envPhotoUrls.map((u: string) => String(u || '').trim()).filter(Boolean)
+          : [],
+        contractUrls: Array.isArray(v.contractUrls)
+          ? v.contractUrls.map((u: string) => String(u || '').trim()).filter(Boolean)
+          : [],
         intro: v.intro,
         benefitUsageRule:
           typeof v.benefitUsageRule === 'string' &&
@@ -637,9 +482,8 @@ export default function StoresPage() {
         bankAccountNo: v.bankAccountNo ?? null,
         bankBranch: v.bankBranch ?? null,
         visibilityWhitelistEnabled: !!v.visibilityWhitelistEnabled,
-        visibilityPhones: ((v.visibilityPhones as string[] | undefined) ?? [])
-          .map((p) => String(p || '').replace(/\D/g, '').trim())
-          .filter(Boolean),
+        isTest: !!v.isTest,
+        sortOrder: v.sortOrder != null ? Number(v.sortOrder) : 0,
         ...(hasCoords
           ? { latitude: Number(v.latitude), longitude: Number(v.longitude) }
           : {}),
@@ -648,7 +492,10 @@ export default function StoresPage() {
         method: 'PUT',
         body: JSON.stringify(payload),
       });
-      message.success('门店信息已保存');
+      const packagesResult = await packagesRef.current?.saveIfLoaded({ quiet: true });
+      message.success(
+        packagesResult?.skipped === false ? '门店信息与套餐已保存' : '门店信息已保存',
+      );
       setDetail(updated);
       setPhoneMismatch(null);
       void reload();
@@ -722,8 +569,9 @@ export default function StoresPage() {
   function openCreateModal() {
     void loadOptions();
     createForm.setFieldsValue({
-      envPhotoUrls: ['', '', ''],
+      envPhotoUrls: [],
       settlementRate: 60,
+      sortOrder: 0,
       openTime: '10:00',
       closeTime: '22:00',
       openTime2: undefined,
@@ -774,6 +622,7 @@ export default function StoresPage() {
       }
 
       const envPhotoUrls = (values.envPhotoUrls ?? []).map((u: string) => u?.trim()).filter(Boolean) as string[];
+      const contractUrls = (values.contractUrls ?? []).map((u: string) => u?.trim()).filter(Boolean) as string[];
       await request('/admin/stores', {
         method: 'POST',
         body: JSON.stringify({
@@ -784,6 +633,7 @@ export default function StoresPage() {
           city: values.city,
           name: values.name.trim(),
           phone: values.phone.trim(),
+          contactPhone: String(values.contactPhone || values.phone || '').trim(),
           district: values.district.trim(),
           address: values.address.trim(),
           ...(values.latitude != null &&
@@ -807,15 +657,13 @@ export default function StoresPage() {
             : {}),
           coverUrl: values.coverUrl?.trim() || undefined,
           envPhotoUrls: envPhotoUrls.length ? envPhotoUrls : undefined,
-          contractUrl: values.contractUrl?.trim() || undefined,
+          contractUrls: contractUrls.length ? contractUrls : undefined,
           bankAccountName: values.bankAccountName.trim(),
           bankAccountNo: values.bankAccountNo.replace(/\s/g, ''),
           bankBranch: values.bankBranch.trim(),
           settlementRate: Number(values.settlementRate ?? 60) / 100,
+          sortOrder: values.sortOrder != null ? Number(values.sortOrder) : 0,
           visibilityWhitelistEnabled: !!values.visibilityWhitelistEnabled,
-          visibilityPhones: (values.visibilityPhones ?? [])
-            .map((p: string) => String(p || '').replace(/\D/g, '').trim())
-            .filter(Boolean),
         }),
       });
       message.success('门店已创建');
@@ -839,14 +687,37 @@ export default function StoresPage() {
       title: '封面', dataIndex: 'coverUrl', width: 72,
       render: (url) => url ? <Image src={url} width={48} height={48} style={{ objectFit: 'cover', borderRadius: 4 }} /> : '—',
     },
-    { title: '门店名', dataIndex: 'name', width: 140 },
+    {
+      title: '门店名',
+      dataIndex: 'name',
+      width: 180,
+      ellipsis: { showTitle: false },
+      render: (v: string, row) => {
+        const name = v || '—';
+        return (
+          <Space size={4} style={{ maxWidth: '100%' }} wrap={false}>
+            <Typography.Text ellipsis={{ tooltip: name }} style={{ maxWidth: row.isTest ? 110 : 160 }}>
+              {name}
+            </Typography.Text>
+            {row.isTest ? <Tag color="orange">测试</Tag> : null}
+          </Space>
+        );
+      },
+    },
     {
       title: '分类',
       width: 100,
+      ellipsis: true,
       render: (_, row) => row.category?.name || '—',
     },
-    { title: '城市', dataIndex: 'cityName', width: 80 },
-    { title: '电话', dataIndex: 'phone', width: 120 },
+    { title: '城市', dataIndex: 'cityName', width: 80, ellipsis: true },
+    { title: '登录号', dataIndex: 'phone', width: 120 },
+    {
+      title: '联系电话',
+      dataIndex: 'contactPhone',
+      width: 120,
+      render: (v: string | null | undefined, row) => v || row.phone,
+    },
     {
       title: '营业状态', dataIndex: 'status', width: 90,
       render: (s) => <Tag>{STORE_STATUS_LABELS[s] || s}</Tag>,
@@ -857,10 +728,10 @@ export default function StoresPage() {
         const status = s || 'APPROVED';
         const color = status === 'PENDING' ? 'orange' : status === 'REJECTED' ? 'red' : 'green';
         return (
-          <Space direction="vertical" size={0}>
+          <Space direction="vertical" size={0} style={{ maxWidth: '100%' }}>
             <Tag color={color}>{STORE_AUDIT_STATUS_LABELS[status] || status}</Tag>
             {status === 'REJECTED' && row.rejectReason ? (
-              <Typography.Text type="secondary" style={{ fontSize: 12 }} ellipsis>
+              <Typography.Text type="secondary" style={{ fontSize: 12, maxWidth: 88 }} ellipsis={{ tooltip: row.rejectReason }}>
                 {row.rejectReason}
               </Typography.Text>
             ) : null}
@@ -872,25 +743,54 @@ export default function StoresPage() {
       title: '开城合伙人',
       dataIndex: 'partner',
       width: 140,
-      render: (partner: StoreRow['partner']) =>
-        partner ? partnerOptionLabel({ id: partner.id ?? '', ...partner }) : '—',
+      ellipsis: { showTitle: false },
+      render: (partner: StoreRow['partner']) => {
+        if (!partner) return '—';
+        const label = partnerOptionLabel({ id: partner.id ?? '', ...partner });
+        return (
+          <Typography.Text ellipsis={{ tooltip: label }} style={{ maxWidth: 124 }}>
+            {label}
+          </Typography.Text>
+        );
+      },
     },
     {
       title: '可见',
       dataIndex: 'visibilityWhitelistEnabled',
       width: 90,
-      render: (v, row) =>
-        v ? <Tag color="orange">限{row.visibilityPhones?.length ?? 0}人</Tag> : <Tag>公开</Tag>,
+      render: (v) =>
+        v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
     { title: '介绍', dataIndex: 'intro', width: 160, ellipsis: true, render: (v) => v || '—' },
-    { title: '店长', dataIndex: ['account', 'name'], width: 90, render: (v) => v || '—' },
+    { title: '排序', dataIndex: 'sortOrder', width: 70 },
+    { title: '店长', dataIndex: ['account', 'name'], width: 90, ellipsis: true, render: (v) => v || '—' },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
-      title: '操作', width: 140,
+      title: '操作',
+      width: 220,
+      fixed: 'right',
       render: (_, row) => (
-        <Space size={0}>
+        <Space size={0} wrap>
           <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>
+            </>
+          ) : null}
         </Space>
       ),
     },
@@ -939,6 +839,9 @@ export default function StoresPage() {
             options={Object.entries(STORE_AUDIT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
           />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
         <Form.Item>
           <Button
@@ -955,8 +858,24 @@ export default function StoresPage() {
           </Button>
         </Form.Item>
       </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1200 }}
-        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
+      <Table
+        rowKey="id"
+        className="admin-table-nowrap"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1720 }}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
       <Drawer title="门店详情" width={760} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Space wrap>
@@ -1053,18 +972,34 @@ export default function StoresPage() {
                           type="warning"
                           showIcon
                           style={{ marginBottom: 16 }}
-                          message={`登录账号手机号仍为 ${phoneMismatch}，与门店手机号不一致。请点击右上角「保存修改」同步，否则门店端无法用新号登录。`}
+                          message={`主账号登录号为 ${phoneMismatch}，与门店登录字段不一致。保存「登录手机号」将同步到门店端登录账号。`}
                         />
                       ) : null}
                       <Form.Item name="name" label="名称" rules={[{ required: true }]}><Input /></Form.Item>
                       <Form.Item
                         name="phone"
-                        label="登录手机号"
+                        label="登录手机号（老板）"
                         rules={[{ required: true }]}
-                        extra="门店端短信登录使用此号码；修改后需用新号重新登录"
+                        extra="门店端主账号短信登录；修改后需用新号重新登录"
                       >
                         <Input />
                       </Form.Item>
+                      <Form.Item
+                        name="contactPhone"
+                        label="联系电话（店长/对外）"
+                        rules={[
+                          { required: true, message: '请填写对外联系电话' },
+                          {
+                            validator: (_, value) =>
+                              isStoreContactPhone(String(value || ''))
+                                ? Promise.resolve()
+                                : Promise.reject(new Error(STORE_CONTACT_PHONE_HINT)),
+                          },
+                        ]}
+                        extra="用户端门店详情展示与拨号使用此号码，可与登录号不同，支持座机"
+                      >
+                        <Input placeholder="手机号或座机，如 0379-8888888" />
+                      </Form.Item>
                       <Form.Item
                         name="categoryParentId"
                         label="门店分类（大类）"
@@ -1159,6 +1094,13 @@ export default function StoresPage() {
                       <Form.Item name="avgPrice" label="人均费用（选填）">
                         <InputNumber min={0} precision={0} style={{ width: '100%' }} addonAfter="元" placeholder="用户端展示" />
                       </Form.Item>
+                      <Form.Item
+                        name="sortOrder"
+                        label="排序"
+                        extra="数值越小越靠前；同排序时按距离（有定位）或创建时间"
+                      >
+                        <InputNumber min={0} precision={0} style={{ width: '100%' }} placeholder="0" />
+                      </Form.Item>
                       <Space wrap style={{ width: '100%' }}>
                         <Form.Item name="openTime" label="营业开始" rules={[{ required: true }]}>
                           <Input type="time" style={{ width: 140 }} />
@@ -1176,6 +1118,14 @@ export default function StoresPage() {
                         </Form.Item>
                       </Space>
                       <StoreVisibilityWhitelistFields form={editForm} />
+                      <Form.Item
+                        name="isTest"
+                        label="测试门店"
+                        valuePropName="checked"
+                        extra="测试门店核销不计入结算账单；联系电话命中全局白名单时会自动标记"
+                      >
+                        <Switch checkedChildren="是" unCheckedChildren="否" />
+                      </Form.Item>
                     </>
                   ),
                 },
@@ -1220,12 +1170,14 @@ export default function StoresPage() {
                 {
                   key: 'media',
                   label: '审核材料',
-                  children: <StoreAuditMediaSection detail={detail} />,
+                  forceRender: true,
+                  children: <StoreAuditMediaEditor />,
                 },
                 {
                   key: 'packages',
                   label: '套餐',
-                  children: <AdminStorePackagesSection storeId={String(detail.id)} />,
+                  forceRender: true,
+                  children: <AdminStorePackagesSection ref={packagesRef} storeId={String(detail.id)} />,
                 },
               ]}
             />
@@ -1323,8 +1275,27 @@ export default function StoresPage() {
               <Form.Item name="name" label="门店名称" rules={[{ required: true, message: '请填写门店名称' }]}>
                 <Input placeholder="请输入门店名称" />
               </Form.Item>
-              <Form.Item name="phone" label="门店手机号（登录账号）" rules={[{ required: true, message: '请填写门店手机号' }]}>
-                <Input placeholder="11位手机号" />
+              <Form.Item name="phone" label="登录手机号（老板）" rules={[{ required: true, message: '请填写登录手机号' }]}>
+                <Input placeholder="门店端主账号登录" />
+              </Form.Item>
+              <Form.Item
+                name="contactPhone"
+                label="联系电话（店长/对外）"
+                extra="用户端拨号展示；留空则与登录号相同。支持座机"
+                rules={[
+                  {
+                    validator: (_, value) => {
+                      const raw = String(value || '').trim();
+                      if (!raw || isStoreContactPhone(raw)) return Promise.resolve();
+                      return Promise.reject(new Error(STORE_CONTACT_PHONE_HINT));
+                    },
+                  },
+                ]}
+              >
+                <Input placeholder="手机号或座机，如 0379-8888888" />
+              </Form.Item>
+              <Form.Item name="sortOrder" label="排序" extra="数值越小越靠前">
+                <InputNumber min={0} precision={0} style={{ width: '100%' }} placeholder="0" />
               </Form.Item>
               <Form.Item name="address" label="详细地址" rules={[{ required: true, message: '请填写详细地址' }]}>
                 <Input.TextArea rows={2} placeholder="请输入详细门牌号" />
@@ -1410,26 +1381,31 @@ export default function StoresPage() {
               <Form.Item name="coverUrl" label="门头照">
                 <OssUpload bizType="STORE_TITLE" mediaType="IMAGE" />
               </Form.Item>
-              <Typography.Text strong>环境照片</Typography.Text>
-              <Typography.Paragraph type="secondary" style={{ marginTop: 4 }}>
-                至少 3 张，可继续添加
-              </Typography.Paragraph>
-              <Form.List name="envPhotoUrls">
-                {(fields, { add }) => (
-                  <div style={{ marginTop: 8 }}>
-                    {fields.map((field, index) => (
-                      <Form.Item key={field.key} name={field.name} label={`环境图 ${index + 1}`}>
-                        <OssUpload bizType="STORE_ENV" mediaType="IMAGE" />
-                      </Form.Item>
-                    ))}
-                    <Button type="dashed" onClick={() => add('')} block>
-                      添加环境照片
-                    </Button>
-                  </div>
-                )}
-              </Form.List>
-              <Form.Item name="contractUrl" label="签约合同">
-                <OssUpload bizType="STORE_CONTRACT" mediaType="FILE" accept="image/*,.pdf" />
+              <Form.Item
+                name="envPhotoUrls"
+                label="环境照片"
+                extra="选填；支持批量上传，最多 20 张"
+              >
+                <MultiImageUpload
+                  bizType="STORE_ENV"
+                  mediaType="IMAGE"
+                  maxCount={20}
+                  tip="环境照支持一次选择多张批量上传"
+                />
+              </Form.Item>
+              <Form.Item
+                name="contractUrls"
+                label="签约合同"
+                extra="选填；支持多张合同照片或 PDF，最多 20 个"
+              >
+                <MultiImageUpload
+                  bizType="STORE_CONTRACT"
+                  mediaType="FILE"
+                  accept="image/*,.pdf"
+                  maxCount={20}
+                  buttonText="批量上传合同"
+                  tip="合同支持一次选择多张照片批量上传，最多 20 个"
+                />
               </Form.Item>
           </div>
           <div style={{ display: createStep === 2 ? 'block' : 'none' }}>

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

@@ -0,0 +1,687 @@
+import { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Card,
+  Checkbox,
+  Descriptions,
+  Drawer,
+  Form,
+  Input,
+  Modal,
+  Popconfirm,
+  Select,
+  Space,
+  Table,
+  Tabs,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { request, type Paginated } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+
+const MOCK_KEYS = ['MOCK_SMS', 'MOCK_WECHAT', 'MOCK_PAY'] as const;
+
+type PhoneRow = {
+  id: string;
+  phone: string;
+  note: string | null;
+  createdByHqId: string | null;
+  createdAt: string;
+  updatedAt: string;
+};
+
+type AccountType = 'user' | 'store_account' | 'partner' | 'store' | 'order';
+
+type LinkedPayload = {
+  phone: PhoneRow;
+  users: Array<{ id: string; userNo: string; phone: string | null; nickname: string | null; isTest: boolean; status: number }>;
+  storeAccounts: Array<{ id: string; phone: string; name: string; isTest: boolean; status: string }>;
+  partners: Array<{ id: string; phone: string; name: string; companyName: string | null; isTest: boolean; status: string }>;
+  stores: Array<{ id: string; name: string; phone: string; isTest: boolean; status: string }>;
+};
+
+const ACCOUNT_TYPE_OPTIONS: { value: AccountType; label: string }[] = [
+  { value: 'user', label: 'C 端用户' },
+  { value: 'store_account', label: '门店账号' },
+  { value: 'partner', label: '合伙人' },
+  { value: 'store', label: '门店' },
+  { value: 'order', label: '订单' },
+];
+
+export default function TestWhitelistPage() {
+  const [mockSms, setMockSms] = useState(false);
+  const [mockWechat, setMockWechat] = useState(false);
+  const [mockPay, setMockPay] = useState(false);
+  const [mockLoading, setMockLoading] = useState(true);
+  const [mockSaving, setMockSaving] = useState(false);
+
+  const [phoneForm] = Form.useForm();
+  const [phones, setPhones] = useState<Paginated<PhoneRow> | null>(null);
+  const [phonesLoading, setPhonesLoading] = useState(false);
+  const [phonePage, setPhonePage] = useState(1);
+  const [phonePageSize, setPhonePageSize] = useState(20);
+  const [phoneFilters, setPhoneFilters] = useState<{ phone?: string }>({});
+  const [addOpen, setAddOpen] = useState(false);
+  const [addForm] = Form.useForm();
+  const [editOpen, setEditOpen] = useState(false);
+  const [editRow, setEditRow] = useState<PhoneRow | null>(null);
+  const [editForm] = Form.useForm();
+  const [migrating, setMigrating] = useState(false);
+
+  const [accountType, setAccountType] = useState<AccountType>('user');
+  const [accountPhone, setAccountPhone] = useState('');
+  const [accounts, setAccounts] = useState<Paginated<Record<string, unknown>> | null>(null);
+  const [accountsLoading, setAccountsLoading] = useState(false);
+  const [accountPage, setAccountPage] = useState(1);
+  const [accountPageSize, setAccountPageSize] = useState(20);
+
+  const [linkedOpen, setLinkedOpen] = useState(false);
+  const [linkedLoading, setLinkedLoading] = useState(false);
+  const [linked, setLinked] = useState<LinkedPayload | null>(null);
+
+  async function loadMockFlags() {
+    setMockLoading(true);
+    try {
+      const cfg = await request<{ mockSms: boolean; mockWechat: boolean; mockPay: boolean }>(
+        '/admin/test-whitelist/mock-flags',
+      );
+      setMockSms(!!cfg.mockSms);
+      setMockWechat(!!cfg.mockWechat);
+      setMockPay(!!cfg.mockPay);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载 Mock 配置失败');
+    } finally {
+      setMockLoading(false);
+    }
+  }
+
+  async function saveMockFlags(next: { MOCK_SMS?: boolean; MOCK_WECHAT?: boolean; MOCK_PAY?: boolean }) {
+    const body: { mockSms?: boolean; mockWechat?: boolean; mockPay?: boolean } = {};
+    if (next.MOCK_SMS !== undefined) body.mockSms = next.MOCK_SMS;
+    if (next.MOCK_WECHAT !== undefined) body.mockWechat = next.MOCK_WECHAT;
+    if (next.MOCK_PAY !== undefined) body.mockPay = next.MOCK_PAY;
+    setMockSaving(true);
+    try {
+      const cfg = await request<{ mockSms: boolean; mockWechat: boolean; mockPay: boolean }>(
+        '/admin/test-whitelist/mock-flags',
+        {
+          method: 'PUT',
+          body: JSON.stringify(body),
+        },
+      );
+      setMockSms(!!cfg.mockSms);
+      setMockWechat(!!cfg.mockWechat);
+      setMockPay(!!cfg.mockPay);
+      message.success('已保存');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+      await loadMockFlags();
+    } finally {
+      setMockSaving(false);
+    }
+  }
+
+  const loadPhones = useCallback(async () => {
+    setPhonesLoading(true);
+    try {
+      const qs = new URLSearchParams({
+        page: String(phonePage),
+        pageSize: String(phonePageSize),
+      });
+      if (phoneFilters.phone) qs.set('phone', phoneFilters.phone);
+      const res = await request<Paginated<PhoneRow>>(`/admin/test-whitelist/phones?${qs}`);
+      setPhones(res);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载手机号名单失败');
+    } finally {
+      setPhonesLoading(false);
+    }
+  }, [phonePage, phonePageSize, phoneFilters]);
+
+  const loadAccounts = useCallback(async () => {
+    setAccountsLoading(true);
+    try {
+      const qs = new URLSearchParams({
+        type: accountType,
+        page: String(accountPage),
+        pageSize: String(accountPageSize),
+      });
+      if (accountPhone.trim()) qs.set('phone', accountPhone.trim());
+      const res = await request<Paginated<Record<string, unknown>>>(
+        `/admin/test-whitelist/accounts?${qs}`,
+      );
+      setAccounts(res);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载测试账号失败');
+    } finally {
+      setAccountsLoading(false);
+    }
+  }, [accountType, accountPage, accountPageSize, accountPhone]);
+
+  useEffect(() => {
+    void loadMockFlags();
+  }, []);
+
+  useEffect(() => {
+    void loadPhones();
+  }, [loadPhones]);
+
+  useEffect(() => {
+    void loadAccounts();
+  }, [loadAccounts]);
+
+  async function onAddPhone() {
+    const v = await addForm.validateFields();
+    try {
+      await request('/admin/test-whitelist/phones', {
+        method: 'POST',
+        body: JSON.stringify({ phone: v.phone, note: v.note || undefined }),
+      });
+      message.success('已添加');
+      setAddOpen(false);
+      addForm.resetFields();
+      setPhonePage(1);
+      void loadPhones();
+      void loadAccounts();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '添加失败');
+    }
+  }
+
+  async function onEditPhone() {
+    if (!editRow) return;
+    const v = await editForm.validateFields();
+    try {
+      await request(`/admin/test-whitelist/phones/${editRow.id}`, {
+        method: 'PATCH',
+        body: JSON.stringify({ note: v.note ?? null }),
+      });
+      message.success('已更新');
+      setEditOpen(false);
+      setEditRow(null);
+      void loadPhones();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '更新失败');
+    }
+  }
+
+  async function onDeletePhone(id: string) {
+    try {
+      await request(`/admin/test-whitelist/phones/${id}`, { method: 'DELETE' });
+      message.success('已删除');
+      void loadPhones();
+      void loadAccounts();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    }
+  }
+
+  async function onMigrate() {
+    setMigrating(true);
+    try {
+      const res = await request<{ importedCandidates: number; added: number }>(
+        '/admin/test-whitelist/migrate-visibility',
+        { method: 'POST' },
+      );
+      message.success(
+        `导入完成：候选 ${res.importedCandidates} 个，新增 ${res.added} 个`,
+      );
+      void loadPhones();
+      void loadAccounts();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '导入失败');
+    } finally {
+      setMigrating(false);
+    }
+  }
+
+  async function openLinked(row: PhoneRow) {
+    setLinkedOpen(true);
+    setLinkedLoading(true);
+    setLinked(null);
+    try {
+      const res = await request<LinkedPayload>(`/admin/test-whitelist/phones/${row.id}/linked`);
+      setLinked(res);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载关联失败');
+      setLinkedOpen(false);
+    } finally {
+      setLinkedLoading(false);
+    }
+  }
+
+  const phoneColumns: ColumnsType<PhoneRow> = [
+    { title: '手机号', dataIndex: 'phone', width: 140 },
+    {
+      title: '备注',
+      dataIndex: 'note',
+      ellipsis: true,
+      render: (v) => v || '—',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createdAt',
+      width: 170,
+      render: fmtTime,
+    },
+    {
+      title: '操作',
+      width: 220,
+      render: (_, row) => (
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => void openLinked(row)}>
+            关联账号
+          </Button>
+          <Button
+            type="link"
+            size="small"
+            onClick={() => {
+              setEditRow(row);
+              editForm.setFieldsValue({ note: row.note ?? '' });
+              setEditOpen(true);
+            }}
+          >
+            编辑备注
+          </Button>
+          <Popconfirm
+            title="确认移出白名单？"
+            description="将同步清除该手机号关联账号的测试标记"
+            okText="确认"
+            cancelText="取消"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => void onDeletePhone(row.id)}
+          >
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  function accountColumns(): ColumnsType<Record<string, unknown>> {
+    if (accountType === 'user') {
+      return [
+        { title: '用户编号', dataIndex: 'userNo', width: 120 },
+        { title: '昵称', dataIndex: 'nickname', width: 100, render: (v) => (v as string) || '—' },
+        { title: '手机', dataIndex: 'phone', width: 120 },
+        {
+          title: '标记',
+          dataIndex: 'isTest',
+          width: 80,
+          render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+        },
+        { title: '注册', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v as string) },
+      ];
+    }
+    if (accountType === 'store_account') {
+      return [
+        { title: '姓名', dataIndex: 'name', width: 100 },
+        { title: '手机', dataIndex: 'phone', width: 120 },
+        { title: '状态', dataIndex: 'status', width: 90 },
+        {
+          title: '标记',
+          dataIndex: 'isTest',
+          width: 80,
+          render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+        },
+        { title: '创建', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v as string) },
+      ];
+    }
+    if (accountType === 'partner') {
+      return [
+        { title: '姓名', dataIndex: 'name', width: 100 },
+        { title: '公司', dataIndex: 'companyName', ellipsis: true, render: (v) => (v as string) || '—' },
+        { title: '手机', dataIndex: 'phone', width: 120 },
+        {
+          title: '标记',
+          dataIndex: 'isTest',
+          width: 80,
+          render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+        },
+        { title: '创建', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v as string) },
+      ];
+    }
+    if (accountType === 'store') {
+      return [
+        { title: '门店名', dataIndex: 'name', width: 160, ellipsis: true },
+        { title: '城市', dataIndex: 'cityName', width: 90 },
+        { title: '电话', dataIndex: 'phone', width: 120 },
+        { title: '状态', dataIndex: 'status', width: 90 },
+        {
+          title: '标记',
+          dataIndex: 'isTest',
+          width: 80,
+          render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+        },
+        { title: '创建', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v as string) },
+      ];
+    }
+    return [
+      { title: '订单号', dataIndex: 'orderNo', width: 180 },
+      { title: '状态', dataIndex: 'status', width: 110 },
+      {
+        title: '实付',
+        dataIndex: 'payAmount',
+        width: 90,
+        render: (v) => `¥${v}`,
+      },
+      { title: '收货手机', dataIndex: 'receiverPhone', width: 120 },
+      {
+        title: '用户手机',
+        width: 120,
+        render: (_, row) =>
+          (row.user as { phone?: string | null } | undefined)?.phone || '—',
+      },
+      {
+        title: '标记',
+        dataIndex: 'isTest',
+        width: 80,
+        render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+      },
+      { title: '下单', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v as string) },
+    ];
+  }
+
+  return (
+    <div>
+      <Typography.Title level={4} style={{ marginTop: 0 }}>
+        白名单管理
+      </Typography.Title>
+
+      <Card size="small" loading={mockLoading} style={{ marginBottom: 16 }}>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
+          Mock 开关（与系统设置同源，勾选 = 不做真实验证）
+        </Typography.Text>
+        <Space wrap>
+          <Checkbox
+            checked={mockSms}
+            disabled={mockSaving}
+            onChange={(e) => void saveMockFlags({ MOCK_SMS: e.target.checked })}
+          >
+            短信不做真实验证
+          </Checkbox>
+          <Checkbox
+            checked={mockWechat}
+            disabled={mockSaving}
+            onChange={(e) => void saveMockFlags({ MOCK_WECHAT: e.target.checked })}
+          >
+            微信不做真实验证
+          </Checkbox>
+          <Checkbox
+            checked={mockPay}
+            disabled={mockSaving}
+            onChange={(e) => void saveMockFlags({ MOCK_PAY: e.target.checked })}
+          >
+            支付不做真实验证
+          </Checkbox>
+        </Space>
+        <Typography.Text type="secondary" style={{ display: 'block', marginTop: 8, fontSize: 12 }}>
+          配置键：{MOCK_KEYS.join(' / ')}
+        </Typography.Text>
+      </Card>
+
+      <Tabs
+        items={[
+          {
+            key: 'phones',
+            label: '手机号名单',
+            children: (
+              <>
+                <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }} wrap>
+                  <Form
+                    form={phoneForm}
+                    layout="inline"
+                    onFinish={(v) => {
+                      setPhoneFilters({ phone: v.phone || undefined });
+                      setPhonePage(1);
+                    }}
+                  >
+                    <Form.Item name="phone" label="手机号">
+                      <Input allowClear placeholder="模糊搜索" />
+                    </Form.Item>
+                    <Form.Item>
+                      <Button type="primary" htmlType="submit">
+                        查询
+                      </Button>
+                    </Form.Item>
+                  </Form>
+                  <Space>
+                    <Button
+                      onClick={() => {
+                        Modal.confirm({
+                          title: '从可见性白名单导入',
+                          content: '将商品/门店旧可见性手机号合并入全局名单（幂等），并同步测试标记。',
+                          okText: '开始导入',
+                          cancelText: '取消',
+                          onOk: () => onMigrate(),
+                        });
+                      }}
+                      loading={migrating}
+                    >
+                      从可见性白名单导入
+                    </Button>
+                    <Button type="primary" onClick={() => setAddOpen(true)}>
+                      添加手机号
+                    </Button>
+                  </Space>
+                </Space>
+                <Table
+                  rowKey="id"
+                  loading={phonesLoading}
+                  columns={phoneColumns}
+                  dataSource={phones?.items ?? []}
+                  pagination={{
+                    current: phonePage,
+                    pageSize: phonePageSize,
+                    total: phones?.total ?? 0,
+                    showSizeChanger: true,
+                    onChange: (p, ps) => {
+                      setPhonePage(p);
+                      setPhonePageSize(ps);
+                    },
+                  }}
+                />
+              </>
+            ),
+          },
+          {
+            key: 'accounts',
+            label: '测试账号记录',
+            children: (
+              <>
+                <Space style={{ marginBottom: 16 }} wrap>
+                  <Select
+                    style={{ width: 140 }}
+                    value={accountType}
+                    options={ACCOUNT_TYPE_OPTIONS}
+                    onChange={(v: AccountType) => {
+                      setAccountType(v);
+                      setAccountPage(1);
+                    }}
+                  />
+                  <Input
+                    allowClear
+                    placeholder="按手机号筛选"
+                    style={{ width: 160 }}
+                    value={accountPhone}
+                    onChange={(e) => setAccountPhone(e.target.value)}
+                    onPressEnter={() => {
+                      setAccountPage(1);
+                      void loadAccounts();
+                    }}
+                  />
+                  <Button
+                    type="primary"
+                    onClick={() => {
+                      if (accountPage !== 1) setAccountPage(1);
+                      else void loadAccounts();
+                    }}
+                  >
+                    查询
+                  </Button>
+                </Space>
+                <Table
+                  rowKey="id"
+                  loading={accountsLoading}
+                  columns={accountColumns()}
+                  dataSource={accounts?.items ?? []}
+                  scroll={{ x: 900 }}
+                  pagination={{
+                    current: accountPage,
+                    pageSize: accountPageSize,
+                    total: accounts?.total ?? 0,
+                    showSizeChanger: true,
+                    onChange: (p, ps) => {
+                      setAccountPage(p);
+                      setAccountPageSize(ps);
+                    },
+                  }}
+                />
+              </>
+            ),
+          },
+        ]}
+      />
+
+      <Modal
+        title="添加白名单手机号"
+        open={addOpen}
+        onCancel={() => setAddOpen(false)}
+        onOk={() => void onAddPhone()}
+        destroyOnClose
+      >
+        <Form form={addForm} layout="vertical">
+          <Form.Item
+            name="phone"
+            label="手机号"
+            rules={[
+              { required: true, message: '请输入手机号' },
+              { pattern: /^1\d{10}$/, message: '请输入 11 位手机号' },
+            ]}
+          >
+            <Input placeholder="1xxxxxxxxxx" maxLength={11} />
+          </Form.Item>
+          <Form.Item name="note" label="备注">
+            <Input.TextArea rows={2} maxLength={256} showCount />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Modal
+        title={`编辑备注 · ${editRow?.phone ?? ''}`}
+        open={editOpen}
+        onCancel={() => {
+          setEditOpen(false);
+          setEditRow(null);
+        }}
+        onOk={() => void onEditPhone()}
+        destroyOnClose
+      >
+        <Form form={editForm} layout="vertical">
+          <Form.Item name="note" label="备注">
+            <Input.TextArea rows={2} maxLength={256} showCount />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Drawer
+        title={linked ? `关联账号 · ${linked.phone.phone}` : '关联账号'}
+        open={linkedOpen}
+        onClose={() => setLinkedOpen(false)}
+        width={560}
+        destroyOnClose
+      >
+        {linkedLoading ? (
+          <Typography.Text type="secondary">加载中…</Typography.Text>
+        ) : linked ? (
+          <Space direction="vertical" size={16} style={{ width: '100%' }}>
+            <Descriptions size="small" column={1} bordered>
+              <Descriptions.Item label="手机号">{linked.phone.phone}</Descriptions.Item>
+              <Descriptions.Item label="备注">{linked.phone.note || '—'}</Descriptions.Item>
+            </Descriptions>
+            <div>
+              <Typography.Title level={5}>C 端用户（{linked.users.length}）</Typography.Title>
+              <Table
+                size="small"
+                rowKey="id"
+                pagination={false}
+                dataSource={linked.users}
+                columns={[
+                  { title: '编号', dataIndex: 'userNo' },
+                  { title: '昵称', dataIndex: 'nickname', render: (v) => v || '—' },
+                  {
+                    title: '测试',
+                    dataIndex: 'isTest',
+                    width: 70,
+                    render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+                  },
+                ]}
+              />
+            </div>
+            <div>
+              <Typography.Title level={5}>门店账号（{linked.storeAccounts.length}）</Typography.Title>
+              <Table
+                size="small"
+                rowKey="id"
+                pagination={false}
+                dataSource={linked.storeAccounts}
+                columns={[
+                  { title: '姓名', dataIndex: 'name' },
+                  { title: '状态', dataIndex: 'status', width: 90 },
+                  {
+                    title: '测试',
+                    dataIndex: 'isTest',
+                    width: 70,
+                    render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+                  },
+                ]}
+              />
+            </div>
+            <div>
+              <Typography.Title level={5}>合伙人（{linked.partners.length}）</Typography.Title>
+              <Table
+                size="small"
+                rowKey="id"
+                pagination={false}
+                dataSource={linked.partners}
+                columns={[
+                  { title: '姓名', dataIndex: 'name' },
+                  { title: '公司', dataIndex: 'companyName', render: (v) => v || '—' },
+                  {
+                    title: '测试',
+                    dataIndex: 'isTest',
+                    width: 70,
+                    render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+                  },
+                ]}
+              />
+            </div>
+            <div>
+              <Typography.Title level={5}>门店（{linked.stores.length}）</Typography.Title>
+              <Table
+                size="small"
+                rowKey="id"
+                pagination={false}
+                dataSource={linked.stores}
+                columns={[
+                  { title: '名称', dataIndex: 'name' },
+                  { title: '状态', dataIndex: 'status', width: 90 },
+                  {
+                    title: '测试',
+                    dataIndex: 'isTest',
+                    width: 70,
+                    render: (v) => (v ? <Tag color="orange">测试</Tag> : '—'),
+                  },
+                ]}
+              />
+            </div>
+          </Space>
+        ) : null}
+      </Drawer>
+    </div>
+  );
+}

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

@@ -30,6 +30,13 @@ type UserOrderRow = {
   createdAt: string;
 };
 
+/** 好客权益金额展示：0 与空值统一显示占位，避免整列都是 ¥0.00 干扰 */
+function fmtBenefit(v: number | null | undefined) {
+  const n = Number(v ?? 0);
+  if (!Number.isFinite(n) || n <= 0) return '—';
+  return `¥${n.toFixed(2)}`;
+}
+
 type UserBehaviorLog = {
   id: string;
   eventName: string;
@@ -112,6 +119,7 @@ export default function UsersPage() {
       if (values.status !== undefined && values.status !== '') {
         qs.set('status', String(values.status));
       }
+      if (values.excludeTest) qs.set('excludeTest', 'true');
       const res = await request<Paginated<AdminUserRow>>(`/admin/users?${qs}`);
       setData(res);
     } finally {
@@ -237,7 +245,17 @@ export default function UsersPage() {
   ];
 
   const columns: ColumnsType<AdminUserRow> = [
-    { title: '用户编号', dataIndex: 'userNo', width: 120 },
+    {
+      title: '用户编号',
+      dataIndex: 'userNo',
+      width: 140,
+      render: (v, row) => (
+        <Space size={4}>
+          <span>{v}</span>
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
+        </Space>
+      ),
+    },
     { title: '昵称', dataIndex: 'nickname', width: 100 },
     {
       title: '手机',
@@ -304,6 +322,39 @@ export default function UsersPage() {
       render: (v) => (v ? <Tag color="blue">已合并</Tag> : '—'),
     },
     { title: '订单数', dataIndex: 'orderCount', width: 80 },
+    {
+      title: '剩余权益',
+      dataIndex: 'benefitBalance',
+      width: 110,
+      align: 'right',
+      sorter: (a, b) => Number(a.benefitBalance ?? 0) - Number(b.benefitBalance ?? 0),
+      render: (v: number | undefined) =>
+        Number(v ?? 0) > 0 ? (
+          <Typography.Text strong style={{ color: '#cf1322' }}>
+            {fmtBenefit(v)}
+          </Typography.Text>
+        ) : (
+          <Typography.Text type="secondary">—</Typography.Text>
+        ),
+    },
+    {
+      title: '已用权益',
+      dataIndex: 'benefitUsedAmount',
+      width: 110,
+      align: 'right',
+      sorter: (a, b) => Number(a.benefitUsedAmount ?? 0) - Number(b.benefitUsedAmount ?? 0),
+      render: (v: number | undefined) => (
+        <Typography.Text type="secondary">{fmtBenefit(v)}</Typography.Text>
+      ),
+    },
+    {
+      title: '累计权益',
+      dataIndex: 'benefitTotalAmount',
+      width: 110,
+      align: 'right',
+      sorter: (a, b) => Number(a.benefitTotalAmount ?? 0) - Number(b.benefitTotalAmount ?? 0),
+      render: (v: number | undefined) => fmtBenefit(v),
+    },
     {
       title: '注册时间',
       dataIndex: 'createdAt',
@@ -362,6 +413,9 @@ export default function UsersPage() {
             { value: 0, label: '停用' },
           ]} />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item>
           <Space>
             <Button type="primary" htmlType="submit">查询</Button>
@@ -375,7 +429,7 @@ export default function UsersPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1500 }}
+        scroll={{ x: 1830 }}
         rowSelection={canDeleteUsers ? {
           selectedRowKeys,
           preserveSelectedRowKeys: true,
@@ -447,6 +501,18 @@ export default function UsersPage() {
               </Descriptions.Item>
               <Descriptions.Item label="被合并访客数">{detail.mergedFromCount ?? 0}</Descriptions.Item>
               <Descriptions.Item label="订单/地址">{detail.orderCount} / {detail.addressCount}</Descriptions.Item>
+              <Descriptions.Item label="好客权益">
+                <Space size={16} wrap>
+                  <span>
+                    剩余{' '}
+                    <Typography.Text strong style={{ color: '#cf1322' }}>
+                      {fmtBenefit(detail.benefitBalance)}
+                    </Typography.Text>
+                  </span>
+                  <span>已用 {fmtBenefit(detail.benefitUsedAmount)}</span>
+                  <span>累计 {fmtBenefit(detail.benefitTotalAmount)}</span>
+                </Space>
+              </Descriptions.Item>
               <Descriptions.Item label="注册时间">
                 {new Date(detail.createdAt).toLocaleString('zh-CN')}
               </Descriptions.Item>

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

@@ -51,13 +51,35 @@ type BillItem = {
 const STATUS_LABELS: Record<string, string> = {
   UNPAID: '未打款',
   PAID: '已打款',
+  NO_PAYMENT_NEEDED: '无需打款',
 };
 
 const STATUS_COLORS: Record<string, string> = {
   UNPAID: 'red',
   PAID: 'green',
+  NO_PAYMENT_NEEDED: 'default',
 };
 
+function isZeroPayable(amount: number | string | null | undefined) {
+  return Number(amount ?? 0) === 0;
+}
+
+/** 应付为 0 时展示「无需打款」（灰），否则按 DB 打款状态 */
+function displayWineryStatus(status: string, wineryAmount: number | string) {
+  if (isZeroPayable(wineryAmount)) {
+    return { key: 'NO_PAYMENT_NEEDED', label: STATUS_LABELS.NO_PAYMENT_NEEDED, color: STATUS_COLORS.NO_PAYMENT_NEEDED };
+  }
+  return {
+    key: status,
+    label: STATUS_LABELS[status] || status,
+    color: STATUS_COLORS[status] || 'default',
+  };
+}
+
+function canConfirmWineryPay(row: { status: string; wineryAmount: number | string }) {
+  return row.status === 'UNPAID' && !isZeroPayable(row.wineryAmount);
+}
+
 const DELIVERY_LABELS: Record<string, string> = {
   LOCAL: '同城',
   CROSS_CITY: '跨城',
@@ -212,7 +234,7 @@ export default function WineryBillsPage() {
       render: (v) => `${Math.round(Number(v) * 100)}%`,
     },
     {
-      title: '酒厂应付',
+      title: '应付',
       dataIndex: 'wineryAmount',
       width: 110,
       render: (v) => `¥${Number(v).toFixed(2)}`,
@@ -220,8 +242,11 @@ export default function WineryBillsPage() {
     {
       title: '状态',
       dataIndex: 'status',
-      width: 90,
-      render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
+      width: 100,
+      render: (s, row) => {
+        const d = displayWineryStatus(s, row.wineryAmount);
+        return <Tag color={d.color}>{d.label}</Tag>;
+      },
     },
     {
       title: '操作',
@@ -232,7 +257,7 @@ export default function WineryBillsPage() {
           <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
             明细
           </Button>
-          {row.status === 'UNPAID' && (
+          {canConfirmWineryPay(row) && (
             <Button type="link" size="small" onClick={() => confirmPay([row.id], Number(row.wineryAmount))}>
               确认打款
             </Button>
@@ -258,7 +283,8 @@ export default function WineryBillsPage() {
             酒厂对账单
           </Typography.Title>
           <Typography.Text type="secondary">
-            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色，可展开订单明细
+            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色、应付为 0
+            无需打款（灰），可展开订单明细
           </Typography.Text>
         </Space>
         {canEditWineryBank ? (
@@ -273,7 +299,7 @@ export default function WineryBillsPage() {
           <Space size="large" wrap>
             <Statistic title="账单数" value={summary.count} />
             <Statistic title="酒单实付合计" value={summary.orderAmount ?? 0} prefix="¥" precision={2} />
-            <Statistic title="酒厂应付合计" value={summary.wineryAmount ?? 0} prefix="¥" precision={2} />
+            <Statistic title="应付合计" value={summary.wineryAmount ?? 0} prefix="¥" precision={2} />
           </Space>
         </Card>
       )}
@@ -296,7 +322,7 @@ export default function WineryBillsPage() {
         <Form.Item name="status" label="状态">
           <Select
             allowClear
-            style={{ width: 120 }}
+            style={{ width: 130 }}
             options={Object.entries(STATUS_LABELS).map(([value, label]) => ({ value, label }))}
           />
         </Form.Item>
@@ -347,7 +373,7 @@ export default function WineryBillsPage() {
         rowSelection={{
           selectedRowKeys: selectedKeys,
           onChange: setSelectedKeys,
-          getCheckboxProps: (r) => ({ disabled: r.status !== 'UNPAID' }),
+          getCheckboxProps: (r) => ({ disabled: !canConfirmWineryPay(r) }),
         }}
         scroll={{ x: 1100 }}
         pagination={{
@@ -368,8 +394,10 @@ export default function WineryBillsPage() {
             <Descriptions column={1} size="small" bordered>
               <Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
               <Descriptions.Item label="账单日">{String(detail.billDate).slice(0, 10)}</Descriptions.Item>
-              <Descriptions.Item label="酒厂应付">¥{Number(detail.wineryAmount).toFixed(2)}</Descriptions.Item>
-              <Descriptions.Item label="状态">{STATUS_LABELS[detail.status] || detail.status}</Descriptions.Item>
+              <Descriptions.Item label="应付">¥{Number(detail.wineryAmount).toFixed(2)}</Descriptions.Item>
+              <Descriptions.Item label="状态">
+                {displayWineryStatus(detail.status, detail.wineryAmount).label}
+              </Descriptions.Item>
               <Descriptions.Item label="打款时间">{detail.paidAt ? fmtTime(detail.paidAt) : '—'}</Descriptions.Item>
             </Descriptions>
             <Typography.Title level={5} style={{ marginTop: 16 }}>
@@ -395,7 +423,7 @@ export default function WineryBillsPage() {
                   render: (v) => `¥${Number(v).toFixed(2)}`,
                 },
                 {
-                  title: '酒厂应付',
+                  title: '应付',
                   dataIndex: 'wineryAmount',
                   width: 90,
                   render: (v) => `¥${Number(v).toFixed(2)}`,

apps/admin-web/tsconfig.json

@@ -11,7 +11,10 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-    "strict": true
+    "strict": true,
+    "paths": {
+      "@dukang/domain": ["../../packages/domain/src/index.ts"]
+    }
   },
   "include": ["src"]
 }

apps/admin-web/vite.config.ts

@@ -1,10 +1,19 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import path from 'path';
+
+const apiTarget = process.env.VITE_API_TARGET ?? 'http://localhost:3010';
 
 export default defineConfig({
   plugins: [react()],
+  resolve: {
+    alias: {
+      '@dukang/domain': path.resolve(__dirname, '../../packages/domain/src/index.ts'),
+    },
+  },
   server: {
+    host: true,
     port: 5175,
-    proxy: { '/api': 'http://localhost:3000' },
+    proxy: { '/api': apiTarget },
   },
 });

apps/h5-partner/package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@dukang/client-logging": "workspace:*",
+    "@dukang/domain": "workspace:*",
     "@dukang/shared-types": "workspace:*",
     "@dukang/shared-ui": "workspace:*",
     "@dukang/weixin-sdk": "workspace:*",

apps/h5-partner/src/components/MultiOssUploadField.tsx

@@ -0,0 +1,236 @@
+import { useEffect, useRef, useState } from 'react';
+import { uploadFileToOss, type OssMediaType } from '../lib/upload';
+import { enqueueUpload } from '../lib/upload-lock';
+import { formatChooseImageFailMessage } from '@dukang/weixin-sdk';
+import { isWechatEnv, weixinSdk } from '../lib/weixin';
+import { toastError, toastSuccess } from '../lib/toast';
+
+type Props = {
+  value?: string[];
+  onChange?: (urls: string[]) => void;
+  bizType: string;
+  mediaType?: OssMediaType;
+  maxCount?: number;
+  disabled?: boolean;
+  label?: string;
+  /** 系统文件选择器的 accept，默认仅图片 */
+  accept?: string;
+  /** 计量单位文案，如「张」「个」 */
+  unit?: string;
+};
+
+function isCancelError(msg: string): boolean {
+  return /cancel|取消/i.test(msg);
+}
+
+function isPdf(url: string): boolean {
+  return /\.pdf(\?|$)/i.test(url);
+}
+
+function normalizeUrls(value?: string[]) {
+  return (value ?? []).map((u) => String(u || '').trim()).filter(Boolean);
+}
+
+/** 合伙人端多图批量上传（微信相册可多选） */
+export default function MultiOssUploadField({
+  value,
+  onChange,
+  bizType,
+  mediaType = 'IMAGE',
+  maxCount = 20,
+  disabled,
+  label,
+  accept = 'image/*',
+  unit = '张',
+}: Props) {
+  const inputRef = useRef<HTMLInputElement>(null);
+  const pickingRef = useRef(false);
+  const [uploading, setUploading] = useState(false);
+  const [error, setError] = useState('');
+
+  const urls = normalizeUrls(value);
+  const urlsRef = useRef(urls);
+  const onChangeRef = useRef(onChange);
+  const remaining = Math.max(0, maxCount - urls.length);
+  const inWechat = isWechatEnv();
+
+  useEffect(() => {
+    urlsRef.current = urls;
+  }, [urls]);
+
+  useEffect(() => {
+    onChangeRef.current = onChange;
+  }, [onChange]);
+
+  useEffect(() => {
+    if (!inWechat) return;
+    void weixinSdk.init().catch(() => {});
+  }, [inWechat]);
+
+  function showUploadError(text: string) {
+    setError(text);
+    toastError(text);
+  }
+
+  async function uploadFiles(files: File[]) {
+    const current = urlsRef.current;
+    const room = Math.max(0, maxCount - current.length);
+    const picked = files.slice(0, room);
+    if (!picked.length) {
+      showUploadError(`最多 ${maxCount} ${unit}`);
+      return;
+    }
+    setUploading(true);
+    setError('');
+    const appended: string[] = [];
+    try {
+      for (const file of picked) {
+        if (!file.size) continue;
+        const result = await enqueueUpload(() => uploadFileToOss(file, { bizType, mediaType }));
+        appended.push(result.url);
+      }
+      if (appended.length) {
+        const next = [...urlsRef.current, ...appended];
+        urlsRef.current = next;
+        onChangeRef.current?.(next);
+        toastSuccess(`已上传 ${appended.length} ${unit}`);
+      }
+    } catch (e) {
+      showUploadError(e instanceof Error ? e.message : '上传失败');
+    } finally {
+      setUploading(false);
+      if (inputRef.current) inputRef.current.value = '';
+    }
+  }
+
+  async function pickWechat() {
+    if (pickingRef.current || uploading || disabled || remaining <= 0) return;
+    pickingRef.current = true;
+    setError('');
+    try {
+      await weixinSdk.init();
+      const files = await weixinSdk.chooseImages({
+        count: Math.min(remaining, 9),
+        sourceType: ['album', 'camera'],
+      });
+      if (!files?.length) return;
+      await uploadFiles(files);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : '无法打开相册';
+      if (isCancelError(msg)) return;
+      const formatted = formatChooseImageFailMessage(msg) || msg;
+      showUploadError(formatted);
+      inputRef.current?.click();
+    } finally {
+      pickingRef.current = false;
+    }
+  }
+
+  function removeAt(index: number) {
+    if (disabled) return;
+    onChange?.(urls.filter((_, i) => i !== index));
+  }
+
+  return (
+    <div className="partner-oss-upload">
+      <input
+        ref={inputRef}
+        type="file"
+        accept={accept}
+        multiple
+        className="partner-oss-upload-input"
+        disabled={disabled || uploading || remaining <= 0}
+        onChange={(e) => {
+          const list = Array.from(e.target.files ?? []);
+          if (list.length) void uploadFiles(list);
+        }}
+      />
+
+      {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>
+          ))}
+        </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>
+      {error ? (
+        <p className="partner-form-error" role="alert">
+          {error}
+        </p>
+      ) : null}
+    </div>
+  );
+}

apps/h5-partner/src/components/StorePackagesForm.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import type { PackageFormItem } from '../lib/storePackages';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import { STORE_PACKAGE_IMAGE_MAX_COUNT, STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
 import { emptyPackage } from '../lib/storePackages';
-import OssUploadField from './OssUploadField';
+import MultiOssUploadField from './MultiOssUploadField';
 
 type Props = {
   items: PackageFormItem[];
@@ -119,38 +119,46 @@ export default function StorePackagesForm({ items, onChange, disabled, embedded
 
                 <div className="partner-field">
                   <label>使用时间</label>
-                  <div className="partner-field-input">
-                    <span className="material-symbols-outlined">schedule</span>
-                    <input
-                      placeholder="节假日除外"
-                      value={item.usableTime || ''}
-                      disabled={disabled}
-                      onChange={(e) => updateAt(index, { usableTime: e.target.value })}
-                    />
-                  </div>
+                  <textarea
+                    rows={2}
+                    placeholder="节假日除外"
+                    value={item.usableTime || ''}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { usableTime: e.target.value })}
+                  />
                 </div>
 
                 <div className="partner-field">
-                  <label>套餐图片</label>
-                  <OssUploadField
+                  <label>套餐图片（最多 {STORE_PACKAGE_IMAGE_MAX_COUNT} 张，支持批量）</label>
+                  <MultiOssUploadField
                     bizType="STORE_PACKAGE"
-                    value={item.imageUrl || ''}
+                    maxCount={STORE_PACKAGE_IMAGE_MAX_COUNT}
                     disabled={disabled}
-                    onChange={(url) => updateAt(index, { imageUrl: url })}
+                    value={
+                      Array.isArray(item.imageUrls) && item.imageUrls.length > 0
+                        ? item.imageUrls.map((u) => String(u ?? '')).filter((u) => u.trim())
+                        : item.imageUrl
+                          ? [String(item.imageUrl)]
+                          : []
+                    }
+                    onChange={(imageUrls) =>
+                      updateAt(index, {
+                        imageUrls,
+                        imageUrl: imageUrls[0] ?? '',
+                      })
+                    }
                   />
                 </div>
 
                 <div className="partner-field">
                   <label>其他说明</label>
-                  <div className="partner-field-input">
-                    <span className="material-symbols-outlined">info</span>
-                    <input
-                      placeholder="不可叠加"
-                      value={item.otherNotes || ''}
-                      disabled={disabled}
-                      onChange={(e) => updateAt(index, { otherNotes: e.target.value })}
-                    />
-                  </div>
+                  <textarea
+                    rows={2}
+                    placeholder="不可叠加"
+                    value={item.otherNotes || ''}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { otherNotes: e.target.value })}
+                  />
                 </div>
               </>
             ) : null}

apps/h5-partner/src/contexts/PartnerSessionContext.tsx

@@ -20,6 +20,7 @@ import {
 } from '../lib/api';
 import { fetchClientConfig, processPartnerWechatOAuthCallback } from '../lib/wechat-auth';
 import { isWechatEnv } from '../lib/weixin';
+import { toastError } from '../lib/toast';
 
 export type PartnerAccount = PartnerMe & {
   staffRole?: PartnerStaffRole;
@@ -115,7 +116,10 @@ export function PartnerSessionProvider({ children }: { children: ReactNode }) {
               }
               stripOAuthParamsFromLocation();
             }
-          } catch {
+          } catch (e) {
+            // 微信 OAuth 回跳后后端可能因账号暂停(DISABLED)等拒绝登录，
+            // 必须把错误显式提示出来，否则用户无任何反馈（与短信路径一致）。
+            toastError(e instanceof Error ? e.message : '微信登录失败');
             stripOAuthParamsFromLocation();
           }
         }

apps/h5-partner/src/lib/storeDraft.ts

@@ -1,3 +1,6 @@
+import { getDefaultPartnerRegionForm } from './china-region';
+import { isStoreContactPhone, STORE_CONTACT_PHONE_HINT } from '@dukang/domain';
+
 export type StoreDraftForm = {
   regionCodes: string[];
   cityId: string;
@@ -5,7 +8,10 @@ export type StoreDraftForm = {
   city: string;
   district: string;
   name: string;
+  /** 门店登录手机号（老板主账号） */
   phone: string;
+  /** 对外联系电话（店长）；可与登录号不同 */
+  contactPhone: string;
   address: string;
   /** 门店坐标（定位或地理编码） */
   latitude: string;
@@ -25,7 +31,8 @@ export type StoreDraftForm = {
   benefitUsageRule: string;
   coverUrl: string;
   envPhotoUrls: string[];
-  contractUrl: string;
+  /** 签约合同，支持多张照片 / PDF */
+  contractUrls: string[];
   bankAccountName: string;
   bankAccountNo: string;
   bankBranch: string;
@@ -44,13 +51,12 @@ export function storeDraftKey(accountId?: string): string {
   return accountId ? `${STORE_DRAFT_KEY}_${accountId}` : STORE_DRAFT_KEY;
 }
 
-import { getDefaultPartnerRegionForm } from './china-region';
-
 export const defaultStoreForm = (): StoreDraftForm => ({
   ...getDefaultPartnerRegionForm(),
   cityId: '',
   name: '',
   phone: '',
+  contactPhone: '',
   address: '',
   latitude: '',
   longitude: '',
@@ -66,7 +72,7 @@ export const defaultStoreForm = (): StoreDraftForm => ({
   benefitUsageRule: '',
   coverUrl: '',
   envPhotoUrls: ['', '', ''],
-  contractUrl: '',
+  contractUrls: [],
   bankAccountName: '',
   bankAccountNo: '',
   bankBranch: '',
@@ -84,6 +90,9 @@ function timeToMinutes(hhmm: string): number {
 
 export const MIN_ENV_PHOTO_COUNT = 3;
 
+/** 签约合同最多可上传的照片 / PDF 数量 */
+export const MAX_CONTRACT_COUNT = 20;
+
 export function normalizeStringArray(urls: unknown, minLen: number): string[] {
   const arr = Array.isArray(urls) ? urls.map((u) => String(u ?? '')) : [];
   while (arr.length < minLen) arr.push('');
@@ -102,6 +111,9 @@ export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | un
     ...raw,
     regionCodes: Array.isArray(raw.regionCodes) ? raw.regionCodes.map(String) : base.regionCodes,
     cityId: String(raw.cityId ?? base.cityId),
+    phone: String(raw.phone ?? base.phone),
+    contactPhone:
+      String(raw.contactPhone ?? '').trim() || String(raw.phone ?? '').trim() || base.contactPhone,
     latitude: raw.latitude != null && raw.latitude !== '' ? String(raw.latitude) : base.latitude,
     longitude: raw.longitude != null && raw.longitude !== '' ? String(raw.longitude) : base.longitude,
     openTime: String(raw.openTime ?? base.openTime),
@@ -111,6 +123,22 @@ export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | un
     closeTime2: String(raw.closeTime2 ?? base.closeTime2),
     avgPrice: String(raw.avgPrice ?? base.avgPrice),
     envPhotoUrls: normalizeStringArray(raw.envPhotoUrls, MIN_ENV_PHOTO_COUNT),
+    // 兼容旧草稿：单个 contractUrl 迁移为数组
+    contractUrls: (() => {
+      const list = Array.isArray(raw.contractUrls)
+        ? raw.contractUrls
+        : [(raw as { contractUrl?: unknown }).contractUrl];
+      const seen = new Set<string>();
+      const out: string[] = [];
+      for (const item of list) {
+        const url = String(item ?? '').trim();
+        if (!url || seen.has(url)) continue;
+        seen.add(url);
+        out.push(url);
+        if (out.length >= MAX_CONTRACT_COUNT) break;
+      }
+      return out;
+    })(),
     packages: Array.isArray(raw.packages)
       ? raw.packages.map((p, i) => ({
           name: String((p as { name?: string }).name ?? ''),
@@ -217,12 +245,13 @@ export function validateStoreStep1(
 }
 
 export function validateStoreStep2(
-  form: Pick<StoreDraftForm, 'coverUrl' | 'envPhotoUrls' | 'contractUrl'>,
+  form: Pick<StoreDraftForm, 'coverUrl' | 'envPhotoUrls' | 'contractUrls'>,
 ): string | null {
   if (!form.coverUrl.trim()) return '请上传门头照';
   const envCount = form.envPhotoUrls.filter((u) => u.trim()).length;
   if (envCount < MIN_ENV_PHOTO_COUNT) return `请上传至少 ${MIN_ENV_PHOTO_COUNT} 张环境照片`;
-  if (!form.contractUrl.trim()) return '请上传签约合同';
+  const contractCount = (form.contractUrls ?? []).filter((u) => u.trim()).length;
+  if (contractCount < 1) return '请上传签约合同';
   return null;
 }
 
@@ -236,14 +265,16 @@ export function patchEnvPhotoAt(urls: string[], index: number, url: string): str
 export function validateStoreStep3(
   form: Pick<
     StoreDraftForm,
-    'bankAccountName' | 'bankAccountNo' | 'bankBranch' | 'phone'
+    'bankAccountName' | 'bankAccountNo' | 'bankBranch' | 'phone' | 'contactPhone'
   >,
 ): string | null {
   if (!form.bankAccountName.trim()) return '请填写户主姓名';
   if (!form.bankAccountNo.trim()) return '请填写银行卡号';
   if (!BANK_RE.test(form.bankAccountNo.replace(/\s/g, ''))) return '银行卡号须为 16~19 位数字';
   if (!form.bankBranch.trim()) return '请填写开户支行';
-  if (!form.phone.trim()) return '请填写联系电话';
-  if (!PHONE_RE.test(form.phone.trim())) return '联系电话须为11位手机号';
+  if (!form.phone.trim()) return '请填写门店登录手机号';
+  if (!PHONE_RE.test(form.phone.trim())) return '门店登录手机号须为11位手机号';
+  if (!form.contactPhone.trim()) return '请填写联系电话';
+  if (!isStoreContactPhone(form.contactPhone.trim())) return STORE_CONTACT_PHONE_HINT;
   return null;
 }

apps/h5-partner/src/lib/storePackages.ts

@@ -1,5 +1,9 @@
 import type { StorePackageItemDto } from '@dukang/shared-types';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import {
+  STORE_PACKAGE_IMAGE_MAX_COUNT,
+  STORE_PACKAGE_MAX_COUNT,
+  normalizeStorePackageImageUrls,
+} from '@dukang/shared-types';
 
 export type PackageFormItem = StorePackageItemDto;
 
@@ -11,24 +15,34 @@ export function emptyPackage(index = 0): PackageFormItem {
     usableTime: '',
     otherNotes: '',
     imageUrl: '',
+    imageUrls: [],
     sortOrder: index,
   };
 }
 
 export function normalizePackageFormItems(raw: PackageFormItem[]): PackageFormItem[] {
   return raw
-    .map((item, index) => ({
-      name: item.name.trim(),
-      price: item.price.trim(),
-      dishes: item.dishes.trim(),
-      usableTime: item.usableTime?.trim() || '',
-      otherNotes: item.otherNotes?.trim() || '',
-      imageUrl: item.imageUrl?.trim() || '',
-      sortOrder: index,
-    }))
+    .map((item, index) => {
+      const imageUrls = normalizeStorePackageImageUrls(item);
+      return {
+        name: item.name.trim(),
+        price: item.price.trim(),
+        dishes: item.dishes.trim(),
+        usableTime: item.usableTime?.trim() || '',
+        otherNotes: item.otherNotes?.trim() || '',
+        imageUrl: imageUrls[0] ?? '',
+        imageUrls,
+        sortOrder: index,
+      };
+    })
     .filter(
       (item) =>
-        item.name || item.price || item.dishes || item.usableTime || item.otherNotes || item.imageUrl,
+        item.name ||
+        item.price ||
+        item.dishes ||
+        item.usableTime ||
+        item.otherNotes ||
+        item.imageUrls.length > 0,
     );
 }
 
@@ -43,6 +57,9 @@ export function validatePackageFormItems(items: PackageFormItem[]): string | nul
     const price = Number(item.price);
     if (!Number.isFinite(price) || price < 0) return `第 ${i + 1} 条套餐价格须为非负数字`;
     if (!item.dishes) return `第 ${i + 1} 条套餐菜品不能为空`;
+    if ((item.imageUrls?.length ?? 0) > STORE_PACKAGE_IMAGE_MAX_COUNT) {
+      return `第 ${i + 1} 条套餐图片最多 ${STORE_PACKAGE_IMAGE_MAX_COUNT} 张`;
+    }
   }
   return null;
 }

apps/h5-partner/src/lib/storeStatus.ts

@@ -2,7 +2,7 @@ export type PartnerStoreAuditStatus = 'PENDING' | 'APPROVED' | 'REJECTED' | stri
 
 export function storeAuditLabel(auditStatus?: string | null): string {
   const s = String(auditStatus || 'APPROVED').toUpperCase();
-  if (s === 'PENDING') return '待总部审核';
+  if (s === 'PENDING') return '待审核';
   if (s === 'REJECTED') return '审核驳回';
   if (s === 'APPROVED') return '审核通过';
   return auditStatus || '—';
@@ -21,10 +21,26 @@ export function storeStatusLabel(status: string): string {
   const s = String(status).toUpperCase();
   if (s === 'OPEN') return '营业中';
   if (s === 'PAUSED') return '临时闭店';
-  if (s === 'CLOSED') return '永久关闭';
+  if (s === 'CLOSED') return '永久闭店';
   return status;
 }
 
+/** 列表右上角统一状态：审核未通过优先于营业状态 */
+export function storeListBadge(store: {
+  status?: unknown;
+  auditStatus?: unknown;
+}): { label: string; pillClass: string } {
+  const audit = String(store.auditStatus || 'APPROVED').toUpperCase();
+  if (audit === 'PENDING') {
+    return { label: '待审核', pillClass: storeAuditPillClass('PENDING') };
+  }
+  if (audit === 'REJECTED') {
+    return { label: '审核驳回', pillClass: storeAuditPillClass('REJECTED') };
+  }
+  const status = String(store.status || '').toUpperCase();
+  return { label: storeStatusLabel(status), pillClass: storeStatusPillClass(status) };
+}
+
 export function storeStatusPillClass(status: string): string {
   const s = String(status).toUpperCase();
   if (s === 'OPEN') return 'partner-status-pill--open';

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

@@ -71,16 +71,24 @@ function formatPartnerError(e: unknown): string {
   if (text.includes('合伙人账号不存在') || text.includes('未找到合伙人账号')) {
     return '未找到合伙人账号';
   }
-  if (text.includes('合伙人账号已停用') || text.includes('账号已停用')) {
-    return '合伙人账号已暂停，无法登录';
+  if (
+    text.includes('合伙人账号已停用') ||
+    text.includes('账号已停用') ||
+    text.includes('暂停使用')
+  ) {
+    return '该账号已暂停使用，请联系客服人员';
   }
   return text;
 }
 
 function formatWechatError(e: unknown): string {
   const text = e instanceof Error ? e.message : '微信登录失败';
-  if (text.includes('合伙人账号已停用') || text.includes('账号已停用')) {
-    return '合伙人账号已暂停，无法登录';
+  if (
+    text.includes('合伙人账号已停用') ||
+    text.includes('账号已停用') ||
+    text.includes('暂停使用')
+  ) {
+    return '该账号已暂停使用，请联系客服人员';
   }
   if (text.includes('首次登录') || text.includes('手机验证码')) {
     return '该微信尚未绑定合伙人账号，请先使用手机验证码登录，登录后将自动关联微信';

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

@@ -5,8 +5,10 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import ChinaRegionPicker from '../components/ChinaRegionPicker';
 
 import OssUploadField from '../components/OssUploadField';
+import MultiOssUploadField from '../components/MultiOssUploadField';
 
 import { request } from '../lib/api';
+import { fetchClientConfig } from '../lib/wechat-auth';
 import { toastError, toastSuccess } from '../lib/toast';
 
 import { resolveRegionBinding } from '../lib/china-region';
@@ -40,15 +42,18 @@ import {
 
   validateStoreStep3,
 
-  patchEnvPhotoAt,
-  addEnvPhotoSlot,
   MIN_ENV_PHOTO_COUNT,
+
+  MAX_CONTRACT_COUNT,
 } from '../lib/storeDraft';
 import StorePackagesForm from '../components/StorePackagesForm';
 import { normalizePackageFormItems, validatePackageFormItems } from '../lib/storePackages';
 
 const STEPS = ['基本信息', '照片上传', '结算资质', '门店套餐'] as const;
 
+const DEFAULT_PARTNER_ONBOARD_CS_HINT =
+  '使用问题、提现问题等随时可联系【杜康好客】客服';
+
 type StoreCategoryNode = {
   id: string;
   name: string;
@@ -57,6 +62,7 @@ type StoreCategoryNode = {
 
 type FieldErrors = {
   phone?: string;
+  contactPhone?: string;
 };
 
 
@@ -98,6 +104,10 @@ export default function StoreCreatePage() {
   const [fieldErrors, setFieldErrors] = useState<FieldErrors>({});
 
   const [submitting, setSubmitting] = useState(false);
+  const [csAdded, setCsAdded] = useState(false);
+  const [csQrUrl, setCsQrUrl] = useState<string | null>(null);
+  const [csHint, setCsHint] = useState(DEFAULT_PARTNER_ONBOARD_CS_HINT);
+  const [csConfigLoading, setCsConfigLoading] = useState(false);
 
   const [cities, setCities] = useState<OpenCityOption[]>([]);
 
@@ -149,6 +159,29 @@ export default function StoreCreatePage() {
     });
   }, [step]);
 
+  useEffect(() => {
+    if (step !== 4) return;
+    let cancelled = false;
+    setCsConfigLoading(true);
+    void fetchClientConfig()
+      .then((cfg) => {
+        if (cancelled) return;
+        setCsQrUrl((cfg.partnerOnboardCsQrUrl ?? '').trim() || null);
+        setCsHint((cfg.partnerOnboardCsHint ?? '').trim() || DEFAULT_PARTNER_ONBOARD_CS_HINT);
+      })
+      .catch(() => {
+        if (cancelled) return;
+        setCsQrUrl(null);
+        setCsHint(DEFAULT_PARTNER_ONBOARD_CS_HINT);
+      })
+      .finally(() => {
+        if (!cancelled) setCsConfigLoading(false);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [step]);
+
   useEffect(() => {
 
     void fetchPartnerCities()
@@ -238,9 +271,17 @@ export default function StoreCreatePage() {
 
     setSubmitError('');
 
-    if ('phone' in patch) {
+    if ('phone' in patch || 'contactPhone' in patch) {
 
-      setFieldErrors((prev) => ({ ...prev, phone: undefined }));
+      setFieldErrors((prev) => ({
+
+        ...prev,
+
+        ...('phone' in patch ? { phone: undefined } : {}),
+
+        ...('contactPhone' in patch ? { contactPhone: undefined } : {}),
+
+      }));
 
     }
 
@@ -250,22 +291,6 @@ export default function StoreCreatePage() {
 
 
 
-  function patchEnvPhotoUrl(index: number, url: string) {
-
-    setForm((prev) => ({
-
-      ...prev,
-
-      envPhotoUrls: patchEnvPhotoAt(prev.envPhotoUrls, index, url),
-
-    }));
-
-    setSubmitError('');
-
-  }
-
-
-
   function bindRegionSelection(codes: string[]) {
 
     const binding = resolveRegionBinding(codes, cities);
@@ -332,7 +357,9 @@ export default function StoreCreatePage() {
       const msg = validateStoreStep3(form);
       if (msg) {
         if (isPhoneValidationMessage(msg)) {
-          setFieldErrors({ phone: msg });
+          setFieldErrors(
+            msg.includes('联系电话') ? { contactPhone: msg } : { phone: msg },
+          );
           reportStepError(msg);
           return;
         }
@@ -348,12 +375,23 @@ export default function StoreCreatePage() {
 
 
   async function submit(skipPackages = false) {
+    const qr = (csQrUrl ?? '').trim();
+    if (!qr) {
+      reportFormError('客服二维码暂未配置，请联系总部');
+      return;
+    }
+    if (!csAdded) {
+      reportFormError('请先勾选「我已添加【杜康好客】客服」');
+      return;
+    }
 
     const msg = validateStoreStep3(form);
 
     if (msg) {
       if (isPhoneValidationMessage(msg)) {
-        setFieldErrors({ phone: msg });
+        setFieldErrors(
+          msg.includes('联系电话') ? { contactPhone: msg } : { phone: msg },
+        );
         return;
       }
       reportFormError(msg);
@@ -440,7 +478,11 @@ export default function StoreCreatePage() {
 
       const envPhotoUrls = Array.from(
         new Set(form.envPhotoUrls.map((u) => u.trim()).filter(Boolean)),
-      ).slice(0, 3);
+      ).slice(0, 20);
+
+      const contractUrls = Array.from(
+        new Set((form.contractUrls ?? []).map((u) => u.trim()).filter(Boolean)),
+      ).slice(0, MAX_CONTRACT_COUNT);
 
       const result = await request<{ store: { id: string } }>('PARTNER_H5', '/partner/stores', {
 
@@ -458,6 +500,8 @@ export default function StoreCreatePage() {
 
           phone: form.phone.trim(),
 
+          contactPhone: form.contactPhone.trim() || form.phone.trim(),
+
           district: form.district.trim(),
 
           address: form.address.trim(),
@@ -488,7 +532,7 @@ export default function StoreCreatePage() {
 
           envPhotoUrls: envPhotoUrls.length ? envPhotoUrls : undefined,
 
-          contractUrl: form.contractUrl.trim() || undefined,
+          contractUrls: contractUrls.length ? contractUrls : undefined,
 
           bankAccountName: form.bankAccountName.trim(),
 
@@ -539,6 +583,7 @@ export default function StoreCreatePage() {
 
   const progress = step === 1 ? 0 : step === 2 ? 33 : step === 3 ? 66 : 100;
 
+  const canSubmitOnboard = !!csQrUrl?.trim() && csAdded && !submitting && !csConfigLoading;
   const nextDisabled = submitting;
 
 
@@ -957,46 +1002,15 @@ export default function StoreCreatePage() {
 
 
           <section className="partner-form-card">
-
             <h3 className="headline-md">环境照片 <span className="text-primary">*</span></h3>
-
-            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>至少 {MIN_ENV_PHOTO_COUNT} 张，展示店内整洁环境</p>
-
-            <div className="partner-upload-grid">
-
-              {form.envPhotoUrls.map((url, index) => (
-
-                <OssUploadField
-
-                  key={index}
-
-                  compact
-
-                  bizType="STORE_ENV"
-
-                  mediaType="IMAGE"
-
-                  value={url}
-
-                  onChange={(nextUrl) => patchEnvPhotoUrl(index, nextUrl)}
-
-                />
-
-              ))}
-
-            </div>
-
-            <button
-              type="button"
-              className="partner-btn-outline"
-              style={{ width: '100%', marginTop: 12 }}
-              onClick={() =>
-                setForm((prev) => ({ ...prev, envPhotoUrls: addEnvPhotoSlot(prev.envPhotoUrls) }))
-              }
-            >
-              添加环境照片
-            </button>
-
+            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>至少 {MIN_ENV_PHOTO_COUNT} 张，支持批量上传，最多 20 张</p>
+            <MultiOssUploadField
+              bizType="STORE_ENV"
+              maxCount={20}
+              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>
 
 
@@ -1005,9 +1019,11 @@ export default function StoreCreatePage() {
 
             <h3 className="headline-md">签约合同 <span className="text-primary">*</span></h3>
 
-            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>拍照上传签约协议首页与盖章页</p>
+            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>
+              拍照上传签约协议首页与盖章页，支持多张，最多 {MAX_CONTRACT_COUNT} 个
+            </p>
 
-            <OssUploadField
+            <MultiOssUploadField
 
               bizType="STORE_CONTRACT"
 
@@ -1015,11 +1031,15 @@ export default function StoreCreatePage() {
 
               accept="image/*,.pdf"
 
-              value={form.contractUrl}
+              unit="个"
 
-              onChange={(contractUrl) => patchForm({ contractUrl })}
+              maxCount={MAX_CONTRACT_COUNT}
 
-              label="上传合同副本"
+              value={form.contractUrls ?? []}
+
+              onChange={(urls) => patchForm({ contractUrls: urls })}
+
+              label={`批量上传合同（${(form.contractUrls ?? []).length}/${MAX_CONTRACT_COUNT}）`}
 
             />
 
@@ -1137,7 +1157,43 @@ export default function StoreCreatePage() {
 
               <p className="label-md text-muted" style={{ marginTop: 8 }}>
 
-                该手机号将作为门店端登录账号。
+                老板手机号，作为门店端主账号登录凭证。
+
+              </p>
+
+            </div>
+
+            <div className="partner-field">
+
+              <label>联系电话 <span className="text-primary">*</span></label>
+
+              <div className="partner-field-input">
+
+                <span className="material-symbols-outlined">phone_in_talk</span>
+
+                <input
+
+                  type="tel"
+
+                  placeholder="手机号或座机，如 0379-8888888"
+
+                  value={form.contactPhone}
+
+                  onChange={(e) => patchForm({ contactPhone: e.target.value })}
+
+                />
+
+              </div>
+
+              {fieldErrors.contactPhone && (
+
+                <p className="partner-field-error" role="alert">{fieldErrors.contactPhone}</p>
+
+              )}
+
+              <p className="label-md text-muted" style={{ marginTop: 8 }}>
+
+                用户端门店详情展示与拨号使用此号码，可与登录号不同，支持座机（如 0379-8888888）。
 
               </p>
 
@@ -1150,6 +1206,37 @@ export default function StoreCreatePage() {
 
       {step === 4 && (
         <>
+          <section className="partner-form-card partner-onboard-cs-card">
+            <div className="partner-section-title">
+              <div className="partner-section-bar" />
+              <h2 className="headline-md">添加客服</h2>
+            </div>
+            <p className="label-md text-muted" style={{ marginBottom: 16, lineHeight: 1.5 }}>
+              {csHint}
+            </p>
+            {csConfigLoading ? (
+              <p className="body-md text-muted">加载客服二维码…</p>
+            ) : csQrUrl ? (
+              <img
+                className="partner-onboard-cs-qr"
+                src={csQrUrl}
+                alt="杜康好客企微客服二维码"
+              />
+            ) : (
+              <p className="partner-form-error" role="alert">
+                客服二维码暂未配置，请联系总部
+              </p>
+            )}
+            <label className="partner-onboard-cs-check">
+              <input
+                type="checkbox"
+                checked={csAdded}
+                disabled={!csQrUrl || submitting}
+                onChange={(e) => setCsAdded(e.target.checked)}
+              />
+              <span>我已添加【杜康好客】客服</span>
+            </label>
+          </section>
           <section className="partner-form-card">
             <div className="partner-section-title">
               <div className="partner-section-bar" />
@@ -1195,13 +1282,21 @@ export default function StoreCreatePage() {
         ) : (
 
           <>
-            <button type="button" className="partner-btn-outline" onClick={() => void submit(true)} disabled={submitting}>
+            <button
+              type="button"
+              className="partner-btn-outline"
+              onClick={() => void submit(true)}
+              disabled={!canSubmitOnboard}
+            >
               跳过
             </button>
-            <button type="button" className="partner-btn-primary" onClick={() => void submit(false)} disabled={submitting}>
-
+            <button
+              type="button"
+              className="partner-btn-primary"
+              onClick={() => void submit(false)}
+              disabled={!canSubmitOnboard}
+            >
               {submitting ? '提交中…' : '提交'}
-
             </button>
           </>
 

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

@@ -5,8 +5,9 @@ import { request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { canManagePartnerStore } from '../lib/partnerAccess';
-import { MIN_ENV_PHOTO_COUNT, normalizeStringArray, patchEnvPhotoAt, addEnvPhotoSlot } from '../lib/storeDraft';
+import { MIN_ENV_PHOTO_COUNT, normalizeStringArray } from '../lib/storeDraft';
 import OssUploadField from '../components/OssUploadField';
+import MultiOssUploadField from '../components/MultiOssUploadField';
 import TencentLocPickerOverlay from '../components/TencentLocPickerOverlay';
 import {
   canPartnerOpenStore,
@@ -42,7 +43,8 @@ export default function StoreDetailPage() {
   const [loadError, setLoadError] = useState('');
   const [form, setForm] = useState({
     name: '',
-    phone: '',
+    loginPhone: '',
+    contactPhone: '',
     address: '',
     intro: '',
     benefitUsageRule: '',
@@ -63,7 +65,8 @@ export default function StoreDetailPage() {
     setStore(data);
     setForm({
       name: String(data.name || ''),
-      phone: String(data.phone || ''),
+      loginPhone: String(data.phone || ''),
+      contactPhone: String(data.contactPhone || data.phone || ''),
       address: String(data.address || ''),
       intro: String(data.intro || ''),
       benefitUsageRule: (() => {
@@ -163,7 +166,7 @@ export default function StoreDetailPage() {
         method: 'PUT',
         body: JSON.stringify({
           name: form.name.trim(),
-          phone: form.phone.trim(),
+          contactPhone: form.contactPhone.trim(),
           address: form.address.trim(),
           intro: form.intro.trim(),
           benefitUsageRule: form.benefitUsageRule.trim() || null,
@@ -282,7 +285,7 @@ export default function StoreDetailPage() {
           <section className="partner-form-card" style={{ margin: '0 0 16px' }}>
             <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
               <h3 className="label-md text-muted" style={{ textTransform: 'uppercase', letterSpacing: '0.1em' }}>门店套餐</h3>
-              <button type="button" className="partner-btn-outline" onClick={() => navigate(`/stores/${id}/packages`)}>
+              <button type="button" className="partner-btn-outline partner-btn-outline--compact" onClick={() => navigate(`/stores/${id}/packages`)}>
                 编辑套餐
               </button>
             </div>
@@ -345,12 +348,31 @@ export default function StoreDetailPage() {
             <label>门店名称</label>
             <input disabled={readOnly} value={form.name} onChange={(e) => setForm({ ...form, name: e.target.value })} style={{ width: '100%', padding: '12px 16px', border: '1px solid rgba(226,190,188,0.5)', borderRadius: 8, fontSize: 16, fontWeight: 500 }} />
           </div>
+          <div className="partner-field">
+            <label>门店登录手机号</label>
+            <div className="partner-field-input">
+              <span className="material-symbols-outlined">lock</span>
+              <input disabled type="tel" value={form.loginPhone} readOnly />
+            </div>
+            <p className="label-md text-muted" style={{ marginTop: 8 }}>
+              老板主账号，用于门店端登录；如需变更请联系总部。
+            </p>
+          </div>
           <div className="partner-field">
             <label>联系电话</label>
             <div className="partner-field-input">
-              <span className="material-symbols-outlined">call</span>
-              <input disabled={readOnly} type="tel" value={form.phone} onChange={(e) => setForm({ ...form, phone: e.target.value })} />
+              <span className="material-symbols-outlined">phone_in_talk</span>
+              <input
+                disabled={readOnly}
+                type="tel"
+                placeholder="手机号或座机，如 0379-8888888"
+                value={form.contactPhone}
+                onChange={(e) => setForm({ ...form, contactPhone: e.target.value })}
+              />
             </div>
+            <p className="label-md text-muted" style={{ marginTop: 8 }}>
+              店长或对外展示号码，用户端拨号使用此号码，支持座机。
+            </p>
           </div>
           <div className="partner-field">
             <label>门店地址</label>
@@ -409,26 +431,13 @@ export default function StoreDetailPage() {
           </div>
           {canMutate && !readOnly ? (
             <>
-              <div className="partner-upload-grid">
-                {envPhotoUrls.map((url, index) => (
-                  <OssUploadField
-                    key={index}
-                    compact
-                    bizType="STORE_ENV"
-                    mediaType="IMAGE"
-                    value={url}
-                    onChange={(nextUrl) => setEnvPhotoUrls((prev) => patchEnvPhotoAt(prev, index, nextUrl))}
-                  />
-                ))}
-              </div>
-              <button
-                type="button"
-                className="partner-btn-outline"
-                style={{ width: '100%', marginTop: 12 }}
-                onClick={() => setEnvPhotoUrls((prev) => addEnvPhotoSlot(prev))}
-              >
-                添加环境照片
-              </button>
+              <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"

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

@@ -8,9 +8,7 @@ import { canCreatePartnerStore, canManagePartnerStore } from '../lib/partnerAcce
 import {
   canPartnerOpenStore,
   storeAuditLabel,
-  storeAuditPillClass,
-  storeStatusLabel,
-  storeStatusPillClass,
+  storeListBadge,
   type StoreStatusValue,
 } from '../lib/storeStatus';
 import { usePartnerPageView } from '../lib/usePageView';
@@ -20,10 +18,10 @@ type StatusFilter = 'ALL' | StoreStatusValue | 'PENDING_AUDIT' | 'REJECTED';
 const FILTERS: { key: StatusFilter; label: string }[] = [
   { key: 'ALL', label: '全部' },
   { key: 'OPEN', label: '营业中' },
-  { key: 'PAUSED', label: '暂时闭店' },
+  { key: 'PAUSED', label: '临时闭店' },
   { key: 'PENDING_AUDIT', label: '待审核' },
   { key: 'REJECTED', label: '已驳回' },
-  { key: 'CLOSED', label: '关闭' },
+  { key: 'CLOSED', label: '永久闭店' },
 ];
 
 export default function StoreListPage() {
@@ -46,7 +44,10 @@ export default function StoreListPage() {
   }, []);
 
   useEffect(() => {
-    if (!isLoggedIn()) { navigate('/login'); return; }
+    if (!isLoggedIn()) {
+      navigate('/login');
+      return;
+    }
     void loadStores();
   }, [navigate, loadStores]);
 
@@ -54,20 +55,28 @@ export default function StoreListPage() {
     document.title = canMutate ? '门店管理' : '我的门店';
   }, [canMutate]);
 
-  const filtered = useMemo(() => stores.filter((s) => {
-    const matchQ = !q || String(s.name).includes(q) || String(s.address).includes(q);
-    const audit = String(s.auditStatus || 'APPROVED').toUpperCase();
-    const status = String(s.status).toUpperCase();
-    let matchStatus = true;
-    if (filter === 'PENDING_AUDIT') matchStatus = audit === 'PENDING';
-    else if (filter === 'REJECTED') matchStatus = audit === 'REJECTED';
-    else if (filter !== 'ALL') matchStatus = status === filter;
-    return matchQ && matchStatus;
-  }), [stores, q, filter]);
+  const filtered = useMemo(
+    () =>
+      stores.filter((s) => {
+        const matchQ = !q || String(s.name).includes(q) || String(s.address).includes(q);
+        const audit = String(s.auditStatus || 'APPROVED').toUpperCase();
+        const status = String(s.status).toUpperCase();
+        let matchStatus = true;
+        if (filter === 'PENDING_AUDIT') matchStatus = audit === 'PENDING';
+        else if (filter === 'REJECTED') matchStatus = audit === 'REJECTED';
+        else if (filter !== 'ALL') matchStatus = status === filter;
+        return matchQ && matchStatus;
+      }),
+    [stores, q, filter],
+  );
 
   async function updateStatus(storeId: string, next: StoreStatusValue, auditStatus?: string) {
     if (next === 'OPEN' && !canPartnerOpenStore(auditStatus)) {
-      setError(auditStatus === 'REJECTED' ? '门店审核未通过，请查看驳回原因并修改后重新提交' : '门店尚在总部审核中，通过后方可开门');
+      setError(
+        auditStatus === 'REJECTED'
+          ? '门店审核未通过，请查看驳回原因并修改后重新提交'
+          : '门店尚在总部审核中，通过后方可开门',
+      );
       return;
     }
     if (next === 'CLOSED') {
@@ -82,7 +91,8 @@ export default function StoreListPage() {
         body: JSON.stringify({ status: next }),
       });
       await loadStores();
-      if (next === 'OPEN') toastSuccess('开店成功');
+      if (next === 'OPEN') toastSuccess('已营业');
+      if (next === 'PAUSED') toastSuccess('已临时闭店');
     } catch {
       /* request 已 toast */
     } finally {
@@ -102,6 +112,7 @@ export default function StoreListPage() {
         body: JSON.stringify({ status: 'CLOSED' }),
       });
       await loadStores();
+      toastSuccess('已永久闭店');
     } catch {
       /* request 已 toast */
     } finally {
@@ -111,29 +122,43 @@ export default function StoreListPage() {
 
   return (
     <PullToRefresh onRefresh={loadStores} className="page partner-store-page partner-home--flush-top">
-      {error && <p className="partner-form-error" role="alert" style={{ margin: '0 20px 12px' }}>{error}</p>}
+      {error && (
+        <p className="partner-form-error" role="alert" style={{ margin: '0 20px 12px' }}>
+          {error}
+        </p>
+      )}
 
       <div className="partner-sticky-filter">
         <div className="partner-search">
           <span className="material-symbols-outlined">search</span>
           <input placeholder="搜索门店名称/地址" value={q} onChange={(e) => setQ(e.target.value)} />
         </div>
-        <div className="partner-chips">
-          {FILTERS.map((f) => (
-            <button key={f.key} type="button" className={`partner-chip${filter === f.key ? ' active' : ''}`} onClick={() => setFilter(f.key)}>
-              {f.label}
-            </button>
-          ))}
+        <div className="partner-store-filter-row">
+          <label className="partner-store-filter-label" htmlFor="partner-store-status-filter">
+            状态
+          </label>
+          <select
+            id="partner-store-status-filter"
+            className="partner-store-filter-select"
+            value={filter}
+            onChange={(e) => setFilter(e.target.value as StatusFilter)}
+          >
+            {FILTERS.map((f) => (
+              <option key={f.key} value={f.key}>
+                {f.label}
+              </option>
+            ))}
+          </select>
         </div>
       </div>
 
       {canCreate && (
-      <Link to="/stores/new" className="partner-fab-link">
-        <button type="button" className="partner-btn-primary">
-          <span className="material-symbols-outlined">add_business</span>
-          录入新门店
-        </button>
-      </Link>
+        <Link to="/stores/new" className="partner-fab-link">
+          <button type="button" className="partner-btn-primary">
+            <span className="material-symbols-outlined">add_business</span>
+            录入新门店
+          </button>
+        </Link>
       )}
 
       {filtered.length === 0 && <div className="empty">暂无门店</div>}
@@ -145,87 +170,114 @@ export default function StoreListPage() {
         const dim = currentStatus === 'CLOSED';
         const storeName = String(s.name || '未命名门店');
         const busy = updatingId === storeId;
-        const canOpen = canPartnerOpenStore(auditStatus);
+        const badge = storeListBadge(s);
+        const switchOn = currentStatus === 'OPEN';
+        const switchDisabled =
+          busy ||
+          currentStatus === 'CLOSED' ||
+          auditStatus === 'PENDING' ||
+          auditStatus === 'REJECTED';
         return (
           <div key={storeId} className={`partner-store-card${dim ? ' partner-store-card--dim' : ''}`}>
-            <Link to={`/stores/${storeId}`} className="partner-store-card-hit" style={{ color: 'inherit', textDecoration: 'none' }}>
+            <Link
+              to={`/stores/${storeId}`}
+              className="partner-store-card-hit"
+              style={{ color: 'inherit', textDecoration: 'none' }}
+            >
               <div className="partner-store-card-header">
-                <div>
-                  <p className="label-md text-muted" style={{ marginBottom: 2 }}>门店名称</p>
+                <div className="partner-store-card-main">
+                  <p className="label-md text-muted" style={{ marginBottom: 2 }}>
+                    门店名称
+                  </p>
                   <h3 className="headline-md">{storeName}</h3>
-                  <p className="label-md text-muted" style={{ marginTop: 4 }}>{String(s.address || s.district || '')}</p>
-                  {auditStatus !== 'APPROVED' && (
-                    <p className="label-md" style={{ marginTop: 8, color: auditStatus === 'REJECTED' ? 'var(--color-heritage-red)' : 'var(--color-secondary)' }}>
-                      {storeAuditLabel(auditStatus)}
-                      {auditStatus === 'REJECTED' && s.rejectReason ? `：${String(s.rejectReason)}` : ''}
+                  <p className="label-md text-muted" style={{ marginTop: 4 }}>
+                    {String(s.address || s.district || '')}
+                  </p>
+                  {auditStatus === 'REJECTED' && s.rejectReason ? (
+                    <p
+                      className="label-md"
+                      style={{ marginTop: 8, color: 'var(--color-heritage-red)' }}
+                    >
+                      {storeAuditLabel(auditStatus)}：{String(s.rejectReason)}
                     </p>
-                  )}
-                </div>
-                <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-end', gap: 6 }}>
-                  {auditStatus !== 'APPROVED' ? (
-                    <span className={`partner-status-pill ${storeAuditPillClass(auditStatus)}`}>
-                      {storeAuditLabel(auditStatus)}
-                    </span>
-                  ) : (
-                    <span className={`partner-status-pill ${storeStatusPillClass(currentStatus)}`}>
-                      {storeStatusLabel(currentStatus)}
-                    </span>
-                  )}
+                  ) : null}
                 </div>
+                <span className={`partner-status-pill partner-store-card-badge ${badge.pillClass}`}>
+                  {badge.label}
+                </span>
               </div>
             </Link>
-            {canMutate && (
-            <div className="partner-store-card-actions">
-              <button
-                type="button"
-                className="btn btn-outline"
-                style={{ fontSize: 12, padding: '8px 12px' }}
-                disabled={busy || currentStatus === 'CLOSED' || currentStatus === 'PAUSED' || auditStatus === 'PENDING'}
-                onClick={() => void updateStatus(storeId, 'PAUSED', auditStatus)}
-              >
-                暂时闭店
-              </button>
-              <button
-                type="button"
-                className="btn btn-outline"
-                style={{ fontSize: 12, padding: '8px 12px', borderColor: 'var(--color-subtle-gray)', color: 'var(--color-subtle-gray)' }}
-                disabled={busy || currentStatus === 'CLOSED'}
-                onClick={() => void updateStatus(storeId, 'CLOSED', auditStatus)}
-              >
-                关闭
-              </button>
-              {currentStatus === 'PAUSED' && (
-                <button
-                  type="button"
-                  className="btn btn-outline"
-                  style={{ fontSize: 12, padding: '8px 12px' }}
-                  disabled={busy || !canOpen}
-                  onClick={() => void updateStatus(storeId, 'OPEN', auditStatus)}
+            {canMutate ? (
+              <div className="partner-store-card-actions partner-store-card-actions--v3416">
+                {currentStatus !== 'CLOSED' ? (
+                  <>
+                    <label
+                      className={`partner-store-switch${switchDisabled ? ' partner-store-switch--disabled' : ''}`}
+                    >
+                      <input
+                        type="checkbox"
+                        role="switch"
+                        checked={switchOn}
+                        disabled={switchDisabled}
+                        aria-label={switchOn ? '营业中，点击临时闭店' : '临时闭店，点击营业'}
+                        onChange={() => {
+                          const next: StoreStatusValue = switchOn ? 'PAUSED' : 'OPEN';
+                          void updateStatus(storeId, next, auditStatus);
+                        }}
+                      />
+                      <span className="partner-store-switch-track" aria-hidden />
+                      <span className="partner-store-switch-text">
+                        {switchOn ? '开启（营业中）' : '关闭（临时闭店）'}
+                      </span>
+                    </label>
+                    <button
+                      type="button"
+                      className="partner-store-close-btn"
+                      disabled={busy}
+                      onClick={() => void updateStatus(storeId, 'CLOSED', auditStatus)}
+                    >
+                      永久闭店
+                    </button>
+                  </>
+                ) : null}
+                <Link
+                  to={`/stores/${storeId}`}
+                  className="partner-menu-icon"
+                  style={{ width: 40, height: 40, borderRadius: 8, textDecoration: 'none' }}
                 >
-                  {canOpen ? '开门营业' : '待审核通过'}
-                </button>
-              )}
-              <Link to={`/stores/${storeId}`} className="partner-menu-icon" style={{ width: 40, height: 40, borderRadius: 8, textDecoration: 'none' }}>
-                <span className="material-symbols-outlined" style={{ fontSize: 20 }}>edit</span>
-              </Link>
-            </div>
-            )}
+                  <span className="material-symbols-outlined" style={{ fontSize: 20 }}>
+                    edit
+                  </span>
+                </Link>
+              </div>
+            ) : null}
           </div>
         );
       })}
       {closeTarget && (
-        <div className="partner-ship-modal-backdrop" role="presentation" onClick={() => setCloseTarget(null)}>
-          <div className="partner-ship-modal" role="dialog" aria-modal="true" onClick={(e) => e.stopPropagation()}>
-            <h3 className="headline-md" style={{ marginBottom: 8 }}>确认关闭门店？</h3>
+        <div
+          className="partner-ship-modal-backdrop"
+          role="presentation"
+          onClick={() => setCloseTarget(null)}
+        >
+          <div
+            className="partner-ship-modal"
+            role="dialog"
+            aria-modal="true"
+            onClick={(e) => e.stopPropagation()}
+          >
+            <h3 className="headline-md" style={{ marginBottom: 8 }}>
+              确认永久闭店？
+            </h3>
             <p className="body-md text-muted" style={{ lineHeight: 1.5 }}>
-              关闭后不可恢复营业，确认关闭该门店？
+              永久闭店后不可再开门营业，确认关闭该门店？
             </p>
             <div className="partner-ship-actions">
               <button type="button" className="partner-btn-secondary" onClick={() => setCloseTarget(null)}>
                 取消
               </button>
               <button type="button" className="partner-btn-primary" onClick={() => void confirmCloseStore()}>
-                确认关闭
+                确认永久闭店
               </button>
             </div>
           </div>

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

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import type { StorePackagesResponse } from '@dukang/shared-types';
+import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
 import StorePackagesForm from '../components/StorePackagesForm';
 import { request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
@@ -30,7 +31,18 @@ export default function StorePackagesPage() {
           : data.live?.length
             ? data.live
             : [emptyPackage()];
-        setItems(base.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i })));
+        setItems(
+          base.map((p, i) => {
+            const imageUrls = normalizeStorePackageImageUrls(p);
+            return {
+              ...p,
+              price: String(p.price),
+              imageUrl: imageUrls[0] ?? '',
+              imageUrls,
+              sortOrder: i,
+            };
+          }),
+        );
         setPending(data.pendingRequest ?? null);
       })
       .catch((e) => setError(e instanceof Error ? e.message : '加载失败'))

apps/h5-partner/src/styles.css

@@ -304,6 +304,30 @@ html {
   cursor: pointer;
 }
 
+/* 卡片标题旁的紧凑型描边按钮：不拉伸、缩小尺寸、贴右对齐 */
+.partner-btn-outline--compact {
+  flex: none;
+  height: 30px;
+  padding: 0 14px;
+  border: 1px solid var(--color-outline);
+  border-radius: var(--radius-sm);
+  background: transparent;
+  color: var(--color-primary);
+  font-family: var(--font-label);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1;
+  cursor: pointer;
+  transition: background 0.15s, border-color 0.15s;
+}
+.partner-btn-outline--compact:hover {
+  background: color-mix(in srgb, var(--color-primary) 8%, transparent);
+  border-color: var(--color-primary);
+}
+.partner-btn-outline--compact:active {
+  transform: scale(0.97);
+}
+
 .partner-btn-wechat {
   width: 100%;
   padding: 16px;
@@ -1960,6 +1984,134 @@ nav.app-tabbar .app-tabbar-label {
   color: #fff;
 }
 
+.partner-store-filter-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.partner-store-filter-label {
+  flex-shrink: 0;
+  font-family: var(--font-label);
+  font-size: 13px;
+  font-weight: 500;
+  color: var(--color-on-surface-variant);
+}
+
+.partner-store-filter-select {
+  flex: 1;
+  height: 40px;
+  padding: 0 12px;
+  border: 1px solid var(--color-outline-variant);
+  border-radius: var(--radius-md);
+  background: var(--color-surface-container-low);
+  font-size: 14px;
+  color: var(--color-ink-black);
+}
+
+.partner-store-filter-select:focus {
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(166, 29, 36, 0.2);
+}
+
+.partner-store-card-main {
+  flex: 1;
+  min-width: 0;
+  padding-right: 8px;
+}
+
+.partner-store-card-badge {
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
+.partner-store-card-actions--v3416 {
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.partner-store-card-actions--v3416 > .partner-store-switch {
+  flex: 1 1 auto;
+  min-width: 140px;
+}
+
+.partner-store-card-actions--v3416 > .partner-store-close-btn {
+  flex: 0 0 auto;
+}
+
+.partner-store-card-actions--v3416 > .partner-menu-icon {
+  flex: 0 0 auto;
+  margin-left: auto;
+}
+
+.partner-store-switch {
+  display: inline-flex;
+  align-items: center;
+  gap: 10px;
+  cursor: pointer;
+  font-family: var(--font-label);
+  font-size: 12px;
+  color: var(--color-on-surface-variant);
+  user-select: none;
+}
+
+.partner-store-switch input {
+  position: absolute;
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.partner-store-switch-track {
+  position: relative;
+  width: 44px;
+  height: 24px;
+  border-radius: 999px;
+  background: var(--color-surface-container-highest);
+  transition: background 0.2s ease;
+  flex-shrink: 0;
+}
+
+.partner-store-switch-track::after {
+  content: '';
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  transition: transform 0.2s ease;
+}
+
+.partner-store-switch input:checked + .partner-store-switch-track {
+  background: var(--color-success-green);
+}
+
+.partner-store-switch input:checked + .partner-store-switch-track::after {
+  transform: translateX(20px);
+}
+
+.partner-store-switch--disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
+}
+
+.partner-store-close-btn {
+  flex: 0 0 auto !important;
+  padding: 8px 12px !important;
+  border: 1px solid rgba(166, 29, 36, 0.35);
+  background: transparent;
+  color: var(--color-heritage-red);
+  font-weight: 500;
+}
+
+.partner-store-close-btn:disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
+}
+
 .partner-store-card {
   background: var(--color-card);
   border-radius: var(--radius-md);
@@ -2061,6 +2213,39 @@ nav.app-tabbar .app-tabbar-label {
   margin: 0 var(--space-page) var(--space-md);
 }
 
+.partner-onboard-cs-card {
+  text-align: center;
+}
+
+.partner-onboard-cs-qr {
+  display: block;
+  width: min(220px, 70vw);
+  height: auto;
+  margin: 0 auto 16px;
+  border-radius: 8px;
+  background: #fff;
+  border: 1px solid var(--color-surface-container);
+}
+
+.partner-onboard-cs-check {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  margin-top: 8px;
+  font-family: var(--font-label);
+  font-size: 14px;
+  color: var(--color-ink-black);
+  cursor: pointer;
+  text-align: left;
+}
+
+.partner-onboard-cs-check input {
+  width: 18px;
+  height: 18px;
+  flex-shrink: 0;
+}
+
 /* ── Store detail ── */
 .partner-detail-page {
   padding-bottom: 96px;

apps/h5-partner/tsconfig.json

@@ -13,7 +13,8 @@
     "jsx": "react-jsx",
     "strict": true,
     "paths": {
-      "@dukang/shared-ui/*": ["../../packages/shared-ui/src/*"]
+      "@dukang/shared-ui/*": ["../../packages/shared-ui/src/*"],
+      "@dukang/domain": ["../../packages/domain/src/index.ts"]
     }
   },
   "include": ["src"]

apps/h5-partner/vite.config.ts

@@ -9,12 +9,14 @@ export default defineConfig({
   resolve: {
     alias: {
       '@dukang/shared-ui': path.resolve(__dirname, '../../packages/shared-ui/src'),
+      '@dukang/domain': path.resolve(__dirname, '../../packages/domain/src/index.ts'),
     },
   },
   server: {
+    host: true,
     port: 5175,
     proxy: {
-      '/api': process.env.VITE_API_TARGET ?? 'http://localhost:3000',
+      '/api': process.env.VITE_API_TARGET ?? 'http://localhost:3010',
     },
   },
 });

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

@@ -1,5 +1,8 @@
 import { useRef, useState } from 'react';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import {
+  STORE_PACKAGE_IMAGE_MAX_COUNT,
+  STORE_PACKAGE_MAX_COUNT,
+} from '@dukang/shared-types';
 import { emptyPackage, type PackageFormItem } from '../lib/storePackages';
 import { uploadFileToOss } from '../lib/upload';
 
@@ -14,14 +17,32 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
   const [uploadingIndex, setUploadingIndex] = useState<number | null>(null);
   const fileRefs = useRef<Record<number, HTMLInputElement | null>>({});
 
-  async function pickPackageImage(index: number, file?: File | null) {
-    if (!file || disabled) return;
-    setUploadingIndex(index);
+  async function pickPackageImages(pkgIndex: number, fileList?: FileList | null) {
+    if (!fileList?.length || disabled) return;
+    const current = items[pkgIndex];
+    const existing =
+      Array.isArray(current.imageUrls) && current.imageUrls.length > 0
+        ? current.imageUrls.map((u) => String(u ?? '')).filter((u) => u.trim())
+        : current.imageUrl
+          ? [String(current.imageUrl)]
+          : [];
+    const room = Math.max(0, STORE_PACKAGE_IMAGE_MAX_COUNT - existing.length);
+    const files = Array.from(fileList).slice(0, room);
+    if (!files.length) return;
+
+    setUploadingIndex(pkgIndex);
     try {
-      const result = await uploadFileToOss(file, 'STORE_PACKAGE');
-      updateAt(index, { imageUrl: result.url });
+      const appended: string[] = [];
+      for (const file of files) {
+        const result = await uploadFileToOss(file, 'STORE_PACKAGE');
+        appended.push(result.url);
+      }
+      const next = [...existing, ...appended];
+      updateAt(pkgIndex, { imageUrls: next, imageUrl: next[0] ?? '' });
     } finally {
       setUploadingIndex(null);
+      const input = fileRefs.current[pkgIndex];
+      if (input) input.value = '';
     }
   }
 
@@ -58,6 +79,12 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
       {list.map((item, index) => {
         const isCollapsed = !!collapsed[index];
         const displayName = item.name.trim() || `套餐 ${index + 1}`;
+        const filled =
+          Array.isArray(item.imageUrls) && item.imageUrls.length > 0
+            ? item.imageUrls.map((u) => String(u ?? '')).filter((u) => u.trim())
+            : item.imageUrl
+              ? [String(item.imageUrl)]
+              : [];
         return (
           <section key={index} className={`shop-packages-card${isCollapsed ? ' shop-packages-card--collapsed' : ''}`}>
             <div className="shop-packages-card-head">
@@ -83,7 +110,7 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
             {!isCollapsed ? (
               <>
                 <label className="shop-packages-field">
-                  <span className="shop-packages-label">套餐名称 *</span>
+                  <span className="shop-packages-label">套餐名称</span>
                   <input
                     className="shop-packages-input"
                     placeholder="如：套餐A"
@@ -94,12 +121,12 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
                 </label>
 
                 <label className="shop-packages-field">
-                  <span className="shop-packages-label">价格（元） *</span>
+                  <span className="shop-packages-label">价格（元）</span>
                   <input
                     className="shop-packages-input"
                     type="number"
                     min={0}
-                    step={0.01}
+                    step="0.01"
                     placeholder="198"
                     value={item.price}
                     disabled={disabled}
@@ -108,10 +135,10 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
                 </label>
 
                 <label className="shop-packages-field">
-                  <span className="shop-packages-label">菜品 *</span>
+                  <span className="shop-packages-label">菜品</span>
                   <textarea
-                    className="shop-packages-textarea"
-                    rows={3}
+                    className="shop-packages-input"
+                    rows={2}
                     placeholder="红烧肉、红烧鱼、油焖茄子"
                     value={item.dishes}
                     disabled={disabled}
@@ -121,8 +148,9 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
 
                 <label className="shop-packages-field">
                   <span className="shop-packages-label">使用时间</span>
-                  <input
+                  <textarea
                     className="shop-packages-input"
+                    rows={2}
                     placeholder="节假日除外"
                     value={item.usableTime || ''}
                     disabled={disabled}
@@ -130,14 +158,35 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
                   />
                 </label>
 
-                <label className="shop-packages-field">
-                  <span className="shop-packages-label">套餐图片</span>
-                  {item.imageUrl ? (
-                    <img
-                      src={item.imageUrl}
-                      alt=""
-                      style={{ width: '100%', maxHeight: 160, objectFit: 'cover', borderRadius: 8, marginBottom: 8 }}
-                    />
+                <div className="shop-packages-field">
+                  <span className="shop-packages-label">
+                    套餐图片（最多 {STORE_PACKAGE_IMAGE_MAX_COUNT} 张，支持批量）
+                  </span>
+                  {filled.length > 0 ? (
+                    <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginBottom: 8 }}>
+                      {filled.map((url, imgIndex) => (
+                        <div key={`${url}-${imgIndex}`} style={{ position: 'relative', width: 88 }}>
+                          <img
+                            src={url}
+                            alt=""
+                            style={{ width: 88, height: 88, objectFit: 'cover', borderRadius: 8 }}
+                          />
+                          {!disabled ? (
+                            <button
+                              type="button"
+                              className="shop-packages-remove"
+                              style={{ position: 'absolute', top: 2, right: 2, margin: 0 }}
+                              onClick={() => {
+                                const next = filled.filter((_, i) => i !== imgIndex);
+                                updateAt(index, { imageUrls: next, imageUrl: next[0] ?? '' });
+                              }}
+                            >
+                              删
+                            </button>
+                          ) : null}
+                        </div>
+                      ))}
+                    </div>
                   ) : null}
                   <input
                     ref={(el) => {
@@ -145,25 +194,29 @@ export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
                     }}
                     type="file"
                     accept="image/*"
+                    multiple
                     hidden
-                    disabled={disabled}
-                    onChange={(e) => void pickPackageImage(index, e.target.files?.[0])}
+                    disabled={disabled || filled.length >= STORE_PACKAGE_IMAGE_MAX_COUNT}
+                    onChange={(e) => void pickPackageImages(index, e.target.files)}
                   />
                   <button
                     type="button"
                     className="shop-packages-add"
                     style={{ marginTop: 0 }}
-                    disabled={disabled || uploadingIndex === index}
+                    disabled={disabled || uploadingIndex === index || filled.length >= STORE_PACKAGE_IMAGE_MAX_COUNT}
                     onClick={() => fileRefs.current[index]?.click()}
                   >
-                    {uploadingIndex === index ? '上传中…' : item.imageUrl ? '更换图片' : '上传图片'}
+                    {uploadingIndex === index
+                      ? '上传中…'
+                      : `批量上传（${filled.length}/${STORE_PACKAGE_IMAGE_MAX_COUNT}）`}
                   </button>
-                </label>
+                </div>
 
                 <label className="shop-packages-field">
                   <span className="shop-packages-label">其他说明</span>
-                  <input
+                  <textarea
                     className="shop-packages-input"
+                    rows={2}
                     placeholder="不可叠加"
                     value={item.otherNotes || ''}
                     disabled={disabled}

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

@@ -2,7 +2,10 @@ type WechatScanAuthModalProps = {
   open: boolean;
   loading?: boolean;
   error?: string;
+  /** bind=首次绑定；recover=扫码 JSSDK 失败后的恢复引导 */
+  mode?: 'bind' | 'recover';
   onAuthorize: () => void;
+  onRefresh?: () => void;
   onCancel: () => void;
 };
 
@@ -10,28 +13,43 @@ export default function WechatScanAuthModal({
   open,
   loading,
   error,
+  mode = 'bind',
   onAuthorize,
+  onRefresh,
   onCancel,
 }: WechatScanAuthModalProps) {
   if (!open) return null;
 
+  const isRecover = mode === 'recover';
+
   return (
     <div className="shop-scan-auth-overlay" role="dialog" aria-modal="true" aria-labelledby="shop-scan-auth-title">
       <div className="shop-scan-auth-card">
         <div className="shop-scan-auth-icon">
-          <span className="material-symbols-outlined shop-fill-icon">qr_code_scanner</span>
+          <span className="material-symbols-outlined shop-fill-icon">
+            {isRecover ? 'sync_problem' : 'qr_code_scanner'}
+          </span>
         </div>
-        <h2 id="shop-scan-auth-title" className="shop-scan-auth-title">微信授权</h2>
+        <h2 id="shop-scan-auth-title" className="shop-scan-auth-title">
+          {isRecover ? '扫码能力未就绪' : '微信授权'}
+        </h2>
         <p className="shop-scan-auth-desc">
-          扫码核销需使用微信相机扫描用户核销码。请先完成微信授权并允许使用摄像头。
+          {isRecover
+            ? '微信扫码接口校验失败（常见于 iPhone 登录/授权后）。请先刷新页面；仍失败再重新授权微信。'
+            : '扫码核销需使用微信相机扫描用户核销码。请先完成微信授权并允许使用摄像头。'}
         </p>
         {error && <p className="shop-scan-auth-error" role="alert">{error}</p>}
         <div className="shop-scan-auth-actions">
           <button type="button" className="shop-scan-auth-cancel" onClick={onCancel} disabled={loading}>
             取消
           </button>
+          {isRecover && onRefresh ? (
+            <button type="button" className="shop-scan-auth-confirm" onClick={onRefresh} disabled={loading}>
+              刷新页面
+            </button>
+          ) : null}
           <button type="button" className="shop-scan-auth-confirm" onClick={onAuthorize} disabled={loading}>
-            {loading ? '跳转授权中…' : '微信授权'}
+            {loading ? '跳转授权中…' : isRecover ? '重新授权微信' : '微信授权'}
           </button>
         </div>
       </div>

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

@@ -3,6 +3,9 @@ import { isIosDevice } from '@dukang/weixin-sdk';
 /** 扫码前发起 OAuth 时标记，回跳后在首页续扫 */
 export const SHOP_PENDING_SCAN_KEY = 'shop_pending_scan';
 
+/** 短信登录后绑定微信等 OAuth 回跳：下次手动扫码加长预热（不自动打开相机） */
+export const SHOP_SCAN_WARMUP_KEY = 'shop_scan_warmup';
+
 export function markPendingScanAfterAuth(): void {
   try {
     sessionStorage.setItem(SHOP_PENDING_SCAN_KEY, '1');
@@ -27,6 +30,25 @@ export function clearPendingScanAfterAuth(): void {
   }
 }
 
+/** OAuth（含短信登录后绑微信）回跳后，标记下一次扫码需要加长预热 */
+export function markScanWarmupAfterAuth(): void {
+  try {
+    sessionStorage.setItem(SHOP_SCAN_WARMUP_KEY, '1');
+  } catch {
+    /* ignore */
+  }
+}
+
+export function consumeScanWarmupAfterAuth(): boolean {
+  try {
+    if (sessionStorage.getItem(SHOP_SCAN_WARMUP_KEY) !== '1') return false;
+    sessionStorage.removeItem(SHOP_SCAN_WARMUP_KEY);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 /** OAuth 回跳后延迟再调 scanQRCode（iOS JSSDK 离线校验更慢） */
 export function getPostAuthScanDelayMs(): number {
   return isIosDevice() ? 1200 : 600;

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

@@ -1,5 +1,9 @@
 import type { StorePackageItemDto } from '@dukang/shared-types';
-import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import {
+  STORE_PACKAGE_IMAGE_MAX_COUNT,
+  STORE_PACKAGE_MAX_COUNT,
+  normalizeStorePackageImageUrls,
+} from '@dukang/shared-types';
 
 export type PackageFormItem = StorePackageItemDto;
 
@@ -11,24 +15,34 @@ export function emptyPackage(index = 0): PackageFormItem {
     usableTime: '',
     otherNotes: '',
     imageUrl: '',
+    imageUrls: [],
     sortOrder: index,
   };
 }
 
 export function normalizePackageFormItems(raw: PackageFormItem[]): PackageFormItem[] {
   return raw
-    .map((item, index) => ({
-      name: item.name.trim(),
-      price: item.price.trim(),
-      dishes: item.dishes.trim(),
-      usableTime: item.usableTime?.trim() || '',
-      otherNotes: item.otherNotes?.trim() || '',
-      imageUrl: item.imageUrl?.trim() || '',
-      sortOrder: index,
-    }))
+    .map((item, index) => {
+      const imageUrls = normalizeStorePackageImageUrls(item);
+      return {
+        name: item.name.trim(),
+        price: item.price.trim(),
+        dishes: item.dishes.trim(),
+        usableTime: item.usableTime?.trim() || '',
+        otherNotes: item.otherNotes?.trim() || '',
+        imageUrl: imageUrls[0] ?? '',
+        imageUrls,
+        sortOrder: index,
+      };
+    })
     .filter(
       (item) =>
-        item.name || item.price || item.dishes || item.usableTime || item.otherNotes || item.imageUrl,
+        item.name ||
+        item.price ||
+        item.dishes ||
+        item.usableTime ||
+        item.otherNotes ||
+        item.imageUrls.length > 0,
     );
 }
 
@@ -43,6 +57,15 @@ export function validatePackageFormItems(items: PackageFormItem[]): string | nul
     const price = Number(item.price);
     if (!Number.isFinite(price) || price < 0) return `第 ${i + 1} 条套餐价格须为非负数字`;
     if (!item.dishes) return `第 ${i + 1} 条套餐菜品不能为空`;
+    if ((item.imageUrls?.length ?? 0) > STORE_PACKAGE_IMAGE_MAX_COUNT) {
+      return `第 ${i + 1} 条套餐图片最多 ${STORE_PACKAGE_IMAGE_MAX_COUNT} 张`;
+    }
   }
   return null;
 }
+
+export function formatPackagePrice(price: string | number) {
+  const n = typeof price === 'number' ? price : Number(price);
+  if (!Number.isFinite(n)) return String(price);
+  return n % 1 === 0 ? String(n) : n.toFixed(2);
+}

apps/h5-shop/src/lib/wechat-auth.ts

@@ -2,6 +2,7 @@ import type { ClientRuntimeConfig, WechatLoginResult } from '@dukang/shared-type
 import { isWxAuthorizeEnabled } from '@dukang/shared-types';
 import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
 import { isWechatEnv, weixinSdk } from './weixin';
+import { markScanWarmupAfterAuth } from './shop-scan-auth';
 import { request, saveWechatSession, type ShopSessionPayload } from './api';
 
 export type ShopAccountProfile = {
@@ -162,15 +163,19 @@ export async function loginShopWithWechat(): Promise<ShopSessionPayload | null |
   if (!isWechatEnv()) {
     throw new Error(WECHAT_INAPP_REQUIRED_MSG);
   }
+  markScanWarmupAfterAuth();
   const result = await weixinSdk.login();
   if (result) return handleShopWechatLoginResult(result);
 }
 
 /** 短信登录成功后于微信内自动发起 OAuth，绑定 openId 便于后续免登 */
-export async function bindShopWechatAfterSmsLogin(): Promise<void> {
+export async function bindShopWechatAfterSmsLogin(session?: ShopSessionPayload): Promise<'skipped' | void> {
   const config = await fetchClientConfig();
-  if (!isWxAuthorizeEnabled(config)) return;
-  if (!isWechatEnv()) return;
+  if (!isWxAuthorizeEnabled(config)) return 'skipped';
+  if (!isWechatEnv()) return 'skipped';
+  // 已绑定则勿再 OAuth：每次 OAuth 回跳都会重置 iOS JSSDK 入场 URL，易导致扫码失败
+  if (session?.account?.hasWechat) return 'skipped';
+  markScanWarmupAfterAuth();
   await weixinSdk.login();
 }
 
@@ -180,5 +185,6 @@ export async function authorizeShopWechat(): Promise<WechatLoginResult | void> {
   if (!isWechatEnv()) {
     throw new Error(WECHAT_INAPP_REQUIRED_MSG);
   }
+  markScanWarmupAfterAuth();
   return weixinSdk.login();
 }

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

@@ -4,7 +4,7 @@ import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 
-import { isScanPermissionWarmupError } from '@dukang/weixin-sdk';
+import { isIosDevice, isScanPermissionWarmupError } from '@dukang/weixin-sdk';
 
 import { useStoreSession } from '../contexts/StoreSessionContext';
 
@@ -28,6 +28,8 @@ import {
 
   clearPendingScanAfterAuth,
 
+  consumeScanWarmupAfterAuth,
+
   getPostAuthScanDelayMs,
 
   markPendingScanAfterAuth,
@@ -56,9 +58,9 @@ function formatScanError(e: unknown, opts?: { afterAuth?: boolean }): string {
 
   const msg = e instanceof Error ? e.message : '扫码失败，请重试';
 
-  if (/invalid signature/i.test(msg)) {
+  if (/invalid signature|config:fail|signature/i.test(msg)) {
 
-    return '微信 JSSDK 签名校验失败：请确认公众号已配置 JS 接口安全域名，并刷新页面后重试';
+    return '微信扫码签名校验失败，请刷新页面或重新授权微信后重试';
 
   }
 
@@ -66,11 +68,11 @@ function formatScanError(e: unknown, opts?: { afterAuth?: boolean }): string {
 
     if (opts?.afterAuth) {
 
-      return '微信授权已完成，扫码权限仍在准备中，请再点一次「扫码核销」';
+      return '微信授权后扫码仍未就绪，请刷新页面或重新授权微信';
 
     }
 
-    return '微信权限校验尚未完成，请等待 1～2 秒后再次点击扫码（首次绑定微信时较常见）';
+    return '微信扫码能力未就绪，请刷新页面或重新授权微信';
 
   }
 
@@ -78,6 +80,12 @@ function formatScanError(e: unknown, opts?: { afterAuth?: boolean }): string {
 
 }
 
+function isScanRecoverableError(msg: string): boolean {
+
+  return isScanPermissionWarmupError(msg) || /签名校验失败|扫码能力未就绪|请刷新页面/i.test(msg);
+
+}
+
 
 
 export default function HomePage() {
@@ -98,10 +106,16 @@ export default function HomePage() {
 
   const [authModalOpen, setAuthModalOpen] = useState(false);
 
+  const [authModalMode, setAuthModalMode] = useState<'bind' | 'recover'>('bind');
+
   const [authLoading, setAuthLoading] = useState(false);
 
   const [authError, setAuthError] = useState('');
 
+  const [showOpenModal, setShowOpenModal] = useState(false);
+
+  const [opening, setOpening] = useState(false);
+
   const pendingScanStartedRef = useRef(false);
 
 
@@ -190,7 +204,8 @@ export default function HomePage() {
 
       try {
 
-        if (opts?.postAuthWarmup) {
+        // iOS / OAuth 回跳后须重新 wx.config（签名用入场 URL）
+        if (opts?.postAuthWarmup || isIosDevice()) {
 
           weixinSdk.reset();
 
@@ -226,7 +241,19 @@ export default function HomePage() {
 
       } catch (e) {
 
-        setScanMsg(formatScanError(e, { afterAuth: opts?.postAuthWarmup }));
+        const tip = formatScanError(e, { afterAuth: opts?.postAuthWarmup });
+
+        setScanMsg(tip);
+
+        if (isScanRecoverableError(tip)) {
+
+          setAuthModalMode('recover');
+
+          setAuthError(tip);
+
+          setAuthModalOpen(true);
+
+        }
 
       } finally {
 
@@ -286,6 +313,12 @@ export default function HomePage() {
 
     setScanMsg('');
 
+    // 门店临时闭店/休息中（非营业状态）时，点击扫码直接提示，不进入扫码流程
+    if (status !== 'OPEN') {
+      setShowOpenModal(true);
+      return;
+    }
+
     if (!isWechatEnv()) {
 
       setScanMsg('请在微信内打开门店端进行扫码核销');
@@ -302,13 +335,19 @@ export default function HomePage() {
 
         pendingScanStartedRef.current = false;
 
+        setAuthModalMode('bind');
+
+        setAuthError('');
+
         setAuthModalOpen(true);
 
         return;
 
       }
 
-      await runScan();
+      const needWarmup = consumeScanWarmupAfterAuth();
+
+      await runScan(needWarmup ? { postAuthWarmup: true } : undefined);
 
     } catch (e) {
 
@@ -320,6 +359,25 @@ export default function HomePage() {
 
 
 
+  async function openStoreAndContinue() {
+    if (opening) return;
+    setOpening(true);
+    try {
+      await request('SHOP_H5', '/shop/store/status', {
+        method: 'PUT',
+        body: JSON.stringify({ status: 'OPEN' }),
+      });
+      setShowOpenModal(false);
+      setScanMsg('');
+      void loadDashboard(); // 刷新门店状态为营业中，扫码按钮可再次使用
+    } catch (e) {
+      setShowOpenModal(false);
+      setScanMsg(e instanceof Error ? e.message : '开启营业失败');
+    } finally {
+      setOpening(false);
+    }
+  }
+
   async function startWechatAuth() {
 
     setAuthLoading(true);
@@ -556,16 +614,26 @@ export default function HomePage() {
 
         open={authModalOpen}
 
+        mode={authModalMode}
+
         loading={authLoading}
 
         error={authError}
 
         onAuthorize={() => void startWechatAuth()}
 
+        onRefresh={() => {
+
+          window.location.reload();
+
+        }}
+
         onCancel={() => {
 
           setAuthModalOpen(false);
 
+          setAuthModalMode('bind');
+
           setAuthError('');
 
           clearPendingScanAfterAuth();
@@ -576,6 +644,33 @@ export default function HomePage() {
 
       />
 
+      {showOpenModal && (
+        <div className="shop-redeem-modal" role="dialog" aria-modal="true">
+          <div className="shop-redeem-modal-card">
+            <h4 className="shop-redeem-modal-title">门店休息中</h4>
+            <p className="shop-redeem-modal-desc">门店目前休息中无法核销，是否开启营业？</p>
+            <div className="shop-redeem-modal-actions">
+              <button
+                type="button"
+                className="shop-redeem-modal-cancel"
+                disabled={opening}
+                onClick={() => setShowOpenModal(false)}
+              >
+                取消
+              </button>
+              <button
+                type="button"
+                className="shop-redeem-modal-confirm"
+                disabled={opening}
+                onClick={() => void openStoreAndContinue()}
+              >
+                {opening ? '开启中…' : '确认开启'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
     </PullToRefresh>
 
   );

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

@@ -159,9 +159,9 @@ export default function LoginPage() {
       });
       saveRememberedSession(data);
       applySession(data);
-      if (isWechatEnv() && wxAuthorize) {
+      if (isWechatEnv() && wxAuthorize && !data.account?.hasWechat) {
         setMsg('登录成功，正在关联微信…');
-        await bindShopWechatAfterSmsLogin();
+        await bindShopWechatAfterSmsLogin(data);
         return;
       }
       routeAfterShopLogin(data, navigate);

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

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import type { StorePackagesResponse } from '@dukang/shared-types';
+import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import ShopPackagesForm from '../components/ShopPackagesForm';
 import { request } from '../lib/api';
@@ -30,7 +31,18 @@ export default function PackagesPage() {
         : data.live?.length
           ? data.live
           : [emptyPackage()];
-      setItems(base.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i })));
+      setItems(
+        base.map((p, i) => {
+          const imageUrls = normalizeStorePackageImageUrls(p);
+          return {
+            ...p,
+            price: String(p.price),
+            imageUrl: imageUrls[0] ?? '',
+            imageUrls,
+            sortOrder: i,
+          };
+        }),
+      );
       setPending(data.pendingRequest ?? null);
       setMsg('');
     } catch (e) {

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

@@ -20,6 +20,8 @@ export default function PhoneRedeemPage() {
   const [msg, setMsg] = useState('');
   const [loading, setLoading] = useState(false);
   const [confirmCooldown, setConfirmCooldown] = useState(0);
+  const [showOpenModal, setShowOpenModal] = useState(false);
+  const [opening, setOpening] = useState(false);
 
   useEffect(() => {
     request<Record<string, unknown>>('SHOP_H5', '/shop/store')
@@ -36,15 +38,7 @@ export default function PhoneRedeemPage() {
     return () => window.clearTimeout(timer);
   }, [confirmCooldown]);
 
-  async function sendConfirmSms() {
-    if (!/^1\d{10}$/.test(phone.trim())) {
-      setMsg('请输入正确的手机号');
-      return;
-    }
-    if (storeClosed) {
-      setMsg('门店未营业，无法核销');
-      return;
-    }
+  async function prepareDirectRedeem() {
     const value = Number(amount);
     if (!Number.isFinite(value) || value <= 0) {
       setMsg('请输入有效核销金额');
@@ -69,6 +63,37 @@ export default function PhoneRedeemPage() {
     }
   }
 
+  async function sendConfirmSms() {
+    if (!/^1\d{10}$/.test(phone.trim())) {
+      setMsg('请输入正确的手机号');
+      return;
+    }
+    if (storeClosed) {
+      setShowOpenModal(true);
+      return;
+    }
+    await prepareDirectRedeem();
+  }
+
+  async function openStoreAndContinue() {
+    if (opening) return;
+    setOpening(true);
+    try {
+      await request('SHOP_H5', '/shop/store/status', {
+        method: 'PUT',
+        body: JSON.stringify({ status: 'OPEN' }),
+      });
+      setStoreClosed(false);
+      setShowOpenModal(false);
+      await prepareDirectRedeem();
+    } catch (e) {
+      setShowOpenModal(false);
+      setMsg(e instanceof Error ? e.message : '开启营业失败');
+    } finally {
+      setOpening(false);
+    }
+  }
+
   async function confirmRedeem() {
     if (!prepared) {
       setMsg('请先发送核销验证码');
@@ -114,7 +139,7 @@ export default function PhoneRedeemPage() {
 
       <main className="shop-redeem-main">
         {storeClosed && (
-          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店当前未营业，无法核销</p>
+          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店目前休息中无法核销，开启营业后可继续</p>
         )}
 
         <section className="shop-redeem-card">
@@ -181,7 +206,7 @@ export default function PhoneRedeemPage() {
                 <button
                   type="button"
                   className="shop-phone-code-btn"
-                  disabled={loading || confirmCooldown > 0 || storeClosed || !canSendCode}
+                  disabled={loading || confirmCooldown > 0 || !canSendCode}
                   onClick={() => void sendConfirmSms()}
                 >
                   {confirmCooldown > 0 ? `${confirmCooldown}s` : '发送验证码'}
@@ -205,6 +230,33 @@ export default function PhoneRedeemPage() {
           </div>
         </section>
       </main>
+
+      {showOpenModal && (
+        <div className="shop-redeem-modal" role="dialog" aria-modal="true">
+          <div className="shop-redeem-modal-card">
+            <h4 className="shop-redeem-modal-title">门店休息中</h4>
+            <p className="shop-redeem-modal-desc">门店目前休息中无法核销，是否开启营业？</p>
+            <div className="shop-redeem-modal-actions">
+              <button
+                type="button"
+                className="shop-redeem-modal-cancel"
+                disabled={opening}
+                onClick={() => setShowOpenModal(false)}
+              >
+                取消
+              </button>
+              <button
+                type="button"
+                className="shop-redeem-modal-confirm"
+                disabled={opening}
+                onClick={() => void openStoreAndContinue()}
+              >
+                {opening ? '开启中…' : '确认开启'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

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

@@ -29,6 +29,8 @@ export default function RedeemConfirmPage() {
   const [storeClosed, setStoreClosed] = useState(false);
   const [failCount, setFailCount] = useState(0);
   const [showWeakNet, setShowWeakNet] = useState(false);
+  const [showOpenModal, setShowOpenModal] = useState(false);
+  const [opening, setOpening] = useState(false);
 
   useEffect(() => {
     request<Record<string, unknown>>('SHOP_H5', '/shop/store')
@@ -48,34 +50,37 @@ export default function RedeemConfirmPage() {
     setToken(scanned);
   }, [searchParams, navigate]);
 
-  useEffect(() => {
+  async function loadPreview() {
     if (!token.trim()) {
       setPreview(null);
       return;
     }
-    request<Preview>('SHOP_H5', '/shop/redeem/preview', {
-      method: 'POST',
-      body: JSON.stringify({ token }),
-    })
-      .then(setPreview)
-      .catch(async (e) => {
-        setPreview(null);
-        setMsg(e instanceof Error ? e.message : '无法预览核销码');
-        const report = await reportRedeemFailure(token, 'preview', e);
-        if (report?.thresholdReached) {
-          setFailCount(report.failCount);
-          setShowWeakNet(true);
-        } else if (report) {
-          setFailCount(report.failCount);
-        }
+    try {
+      const p = await request<Preview>('SHOP_H5', '/shop/redeem/preview', {
+        method: 'POST',
+        body: JSON.stringify({ token }),
       });
+      setPreview(p);
+      setMsg('');
+    } catch (e) {
+      setPreview(null);
+      setMsg(e instanceof Error ? e.message : '无法预览核销码');
+      const report = await reportRedeemFailure(token, 'preview', e);
+      if (report?.thresholdReached) {
+        setFailCount(report.failCount);
+        setShowWeakNet(true);
+      } else if (report) {
+        setFailCount(report.failCount);
+      }
+    }
+  }
+
+  useEffect(() => {
+    void loadPreview();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [token]);
 
-  async function confirm() {
-    if (storeClosed) {
-      setMsg('门店未营业，无法核销');
-      return;
-    }
+  async function doConfirm() {
     if (!token.trim()) {
       setMsg('请先扫码获取核销码');
       return;
@@ -103,6 +108,36 @@ export default function RedeemConfirmPage() {
     }
   }
 
+  async function confirm() {
+    if (storeClosed) {
+      setShowOpenModal(true);
+      return;
+    }
+    await doConfirm();
+  }
+
+  async function openStoreAndContinue() {
+    if (opening) return;
+    setOpening(true);
+    try {
+      await request('SHOP_H5', '/shop/store/status', {
+        method: 'PUT',
+        body: JSON.stringify({ status: 'OPEN' }),
+      });
+      setStoreClosed(false);
+      setShowOpenModal(false);
+      setMsg('');
+      // 开张后重新拉取预览（门店已 OPEN，后端不再拦截），再继续核销
+      await loadPreview();
+      await doConfirm();
+    } catch (e) {
+      setShowOpenModal(false);
+      setMsg(e instanceof Error ? e.message : '开启营业失败');
+    } finally {
+      setOpening(false);
+    }
+  }
+
   const previewAmount = preview?.amount ?? 0;
   const userLabel = preview?.user?.nickname || preview?.user?.phone || '—';
 
@@ -117,7 +152,7 @@ export default function RedeemConfirmPage() {
 
       <main className="shop-redeem-main">
         {storeClosed && (
-          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店当前未营业，无法核销</p>
+          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店目前休息中无法核销，开启营业后可继续</p>
         )}
         <section className="shop-redeem-card">
           <div className="shop-redeem-banner">
@@ -189,13 +224,13 @@ export default function RedeemConfirmPage() {
                 <button
                   type="button"
                   className={`shop-redeem-confirm-btn${loading ? ' success' : ''}`}
-                  disabled={loading || storeClosed || !preview}
+                  disabled={loading || (!preview && !storeClosed)}
                   onClick={() => void confirm()}
                 >
                   <span className="material-symbols-outlined shop-fill-icon">
                     {loading ? 'sync' : 'check_circle'}
                   </span>
-                  <span>{loading ? '正在核销...' : preview ? `确认核销 ¥${formatAmount(previewAmount)}` : '加载中…'}</span>
+                  <span>{loading ? '正在核销...' : preview ? `确认核销 ¥${formatAmount(previewAmount)}` : storeClosed ? '确认核销' : '加载中…'}</span>
                 </button>
                 <p className="shop-redeem-hint">请核对金额后点击确认</p>
               </>
@@ -213,6 +248,33 @@ export default function RedeemConfirmPage() {
           </span>
         </div>
       </main>
+
+      {showOpenModal && (
+        <div className="shop-redeem-modal" role="dialog" aria-modal="true">
+          <div className="shop-redeem-modal-card">
+            <h4 className="shop-redeem-modal-title">门店休息中</h4>
+            <p className="shop-redeem-modal-desc">门店目前休息中无法核销，是否开启营业？</p>
+            <div className="shop-redeem-modal-actions">
+              <button
+                type="button"
+                className="shop-redeem-modal-cancel"
+                disabled={opening}
+                onClick={() => setShowOpenModal(false)}
+              >
+                取消
+              </button>
+              <button
+                type="button"
+                className="shop-redeem-modal-confirm"
+                disabled={opening}
+                onClick={() => void openStoreAndContinue()}
+              >
+                {opening ? '开启中…' : '确认开启'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

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

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

apps/h5-shop/src/styles.css

@@ -794,6 +794,7 @@
 
 .shop-scan-auth-actions {
   display: flex;
+  flex-wrap: wrap;
   gap: 12px;
 }
 
@@ -1518,6 +1519,7 @@
   z-index: 40;
   background: var(--color-surface);
   border-bottom: 1px solid var(--color-surface-container-highest);
+  padding: 0 var(--space-page);
 }
 
 .shop-records-range-tabs {
@@ -1565,7 +1567,7 @@
 .shop-records-status-chips {
   display: flex;
   gap: 8px;
-  padding: 0;
+  padding-bottom: 10px;
   overflow-x: auto;
   scrollbar-width: none;
   flex: 1;
@@ -1896,8 +1898,8 @@
 }
 
 .shop-withdraw-btn {
-  width: 100%;
-  margin-top: 12px;
+  width: calc(100% - 2 * var(--space-page));
+  margin: 12px var(--space-page) 0;
   height: 44px;
   border: none;
   border-radius: 12px;
@@ -1915,11 +1917,80 @@
 
 .shop-withdraw-msg {
   margin-top: 10px;
+  padding: 0 var(--space-page);
   font-size: 13px;
   color: var(--color-aged-amber);
   text-align: center;
 }
 
+/* ─── 休息中核销·开张确认弹窗 ─── */
+.shop-redeem-modal {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 24px;
+  background: rgba(0, 0, 0, 0.45);
+}
+
+.shop-redeem-modal-card {
+  width: 100%;
+  max-width: 320px;
+  background: var(--color-surface);
+  border-radius: var(--radius-lg, 16px);
+  padding: 24px;
+  box-shadow: 0 8px 30px rgba(0, 0, 0, 0.2);
+}
+
+.shop-redeem-modal-title {
+  margin: 0 0 8px;
+  font-family: var(--font-headline);
+  font-size: 17px;
+  font-weight: 600;
+  color: var(--color-on-surface);
+}
+
+.shop-redeem-modal-desc {
+  margin: 0 0 20px;
+  font-size: 14px;
+  line-height: 1.5;
+  color: var(--color-on-surface-variant);
+}
+
+.shop-redeem-modal-actions {
+  display: flex;
+  gap: 12px;
+}
+
+.shop-redeem-modal-cancel,
+.shop-redeem-modal-confirm {
+  flex: 1;
+  padding: 11px 0;
+  border: none;
+  border-radius: 999px;
+  font-size: 15px;
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.shop-redeem-modal-cancel {
+  background: var(--color-surface-container, #ececec);
+  color: var(--color-on-surface-variant);
+}
+
+.shop-redeem-modal-confirm {
+  background: var(--color-primary, #8b1a1a);
+  color: #fff;
+}
+
+.shop-redeem-modal-cancel:disabled,
+.shop-redeem-modal-confirm:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
 /* ─── 门店套餐 ─── */
 .shop-packages-page .shop-records-main {
   padding-bottom: 24px;

apps/h5-shop/vite.config.ts

@@ -12,7 +12,8 @@ export default defineConfig({
     },
   },
   server: {
+    host: true,
     port: 5174,
-    proxy: { '/api': 'http://localhost:3000' },
+    proxy: { '/api': process.env.VITE_API_TARGET ?? 'http://localhost:3010' },
   },
 });

apps/h5-user/vite.config.ts

@@ -12,8 +12,9 @@ export default defineConfig({
     },
   },
   server: {
+    host: true,
     proxy: {
-      '/api': 'http://localhost:3000',
+      '/api': process.env.VITE_API_TARGET ?? 'http://localhost:3010',
     },
   },
 });

apps/mini-hq/config/index.ts

@@ -16,7 +16,7 @@ export default defineConfig(async () => ({
   plugins: ['@tarojs/plugin-html'],
   defineConstants: {
     /** H5 静态托管无 /api 代理时直连后端；dev 构建可通过 VITE_API_TARGET 覆盖 */
-    TARO_APP_API_ORIGIN: JSON.stringify(process.env.VITE_API_TARGET ?? 'http://localhost:3000'),
+    TARO_APP_API_ORIGIN: JSON.stringify(process.env.VITE_API_TARGET ?? 'http://localhost:3010'),
   },
   copy: {
     patterns: [],
@@ -44,7 +44,7 @@ export default defineConfig(async () => ({
       host: '0.0.0.0',
       proxy: {
         '/api': {
-          target: process.env.VITE_API_TARGET ?? 'http://localhost:3000',
+          target: process.env.VITE_API_TARGET ?? 'http://localhost:3010',
           changeOrigin: true,
         },
       },

apps/mini-hq/src/lib/api.ts

@@ -5,7 +5,7 @@ function resolveApiBase(): string {
     typeof TARO_APP_API_ORIGIN !== 'undefined' && TARO_APP_API_ORIGIN
       ? TARO_APP_API_ORIGIN
       : process.env.TARO_ENV === 'h5'
-        ? 'http://localhost:3000'
+        ? 'http://localhost:3010'
         : '';
   if (origin) {
     return `${origin.replace(/\/$/, '')}/api/v1`;

apps/mini-user/README.md

@@ -21,7 +21,7 @@ pnpm build:mini-user:weapp
 
 | 环节 | 文件 | 说明 |
 |------|------|------|
-| **编译注入** | `config/index.ts` → `defineConstants.TARO_APP_API_ORIGIN` | `dev:weapp` / watch → `localhost:3000`；`build:weapp`（`--mode production`）→ `https://api.dukanghaoke.com`；可用 `VITE_API_TARGET` 覆盖 |
+| **编译注入** | `config/index.ts` → `defineConstants.TARO_APP_API_ORIGIN` | `dev:weapp` / watch → `localhost:3010`；`build:weapp`（`--mode production`）→ `https://api.dukanghaoke.com`；可用 `VITE_API_TARGET` 覆盖 |
 | **运行时拼装** | `src/lib/api.ts` → `resolveApiBase()` | `{origin}/api/v1` |
 
 ### 微信登录 `invalid code`
@@ -33,7 +33,7 @@ pnpm build:mini-user:weapp
 | 小程序 appid | `project.config.json` → `wxda31c8e8e85051e7` |
 | 后端须配置 | `WX_MINI_APP_ID` / `WX_MINI_APP_SECRET`（与上表一致） |
 
-**本地联调（不接真实微信）**：保持默认即可（API → `localhost:3000`），并开启 Mock：
+**本地联调（不接真实微信）**：保持默认即可（API → `localhost:3010`），并开启 Mock：
 
 ```bash
 # 终端 1

apps/mini-user/config/index.ts

@@ -11,7 +11,7 @@ const isDevMode =
 /** 小程序/H5 请求的后端 origin（不含 /api）；本地默认本机，生产构建默认远程 */
 const API_ORIGIN =
   process.env.VITE_API_TARGET ??
-  (isDevMode ? 'http://localhost:3000' : 'https://api.dukanghaoke.com');
+  (isDevMode ? 'http://localhost:3010' : 'https://api.dukanghaoke.com');
 
 const requireFromApp = createRequire(path.resolve(__dirname, '../package.json'));
 

apps/mini-user/package.json

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

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

@@ -7,8 +7,13 @@ type ProductCarouselProps = {
   alt: string;
   variant?: 'home' | 'detail' | 'store';
   previewable?: boolean;
-  /** cover=aspectFill 裁剪铺满；contain=aspectFit 缩放完整显示（门店门头固定区） */
-  imageFit?: 'cover' | 'contain';
+  /**
+   * cover=aspectFill 裁剪铺满（固定高度，可能裁切）
+   * contain=aspectFit 完整显示（固定高度，可能留白）
+   * adaptive=widthFix 按图片真实比例自适应高度，完整显示不裁剪（门店套餐详情用）
+   *   依赖 swiper 原生 auto-height：海报有多高，轮播就有多高，无裁切。
+   */
+  imageFit?: 'cover' | 'contain' | 'adaptive';
 };
 
 /** 商品/门店轮播（对齐 h5 ProductCarousel 三变体） */
@@ -24,7 +29,8 @@ export default function ProductCarousel({
   const prefix =
     variant === 'store' ? 'store-detail-carousel' : variant === 'home' ? 'home-carousel' : 'detail-carousel';
   const isContain = imageFit === 'contain';
-  const wrapClass = `${prefix}-wrap${isContain ? ` ${prefix}-wrap--contain` : ''}`;
+  const isAdaptive = imageFit === 'adaptive';
+  const wrapClass = `${prefix}-wrap${isContain ? ` ${prefix}-wrap--contain` : ''}${isAdaptive ? ` ${prefix}-wrap--adaptive` : ''}`;
 
   function previewAt(index: number) {
     const urls = slides.filter(Boolean);
@@ -38,6 +44,8 @@ export default function ProductCarousel({
       <Swiper
         className={prefix}
         circular={slides.length > 1}
+        autoHeight={isAdaptive}
+        {...(variant === 'detail' && slides.length > 1 ? { autoplay: true, interval: 3500 } : {})}
         onChange={(e) => setActiveIndex(e.detail.current)}
       >
         {slides.map((src, index) => (
@@ -46,7 +54,7 @@ export default function ProductCarousel({
               <Image
                 className={`${prefix}-image`}
                 src={src}
-                mode={isContain ? 'aspectFit' : 'aspectFill'}
+                mode={isAdaptive ? 'widthFix' : isContain ? 'aspectFit' : 'aspectFill'}
                 alt={alt}
                 onClick={previewable ? () => previewAt(index) : undefined}
               />
@@ -66,6 +74,9 @@ export default function ProductCarousel({
           ))}
         </View>
       ) : null}
+      {variant === 'detail' && slides.length > 1 ? (
+        <View className={`${prefix}-counter`}>{activeIndex + 1}/{slides.length}</View>
+      ) : null}
     </View>
   );
 }

apps/mini-user/src/lib/api.ts

@@ -10,7 +10,7 @@ function resolveApiBase(): string {
     typeof TARO_APP_API_ORIGIN !== 'undefined' && TARO_APP_API_ORIGIN
       ? TARO_APP_API_ORIGIN
       : process.env.TARO_ENV === 'h5'
-        ? 'http://localhost:3000'
+        ? 'http://localhost:3010'
         : '';
   if (origin) {
     return `${origin.replace(/\/$/, '')}/api/v1`;

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

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

apps/mini-user/src/lib/phone.ts

@@ -1,4 +1,5 @@
 const MOBILE_PHONE_RE = /^1[3-9]\d{9}$/;
+const LANDLINE_PHONE_RE = /^0\d{2,3}-?\d{7,8}(-\d{1,6})?$/;
 
 export function normalizePhoneInput(value: string): string {
   return value.replace(/\D/g, '').slice(0, 11);
@@ -18,6 +19,48 @@ export function validateMobilePhone(phone: string): { ok: boolean; message?: str
   return { ok: true };
 }
 
-export function maskPhone(phone: string) {
-  return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+function normalizeContactPhone(raw: string): string {
+  return String(raw ?? '')
+    .trim()
+    .replace(/\s+/g, '');
+}
+
+/**
+ * 脱敏展示：手机 138****8000；座机隐藏本地号中间四位，如 0379-12****78。
+ * 门店详情电话展示用（拨号仍走 toDialablePhone 明文）。
+ */
+export function maskPhone(phone: string) {
+  const normalized = normalizeContactPhone(phone);
+  if (!normalized) return '';
+  if (MOBILE_PHONE_RE.test(normalized)) {
+    const digits = normalized.replace(/\D/g, '');
+    return `${digits.slice(0, 3)}****${digits.slice(-4)}`;
+  }
+  if (LANDLINE_PHONE_RE.test(normalized)) {
+    const extMatch = normalized.match(/-(\d{1,6})$/);
+    const hasExt = !!extMatch && normalized.indexOf('-') !== normalized.lastIndexOf('-');
+    const ext = hasExt ? extMatch![1] : '';
+    const main = hasExt ? normalized.slice(0, -(ext.length + 1)) : normalized;
+    const digits = main.replace(/\D/g, '');
+    const areaLen = digits.startsWith('01') || digits.startsWith('02') ? 3 : 4;
+    const area = digits.slice(0, areaLen);
+    const local = digits.slice(areaLen);
+    // 隐藏本地号中间四位（保留区号，本号前后各留若干位）：0379-12345678 → 0379-12****78
+    let maskedLocal: string;
+    if (local.length <= 4) {
+      maskedLocal = '*'.repeat(local.length);
+    } else {
+      const keep = local.length - 4;
+      const head = Math.max(1, Math.floor(keep / 2));
+      const tail = keep - head;
+      maskedLocal = `${local.slice(0, head)}${'*'.repeat(4)}${local.slice(local.length - tail)}`;
+    }
+    const joiner = main.includes('-') ? '-' : '';
+    return ext ? `${area}${joiner}${maskedLocal}-${ext}` : `${area}${joiner}${maskedLocal}`;
+  }
+  return normalized.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+}
+
+export function toDialablePhone(raw: string): string {
+  return String(raw ?? '').replace(/[\s-]/g, '');
 }

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

@@ -524,8 +524,13 @@ export default function MinePage() {
       {shouldRenderPageTabBar() ? <UserTabBar selected={3} /> : null}
 
       {profileSheetOpen ? (
-        <View className="mine-profile-sheet-mask" onClick={() => !savingProfile && setProfileSheetOpen(false)}>
-          <View className="mine-profile-sheet" onClick={(e) => e.stopPropagation()}>
+        <View className="mine-profile-sheet-mask">
+          {/* 遮罩单独绑 tap，勿在含 chooseAvatar 的祖先上用 stopPropagation（会编译成 catchtap 导致选头像无反应） */}
+          <View
+            className="mine-profile-sheet-backdrop"
+            onClick={() => !savingProfile && setProfileSheetOpen(false)}
+          />
+          <View className="mine-profile-sheet">
             <Text className="mine-profile-sheet-title">完善头像与昵称</Text>
             <Text className="mine-profile-sheet-hint">
               点击头像选择，并填写昵称后保存（用于个人中心展示）
@@ -534,6 +539,7 @@ export default function MinePage() {
               className="mine-profile-avatar-btn"
               openType="chooseAvatar"
               hoverClass="none"
+              plain
               onChooseAvatar={onChooseAvatar}
             >
               <View className="mine-profile-avatar-preview">

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

@@ -143,7 +143,7 @@ export default function OrderConfirmPickupPage() {
 
     const { confirm } = await Taro.showModal({
       title: '确认提交订单',
-      content: `确认提交现场提货订单？共 ${quantity} 瓶，应付 ¥${Number(preview?.payAmount ?? 0).toFixed(2)}。`,
+      content: `请确保您已拿到货品，货款将直接打给商家，如不是现场交易请选择立即购买方式下单，我们会为您安排配送到家。`,
       confirmText: '确认提交',
       cancelText: '再想想',
     });

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

@@ -15,7 +15,7 @@ import ShareNavButton from '../../components/ShareNavButton';
 import StoreRedeemMarquee from '../../components/StoreRedeemMarquee';
 import WechatShareReady from '../../components/WechatShareReady';
 import { request, toast } from '../../lib/api';
-import { maskPhone } from '../../lib/phone';
+import { maskPhone, toDialablePhone } from '../../lib/phone';
 import { track } from '../../lib/analytics';
 import { formatShanghaiDateTime } from '../../lib/datetime';
 import {
@@ -108,6 +108,13 @@ function formatRedeemTime(input?: string | null) {
   return formatShanghaiDateTime(input);
 }
 
+function formatPackagePriceYuan(price: string | number) {
+  const n = typeof price === 'number' ? price : Number(price);
+  if (!Number.isFinite(n)) return '0';
+  if (Math.abs(n - Math.round(n)) < 1e-9) return String(Math.round(n));
+  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';
@@ -269,7 +276,7 @@ export default function StoreDetailPage() {
       return;
     }
     track('store_phone_call', { storeId: store.id });
-    Taro.makePhoneCall({ phoneNumber: store.phone }).catch(() => toast('无法拨打电话'));
+    Taro.makePhoneCall({ phoneNumber: toDialablePhone(store.phone) }).catch(() => toast('无法拨打电话'));
   }
 
   function openMap() {
@@ -419,7 +426,12 @@ export default function StoreDetailPage() {
                 className="store-detail-package-list-item"
                 onClick={() => openPackageDetail(index)}
               >
-                <Text className="store-detail-package-list-title">{pkg.name}</Text>
+                <View className="store-detail-package-list-row">
+                  <Text className="store-detail-package-list-title">{pkg.name}</Text>
+                  <Text className="store-detail-package-list-price">
+                    &nbsp;&nbsp;&nbsp;&nbsp;¥{formatPackagePriceYuan(pkg.price)}
+                  </Text>
+                </View>
               </View>
             ))}
           </View>

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

@@ -1,8 +1,10 @@
 import { useCallback, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text } from '@tarojs/components';
 import Taro, { useLoad, useRouter } from '@tarojs/taro';
+import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import PageNavBar from '../../components/PageNavBar';
+import ProductCarousel from '../../components/ProductCarousel';
 import { request, toast } from '../../lib/api';
 
 type StorePackage = {
@@ -12,6 +14,7 @@ type StorePackage = {
   usableTime?: string | null;
   otherNotes?: string | null;
   imageUrl?: string | null;
+  imageUrls?: string[] | null;
 };
 
 type Store = {
@@ -97,10 +100,6 @@ export default function StorePackageDetailPage() {
     }
   }
 
-  function previewImage(url: string) {
-    Taro.previewImage({ urls: [url], current: url }).catch(() => toast('无法预览图片'));
-  }
-
   if (loading) {
     return (
       <PageShell variant="scroll" className="store-package-detail-page">
@@ -119,7 +118,7 @@ export default function StorePackageDetailPage() {
     );
   }
 
-  const imageUrl = (pkg.imageUrl || '').trim();
+  const imageUrls = normalizeStorePackageImageUrls(pkg);
 
   return (
     <PageShell variant="scroll" className="store-package-detail-page">
@@ -137,15 +136,14 @@ export default function StorePackageDetailPage() {
             ) : null}
           </View>
 
-          {imageUrl ? (
-            <View
-              className="store-package-detail-photo"
-              onClick={() => previewImage(imageUrl)}
-            >
-              <Image
-                className="store-package-detail-photo-image"
-                src={imageUrl}
-                mode="widthFix"
+          {imageUrls.length > 0 ? (
+            <View className="store-package-detail-gallery">
+              <ProductCarousel
+                images={imageUrls}
+                alt={pkg.name}
+                variant="detail"
+                previewable
+                imageFit="adaptive"
               />
             </View>
           ) : null}

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

@@ -40,6 +40,7 @@ import {
   toWeappShareMessage,
   toWeappShareTimeline,
 } from '../../lib/wechat-share';
+import openBadgeImg from '../../assets/icons/store-open-badge.png';
 
 type Store = {
   id: string;
@@ -341,12 +342,12 @@ export default function StoresPage() {
     }
   }
 
-  function hoursLines(store: Store): string[] {
+  function hoursText(store: Store): string {
     const parts: string[] = [];
     if (store.openTime && store.closeTime) parts.push(`${store.openTime}-${store.closeTime}`);
     if (store.openTime2 && store.closeTime2) parts.push(`${store.openTime2}-${store.closeTime2}`);
     if (!parts.length) parts.push('10:00-22:00');
-    return parts.map((p, i) => (i === 0 ? `营业时间: ${p}` : p));
+    return `营业时间: ${parts.join(' ')}`;
   }
 
   const sharePayload = useMemo(
@@ -421,45 +422,38 @@ export default function StoresPage() {
               className="store-card"
               onClick={() => Taro.navigateTo({ url: `/pages/store-detail/index?id=${s.id}` })}
             >
-              {s.coverUrl ? (
-                <Image className="store-card-cover" src={s.coverUrl} mode="aspectFill" />
-              ) : (
-                <View className="store-card-cover store-card-cover--empty" />
-              )}
+              <View className="store-card-cover-wrap">
+                {s.coverUrl ? (
+                  <Image className="store-card-cover" src={s.coverUrl} mode="aspectFill" />
+                ) : (
+                  <View className="store-card-cover store-card-cover--empty" />
+                )}
+                <Image
+                  className="store-card-open-badge"
+                  src={openBadgeImg}
+                  mode="aspectFit"
+                />
+              </View>
               <View className="store-card-body">
-                {/* 第1行：标题 + 距离 */}
+                {/* 第1行：标题（截断无省略号，顶到最右） */}
                 <View className="store-card-row store-card-row--head">
-                  <Text className="store-card-name" numberOfLines={1}>
-                    {s.name}
+                  <Text className="store-card-name">{s.name}</Text>
+                </View>
+                {/* 第2行：地址（最多两行）+ 距离 */}
+                <View className="store-card-row store-card-row--mid">
+                  <Text className="store-card-address" numberOfLines={2}>
+                    {s.address || (s.district ? `${s.district}` : '地址待完善')}
                   </Text>
                   <Text className="store-card-distance">
                     {formatDistanceMeters(s.distanceMeters)}
                   </Text>
                 </View>
-                {/* 第2行：营业时间（多段各占一行，居左） */}
-                <View className="store-card-hours">
-                  {hoursLines(s).map((line) => (
-                    <Text key={line} className="store-card-hours-line">
-                      {line}
-                    </Text>
-                  ))}
-                </View>
-                {/* 第3行：地址（最多两行）+ 去核销 */}
-                <View className="store-card-row store-card-row--foot">
-                  <Text className="store-card-address" numberOfLines={2}>
-                    {s.address || (s.district ? `${s.district}` : '地址待完善')}
-                  </Text>
-                  <View
-                    className="store-card-cta"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      Taro.navigateTo({ url: '/pages/redeem/index' });
-                    }}
-                  >
-                    <Text className="store-card-cta-text">去核销</Text>
-                  </View>
+                {/* 第3行：营业时间（同行） */}
+                <View className="store-card-row store-card-row--hours">
+                  <Text className="store-card-hours">{hoursText(s)}</Text>
                 </View>
               </View>
+              <Text className="store-card-arrow">›</Text>
             </View>
           ))}
       </View>

apps/mini-user/src/styles/mine.css

@@ -386,13 +386,20 @@
   position: fixed;
   inset: 0;
   z-index: 1000;
-  background: rgba(20, 16, 14, 0.45);
   display: flex;
   align-items: flex-end;
   justify-content: center;
 }
 
+.mine-profile-sheet-backdrop {
+  position: absolute;
+  inset: 0;
+  background: rgba(20, 16, 14, 0.45);
+}
+
 .mine-profile-sheet {
+  position: relative;
+  z-index: 1;
   width: 100%;
   max-width: 480px;
   box-sizing: border-box;
@@ -422,8 +429,9 @@
   margin: 20px auto 0;
   padding: 0;
   width: auto;
-  background: transparent;
-  border: none;
+  height: auto;
+  background: transparent !important;
+  border: none !important;
   line-height: 1.2;
   display: flex;
   flex-direction: column;
@@ -434,6 +442,11 @@
   border: none;
 }
 
+/* 子节点不抢触摸，保证 open-type=chooseAvatar 由 Button 本人响应 */
+.mine-profile-avatar-btn > * {
+  pointer-events: none;
+}
+
 .mine-profile-avatar-preview {
   width: 88px;
   height: 88px;

apps/mini-user/src/styles/product-detail.css

@@ -14,10 +14,23 @@
 .detail-carousel-wrap {
   position: relative;
   width: 100%;
-  aspect-ratio: 1;
+  aspect-ratio: 1.33; /* 保持4:3的比例 */
   overflow: hidden;
 }
 
+/* adaptive 模式（方案 A）：删除固定 1:1 比例与固定高度，
+   改用 swiper 原生 auto-height + image widthFix，海报有多高轮播就有多高，无裁切 */
+.detail-carousel-wrap--adaptive {
+  /* aspect-ratio: auto; */
+  overflow: visible;
+}
+
+.detail-carousel-wrap--adaptive .detail-carousel,
+.detail-carousel-wrap--adaptive .detail-carousel-item,
+.detail-carousel-wrap--adaptive .detail-carousel-image {
+  height: 100%;
+}
+
 .detail-carousel {
   width: 100%;
   height: 100%;
@@ -57,6 +70,20 @@
   background: var(--color-heritage-red);
 }
 
+.detail-carousel-counter {
+  position: absolute;
+  right: 12px;
+  bottom: 12px;
+  z-index: 2;
+  padding: 2px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #fff;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 999px;
+  pointer-events: none;
+}
+
 .product-detail-info {
   padding: var(--space-md) var(--space-page) var(--space-lg);
 }

apps/mini-user/src/styles/store-detail.css

@@ -74,6 +74,21 @@
   background: #fff;
 }
 
+/* 套餐详情图右下角 1/N 计数（detail 变体复用 .detail-carousel-counter） */
+.detail-carousel-counter {
+  position: absolute;
+  right: 12px;
+  bottom: 12px;
+  z-index: 2;
+  padding: 2px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #fff;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 999px;
+  pointer-events: none;
+}
+
 .store-detail-info-card {
   margin: 0 var(--space-page) 16px;
   position: relative;
@@ -281,13 +296,36 @@
   padding-bottom: 0;
 }
 
-.store-detail-package-list-title {
+/* 名称在左可换行；价格始终贴该行最右侧 */
+.store-detail-package-list-row {
+  /* display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  column-gap: 12px;
+  row-gap: 4px; */
   display: block;
+  width: 100%;
+}
+
+.store-detail-package-list-title {
+  min-width: 0;
+  font-family: var(--font-headline);
   font-size: 15px;
   line-height: 1.5;
   font-weight: 500;
   color: var(--color-on-surface);
   word-break: break-word;
+  display: inline;
+}
+
+.store-detail-package-list-price {
+  display: inline;
+  margin-left: auto;
+  font-size: 15px;
+  line-height: 1.5;
+  font-weight: 600;
+  color: var(--color-heritage-red, #a61d24);
+  text-align: right;
 }
 
 .store-detail-package-list-item:active {
@@ -315,15 +353,18 @@
   padding: 8px 16px 4px 16px;
 }
 
+/* 与门店详情套餐列表一致：名称在左可换行；价格始终贴该行最右侧 */
 .store-package-detail-title-row {
   display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 16px;
+  flex-wrap: wrap;
+  align-items: flex-end;
+  column-gap: 16px;
+  row-gap: 4px;
+  width: 100%;
 }
 
 .store-package-detail-title {
-  flex: 1;
+  /* flex: 1 1 10em; */
   min-width: 0;
   font-family: var(--font-headline);
   font-size: 20px;
@@ -334,13 +375,14 @@
 }
 
 .store-package-detail-price {
-  flex-shrink: 0;
-  font-size: 24px;
+  /* flex: 0 0 auto; */
+  margin-left: auto;
+  font-size: 20px;
   font-weight: 700;
-  line-height: 1.35;
-  color: #a61d24;
+  line-height: 1.4;
   color: var(--color-heritage-red, #a61d24);
   text-align: right;
+  white-space: nowrap;
 }
 
 .store-package-detail-store {
@@ -352,7 +394,7 @@
   padding-left: 4px;
 }
 
-.store-package-detail-photo {
+.store-package-detail-gallery {
   margin: 14px 0 0;
   border-radius: var(--radius-lg);
   overflow: hidden;
@@ -360,10 +402,8 @@
   box-shadow: var(--shadow-card);
 }
 
-.store-package-detail-photo-image {
-  width: 100%;
-  display: block;
-  vertical-align: top;
+.store-package-detail-gallery .detail-carousel-wrap {
+  border-radius: 0;
 }
 
 .store-package-detail-content {

apps/mini-user/src/styles/stores.css

@@ -144,12 +144,12 @@
   padding: 4px var(--space-page) 16px;
 }
 
-/* 左图右文 */
+/* 左图 + 中间文案 + 右侧箭头 */
 .store-card {
   display: flex;
   flex-direction: row;
-  align-items: flex-start;
-  gap: 12px;
+  align-items: center;
+  gap: 10px;
   padding: 12px;
   box-sizing: border-box;
   background: var(--color-card);
@@ -158,11 +158,19 @@
   margin-bottom: 12px;
 }
 
-.store-card-cover {
+.store-card-cover-wrap {
+  position: relative;
   flex-shrink: 0;
   width: 96px;
   height: 96px;
   border-radius: 8px;
+  overflow: hidden;
+}
+
+.store-card-cover {
+  width: 100%;
+  height: 100%;
+  border-radius: 8px;
   background: var(--color-surface-container);
   display: block;
 }
@@ -171,6 +179,16 @@
   background: var(--color-surface-container);
 }
 
+.store-card-open-badge {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 44px;
+  height: 44px;
+  pointer-events: none;
+  z-index: 1;
+}
+
 .store-card-body {
   flex: 1;
   min-width: 0;
@@ -184,19 +202,19 @@
 
 .store-card-row {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   min-width: 0;
   overflow: hidden;
 }
 
-/* 第1行：加粗标题（单行截断）+ 右对齐距离 */
+/* 第1行：加粗标题（单行截断，不显示 …，宽度顶到最右） */
 .store-card-row--head {
-  gap: 8px;
   height: 22px;
+  align-items: center;
 }
 
 .store-card-name {
-  flex: 1;
+  width: 100%;
   min-width: 0;
   font-family: var(--font-headline);
   font-size: 15px;
@@ -204,53 +222,23 @@
   line-height: 22px;
   color: #1a1a1a;
   overflow: hidden;
-  text-overflow: ellipsis;
+  text-overflow: clip;
   white-space: nowrap;
 }
 
-.store-card-distance {
-  flex-shrink: 0;
-  max-width: 40%;
-  font-size: 12px;
-  font-weight: 400;
-  line-height: 22px;
-  color: #999;
-  text-align: right;
-  white-space: nowrap;
-}
-
-/* 第2行：营业时间独自居左；多段各占一行 */
-.store-card-hours {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: 2px;
-  min-width: 0;
-}
-
-.store-card-hours-line {
-  font-size: 11px;
-  font-weight: 400;
-  line-height: 16px;
-  color: #999;
-  text-align: left;
-}
-
-/* 第3行：地址最多两行截断 + 右对齐去核销；与按钮垂直居中 */
-.store-card-row--foot {
+/* 第2行：地址最多两行 + 右对齐距离 */
+.store-card-row--mid {
   gap: 8px;
-  min-height: 28px;
-  align-items: center;
-  overflow: visible;
+  align-items: flex-start;
 }
 
 .store-card-address {
   flex: 1;
   min-width: 0;
-  font-size: 9px;
+  font-size: 11px;
   font-weight: 400;
-  line-height: 14px;
-  max-height: 28px;
+  line-height: 16px;
+  max-height: 32px;
   color: #999;
   text-align: left;
   white-space: normal;
@@ -260,25 +248,44 @@
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   line-clamp: 2;
-  text-overflow: ellipsis;
 }
 
-.store-card-cta {
+.store-card-distance {
   flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0 14px;
-  height: 26px;
-  border-radius: 999px;
-  background: var(--color-heritage-red, #a61d24);
-  box-sizing: border-box;
-}
-
-.store-card-cta-text {
+  max-width: 40%;
+  padding-top: 1px;
   font-size: 12px;
-  font-weight: 600;
-  line-height: 26px;
-  color: #fff;
+  font-weight: 400;
+  line-height: 16px;
+  color: #999;
+  text-align: right;
   white-space: nowrap;
 }
+
+/* 第3行：营业时间同行 */
+.store-card-row--hours {
+  align-items: center;
+}
+
+.store-card-hours {
+  width: 100%;
+  min-width: 0;
+  font-size: 11px;
+  font-weight: 400;
+  line-height: 16px;
+  color: #999;
+  overflow: hidden;
+  text-overflow: clip;
+  white-space: nowrap;
+}
+
+.store-card-arrow {
+  flex-shrink: 0;
+  align-self: center;
+  width: 16px;
+  font-size: 20px;
+  font-weight: 300;
+  line-height: 1;
+  color: #ccc;
+  text-align: center;
+}

deploy/sync-prod-db-to-local.sh

@@ -0,0 +1,171 @@
+#!/usr/bin/env bash
+# sync-prod-db-to-local.sh — 将线上(production)数据库同步到本地 Docker MySQL
+#
+# 原理：
+#   1. 通过 SSH 隧道穿透到阿里云 RDS。生产 DB 主机通常只允许应用服务器访问，
+#      本地开发机一般不在白名单，因此借道生产服务器 dukang-server 建立隧道。
+#   2. 在本地 dukang-v1-mysql 容器内用 mysqldump 连接隧道端口，导出线上库。
+#   3. 通过管道直接导入本地库（默认 dukang_haoke，即应用本地库名）。
+#
+# 前置条件：
+#   - deploy.env 中 DEPLOY_HOST / DEPLOY_USER / DEPLOY_PORT 已配置且可无密码 SSH
+#   - 本地 docker compose 已启动（dukang-v1-mysql 容器监听 6016）
+#   - 远端 /opt/dukang/server/dukang-api/.env.production 含 DATABASE_URL
+#   - 本地已安装 docker（Windows 用 Docker Desktop，容器内自带 mysql 客户端）
+#
+# 用法：
+#   bash deploy/sync-prod-db-to-local.sh                 # 交互确认 + 先备份本地
+#   bash deploy/sync-prod-db-to-local.sh --yes           # 跳过确认（仍先备份本地）
+#   bash deploy/sync-prod-db-to-local.sh --no-backup --yes
+#   bash deploy/sync-prod-db-to-local.sh --dry-run       # 仅打印计划，不落库、不开隧道
+#   bash deploy/sync-prod-db-to-local.sh --help
+#
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# ---------------- 默认参数 ----------------
+LOCAL_CONTAINER="dukang-v1-mysql"
+LOCAL_DB="dukang_haoke"
+LOCAL_ROOT_PASSWORD="root"
+TUNNEL_PORT=6018
+REMOTE_ENV_FILE="/opt/dukang/server/dukang-api/.env.production"
+HOST_ALIAS="host.docker.internal"   # 容器内访问宿主机（Docker Desktop 默认支持）
+DO_BACKUP=1
+ASSUME_YES=0
+DRY_RUN=0
+
+# ---------------- 解析参数 ----------------
+for arg in "$@"; do
+  case "$arg" in
+    --yes|-y) ASSUME_YES=1 ;;
+    --no-backup) DO_BACKUP=0 ;;
+    --dry-run) DRY_RUN=1 ;;
+    --help|-h) sed -n '3,30p' "$0"; exit 0 ;;
+    --tunnel-port=*) TUNNEL_PORT="${arg#*=}" ;;
+    --local-db=*) LOCAL_DB="${arg#*=}" ;;
+    --container=*) LOCAL_CONTAINER="${arg#*=}" ;;
+    --host-alias=*) HOST_ALIAS="${arg#*=}" ;;
+    *) echo "未知参数: $arg" >&2; exit 2 ;;
+  esac
+done
+
+# ---------------- 加载 deploy.env ----------------
+if [[ -f deploy.env ]]; then
+  # shellcheck disable=SC1091
+  source deploy.env
+fi
+DEPLOY_HOST="${DEPLOY_HOST:?请在 deploy.env 配置 DEPLOY_HOST}"
+DEPLOY_USER="${DEPLOY_USER:-root}"
+DEPLOY_PORT="${DEPLOY_PORT:-22}"
+SSH=(ssh -o StrictHostKeyChecking=accept-new -p "$DEPLOY_PORT")
+if [[ -n "${DEPLOY_SSH_KEY:-}" ]]; then SSH+=(-i "$DEPLOY_SSH_KEY"); fi
+TARGET="$DEPLOY_USER@$DEPLOY_HOST"
+
+# ---------------- 读取并解析远端 DATABASE_URL ----------------
+echo "==> 读取线上数据库配置 ($TARGET:$REMOTE_ENV_FILE)"
+# 用服务端 new URL 解析（密码可能含 @ / : 等特殊字符），base64 回传避免 shell 转义问题
+PARSED="$("${SSH[@]}" "$TARGET" bash -s <<'NODEEOF'
+cat > /tmp/_parse_db.js <<'JSEOF'
+const fs=require("fs");
+const l=fs.readFileSync("/opt/dukang/server/dukang-api/.env.production","utf8").match(/^DATABASE_URL=(.*)$/m)[1].trim();
+let u=l;
+if((u[0]==='"'&&u[u.length-1]==='"')||(u[0]==="'"&&u[u.length-1]==="'"))u=u.slice(1,-1);
+const U=new URL(u);
+const b=s=>Buffer.from(s).toString("base64");
+const path=U.pathname.replace(/^\//,"").split("?")[0];
+process.stdout.write([b(decodeURIComponent(U.username)),b(U.hostname),U.port||"3306",b(path),b(decodeURIComponent(U.password))].join("|")+"\n");
+JSEOF
+node /tmp/_parse_db.js; rm -f /tmp/_parse_db.js
+NODEEOF
+)"
+if [[ -z "$PARSED" ]]; then
+  echo "无法读取远端 DATABASE_URL，中止。" >&2; exit 1
+fi
+IFS='|' read -r _U _H _P _DB _PASS <<< "$PARSED"
+REMOTE_USER="$(echo "$_U" | base64 -d)"
+REMOTE_HOST="$(echo "$_H" | base64 -d)"
+REMOTE_PORT="$_P"
+REMOTE_DB="$(echo "$_DB" | base64 -d)"
+REMOTE_PASS="$(echo "$_PASS" | base64 -d)"
+echo "    线上库: $REMOTE_USER@$REMOTE_HOST:$REMOTE_PORT/$REMOTE_DB"
+
+# ---------------- 检查本地容器 ----------------
+if ! docker ps --format '{{.Names}}' | grep -qx "$LOCAL_CONTAINER"; then
+  echo "本地容器 $LOCAL_CONTAINER 未运行。请先执行: cd deploy && docker compose up -d" >&2
+  exit 1
+fi
+
+# ---------------- 打印计划 ----------------
+echo
+echo "同步计划:"
+echo "  源(线上): $REMOTE_USER@$REMOTE_HOST:$REMOTE_PORT/$REMOTE_DB"
+echo "  目标(本地): root@$LOCAL_CONTAINER:$LOCAL_DB (对外端口 6016)"
+echo "  隧道:      $TARGET -L $TUNNEL_PORT:$REMOTE_HOST:$REMOTE_PORT"
+echo "  本地备份:  $([[ $DO_BACKUP -eq 1 ]] && echo 是 || echo 否)"
+if [[ $DRY_RUN -eq 1 ]]; then
+  echo "(dry-run) 已结束，未做任何修改。"
+  exit 0
+fi
+
+# ---------------- 确认 ----------------
+if [[ $ASSUME_YES -ne 1 ]]; then
+  read -r -p "确认将【线上 $REMOTE_DB】覆盖同步到【本地 $LOCAL_DB】? [y/N] " ans
+  [[ "$ans" == "y" || "$ans" == "Y" ]] || { echo "已取消。"; exit 0; }
+fi
+
+# ---------------- 备份本地 ----------------
+if [[ $DO_BACKUP -eq 1 ]]; then
+  mkdir -p backups
+  BK="backups/local-${LOCAL_DB}-$(date +%Y%m%d-%H%M%S).sql"
+  echo "==> 备份本地库到 $BK"
+  docker exec "$LOCAL_CONTAINER" mysqldump -uroot -p"$LOCAL_ROOT_PASSWORD" --single-transaction "$LOCAL_DB" > "$BK"
+  echo "    备份完成 ($(wc -c < "$BK") bytes)"
+fi
+
+# ---------------- 确保本地目标库存在 ----------------
+docker exec "$LOCAL_CONTAINER" mysql -uroot -p"$LOCAL_ROOT_PASSWORD" \
+  -e "CREATE DATABASE IF NOT EXISTS \`$LOCAL_DB\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+
+# ---------------- 建立 SSH 隧道 ----------------
+CTL="/tmp/sync-prod-db-$$.sock"
+echo "==> 建立 SSH 隧道 $TARGET -L $TUNNEL_PORT:$REMOTE_HOST:$REMOTE_PORT"
+"${SSH[@]}" -M -S "$CTL" -f -N -L "$TUNNEL_PORT:$REMOTE_HOST:$REMOTE_PORT" "$TARGET"
+
+# 等待隧道就绪
+ready=0
+for i in 1 2 3 4 5 6 7 8 9 10; do
+  if docker exec -e "MYSQL_PWD=$REMOTE_PASS" "$LOCAL_CONTAINER" \
+        mysqladmin -h "$HOST_ALIAS" -P "$TUNNEL_PORT" -u "$REMOTE_USER" ping >/dev/null 2>&1; then
+    ready=1; break
+  fi
+  sleep 1
+done
+if [[ $ready -ne 1 ]]; then
+  echo "隧道未就绪，中止。" >&2
+  "${SSH[@]}" -S "$CTL" -O exit "$TARGET" 2>/dev/null || true
+  exit 1
+fi
+
+# ---------------- 同步（线上 -> 本地，管道直导） ----------------
+echo "==> 开始同步（管道直导，不落临时文件）"
+echo "    提示：同步前建议本地 Prisma 已追平线上 schema（pnpm db:push 或迁移），否则可能因表结构差异报错。"
+set +e
+docker exec -i -e "MYSQL_PWD=$REMOTE_PASS" "$LOCAL_CONTAINER" \
+  mysqldump -h "$HOST_ALIAS" -P "$TUNNEL_PORT" -u "$REMOTE_USER" \
+  --lock-tables=0 --add-drop-table --skip-triggers --no-create-db \
+  --skip-routines --skip-events --column-statistics=0 --no-tablespaces --set-gtid-purged=OFF \
+  "$REMOTE_DB" \
+  | docker exec -i "$LOCAL_CONTAINER" mysql -uroot -p"$LOCAL_ROOT_PASSWORD" "$LOCAL_DB"
+RC=${PIPESTATUS[0]}
+set -e
+
+# ---------------- 关闭隧道 ----------------
+"${SSH[@]}" -S "$CTL" -O exit "$TARGET" 2>/dev/null || true
+
+if [[ $RC -ne 0 ]]; then
+  echo "同步失败 (mysqldump 退出码 $RC)。本地库可能处于不一致状态。" >&2
+  [[ $DO_BACKUP -eq 1 ]] && echo "请用备份恢复: $BK" >&2
+  exit 1
+fi
+echo "==> 同步完成 ✅ 本地 $LOCAL_DB 现已是线上 $REMOTE_DB 的副本。"

fix_acl.ps1

@@ -0,0 +1,6 @@
+$sid = New-Object System.Security.Principal.SecurityIdentifier('S-1-5-21-4178830254-1499118431-1315729128-3960883439')
+$acl = Get-Acl 'C:\Users\Jacy\0projects\2026062901-dukang-v1\.git'
+$rules = $acl.Access | Where-Object { $_.IdentityReference -eq $sid -and $_.AccessControlType -eq 'Deny' }
+foreach ($r in $rules) { $acl.RemoveAccessRule($r) | Out-Null }
+$acl | Set-Acl 'C:\Users\Jacy\0projects\2026062901-dukang-v1\.git'
+Write-Host 'done'

packages/domain/package.json

@@ -4,6 +4,14 @@
   "private": true,
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./src/index.ts",
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
+    }
+  },
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",

packages/domain/src/index.ts

@@ -351,3 +351,4 @@ export function orderTabToStatuses(tab: string): string[] | undefined {
 export * from './city-partner';
 export * from './dev-plan';
 export * from './support-ticket';
+export * from './phone';

packages/domain/src/phone.test.ts

@@ -0,0 +1,49 @@
+import { describe, expect, it } from 'vitest';
+import {
+  isLandlinePhone,
+  isMobilePhone,
+  isStoreContactPhone,
+  maskContactPhone,
+  normalizeContactPhone,
+  toDialablePhone,
+} from './phone';
+
+describe('store contact phone', () => {
+  it('accepts mainland mobile numbers', () => {
+    expect(isMobilePhone('13800138000')).toBe(true);
+    expect(isStoreContactPhone('13800138000')).toBe(true);
+    expect(isStoreContactPhone(' 13800138000 ')).toBe(true);
+  });
+
+  it('accepts landlines with or without hyphens and optional extension', () => {
+    expect(isLandlinePhone('0379-8888888')).toBe(true);
+    expect(isLandlinePhone('010-12345678')).toBe(true);
+    expect(isLandlinePhone('03798888888')).toBe(true);
+    expect(isLandlinePhone('01012345678')).toBe(true);
+    expect(isLandlinePhone('0379-8888888-12')).toBe(true);
+    expect(isStoreContactPhone('0379-8888 888')).toBe(true);
+  });
+
+  it('rejects login-style invalid and incomplete numbers', () => {
+    expect(isStoreContactPhone('')).toBe(false);
+    expect(isStoreContactPhone('12345678')).toBe(false);
+    expect(isStoreContactPhone('12345678901')).toBe(false);
+    expect(isStoreContactPhone('400-123-4567')).toBe(false);
+    expect(isMobilePhone('0379-8888888')).toBe(false);
+  });
+
+  it('normalizes spaces and strips dial punctuation', () => {
+    expect(normalizeContactPhone(' 0379-8888 888 ')).toBe('0379-8888888');
+    expect(toDialablePhone('0379-8888888')).toBe('03798888888');
+    expect(toDialablePhone('010 1234 5678')).toBe('01012345678');
+  });
+
+  it('masks mobile and landline for display', () => {
+    expect(maskContactPhone('13800138000')).toBe('138****8000');
+    expect(maskContactPhone('0379-8888888')).toBe('0379-****888');
+    expect(maskContactPhone('010-12345678')).toBe('010-****5678');
+    expect(maskContactPhone('03798888888')).toBe('0379****888');
+    expect(maskContactPhone('0379-8888888-12')).toBe('0379-****888-12');
+    expect(maskContactPhone('')).toBe('—');
+  });
+});

packages/domain/src/phone.ts

@@ -0,0 +1,71 @@
+/** 11 位大陆手机号（登录凭证） */
+export const MOBILE_PHONE_RE = /^1[3-9]\d{9}$/;
+
+/**
+ * 国内座机：区号 0 开头（3~4 位），本地号 7~8 位，允许 `-`，可选分机。
+ * 例：0379-8888888、010-12345678、03798888888
+ */
+export const LANDLINE_PHONE_RE = /^0\d{2,3}-?\d{7,8}(-\d{1,6})?$/;
+
+export const STORE_CONTACT_PHONE_HINT = '请输入正确的联系电话（手机号或座机，如 0379-8888888）';
+
+export function normalizeContactPhone(raw: string): string {
+  return String(raw ?? '')
+    .trim()
+    .replace(/\s+/g, '');
+}
+
+export function isMobilePhone(raw: string): boolean {
+  return MOBILE_PHONE_RE.test(normalizeContactPhone(raw));
+}
+
+export function isLandlinePhone(raw: string): boolean {
+  return LANDLINE_PHONE_RE.test(normalizeContactPhone(raw));
+}
+
+/** 门店对外联系电话：手机号或座机 */
+export function isStoreContactPhone(raw: string): boolean {
+  const s = normalizeContactPhone(raw);
+  return isMobilePhone(s) || isLandlinePhone(s);
+}
+
+/** 拨号用：去掉空格和横线 */
+export function toDialablePhone(raw: string): string {
+  return String(raw ?? '').replace(/[\s-]/g, '');
+}
+
+/**
+ * 对外联系电话脱敏展示。
+ * - 手机：138****8000
+ * - 座机：保留区号，本地号中间打码，如 0379-****888 / 010-****5678
+ * - 带分机时保留分机后缀
+ */
+export function maskContactPhone(phone?: string | null): string {
+  const raw = String(phone ?? '').trim();
+  if (!raw) return '—';
+  const normalized = normalizeContactPhone(raw);
+  if (isMobilePhone(normalized)) {
+    const digits = normalized.replace(/\D/g, '');
+    return `${digits.slice(0, 3)}****${digits.slice(-4)}`;
+  }
+  if (isLandlinePhone(normalized)) {
+    const extMatch = normalized.match(/-(\d{1,6})$/);
+    const hasExt = !!extMatch && normalized.indexOf('-') !== normalized.lastIndexOf('-');
+    const ext = hasExt ? extMatch![1] : '';
+    const main = hasExt ? normalized.slice(0, -(ext.length + 1)) : normalized;
+    const digits = main.replace(/\D/g, '');
+    const areaLen = digits.startsWith('01') || digits.startsWith('02') ? 3 : 4;
+    const area = digits.slice(0, areaLen);
+    const local = digits.slice(areaLen);
+    const keepTail = Math.min(4, Math.max(2, local.length - 4));
+    const maskedLocal =
+      local.length <= 4 ? '*'.repeat(local.length) : `${'*'.repeat(local.length - keepTail)}${local.slice(-keepTail)}`;
+    const joiner = main.includes('-') ? '-' : '';
+    return ext ? `${area}${joiner}${maskedLocal}-${ext}` : `${area}${joiner}${maskedLocal}`;
+  }
+  const digits = normalized.replace(/\D/g, '');
+  if (digits.length >= 11) return `${digits.slice(0, 3)}****${digits.slice(-4)}`;
+  if (digits.length >= 7) return `${digits.slice(0, 3)}****${digits.slice(-2)}`;
+  if (digits.length > 0) return `${digits.slice(0, 1)}****`;
+  return '****';
+}

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

@@ -1,4 +1,4 @@
-/** HQ 权限目录（权限分配页勾选源） */
+/** HQ 权限目录（权限分配页勾选源） */
 export const HQ_PERMISSION_CATALOG = [
   { key: 'dashboard', label: '概览', group: '业务' },
   { key: 'users', label: '用户管理', group: '业务' },
@@ -18,6 +18,7 @@ export const HQ_PERMISSION_CATALOG = [
   { key: 'llm_configs', label: '语言模型配置', group: '业务' },
   { key: 'knowledge_bases', label: '知识库', group: '业务' },
   { key: 'dev_plan', label: '开发计划', group: '业务' },
+  { key: 'test_whitelist', label: '白名单管理', group: '业务' },
   { key: 'resources', label: 'OSS 资源库', group: '业务' },
   { key: 'logs', label: '日志', group: '业务' },
   { key: 'users_delete', label: '删除用户', group: '危险操作' },
@@ -29,6 +30,7 @@ export const HQ_PERMISSION_CATALOG = [
   { key: 'system_settings_sms', label: '短信', group: '系统设置' },
   { key: 'system_settings_wechat', label: '微信', group: '系统设置' },
   { key: 'system_settings_wechat_mini', label: '微信小程序', group: '系统设置' },
+  { key: 'system_settings_wechat_mini_share', label: '小程序分享配置', group: '系统设置' },
   { key: 'system_settings_oss', label: '对象存储 OSS', group: '系统设置' },
   { key: 'system_settings_app', label: '应用链接', group: '系统设置' },
   { key: 'system_settings_deploy', label: '发布部署', group: '系统设置' },
@@ -59,6 +61,7 @@ export const SYSTEM_CONFIG_GROUP_PERMISSION: Record<string, HqPermissionKey> = {
   sms: 'system_settings_sms',
   wechat: 'system_settings_wechat',
   wechat_mini: 'system_settings_wechat_mini',
+  wechat_mini_share: 'system_settings_wechat_mini_share',
   oss: 'system_settings_oss',
   app: 'system_settings_app',
   deploy: 'system_settings_deploy',
@@ -116,9 +119,11 @@ export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
     'llm_configs',
     'knowledge_bases',
     'dev_plan',
+    'test_whitelist',
     'resources',
     'logs',
     'system_settings_wechat_mini',
+    'system_settings_wechat_mini_share',
   ],
   FINANCE: [
     'dashboard',

packages/shared-types/src/store-package.ts

@@ -5,7 +5,10 @@ export interface StorePackageItemDto {
   dishes: string;
   usableTime?: string | null;
   otherNotes?: string | null;
+  /** 首图（兼容旧字段；多图时等于 imageUrls[0]） */
   imageUrl?: string | null;
+  /** 套餐图片列表，最多 STORE_PACKAGE_IMAGE_MAX_COUNT 张 */
+  imageUrls?: string[] | null;
   sortOrder: number;
 }
 
@@ -25,6 +28,49 @@ export const STORE_PACKAGE_CHANGE_STATUS_LABELS: Record<StorePackageChangeStatus
 
 export const STORE_PACKAGE_MAX_COUNT = 10;
 
+/** 单条套餐最多上传图片数 */
+export const STORE_PACKAGE_IMAGE_MAX_COUNT = 20;
+
+/** 门店环境照最多张数（总部/合伙人上传） */
+export const STORE_ENV_PHOTO_MAX_COUNT = 20;
+
+/** 归一化套餐图片：兼容 imageUrl / imageUrls（含 JSON 字符串），去重后截断上限 */
+export function normalizeStorePackageImageUrls(input: {
+  imageUrl?: string | null;
+  imageUrls?: unknown;
+}): string[] {
+  const seen = new Set<string>();
+  const out: string[] = [];
+  const push = (raw: unknown) => {
+    const url = String(raw ?? '').trim();
+    if (!url || seen.has(url)) return;
+    seen.add(url);
+    out.push(url);
+  };
+
+  let list: unknown = input.imageUrls;
+  if (typeof list === 'string') {
+    const trimmed = list.trim();
+    if (trimmed.startsWith('[')) {
+      try {
+        list = JSON.parse(trimmed);
+      } catch {
+        list = trimmed ? [trimmed] : [];
+      }
+    } else if (trimmed) {
+      list = [trimmed];
+    } else {
+      list = [];
+    }
+  }
+
+  if (Array.isArray(list)) {
+    for (const item of list) push(item);
+  }
+  if (out.length === 0) push(input.imageUrl);
+  return out.slice(0, STORE_PACKAGE_IMAGE_MAX_COUNT);
+}
+
 export interface StorePackagesResponse {
   live: StorePackageViewDto[];
   pendingRequest?: {
@@ -59,6 +105,10 @@ export interface StorePackageAuditAction {
   rejectReason?: string;
 }
 
+export interface StorePackageAuditSummaryDto {
+  pendingCount: number;
+}
+
 export interface CreatePackageDisputeRequest {
   storeId: string;
   remark?: string;

packages/shared-types/src/wechat.ts

@@ -64,6 +64,10 @@ export type ClientRuntimeConfig = {
   qualificationDisclosureUrl?: string;
   /** 总部客服电话 */
   customerServicePhone?: string;
+  /** 合伙人入驻：企微客服二维码图片 URL */
+  partnerOnboardCsQrUrl?: string | null;
+  /** 合伙人入驻：企微客服提示文案 */
+  partnerOnboardCsHint?: string | null;
   /** 小程序各场景分享文案/图 */
   share?: MiniShareRuntime;
 };

packages/weixin-sdk/GOTCHAS.md

@@ -0,0 +1,34 @@
+# @dukang/weixin-sdk · 踩坑
+
+## iOS 微信 H5：JSSDK 入场 URL（扫码 / 定位 / 选图）
+
+### 症状
+
+- 登录或 OAuth 后立刻调 `scanQRCode` / `getLocation` / `chooseImage` 失败
+- 错误类似：`permission value is offline verifying`、`invalid signature`
+- 业务文案常被写成「权限校验尚未完成，请等 1～2 秒」——**多数情况下等无效**
+- 关掉 webview 再进（整页重载）立即恢复
+
+### 原因
+
+iOS 微信对 JS-SDK 验签使用的是**本次 document 加载时的 URL**（去掉 `#` 后的完整 URL，**含 query**）。  
+`history.pushState` / `replaceState`（含 React Router）**不会**更新微信内部用于验签的 URL。
+
+典型错误链路：
+
+1. OAuth 回跳：`/login?code=xxx&state=yyy`（入场 URL）
+2. SPA：`navigate('/')`
+3. 用当前页 `/` 或「去掉 code 后的 `/login`」去签名 → 与微信内部 URL 不一致 → 失败
+
+### 正确做法
+
+1. **业务跳转（登录成功 / 选店进首页）**：iOS 微信内用 `hardNavigateInWechat(path)` / `location.replace`，让目标页成为新的入场 URL。
+2. **签名 URL**：`getJssdkSignUrl()` 在 iOS 上返回入场 URL；OAuth 的 `code/state` **必须保留**参与签名；后端 `jssdk-config` 只去 `#`，不要删 query。
+3. **先 `captureIosJssdkEntryUrl()`，再 `stripOAuthParamsFromLocation()`**。
+4. 失败恢复：引导用户刷新页面或重新走 OAuth，而不是无限「再点一次」。
+
+### 相关 API
+
+- `captureIosJssdkEntryUrl` / `getJssdkSignUrl`
+- `shouldHardNavigateForJssdk` / `hardNavigateInWechat`
+- `stripOAuthParamsFromLocation`

packages/weixin-sdk/src/index.ts

@@ -5,10 +5,13 @@ export {
   ensureJssdkReady,
   isJssdkReady,
   normalizeJssdkPageUrl,
+  jssdkUrlWithoutHash,
   getJssdkSignUrl,
   captureIosJssdkEntryUrl,
   resetJssdkConfig,
   stripOAuthParamsFromLocation,
+  hardNavigateInWechat,
+  shouldHardNavigateForJssdk,
 } from './jssdk';
 export { formatScanFailMessage, isScanPermissionWarmupError } from './scan';
 export {

packages/weixin-sdk/src/jssdk.ts

@@ -1,31 +1,53 @@
 import type { WechatJssdkConfig } from '@dukang/shared-types';
-import { isWechatBrowser, isWechatDevTools } from './env';
+import { isIosDevice, isWechatBrowser, isWechatDevTools } from './env';
 import { DEFAULT_JS_API_LIST } from './types';
 
 const JSSDK_URL = 'https://res.wx.qq.com/open/js/jweixin-1.6.0.js';
-const SIGN_URL_CACHE_KEY = 'dukang_wx_sign_url_v2';
+/** 旧版错误地把 SPA 当前 URL 写入 session；清理以免干扰排查 */
+const LEGACY_SIGN_URL_CACHE_KEY = 'dukang_wx_sign_url_v2';
 
 let scriptPromise: Promise<void> | null = null;
 let configured = false;
 let configuredUrl: string | null = null;
 
+/**
+ * iOS 微信 WebView：JSSDK 签名校验用的是「本次 document 加载」的入场 URL（含 query），
+ * SPA pushState/replaceState 后 location.href 会变，但微信仍按入场 URL 验签。
+ * OAuth 回跳带 code/state 时也必须按入场完整 query 签名，不可剔除。
+ * 模块级变量：整页刷新（含 OAuth / location.replace）会重置；同页 SPA 保持不变。
+ */
+let iosEntryUrl: string | null = null;
+
 /** 清除 JSSDK 配置缓存（路由切换后须重新 wx.config） */
 export function resetJssdkConfig(): void {
   configured = false;
   configuredUrl = null;
 }
 
-/** 参与 JSSDK 签名的页面 URL：与微信文档一致，取 location.href 去掉 # 后的部分；剔除 OAuth 回调参数 */
-export function normalizeJssdkPageUrl(rawUrl: string): string {
+/** 仅去 hash，保留全部 query（含 OAuth code/state）— iOS 入场签名必须如此 */
+export function jssdkUrlWithoutHash(rawUrl: string): string {
+  return rawUrl.split('#')[0];
+}
+
+/**
+ * 规范化签名 URL。
+ * - 默认：去 hash；可保留 code/state（由 keepOAuthQuery 控制）
+ * - Android / 当前页签名：通常已 stripOAuth 后再签，keepOAuthQuery=false
+ */
+export function normalizeJssdkPageUrl(rawUrl: string, opts?: { keepOAuthQuery?: boolean }): string {
+  const keepOAuth = !!opts?.keepOAuthQuery;
   try {
     const url = new URL(rawUrl);
     url.hash = '';
-    url.searchParams.delete('code');
-    url.searchParams.delete('state');
+    if (!keepOAuth) {
+      url.searchParams.delete('code');
+      url.searchParams.delete('state');
+    }
     const query = url.searchParams.toString();
     return `${url.origin}${url.pathname}${query ? `?${query}` : ''}`;
   } catch {
-    const noHash = rawUrl.split('#')[0];
+    const noHash = jssdkUrlWithoutHash(rawUrl);
+    if (keepOAuth) return noHash;
     try {
       const url = new URL(noHash, typeof window !== 'undefined' ? window.location.origin : 'https://localhost');
       url.searchParams.delete('code');
@@ -42,25 +64,48 @@ function signUrlChanged(prev: string | null, current: string): boolean {
   return prev !== current;
 }
 
-/** 记录最近一次签名 URL；SPA 路由或 ?step= 变化时须重新 wx.config */
-export function captureIosJssdkEntryUrl(): void {
-  if (typeof window === 'undefined') return;
-  if (!isWechatBrowser() || isWechatDevTools()) return;
-  const current = normalizeJssdkPageUrl(window.location.href);
-  const existing = sessionStorage.getItem(SIGN_URL_CACHE_KEY);
-  if (!existing) {
-    sessionStorage.setItem(SIGN_URL_CACHE_KEY, current);
-    return;
-  }
-  if (signUrlChanged(existing, current)) {
-    sessionStorage.setItem(SIGN_URL_CACHE_KEY, current);
-    resetJssdkConfig();
+function clearLegacySignUrlCache(): void {
+  try {
+    sessionStorage.removeItem(LEGACY_SIGN_URL_CACHE_KEY);
+  } catch {
+    /* ignore */
   }
 }
 
-/** 获取参与 JSSDK 签名的 URL（始终为当前页完整 URL，含 query） */
+/**
+ * 捕获 iOS 微信入场 URL（每个 document 生命周期只记一次；保留 code/state）。
+ * Android / 非微信环境为 no-op。
+ */
+export function captureIosJssdkEntryUrl(): void {
+  if (typeof window === 'undefined') return;
+  if (!isIosDevice() || !isWechatBrowser() || isWechatDevTools()) return;
+  clearLegacySignUrlCache();
+  if (iosEntryUrl) return;
+  iosEntryUrl = normalizeJssdkPageUrl(window.location.href, { keepOAuthQuery: true });
+}
+
+/** 获取参与 JSSDK 签名的 URL；iOS 微信内固定为本次入场 URL（含 OAuth query） */
 export function getJssdkSignUrl(rawUrl?: string): string {
-  return normalizeJssdkPageUrl(rawUrl ?? (typeof window !== 'undefined' ? window.location.href : ''));
+  if (typeof window !== 'undefined' && isIosDevice() && isWechatBrowser() && !isWechatDevTools()) {
+    captureIosJssdkEntryUrl();
+    if (iosEntryUrl) return iosEntryUrl;
+  }
+  return normalizeJssdkPageUrl(rawUrl ?? (typeof window !== 'undefined' ? window.location.href : ''), {
+    keepOAuthQuery: false,
+  });
+}
+
+/**
+ * iOS 微信内业务跳转须用整页导航，使下一页成为新的 JSSDK 入场 URL。
+ * SPA navigate 会导致扫码/定位等 JSAPI 验签失败。
+ */
+export function hardNavigateInWechat(path: string): void {
+  if (typeof window === 'undefined') return;
+  window.location.replace(path);
+}
+
+export function shouldHardNavigateForJssdk(): boolean {
+  return typeof window !== 'undefined' && isIosDevice() && isWechatBrowser() && !isWechatDevTools();
 }
 
 function isJssdkDebugEnabled(): boolean {
@@ -76,6 +121,8 @@ export function stripOAuthParamsFromLocation(): void {
   if (typeof window === 'undefined') return;
   const url = new URL(window.location.href);
   if (!url.searchParams.has('code') && !url.searchParams.has('state')) return;
+  // iOS：须先锁定入场 URL（含 code/state），再 replaceState
+  captureIosJssdkEntryUrl();
   url.searchParams.delete('code');
   url.searchParams.delete('state');
   const query = url.searchParams.toString();
@@ -126,7 +173,7 @@ export async function initWechatJssdk(options: {
 }): Promise<void> {
   captureIosJssdkEntryUrl();
   const { apiBase, clientApp, getAccessToken } = options;
-  const pageUrl = options.url ?? getJssdkSignUrl();
+  const pageUrl = getJssdkSignUrl(options.url);
   await loadScript();
   if (!window.wx) throw new Error('微信 JSSDK 不可用');
 
@@ -164,7 +211,7 @@ export async function ensureJssdkReady(options: {
   jsApiList?: string[];
 }): Promise<void> {
   captureIosJssdkEntryUrl();
-  const pageUrl = options.url ?? getJssdkSignUrl();
+  const pageUrl = getJssdkSignUrl(options.url);
   if (configuredUrl && signUrlChanged(configuredUrl, pageUrl)) {
     resetJssdkConfig();
   }

pnpm-lock.yaml

@@ -26,6 +26,9 @@ importers:
       '@ant-design/icons':
         specifier: ^5.5.1
         version: 5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@dukang/domain':
+        specifier: workspace:*
+        version: link:../../packages/domain
       '@dukang/shared-types':
         specifier: workspace:*
         version: link:../../packages/shared-types
@@ -78,6 +81,9 @@ importers:
       '@dukang/client-logging':
         specifier: workspace:*
         version: link:../../packages/client-logging
+      '@dukang/domain':
+        specifier: workspace:*
+        version: link:../../packages/domain
       '@dukang/shared-types':
         specifier: workspace:*
         version: link:../../packages/shared-types

server/dukang-api/.env.example

@@ -8,7 +8,7 @@ DATABASE_URL="mysql://root:root@localhost:6016/dukang_haoke"
 REDIS_URL="redis://localhost:6017"
 JWT_SECRET="dukang-prev1-dev-secret-change-in-prod"
 JWT_EXPIRES_IN="7d"
-PORT=3000
+PORT=3010
 MOCK_SMS=true
 # MOCK_SMS=false 时必填（可与 OSS 共用 RAM）
 ALIYUN_SMS_SIGN_NAME=

server/dukang-api/prisma/schema.prisma

@@ -812,6 +812,21 @@ model CommonProductVisibilityPhone {
   @@map("common_product_visibility_phone")
 }
 
+/// 全局测试白名单手机号（测试账号 + 限测商品/门店可见）
+model CommonTestWhitelistPhone {
+  id              BigInt   @id @default(autoincrement()) @db.UnsignedBigInt
+  phone           String   @unique @db.VarChar(20)
+  note            String?  @db.VarChar(256)
+  createdByHqId   BigInt?  @map("created_by_hq_id") @db.UnsignedBigInt
+  createdAt       DateTime @default(now()) @map("created_at") @db.DateTime(3)
+  updatedAt       DateTime @updatedAt @map("updated_at") @db.DateTime(3)
+
+  createdBy HqAccount? @relation("TestWhitelistCreatedBy", fields: [createdByHqId], references: [id], onDelete: SetNull)
+
+  @@index([createdAt])
+  @@map("common_test_whitelist_phone")
+}
+
 model CommonProductDetailTemplate {
   id                        BigInt               @id @default(autoincrement()) @db.UnsignedBigInt
   code                      String               @unique @db.VarChar(32)
@@ -1043,6 +1058,8 @@ model PartnerAccount {
   bankBranch           String?              @map("bank_branch") @db.VarChar(128)
   weeklyStoreTarget    Int?                 @default(20) @map("weekly_store_target")
   managedWarehouseId   BigInt?              @unique @map("managed_warehouse_id") @db.UnsignedBigInt
+  /// 测试合伙人账号
+  isTest               Boolean              @default(false) @map("is_test")
   createdAt            DateTime             @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt            DateTime             @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1059,6 +1076,7 @@ model PartnerAccount {
   @@index([parentAccountId])
   @@index([wxOpenId])
   @@index([contactPhone])
+  @@index([isTest])
   @@map("partner_account")
 }
 
@@ -1102,6 +1120,7 @@ model HqAccount {
   updatedAt   DateTime      @updatedAt @map("updated_at") @db.DateTime(3)
 
   permissions HqAccountPermission[]
+  testWhitelistPhones CommonTestWhitelistPhone[] @relation("TestWhitelistCreatedBy")
 
   @@map("hq_account")
 }
@@ -1140,6 +1159,8 @@ model User {
   nickname         String?        @db.VarChar(64)
   avatarResourceId BigInt?        @map("avatar_resource_id") @db.UnsignedBigInt
   status           Int            @default(1) @db.TinyInt
+  /// 测试账号：命中全局测试白名单手机号
+  isTest           Boolean        @default(false) @map("is_test")
   sourceType       UserSourceType @default(ORGANIC) @map("source_type")
   sourceRefId      BigInt?        @map("source_ref_id") @db.UnsignedBigInt
   sourceLabel      String?        @map("source_label") @db.VarChar(128)
@@ -1166,6 +1187,7 @@ model User {
   @@index([referrerUserId])
   @@index([mergedIntoUserId])
   @@index([wxOpenId])
+  @@index([isTest])
   @@map("user_user")
 }
 
@@ -1226,7 +1248,10 @@ model Store {
   partnerAccountId BigInt     @map("partner_account_id") @db.UnsignedBigInt
   categoryId      BigInt?     @map("category_id") @db.UnsignedBigInt
   name            String      @db.VarChar(128)
+  /// 门店主账号登录手机号（老板）；与 StoreAccount.phone 对齐
   phone           String      @db.VarChar(20)
+  /// 对外联系电话（店长等）；C 端拨号展示用；空则回退 phone
+  contactPhone    String?     @map("contact_phone") @db.VarChar(20)
   province        String      @db.VarChar(32)
   cityName        String      @map("city_name") @db.VarChar(32)
   district        String      @db.VarChar(32)
@@ -1253,6 +1278,10 @@ model Store {
   visibilityWhitelistEnabled Boolean @default(false) @map("visibility_whitelist_enabled")
   /// FIN-001：允许未出账手动提现的白名单门店
   withdrawWhitelistEnabled Boolean @default(false) @map("withdraw_whitelist_enabled")
+  /// 测试门店：不计结算 / HQ 可手动标记
+  isTest          Boolean     @default(false) @map("is_test")
+  /// C 端 / 列表排序：数值越小越靠前
+  sortOrder       Int         @default(0) @map("sort_order")
   createdAt       DateTime    @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt       DateTime    @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1274,6 +1303,8 @@ model Store {
   @@index([cityId, status])
   @@index([partnerAccountId])
   @@index([auditStatus, createdAt])
+  @@index([isTest])
+  @@index([sortOrder])
   @@map("store_store")
 }
 
@@ -1300,6 +1331,8 @@ model StorePackage {
   usableTime String?  @map("usable_time") @db.VarChar(256)
   otherNotes String?  @map("other_notes") @db.VarChar(512)
   imageUrl   String?  @map("image_url") @db.VarChar(512)
+  /// 套餐多图 URL 列表（JSON string[]），最多 20 张；imageUrl 同步为首图
+  imageUrls  Json?    @map("image_urls")
   sortOrder  Int      @default(0) @map("sort_order")
   createdAt  DateTime @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt  DateTime @updatedAt @map("updated_at") @db.DateTime(3)
@@ -1344,6 +1377,8 @@ model StoreAccount {
   bankBranch      String?         @map("bank_branch") @db.VarChar(128)
   status          AccountStatus   @default(ACTIVE)
   lastLoginAt     DateTime?       @map("last_login_at") @db.DateTime(3)
+  /// 测试门店账号（商户）
+  isTest          Boolean         @default(false) @map("is_test")
   createdAt       DateTime        @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt       DateTime        @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1354,6 +1389,7 @@ model StoreAccount {
   withdrawRequests     StoreWithdrawRequest[]
 
   @@index([parentAccountId])
+  @@index([isTest])
   @@map("store_account")
 }
 
@@ -1432,6 +1468,8 @@ model Order {
   fulfillmentHold          Boolean   @default(false) @map("fulfillment_hold")
   fulfillmentHoldReason    String?   @map("fulfillment_hold_reason") @db.VarChar(64)
   remark                   String?   @db.VarChar(512)
+  /// 测试订单快照（下单时取自 User.isTest）
+  isTest                   Boolean   @default(false) @map("is_test")
   createdAt                DateTime  @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt                DateTime  @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1456,6 +1494,7 @@ model Order {
   @@index([gpsCity])
   @@index([fulfillmentWarehouseId])
   @@index([proxyPartnerAccountId])
+  @@index([isTest])
   @@map("user_order")
 }
 
@@ -1548,6 +1587,8 @@ model RedeemRecord {
   settleAmount Decimal       @map("settle_amount") @db.Decimal(10, 2)
   /// SCAN=qrcode, PHONE=phone
   channel      RedeemChannel @default(SCAN)
+  /// 测试核销快照（User.isTest || Store.isTest）
+  isTest       Boolean       @default(false) @map("is_test")
   createdAt    DateTime      @default(now()) @map("created_at") @db.DateTime(3)
 
   user         User                     @relation(fields: [userId], references: [id], onDelete: Restrict)
@@ -1560,6 +1601,7 @@ model RedeemRecord {
 
   @@index([storeId, createdAt])
   @@index([storeId, channel, createdAt])
+  @@index([isTest])
   @@map("user_redeem_record")
 }
 

server/dukang-api/prisma/seed-v31.ts

@@ -61,6 +61,16 @@ async function main() {
 
   await prisma.storePayout.deleteMany();
 
+  await prisma.storeWithdrawPayoutItem.deleteMany();
+
+  await prisma.storeWithdrawRequest.deleteMany();
+
+  await prisma.storeBill.deleteMany();
+
+  await prisma.redeemPendingRecord.deleteMany();
+
+  await prisma.logStoreAnalytics.deleteMany();
+
   await prisma.storeRating.deleteMany();
 
   await prisma.redeemRecord.deleteMany();
@@ -83,16 +93,28 @@ async function main() {
 
   await prisma.user.deleteMany();
 
+  await prisma.storeAccount.updateMany({ data: { parentAccountId: null } });
   await prisma.storeAccount.deleteMany();
 
   await prisma.store.deleteMany();
 
   await prisma.partnerBill.deleteMany();
 
+  await prisma.logisticsBillItem.deleteMany();
+
+  await prisma.logisticsPrepaidLedger.deleteMany();
+
+  await prisma.logisticsBill.deleteMany();
+
+  await prisma.wineryBillItem.deleteMany();
+
+  await prisma.wineryBill.deleteMany();
+
   await prisma.cityWarehouse.deleteMany();
 
   await prisma.fulfillmentProvider.deleteMany();
 
+  await prisma.partnerAccount.updateMany({ data: { parentAccountId: null } });
   await prisma.partnerAccount.deleteMany();
 
   await prisma.commonCity.deleteMany();
@@ -101,6 +123,7 @@ async function main() {
 
   await prisma.commonProductDetailTemplate.deleteMany();
 
+  await prisma.commonStoreCategory.updateMany({ data: { parentId: null } });
   await prisma.commonStoreCategory.deleteMany();
 
   await prisma.commonPromoCode.deleteMany();
@@ -914,6 +937,25 @@ async function main() {
 
 
 
+  const testWhitelistPhones = [
+    '13800000001',
+    '13700000001',
+    '13700000002',
+    '13910000001',
+    '13910000002',
+  ];
+  for (const phone of testWhitelistPhones) {
+    await prisma.commonTestWhitelistPhone.upsert({
+      where: { phone },
+      create: { phone, note: 'seed 测试账号' },
+      update: {},
+    });
+    await prisma.user.updateMany({ where: { phone }, data: { isTest: true } });
+    await prisma.storeAccount.updateMany({ where: { phone }, data: { isTest: true } });
+    await prisma.partnerAccount.updateMany({ where: { phone }, data: { isTest: true } });
+    await prisma.store.updateMany({ where: { phone }, data: { isTest: true } });
+  }
+
   console.log('Seed complete:', {
 
     city: city.name,
@@ -928,6 +970,8 @@ async function main() {
 
     stores: createdStores.length,
 
+    testWhitelistPhones,
+
     testPhones: {
 
       user: '13800000001',