merge(dev): v3.4.13 partner column, release cascade, client UX

- HQ stores: partner column uses companyName/name/phone via partnerOptionLabel

- Dev plan: version RELEASED auto-marks tasks RELEASED and tickets PUBLISHED with releasedVersionNo

- mini-user/h5-shop/h5-partner v3.4.13 UX fixes (store UI, iOS scan OAuth, partner login guard)

- Docs: v3.4.13 dev doc + status audit updates

Co-authored-by: Cursor <cursoragent@cursor.com>

.cursor/rules/git-conventions.mdc

@@ -29,4 +29,5 @@ chore(shared-types): add OrderStatus enum
 ## Agent 行为
 
 - **仅用户明确要求时** 才执行 git commit / push
-- 不 amend 已推送的 commit，不 force push main/master
+- 不 amend 已推送的 commit，不 force push main/master/dev
+- 发版：`dev`→测试(staging)，`main`→生产；用户只说「发布/发版」默认发**生产**（见 dukang-release skill）；明确说「发测试」才发 staging

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

@@ -1,89 +1,91 @@
 ---
 name: dukang-release
 description: >-
-  杜康好客生产发布流程：dev_jacy 提交合并到 dev，并用 deploy.sh 发版。
-  Use when the user says 发布、上传、deploy、上线、发版, or @杜康发布 / @dukang-release.
+  杜康好客发布流程：dev→测试(staging)，main→生产；同机双栈。
+  Use when the user says 发布、上传、deploy、上线、发版、发测试、发生产,
+  or @杜康发布 / @dukang-release.
 ---
 
 # 杜康发布
 
-将已完成改动发到生产（`aliyun-smarthr`）。**仅用户明确要求发布时执行。**
+同机双栈：`/opt/dukang-staging`（测试）与 `/opt/dukang`（生产）。**仅用户明确要求发布时执行。**
 
-## 分支约定
+## 分支与环境
 
-| 分支 | 用途 |
-|------|------|
-| `dev_jacy` | 日常开发 / 提交 |
-| `dev` | **发布分支**（服务器拉这个） |
+| 分支 | 环境 | 目录 | 端口 | 域名 |
+|------|------|------|------|------|
+| `dev_jacy` | 日常开发 | 本机 | — | — |
+| `dev` | **staging 测试** | `/opt/dukang-staging` | 8190–8194 | `*-test.dukanghaoke.com` |
+| `main` | **production 生产** | `/opt/dukang` | 8090–8094 | `*.dukanghaoke.com` |
 
-默认：`dev_jacy` → merge → `dev` → 部署。勿 force push `main`/`dev`。
+默认：`dev_jacy` → merge → `dev` → merge → `main` → **发生产**。勿 force push `main`/`dev`。
+
+> **团队约定（2026-08）**：用户说「发布 / 发版 / 直接发版」且**未特别强调**时 → **发生产（production）**。  
+> 仅当用户明确说「发测试 / staging / 测试环境」时 → 发 staging。
+
+用户说「发生产 / 上线生产 / 发版」→ 用 `deploy-prod.sh`。  
+用户说「发测试」→ 用 `deploy-staging.sh`。
 
 ## 标准流程（Windows）
 
-PowerShell 下 **分支名必须加引号**（否则 `checkout` 与 `dev` 会被粘成 `checkoutdev`）。
+PowerShell 下 **分支名必须加引号**。
 
-### 1. 提交（在 `dev_jacy`）
-
-```powershell
-git status -sb
-git add <files>
-git commit -m @"
-fix(scope): summary
-
-Optional body.
-"@
-```
-
-- Conventional Commits；不提交 `.env` / `dist` / `node_modules`
-- 用户未要求 commit 时不要擅自提交
-
-### 2. 推送并合并到 `dev`
+### A. 发测试（日常）
 
 ```powershell
+# 1. 在 dev_jacy 提交（用户要求时）
 git push -u origin HEAD
 git checkout "dev"
 git pull origin "dev"
 git merge "dev_jacy" -m "merge(dev_jacy): <简述>"
 git push origin "dev"
 git checkout "dev_jacy"
+
+# 2. 发 staging
+& "C:\Program Files\Git\bin\bash.exe" "<repo>/deploy/deploy-staging.sh" -- --skip-db
 ```
 
-### 3. 远程发版
-
-本机无 WSL bash 时用 **Git Bash**：
+### B. 发生产（验收后）
 
 ```powershell
-& "C:\Program Files\Git\bin\bash.exe" "<repo>/deploy/deploy.sh" --branch "dev" -- --skip-db
+git checkout "main"
+git pull origin "main"
+git merge "dev" -m "merge(dev): <简述>"
+git push origin "main"
+git checkout "dev_jacy"
+
+& "C:\Program Files\Git\bin\bash.exe" "<repo>/deploy/deploy-prod.sh" -- --skip-db
 ```
 
 - 默认加 `--skip-db`（无迁移时）
-- 有 Prisma 迁移时去掉 `--skip-db`，按用户确认是否 `--seed` / `--accept-data-loss`
-- `deploy/deploy.env` 提供 `DEPLOY_HOST` 等（勿提交密钥）
+- 有 Prisma 迁移：先在 **staging** 跑通（可 `--seed` / `--accept-data-loss`），再生产去掉 `--skip-db`
+- Staging 微信：正式号 + 全 Mock（`.env.staging`）
+- `deploy/deploy.env` 提供 `DEPLOY_HOST`、`STAGING_APP_ROOT`、`PROD_APP_ROOT`（勿提交密钥）
 
-### 4. 等待完成
+### 首次启用 Staging
 
-后台跑部署时轮询终端输出，成功标志：
+服务器一次性：`bash deploy/bootstrap-staging.sh`（见脚本说明）→ 配 `.env.staging` → DNS `*-test` → nginx → `deploy-staging.sh -- --seed`
+
+### 同步环境变量
+
+```powershell
+bash deploy/sync-api-env.sh staging
+bash deploy/sync-api-env.sh production
+```
+
+## 等待完成
 
 - 出现 `发版完成`
 - `exit_code: 0`
-- `mini-user(h5): 200`（或对应前端 200）
+- `mini-user(h5): 200` / `api: 200`
 
-说明：API 健康检查短暂 `FAIL`/`000` 多为重启中，以 `发版完成` + `exit_code: 0` 为准。
+## 回复用户
 
-### 5. 回复用户
-
-一句说明：已合并 commit、发版结果、建议微信强刷验证。
-
-## 常用变体
-
-| 场景 | 做法 |
-|------|------|
-| 仅部署已推送的 `dev` | 跳过 commit/merge，直接跑 `deploy.sh --branch "dev" -- --skip-db` |
-| 检查服务器 | `deploy.sh --branch "dev" --check` |
-| 含 DB | `deploy.sh --branch "dev" --`（无 skip-db）或按用户给 seed 参数 |
+说明：环境（测试/生产）、commit、建议硬刷验证。测试后台有橙色「测试环境」条。
 
 ## 禁止
 
-- 不 amend 已推送 commit；不 force push `main`/`master`/`dev`
-- 不把 `.env` / 私钥打进仓库
-- 用户只说「修好」未说发布时 → **只改代码，不发版**
+- 不 amend 已推送 commit；不 force push `main`/`dev`
+- 不把 `.env*` 私钥打进仓库
+- **禁止**再用 `dev` 直发生产
+- 用户只说「修好」未说发布 → 只改代码，不发版

.cursor/skills/dukang-v3/reference-req-index.md

@@ -32,6 +32,7 @@
 | REQ-U-024 | 推广码 | 扫码归因；现场提货有码归码 |
 | REQ-U-025 | 分享 | 微信商品分享+渠道参数 |
 | REQ-U-026 | 门店规则 | 附件一完整展示 |
+| REQ-U-027 | 门店套餐 **3.4.10** | 门店详情展示生效套餐；套餐异议申诉入口 |
 
 ## 门店端 REQ-S
 
@@ -58,6 +59,7 @@
 | REQ-S-018 | 权限 | §4.6 矩阵 |
 | REQ-S-019 | 多店选店 | 记住上次所选 |
 | REQ-S-020 | 待处理核销 | Wave 3 弱网单 |
+| REQ-S-021 | 门店套餐 **3.4.10** | 套餐列表/编辑/提审 |
 
 ## 合伙人端 REQ-P
 
@@ -89,6 +91,7 @@
 | REQ-P-024 | 负责人复核 | 待复核→待总部审 |
 | REQ-P-025 | 合同同日 | 同日提交校验 |
 | REQ-P-026 | 我的仓库 | Wave 3 管仓只读 |
+| REQ-P-027 | 门店套餐 **3.4.10** | 拓店套餐页；门店套餐列表/编辑/提审 |
 
 ## 总部端 REQ-H
 
@@ -122,3 +125,4 @@
 | REQ-H-022 | 签约主体 | 山西领势酒业 |
 | REQ-H-023 | 热力图 | 腾讯位置服务 |
 | REQ-H-024 | 结算异议 | 门店 3 日异议处理 |
+| REQ-H-025 | 门店套餐 **3.4.10** | 门店详情套餐 Tab 直存；套餐变更审核通过/驳回 |

.gitignore

@@ -8,7 +8,13 @@ server/dukang-api/.env
 server/dukang-api/.env.development
 server/dukang-api/.env.production
 server/dukang-api/.env.production.local
+server/dukang-api/.env.staging
+server/dukang-api/.env.staging.local
 deploy/deploy.env
+deploy/.staging-mysql.pass
+deploy/_ops-*.log
+deploy/_ops-*.sh
+
 .DS_Store
 coverage/
 *.tsbuildinfo

AGENTS.md

@@ -40,7 +40,7 @@ node scripts/smoke-prev1.mjs
 pnpm lint && pnpm test
 ```
 
-Mock 验证码：`123456`。测试账号见 [`README.md`](./README.md)。
+Mock 验证码：`999888`。测试账号见 [`README.md`](./README.md)。
 
 > **端口冲突**：`h5-partner` 与 `admin-web` 同为 5175，勿同时 `dev:partner` + `dev:admin`。
 
@@ -137,6 +137,19 @@ C 端门店仅 status=OPEN
 订单 Tab：待付款 | 已付款 | 已完成
 ```
 
+## 环境与发版
+
+| 环境 | 分支 | 目录 | 端口 | 域名 |
+|------|------|------|------|------|
+| local | `dev_jacy` | 本机 Docker 6016/6017 | API `:3000` | — |
+| **staging 测试** | `dev` | `/opt/dukang-staging` | 8190–8194 | `*-test.dukanghaoke.com` |
+| **production 生产** | `main` | `/opt/dukang` | 8090–8094 | `*.dukanghaoke.com` |
+
+- 日常发布 → `deploy/deploy-staging.sh`（`dev`）
+- 生产发布 → `deploy/deploy-prod.sh`（`main`，验收后）
+- Staging：正式微信 + 全 Mock；配置见 `.env.staging.example`
+- 详情：`@dukang-release` / `.cursor/skills/dukang-release/SKILL.md`
+
 ## 提交与 PR
 
 - Conventional Commits：`feat(trade):`、`fix(redeem):`；scope = 端或模块

MP_verify_ayPJ4CQqbUcec3jX.txt

@@ -0,0 +1 @@
+ayPJ4CQqbUcec3jX

apps/admin-web/package.json

@@ -11,8 +11,11 @@
   "dependencies": {
     "@ant-design/icons": "^5.5.1",
     "@dukang/shared-types": "workspace:*",
+    "@dukang/shared-ui": "workspace:*",
     "antd": "^5.22.0",
     "dayjs": "^1.11.13",
+    "echarts": "^6.1.0",
+    "echarts-for-react": "^3.0.6",
     "element-china-area-data": "^6.1.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

apps/admin-web/src/App.tsx

@@ -5,7 +5,9 @@ import LoginPage from './pages/LoginPage';
 import DashboardPage from './pages/DashboardPage';
 import UsersPage from './pages/UsersPage';
 import OrdersPage from './pages/OrdersPage';
+import StorePackageAuditsPage from './pages/StorePackageAuditsPage';
 import StoresPage from './pages/StoresPage';
+import StoreRatingsPage from './pages/StoreRatingsPage';
 import StoreAccountsPage from './pages/StoreAccountsPage';
 import BenefitCouponsPage from './pages/BenefitCouponsPage';
 import BenefitLedgersPage from './pages/BenefitLedgersPage';
@@ -36,6 +38,7 @@ import TicketsPage from './pages/TicketsPage';
 import SupportTicketsPage from './pages/SupportTicketsPage';
 import InvoicesPage from './pages/InvoicesPage';
 import UserLogsPage from './pages/UserLogsPage';
+import DomainEventsPage from './pages/DomainEventsPage';
 import HqLogsPage from './pages/HqLogsPage';
 import ThirdPartyLogsPage from './pages/ThirdPartyLogsPage';
 import StoreLogsPage from './pages/StoreLogsPage';
@@ -44,8 +47,13 @@ import WechatBindingsPage from './pages/WechatBindingsPage';
 import HqPermissionsPage from './pages/HqPermissionsPage';
 import SystemSettingsPage from './pages/SystemSettingsPage';
 import WecomBotsPage from './pages/WecomBotsPage';
+import WecomMessagePushesPage from './pages/WecomMessagePushesPage';
+import WecomBotLogsPage from './pages/WecomBotLogsPage';
 import LlmConfigsPage from './pages/LlmConfigsPage';
 import KnowledgeBasesPage from './pages/KnowledgeBasesPage';
+import DevPlanVersionsPage from './pages/DevPlanVersionsPage';
+import DevPlanTasksPage from './pages/DevPlanTasksPage';
+import DevPlanSettingsPage from './pages/DevPlanSettingsPage';
 
 function RequireAuth({ children }: { children: React.ReactNode }) {
   if (!getToken()) return <Navigate to="/login" replace />;
@@ -72,12 +80,20 @@ export default function App() {
           <Route index element={<PromoCodeDetailPage />} />
           <Route path="users" element={<PromoCodeUsersPage />} />
         </Route>
-        <Route path="/wecom-bots" element={<WecomBotsPage />} />
+        <Route path="/wecom-bots" element={<Navigate to="/wecom/bots" replace />} />
+        <Route path="/wecom/bots" element={<WecomBotsPage />} />
+        <Route path="/wecom/pushes" element={<WecomMessagePushesPage />} />
+        <Route path="/logs/wecom-bots" element={<WecomBotLogsPage />} />
         <Route path="/llm-configs" element={<LlmConfigsPage />} />
         <Route path="/knowledge-bases" element={<KnowledgeBasesPage />} />
+        <Route path="/dev-plan/versions" element={<DevPlanVersionsPage />} />
+        <Route path="/dev-plan/tasks" element={<DevPlanTasksPage />} />
+        <Route path="/dev-plan/settings" element={<DevPlanSettingsPage />} />
         <Route path="/products" element={<ProductsPage />} />
         <Route path="/product-detail-templates" element={<ProductDetailTemplatesPage />} />
         <Route path="/stores" element={<StoresPage />} />
+        <Route path="/store-package-audits" element={<StorePackageAuditsPage />} />
+        <Route path="/store-ratings" element={<StoreRatingsPage />} />
         <Route path="/store-categories" element={<StoreCategoriesPage />} />
         <Route path="/store-accounts" element={<StoreAccountsPage />} />
         <Route path="/store-media" element={<StoreMediaPage />} />
@@ -94,11 +110,19 @@ export default function App() {
         <Route path="/redeem-pending" element={<PendingRedeemPage />} />
         <Route path="/redeem/debug" element={<RedeemDebugPage />} />
         <Route path="/finance/store-bills" element={<StoreBillsPage />} />
+        <Route
+          path="/finance/store-withdrawals"
+          element={<Navigate to="/finance/store-bills?kind=WITHDRAW" replace />}
+        />
         <Route path="/finance/partner-bills" element={<PartnerBillsPage />} />
         <Route path="/finance/winery-bills" element={<WineryBillsPage />} />
         <Route path="/finance/logistics-bills" element={<LogisticsBillsPage />} />
         <Route path="/store-bills" element={<Navigate to="/finance/store-bills" replace />} />
         <Route path="/store-payouts" element={<Navigate to="/finance/store-bills" replace />} />
+        <Route
+          path="/store-withdrawals"
+          element={<Navigate to="/finance/store-bills?kind=WITHDRAW" replace />}
+        />
         <Route path="/partner-bills" element={<Navigate to="/finance/partner-bills" replace />} />
         <Route path="/tickets" element={<TicketsPage />} />
         <Route path="/tickets/support" element={<SupportTicketsPage />} />
@@ -108,6 +132,7 @@ export default function App() {
         <Route path="/logs/partners" element={<PartnerLogsPage />} />
         <Route path="/logs/hq" element={<HqLogsPage />} />
         <Route path="/logs/third-party" element={<ThirdPartyLogsPage />} />
+        <Route path="/logs/domain-events" element={<DomainEventsPage />} />
         <Route path="/deliveries" element={<DeliveriesPage />} />
         <Route path="/deliveries/xiaofeixia" element={<XiaofeixiaTestPage />} />
         <Route path="/hq-permissions" element={<HqPermissionsPage />} />

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

@@ -0,0 +1,253 @@
+import { useEffect, useState } from 'react';
+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 { request } from '../lib/api';
+import OssUpload from './OssUpload';
+type PackageRow = StorePackageItemDto;
+
+function emptyRow(index = 0): PackageRow {
+  return { name: '', price: '0', dishes: '', usableTime: '', otherNotes: '', imageUrl: '', 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);
+
+  useEffect(() => {
+    setLoading(true);
+    request<{ live: PackageRow[] }>(`/admin/stores/${storeId}/packages`)
+      .then((data) => {
+        setItems(
+          data.live?.length
+            ? data.live.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i }))
+            : [emptyRow()],
+        );
+      })
+      .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;
+      }
+    }
+
+    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);
+    }
+  }
+
+  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="该门店暂无套餐，可添加或保存为空。" />
+        <Button onClick={addRow} style={{ marginBottom: 16 }}>
+          添加套餐
+        </Button>
+        <Button type="primary" loading={saving} onClick={() => void save()}>
+          保存套餐
+        </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>
+  );
+}

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

@@ -15,8 +15,6 @@ type OssUploadProps = {
   placeholder?: string;
 };
 
-const DEFAULT_MAX_MB = 10;
-
 export default function OssUpload({
   value,
   onChange,
@@ -24,7 +22,6 @@ export default function OssUpload({
   bizType,
   mediaType = 'IMAGE',
   accept,
-  maxSizeMb = DEFAULT_MAX_MB,
   placeholder = '上传后自动填入，或手动粘贴 URL',
 }: OssUploadProps) {
   const [uploading, setUploading] = useState(false);
@@ -34,12 +31,6 @@ export default function OssUpload({
 
   const customRequest: UploadProps['customRequest'] = async ({ file, onSuccess, onError }) => {
     const raw = file as File;
-    if (raw.size > maxSizeMb * 1024 * 1024) {
-      const err = new Error(`文件不能超过 ${maxSizeMb}MB`);
-      message.error(err.message);
-      onError?.(err);
-      return;
-    }
     setUploading(true);
     try {
       const result = await uploadFileToOss(raw, { bizType, mediaType });

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

@@ -0,0 +1,424 @@
+import { useEffect, useMemo, useRef, useState } from 'react';
+import {
+  Alert,
+  Button,
+  Checkbox,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  QRCode,
+  Radio,
+  Select,
+  Space,
+  Typography,
+  message,
+} from 'antd';
+import type {
+  HqProxyOrderCreateRequest,
+  PartnerProxyDeliveryMode,
+  PartnerProxyOrderOptions,
+  PartnerProxyOrderPreviewResult,
+  ProxyOrderCreateResponse,
+  ProxyOrderPayResponse,
+} from '@dukang/shared-types';
+import ChinaRegionCascader from './ChinaRegionCascader';
+import { parseRegionCodes } from '../lib/china-region';
+import { request } from '../lib/api';
+
+type ProxyOrderModalProps = {
+  open: boolean;
+  onClose: () => void;
+  onSuccess: (order: { id: string; orderNo: string }) => void;
+};
+
+type PayStatus = {
+  id: string;
+  orderNo: string;
+  status: string;
+  payStatus: string;
+};
+
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
+export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrderModalProps) {
+  const [options, setOptions] = useState<PartnerProxyOrderOptions | null>(null);
+  const [loadingOptions, setLoadingOptions] = useState(false);
+  const [phone, setPhone] = useState('');
+  const [receiverName, setReceiverName] = useState('');
+  const [regionCodes, setRegionCodes] = useState<string[]>([]);
+  const [addressDetail, setAddressDetail] = useState('');
+  const [productId, setProductId] = useState<string>();
+  const [quantity, setQuantity] = useState(2);
+  const [promoCodeId, setPromoCodeId] = useState<string>();
+  const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>('ADDRESS');
+  const [autoReceive, setAutoReceive] = useState(false);
+  const [preview, setPreview] = useState<PartnerProxyOrderPreviewResult | null>(null);
+  const [previewLoading, setPreviewLoading] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
+
+  const [step, setStep] = useState<'form' | 'pay'>('form');
+  const [created, setCreated] = useState<ProxyOrderCreateResponse | null>(null);
+  const [codeUrl, setCodeUrl] = useState<string | null>(null);
+  const [payLoading, setPayLoading] = useState(false);
+  const pollRef = useRef<number | null>(null);
+
+  const region = useMemo(() => parseRegionCodes(regionCodes), [regionCodes]);
+
+  function stopPoll() {
+    if (pollRef.current != null) {
+      window.clearInterval(pollRef.current);
+      pollRef.current = null;
+    }
+  }
+
+  useEffect(() => {
+    if (!open) return;
+    setLoadingOptions(true);
+    request<PartnerProxyOrderOptions>('/admin/proxy-orders/options')
+      .then((data) => {
+        setOptions(data);
+        if (data.products[0]) setProductId(data.products[0].id);
+      })
+      .catch((e) => message.error(e instanceof Error ? e.message : '加载失败'))
+      .finally(() => setLoadingOptions(false));
+  }, [open]);
+
+  const selectedProduct = options?.products.find((p) => p.id === productId);
+  const allowOnline = selectedProduct ? selectedProduct.allowOnlinePurchase !== false : true;
+  const allowOnSite = !!selectedProduct?.allowOnSitePickup;
+  const allowCrossCity = selectedProduct ? selectedProduct.allowCrossCityDelivery !== false : true;
+
+  useEffect(() => {
+    if (!open || !selectedProduct) return;
+    if (!allowOnline && allowOnSite && deliveryMode !== 'ON_SITE_PICKUP') {
+      setDeliveryMode('ON_SITE_PICKUP');
+      return;
+    }
+    if (allowOnline && !allowOnSite && deliveryMode !== 'ADDRESS') {
+      setDeliveryMode('ADDRESS');
+    }
+  }, [open, selectedProduct, allowOnline, allowOnSite, deliveryMode]);
+
+  useEffect(() => {
+    if (!open || !productId || quantity < 1 || step !== 'form') {
+      if (step === 'form') setPreview(null);
+      return;
+    }
+    const timer = window.setTimeout(() => {
+      setPreviewLoading(true);
+      request<PartnerProxyOrderPreviewResult>('/admin/proxy-orders/preview', {
+        method: 'POST',
+        body: JSON.stringify({
+          productId,
+          quantity,
+          deliveryMode,
+          receiverCity: deliveryMode === 'ADDRESS' ? region?.city || undefined : undefined,
+          receiverDistrict: deliveryMode === 'ADDRESS' ? region?.district || undefined : undefined,
+        }),
+      })
+        .then(setPreview)
+        .catch(() => setPreview(null))
+        .finally(() => setPreviewLoading(false));
+    }, 300);
+    return () => window.clearTimeout(timer);
+  }, [open, productId, quantity, deliveryMode, region?.city, region?.district, step]);
+
+  useEffect(() => () => stopPoll(), []);
+
+  function resetForm() {
+    stopPoll();
+    setPhone('');
+    setReceiverName('');
+    setRegionCodes([]);
+    setAddressDetail('');
+    setQuantity(2);
+    setPromoCodeId(undefined);
+    setDeliveryMode('ADDRESS');
+    setAutoReceive(false);
+    setPreview(null);
+    setProductId(options?.products[0]?.id);
+    setStep('form');
+    setCreated(null);
+    setCodeUrl(null);
+    setPayLoading(false);
+  }
+
+  function handleClose() {
+    resetForm();
+    onClose();
+  }
+
+  function validateForm(): string | null {
+    if (!/^1\d{10}$/.test(phone.trim())) return '请输入有效手机号';
+    if (!productId) return '请选择商品';
+    if (deliveryMode === 'ADDRESS') {
+      if (!allowOnline) return '该商品不支持线上购买';
+      if (!region?.province || !region?.city || !region?.district) return '请选择省市区';
+      if (!addressDetail.trim()) return '请填写详细地址';
+      if (!autoReceive) return '配送到址须勾选同意自动收货';
+    } else if (!allowOnSite) {
+      return '该商品不支持现场提货';
+    }
+    if (!preview) return '请等待费用计算完成';
+    return null;
+  }
+
+  function startPoll(orderId: string) {
+    stopPoll();
+    pollRef.current = window.setInterval(() => {
+      void request<PayStatus>(`/admin/proxy-orders/${orderId}/pay-status`)
+        .then((st) => {
+          if (st.payStatus === 'PAID') {
+            stopPoll();
+            message.success(`支付成功：${st.orderNo}`);
+            const payload = { id: st.id, orderNo: st.orderNo };
+            resetForm();
+            onSuccess(payload);
+          }
+        })
+        .catch(() => undefined);
+    }, 2000);
+  }
+
+  async function submit() {
+    const err = validateForm();
+    if (err) {
+      message.warning(err);
+      return;
+    }
+
+    const payload: HqProxyOrderCreateRequest = {
+      phone: phone.trim(),
+      deliveryMode,
+      autoReceive: deliveryMode === 'ADDRESS' ? true : undefined,
+      receiverName: receiverName.trim() || undefined,
+      province: deliveryMode === 'ADDRESS' ? region?.province : undefined,
+      city: deliveryMode === 'ADDRESS' ? region?.city : undefined,
+      district: deliveryMode === 'ADDRESS' ? region?.district : undefined,
+      addressDetail: deliveryMode === 'ADDRESS' ? addressDetail.trim() : undefined,
+      productId: productId!,
+      quantity,
+      promoCodeId: promoCodeId || undefined,
+    };
+
+    setSubmitting(true);
+    try {
+      const order = await request<ProxyOrderCreateResponse>('/admin/proxy-orders', {
+        method: 'POST',
+        body: JSON.stringify(payload),
+      });
+      setCreated(order);
+      setStep('pay');
+      setPayLoading(true);
+      const pay = await request<ProxyOrderPayResponse>(`/admin/proxy-orders/${order.id}/pay`, {
+        method: 'POST',
+        body: JSON.stringify({ payMethod: 'NATIVE' }),
+      });
+      setCodeUrl(pay.codeUrl ?? null);
+      startPoll(order.id);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '下单失败');
+      setStep('form');
+      setCreated(null);
+    } finally {
+      setSubmitting(false);
+      setPayLoading(false);
+    }
+  }
+
+  const deliveryLabel =
+    preview?.deliveryType === 'ON_SITE_PICKUP'
+      ? '现场提货'
+      : preview?.deliveryType === 'CROSS_CITY'
+        ? '跨城配送'
+        : '同城配送';
+
+  return (
+    <Modal
+      title={step === 'pay' ? '代下单 · 待支付' : '代下单'}
+      open={open}
+      onCancel={handleClose}
+      width={640}
+      destroyOnClose
+      footer={
+        step === 'pay' ? (
+          <Space>
+            <Button onClick={handleClose}>关闭</Button>
+          </Space>
+        ) : (
+          <Space>
+            <Button onClick={handleClose}>取消</Button>
+            <Button type="primary" loading={submitting || loadingOptions} onClick={() => void submit()}>
+              提交并收款
+            </Button>
+          </Space>
+        )
+      }
+    >
+      {step === 'pay' && created ? (
+        <div style={{ textAlign: 'center' }}>
+          <Alert
+            type="info"
+            showIcon
+            style={{ marginBottom: 16, textAlign: 'left' }}
+            message={`订单 ${created.orderNo} 待支付 ¥${fmtMoney(created.payAmount)}，请扫码支付`}
+            description={
+              created.deliveryType === 'ON_SITE_PICKUP'
+                ? '支付完成后订单即为已完成，并发放好客权益'
+                : '支付完成后将进入待发货，由总部履约发货'
+            }
+          />
+          {payLoading && !codeUrl ? (
+            <Typography.Text type="secondary">正在生成收款码…</Typography.Text>
+          ) : codeUrl ? (
+            <Space direction="vertical" size={12} align="center">
+              <QRCode value={codeUrl} size={200} />
+              <Typography.Text type="secondary">请使用微信扫一扫完成支付，成功后自动关闭</Typography.Text>
+              <Typography.Text type="secondary" style={{ fontSize: 12, wordBreak: 'break-all' }}>
+                {codeUrl}
+              </Typography.Text>
+            </Space>
+          ) : (
+            <Typography.Text type="danger">收款码生成失败，请关闭后重试</Typography.Text>
+          )}
+        </div>
+      ) : (
+        <>
+          <Alert
+            type="info"
+            showIcon
+            style={{ marginBottom: 16 }}
+            message="提交后生成微信收款码，支付成功后发放好客权益；配送单进入待发货"
+          />
+
+          <Form layout="vertical">
+            <Form.Item label="用户手机号" required>
+              <Input
+                placeholder="11 位手机号"
+                value={phone}
+                maxLength={11}
+                onChange={(e) => setPhone(e.target.value.replace(/\D/g, '').slice(0, 11))}
+              />
+            </Form.Item>
+
+            <Form.Item label="酒品" required>
+              <Select
+                showSearch
+                optionFilterProp="label"
+                loading={loadingOptions}
+                placeholder="选择商品"
+                value={productId}
+                onChange={setProductId}
+                options={(options?.products ?? []).map((p) => ({
+                  value: p.id,
+                  label: `${p.name} · ${p.spec} · ¥${fmtMoney(p.price)}`,
+                }))}
+              />
+            </Form.Item>
+
+            <Form.Item label="数量" required>
+              <InputNumber
+                min={1}
+                value={quantity}
+                onChange={(v) => setQuantity(Math.max(1, Number(v) || 1))}
+                style={{ width: '100%' }}
+              />
+            </Form.Item>
+
+            {(options?.promoCodes.length ?? 0) > 0 ? (
+              <Form.Item label="绑定推广码（选填）">
+                <Select
+                  allowClear
+                  placeholder="不绑定"
+                  value={promoCodeId}
+                  onChange={setPromoCodeId}
+                  options={(options?.promoCodes ?? []).map((p) => ({
+                    value: p.id,
+                    label: `${p.code} · ${p.name}`,
+                  }))}
+                />
+              </Form.Item>
+            ) : null}
+
+            <Form.Item label="履约方式" required>
+              {allowOnline && allowOnSite ? (
+                <Radio.Group
+                  value={deliveryMode}
+                  onChange={(e) => {
+                    setDeliveryMode(e.target.value);
+                    if (e.target.value !== 'ADDRESS') setAutoReceive(false);
+                  }}
+                  options={[
+                    { value: 'ADDRESS', label: '配送到址' },
+                    { value: 'ON_SITE_PICKUP', label: '现场提货' },
+                  ]}
+                />
+              ) : (
+                <Typography.Text type="secondary">
+                  {!allowOnline && allowOnSite
+                    ? '该商品仅支持现场提货'
+                    : allowOnline && !allowOnSite
+                      ? allowCrossCity
+                        ? '该商品仅支持配送到址（含跨城）'
+                        : '该商品仅支持配送到址（不可跨城）'
+                      : '该商品暂无可选履约方式'}
+                </Typography.Text>
+              )}
+            </Form.Item>
+
+            {deliveryMode === 'ADDRESS' && allowOnline ? (
+              <>
+                <Form.Item label="收货人（选填）">
+                  <Input
+                    placeholder="默认：用户+手机尾号"
+                    value={receiverName}
+                    maxLength={32}
+                    onChange={(e) => setReceiverName(e.target.value)}
+                  />
+                </Form.Item>
+                <Form.Item label="省市区" required>
+                  <ChinaRegionCascader value={regionCodes} onChange={setRegionCodes} />
+                </Form.Item>
+                <Form.Item label="详细地址" required>
+                  <Input.TextArea
+                    rows={2}
+                    placeholder="街道门牌等"
+                    value={addressDetail}
+                    maxLength={256}
+                    onChange={(e) => setAddressDetail(e.target.value)}
+                  />
+                </Form.Item>
+                <Form.Item>
+                  <Checkbox checked={autoReceive} onChange={(e) => setAutoReceive(e.target.checked)}>
+                    同意自动收货（配送到址必选）
+                  </Checkbox>
+                </Form.Item>
+              </>
+            ) : null}
+
+            <div style={{ background: '#fafafa', borderRadius: 8, padding: 12 }}>
+              <Typography.Text type="secondary">费用预览</Typography.Text>
+              {previewLoading ? (
+                <div>计算中…</div>
+              ) : preview ? (
+                <Space direction="vertical" size={2} style={{ width: '100%', marginTop: 8 }}>
+                  <div>履约：{deliveryLabel}</div>
+                  <div>商品金额：¥{fmtMoney(preview.productAmount)}</div>
+                  <div>实付：¥{fmtMoney(preview.payAmount)}</div>
+                  <div>好客权益：¥{fmtMoney(preview.benefitAmount)}</div>
+                </Space>
+              ) : (
+                <div style={{ marginTop: 8 }}>
+                  <Typography.Text type="secondary">请完善商品与数量</Typography.Text>
+                </div>
+              )}
+            </div>
+          </Form>
+        </>
+      )}
+    </Modal>
+  );
+}

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

@@ -0,0 +1,84 @@
+import { Descriptions } from 'antd';
+import { REDEEM_CHANNEL_LABELS, type RedeemChannel } from '@dukang/shared-types';
+import { fmtTime } from '../lib/constants';
+
+function maskPhone(phone: string | null | undefined) {
+  if (!phone || phone.length < 7) return phone ?? '—';
+  return `${phone.slice(0, 3)}****${phone.slice(-4)}`;
+}
+
+type Props = {
+  detail: Record<string, unknown>;
+  /** 列表页已脱敏展示时可设为 false，详情抽屉展示完整手机号 */
+  maskUserPhone?: boolean;
+};
+
+export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone = false }: Props) {
+  const user = detail.user as
+    | { userNo?: string; nickname?: string | null; phone?: string | null }
+    | undefined;
+  const store = detail.store as
+    | {
+        name?: string;
+        cityName?: string;
+        address?: string;
+        partnerAccount?: { companyName?: string };
+      }
+    | undefined;
+  const coupon = detail.coupon as { couponNo?: string; order?: { orderNo?: string } } | undefined;
+  const channel = detail.channel === 'PHONE' ? 'PHONE' : 'SCAN';
+
+  return (
+    <Descriptions column={1} bordered size="small">
+      <Descriptions.Item label="核销号">{String(detail.redeemNo ?? '—')}</Descriptions.Item>
+      <Descriptions.Item label="方式">{REDEEM_CHANNEL_LABELS[channel as RedeemChannel]}</Descriptions.Item>
+      <Descriptions.Item label="核销额">¥{Number(detail.amount ?? 0).toFixed(2)}</Descriptions.Item>
+      <Descriptions.Item label="结算额">¥{Number(detail.settleAmount ?? 0).toFixed(2)}</Descriptions.Item>
+      <Descriptions.Item label="时间">{fmtTime(String(detail.createdAt ?? ''))}</Descriptions.Item>
+      <Descriptions.Item label="用户编号">{user?.userNo ?? '—'}</Descriptions.Item>
+      <Descriptions.Item label="用户昵称">{user?.nickname?.trim() || '—'}</Descriptions.Item>
+      <Descriptions.Item label="用户手机">
+        {maskUserPhone ? maskPhone(user?.phone) : user?.phone || '—'}
+      </Descriptions.Item>
+      <Descriptions.Item label="门店">
+        {store?.name ?? '—'}
+        {store?.cityName ? `（${store.cityName}）` : ''}
+      </Descriptions.Item>
+      <Descriptions.Item label="门店地址">{store?.address ?? '—'}</Descriptions.Item>
+      <Descriptions.Item label="合伙人">{store?.partnerAccount?.companyName ?? '—'}</Descriptions.Item>
+      <Descriptions.Item label="权益券号">{coupon?.couponNo ?? '—'}</Descriptions.Item>
+      <Descriptions.Item label="关联订单">{coupon?.order?.orderNo ?? '—'}</Descriptions.Item>
+      {Array.isArray(detail.allocations) && (detail.allocations as unknown[]).length > 0 ? (
+        <Descriptions.Item label="券分摊">
+          {(
+            detail.allocations as Array<{
+              couponNo?: string;
+              orderNo?: string | null;
+              amount?: number;
+            }>
+          )
+            .map((a, idx) => {
+              const role = idx === 0 ? '主' : '次';
+              return `${role} ${a.couponNo ?? '—'}¥${Number(a.amount ?? 0).toFixed(2)}${
+                a.orderNo ? `（订单 ${a.orderNo}）` : ''
+              }`;
+            })
+            .join('；')}
+        </Descriptions.Item>
+      ) : null}
+      {detail.payout ? (
+        <Descriptions.Item label="门店结算单">
+          ¥{Number((detail.payout as { settleAmount?: number }).settleAmount ?? 0).toFixed(2)}
+          {' / '}
+          {String((detail.payout as { status?: string }).status ?? '—')}
+        </Descriptions.Item>
+      ) : null}
+      {detail.rating ? (
+        <Descriptions.Item label="评价">
+          服务 {(detail.rating as { serviceScore?: number }).serviceScore ?? '—'} 分 / 环境{' '}
+          {(detail.rating as { envScore?: number }).envScore ?? '—'} 分
+        </Descriptions.Item>
+      ) : null}
+    </Descriptions>
+  );
+}

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

@@ -18,6 +18,7 @@ import {
   LockOutlined,
   SettingOutlined,
   AccountBookOutlined,
+  ProjectOutlined,
 } from '@ant-design/icons';
 import { hasAnySystemSettingsPermission } from '@dukang/shared-types';
 import { clearAuth, request, type HqProfile } from '../lib/api';
@@ -42,7 +43,15 @@ const MENU_ITEMS: MenuProps['items'] = [
   },
   { key: '/orders', icon: <ShoppingOutlined />, label: '订单' },
   { key: '/promo-codes', icon: <GiftOutlined />, label: '推广码' },
-  { key: '/wecom-bots', icon: <TeamOutlined />, label: '企微机器人' },
+  {
+    key: 'wecom-group',
+    icon: <TeamOutlined />,
+    label: '企微机器人',
+    children: [
+      { key: '/wecom/bots', label: '智能机器人' },
+      { key: '/wecom/pushes', label: '消息推送' },
+    ],
+  },
   { key: '/llm-configs', icon: <RobotOutlined />, label: '语言模型' },
   { key: '/knowledge-bases', icon: <FileTextOutlined />, label: '知识库' },
   {
@@ -51,6 +60,8 @@ const MENU_ITEMS: MenuProps['items'] = [
     label: '门店',
     children: [
       { key: '/stores', label: '门店列表' },
+      { key: '/store-package-audits', label: '套餐审核' },
+      { key: '/store-ratings', label: '门店评价' },
       { key: '/store-categories', label: '门店分类' },
       { key: '/store-accounts', label: '门店账户' },
       { key: '/store-media', label: '门店资源' },
@@ -108,6 +119,16 @@ const MENU_ITEMS: MenuProps['items'] = [
       { key: '/tickets/support', label: '技术支持' },
     ],
   },
+  {
+    key: 'dev-plan-group',
+    icon: <ProjectOutlined />,
+    label: '开发计划',
+    children: [
+      { key: '/dev-plan/versions', label: '版本列表' },
+      { key: '/dev-plan/tasks', label: '任务列表' },
+      { key: '/dev-plan/settings', label: '开发设置' },
+    ],
+  },
   { key: '/invoices', icon: <FileTextOutlined />, label: '发票管理' },
   { key: '/resources', icon: <CloudUploadOutlined />, label: 'OSS 资源库' },
   {
@@ -120,6 +141,8 @@ const MENU_ITEMS: MenuProps['items'] = [
       { key: '/logs/partners', label: '合伙人日志' },
       { key: '/logs/hq', label: 'HQ 操作日志' },
       { key: '/logs/third-party', label: '第三方日志' },
+      { key: '/logs/domain-events', label: '领域事件' },
+      { key: '/logs/wecom-bots', label: '智能机器人日志' },
     ],
   },
   { key: '/hq-permissions', icon: <LockOutlined />, label: '权限分配' },
@@ -131,6 +154,9 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
   if (key === 'tickets-group') {
     return permissionKeys.includes('tickets') || permissionKeys.includes('tech_support');
   }
+  if (key === 'dev-plan-group') {
+    return permissionKeys.includes('dev_plan');
+  }
   const map: Record<string, string | 'system_settings_any'> = {
     '/': 'dashboard',
     '/users': 'users',
@@ -140,11 +166,15 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/product-detail-templates': 'products',
     '/orders': 'orders',
     '/promo-codes': 'promo_codes',
-    '/wecom-bots': 'wecom_bots',
+    '/wecom/bots': 'wecom_bots',
+    '/wecom/pushes': 'wecom_bots',
+    'wecom-group': 'wecom_bots',
     '/llm-configs': 'llm_configs',
     '/knowledge-bases': 'knowledge_bases',
     'stores-group': 'stores',
     '/stores': 'stores',
+    '/store-package-audits': 'stores',
+    '/store-ratings': 'stores',
     '/store-categories': 'stores',
     '/store-accounts': 'stores',
     '/store-media': 'stores',
@@ -155,6 +185,7 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/fulfillment-providers': 'partners',
     'finance-group': 'finance',
     '/finance/store-bills': 'finance',
+    '/finance/store-withdrawals': 'finance',
     '/finance/partner-bills': 'finance',
     '/finance/winery-bills': 'finance',
     '/finance/logistics-bills': 'finance',
@@ -169,14 +200,20 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/deliveries/xiaofeixia': 'deliveries',
     '/tickets': 'tickets',
     '/tickets/support': 'tech_support',
+    'dev-plan-group': 'dev_plan',
+    '/dev-plan/versions': 'dev_plan',
+    '/dev-plan/tasks': 'dev_plan',
+    '/dev-plan/settings': 'dev_plan',
     '/invoices': 'invoices',
     '/resources': 'resources',
     'logs-group': 'logs',
     '/logs/users': 'logs',
+    '/logs/wecom-bots': 'logs',
     '/logs/stores': 'logs',
     '/logs/partners': 'logs',
     '/logs/hq': 'logs',
     '/logs/third-party': 'logs',
+    '/logs/domain-events': 'logs',
     '/hq-permissions': 'hq_permissions',
     '/system-settings': 'system_settings_any',
     '/hq-accounts': 'hq_accounts',
@@ -204,6 +241,8 @@ function filterMenuItems(items: MenuProps['items'], permissionKeys: string[]): M
     .filter(Boolean) as MenuProps['items'];
 }
 
+const IS_STAGING = import.meta.env.VITE_APP_ENV === 'staging';
+
 export default function AdminLayout() {
   const navigate = useNavigate();
   const location = useLocation();
@@ -239,16 +278,35 @@ export default function AdminLayout() {
 
   return (
     <Layout style={{ height: '100vh', overflow: 'hidden' }}>
+      {IS_STAGING ? (
+        <div
+          style={{
+            position: 'fixed',
+            top: 0,
+            left: 0,
+            right: 0,
+            zIndex: 1100,
+            background: '#d48806',
+            color: '#fff',
+            textAlign: 'center',
+            fontSize: 13,
+            fontWeight: 600,
+            lineHeight: '28px',
+          }}
+        >
+          测试环境 · staging · 数据与生产隔离 · Mock 开启
+        </div>
+      ) : null}
       <Sider
         breakpoint="lg"
         collapsedWidth={64}
         theme="dark"
         width={220}
-        style={{ height: '100vh', overflow: 'hidden' }}
+        style={{ height: '100vh', overflow: 'hidden', marginTop: IS_STAGING ? 28 : 0 }}
       >
-        <div style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}>
+        <div style={{ display: 'flex', flexDirection: 'column', height: IS_STAGING ? 'calc(100vh - 28px)' : '100vh' }}>
           <div style={{ flexShrink: 0, padding: '16px', color: '#fff', fontWeight: 600 }}>
-            杜康 HQ
+            杜康 HQ{IS_STAGING ? ' · 测试' : ''}
           </div>
           <div className="admin-sider-menu-scroll" style={{ flex: 1, minHeight: 0, overflow: 'auto' }}>
             <Menu
@@ -264,7 +322,15 @@ export default function AdminLayout() {
           </div>
         </div>
       </Sider>
-      <Layout style={{ height: '100vh', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+      <Layout
+        style={{
+          height: IS_STAGING ? 'calc(100vh - 28px)' : '100vh',
+          marginTop: IS_STAGING ? 28 : 0,
+          overflow: 'hidden',
+          display: 'flex',
+          flexDirection: 'column',
+        }}
+      >
         <Header
           style={{
             flexShrink: 0,

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

@@ -85,9 +85,56 @@ export type DashboardStats = {
   pendingBills?: number;
   pendingPartnerDraftBills?: number;
   openTickets?: number;
+  pendingStoreWithdrawals?: number;
+  overdueStoreWithdrawals?: number;
   ordersByStatus: Array<{ status: string; count: number }>;
 };
 
+export type DashboardAnalytics = {
+  summary: {
+    users: number;
+    orders: number;
+    payingUsers: number;
+    partners: number;
+    stores: number;
+    redeems: number;
+    redeemAmount: number;
+  };
+  byDate: Array<{
+    date: string;
+    users: number;
+    orders: number;
+    partners: number;
+    stores: number;
+    redeems: number;
+    redeemAmount: number;
+  }>;
+  byCity: Array<{
+    cityId: string;
+    cityName: string;
+    users: number;
+    orders: number;
+    partners: number;
+    stores: number;
+    redeems: number;
+    redeemAmount: number;
+  }>;
+  byPromo: Array<{
+    promoCodeId: string | null;
+    code: string;
+    name: string;
+    users: number;
+    orders: number;
+  }>;
+  byPartner: Array<{
+    partnerAccountId: string;
+    companyName: string;
+    stores: number;
+    redeems: number;
+    redeemAmount: number;
+  }>;
+};
+
 export type SystemVersion = {
   id: string;
   gitTag: string | null;
@@ -148,6 +195,10 @@ export type AdminOrderRow = {
   fulfillmentWarehouse?: { id: string; name: string } | null;
   fulfillmentHold?: boolean;
   fulfillmentHoldReason?: string | null;
+  orderType?: string;
+  isProxyOrder?: boolean;
+  proxyPartnerName?: string | null;
+  proxyPartnerPhone?: string | null;
   user?: { id: string; userNo: string; phone: string | null; nickname: string | null };
   delivery?: {
     provider: string;

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

@@ -19,6 +19,17 @@ export const ORDER_STATUS_LABELS: Record<string, string> = {
   REFUNDED: '已退款',
 };
 
+/** 订单状态流转操作人（common_event.param3） */
+export const ORDER_STATUS_OPERATOR_LABELS: Record<string, string> = {
+  USER: '用户',
+  USER_ON_SITE: '用户·现场取货',
+  USER_WECHAT_CONFIRM: '用户·微信确认收货',
+  WECHAT_TRADE_MANAGE: '微信结算同步',
+  MOCK: 'Mock',
+  MOCK_PAY: 'Mock 支付',
+  SYSTEM: '系统',
+};
+
 /** 订单状态 Tag 颜色（Ant Design preset） */
 export const ORDER_STATUS_COLORS: Record<string, string> = {
   PENDING_PAY: 'red',

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

@@ -27,6 +27,8 @@ export type StoreCreateForm = {
   bankAccountNo: string;
   bankBranch: string;
   settlementRate?: number;
+  visibilityWhitelistEnabled?: boolean;
+  visibilityPhones?: string[];
 };
 
 const PHONE_RE = /^1\d{10}$/;

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

@@ -1,4 +1,9 @@
 import { apiBase, CLIENT_APP, getToken, clearAuth } from './api';
+import {
+  compressImageFileIfNeeded,
+  DEFAULT_OSS_MAX_UPLOAD_BYTES,
+  formatOssMaxSizeMb,
+} from '@dukang/shared-ui/compressImage';
 
 export type OssMediaType = 'IMAGE' | 'VIDEO' | 'FILE';
 
@@ -9,14 +14,24 @@ export type UploadFileResult = {
   mock: boolean;
 };
 
+async function prepareUploadFile(file: File, mediaType: OssMediaType): Promise<File> {
+  if (mediaType !== 'IMAGE') return file;
+  const compressed = await compressImageFileIfNeeded(file);
+  if (compressed.size > DEFAULT_OSS_MAX_UPLOAD_BYTES) {
+    throw new Error(`图片压缩后仍超过 ${formatOssMaxSizeMb()}MB，请换一张较小的图片`);
+  }
+  return compressed;
+}
+
 /** 经 API 服务端转存 OSS，避免浏览器直传跨域 */
 export async function uploadFileToOss(
   file: File,
   options: { bizType: string; mediaType?: OssMediaType },
 ): Promise<UploadFileResult> {
   const mediaType = options.mediaType ?? (file.type.startsWith('video/') ? 'VIDEO' : 'IMAGE');
+  const prepared = await prepareUploadFile(file, mediaType);
   const formData = new FormData();
-  formData.append('file', file);
+  formData.append('file', prepared);
   formData.append('bizType', options.bizType);
   formData.append('mediaType', mediaType);
 

apps/admin-web/src/lib/user-log.ts

@@ -1,45 +1,12 @@
-export type UserLogCategory =
-  | 'login'
-  | 'browse_product'
-  | 'order'
-  | 'pay'
-  | 'wechat_auth'
-  | 'browse_store'
-  | 'redeem'
-  | 'profile';
+export {
+  USER_LOG_CATEGORY_OPTIONS,
+  resolveUserLogCategory,
+  eventNamesForUserLogCategory,
+  type UserLogCategory,
+} from '@dukang/shared-types';
 
-const USER_LOG_EVENT_CATEGORIES: Record<UserLogCategory, readonly string[]> = {
-  login: ['login_success', 'sms_login', 'sms_send', 'sms_verify_fail'],
-  browse_product: ['home_view', 'product_click', 'product_detail_view'],
-  order: ['order_confirm_view', 'order_submit'],
-  pay: ['pay_success', 'pay_fail'],
-  wechat_auth: ['wechat_login', 'wechat_phone', 'wechat_location', 'wechat_album'],
-  browse_store: ['store_list_view', 'store_detail_view'],
-  redeem: ['benefit_redeem_start', 'benefit_redeem_success'],
-  profile: ['profile_update', 'bind_phone'],
-};
+import { USER_LOG_CATEGORY_OPTIONS } from '@dukang/shared-types';
 
-export const USER_LOG_CATEGORY_OPTIONS: Array<{ value: UserLogCategory | ''; label: string }> = [
-  { value: '', label: '全部' },
-  { value: 'login', label: '登录' },
-  { value: 'browse_product', label: '浏览商品' },
-  { value: 'order', label: '下单' },
-  { value: 'pay', label: '支付' },
-  { value: 'wechat_auth', label: '微信授权' },
-  { value: 'browse_store', label: '浏览门店' },
-  { value: 'redeem', label: '核销' },
-  { value: 'profile', label: '信息修改' },
-];
-
-export function resolveUserLogCategory(eventName: string): UserLogCategory | null {
-  for (const [category, events] of Object.entries(USER_LOG_EVENT_CATEGORIES) as Array<
-    [UserLogCategory, readonly string[]]
-  >) {
-    if (events.includes(eventName)) return category;
-  }
-  return null;
-}
-
-export const USER_LOG_CATEGORY_LABELS = Object.fromEntries(
+export const USER_LOG_CATEGORY_LABELS: Record<string, string> = Object.fromEntries(
   USER_LOG_CATEGORY_OPTIONS.filter((o) => o.value).map((o) => [o.value, o.label]),
-) as Record<string, string>;
+);

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

@@ -18,6 +18,7 @@ import type { ColumnsType } from 'antd/es/table';
 import type { AdminBenefitGrantRequest } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { COUPON_STATUS_LABELS, fmtTime } from '../lib/constants';
+import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
 import { useAdminList } from '../lib/useAdminList';
 
 type Row = {
@@ -242,7 +243,8 @@ export default function BenefitCouponsPage() {
 
       <Drawer
         title="权益券详情"
-        width={720}
+        width={980}
+        styles={{ body: { paddingBottom: 24 } }}
         open={drawerOpen}
         onClose={() => setDrawerOpen(false)}
         extra={
@@ -310,14 +312,15 @@ export default function BenefitCouponsPage() {
                   size="small"
                   rowKey="id"
                   pagination={false}
+                  tableLayout="fixed"
                   locale={{ emptyText: '暂无关联核销单' }}
                   dataSource={detail.redeemRecords ?? []}
                   columns={[
-                    { title: '核销号', dataIndex: 'redeemNo', width: 160, ellipsis: true },
+                    { title: '核销号', dataIndex: 'redeemNo', ellipsis: true },
                     {
                       title: '角色',
                       dataIndex: 'role',
-                      width: 70,
+                      width: 72,
                       render: (v: string | undefined) =>
                         v === 'SECONDARY' ? <Tag color="orange">次券</Tag> : <Tag color="blue">主券</Tag>,
                     },
@@ -331,31 +334,31 @@ export default function BenefitCouponsPage() {
                     {
                       title: '本券分摊',
                       dataIndex: 'couponAmount',
-                      width: 95,
+                      width: 96,
                       render: (v: number | undefined, row: CouponRedeemRecord) =>
                         `¥${Number(v ?? row.amount).toFixed(2)}`,
                     },
                     {
                       title: '核销总额',
                       dataIndex: 'amount',
-                      width: 90,
+                      width: 96,
                       render: (v: number) => `¥${Number(v).toFixed(2)}`,
                     },
                     {
                       title: '结算额',
                       dataIndex: 'settleAmount',
-                      width: 90,
+                      width: 96,
                       render: (v: number) => `¥${Number(v).toFixed(2)}`,
                     },
                     {
                       title: '时间',
                       dataIndex: 'createdAt',
-                      width: 150,
+                      width: 148,
                       render: (v: string) => fmtTime(v),
                     },
                     {
                       title: '操作',
-                      width: 70,
+                      width: 64,
                       render: (_: unknown, row: CouponRedeemRecord) => (
                         <Button type="link" size="small" onClick={() => void openRedeemDetail(row.id)}>
                           详情
@@ -374,7 +377,7 @@ export default function BenefitCouponsPage() {
 
       <Drawer
         title="核销单详情"
-        width={520}
+        width={640}
         open={redeemDrawerOpen}
         onClose={() => {
           setRedeemDrawerOpen(false);
@@ -385,79 +388,7 @@ export default function BenefitCouponsPage() {
         {redeemDetailLoading ? (
           <Typography.Text type="secondary">加载中…</Typography.Text>
         ) : redeemDetail ? (
-          <Descriptions column={1} bordered size="small">
-            <Descriptions.Item label="核销号">{String(redeemDetail.redeemNo ?? '—')}</Descriptions.Item>
-            <Descriptions.Item label="核销额">
-              ¥{Number(redeemDetail.amount ?? 0).toFixed(2)}
-            </Descriptions.Item>
-            <Descriptions.Item label="结算额">
-              ¥{Number(redeemDetail.settleAmount ?? 0).toFixed(2)}
-            </Descriptions.Item>
-            <Descriptions.Item label="时间">{fmtTime(String(redeemDetail.createdAt ?? ''))}</Descriptions.Item>
-            <Descriptions.Item label="用户">
-              {String((redeemDetail.user as { userNo?: string } | undefined)?.userNo ?? '—')}
-              {(redeemDetail.user as { phone?: string | null } | undefined)?.phone
-                ? ` / ${(redeemDetail.user as { phone?: string | null }).phone}`
-                : ''}
-            </Descriptions.Item>
-            <Descriptions.Item label="门店">
-              {String((redeemDetail.store as { name?: string } | undefined)?.name ?? '—')}
-              {(redeemDetail.store as { cityName?: string } | undefined)?.cityName
-                ? `（${(redeemDetail.store as { cityName?: string }).cityName}）`
-                : ''}
-            </Descriptions.Item>
-            <Descriptions.Item label="门店地址">
-              {String((redeemDetail.store as { address?: string } | undefined)?.address ?? '—')}
-            </Descriptions.Item>
-            <Descriptions.Item label="合伙人">
-              {String(
-                (redeemDetail.store as { partnerAccount?: { companyName?: string } } | undefined)
-                  ?.partnerAccount?.companyName ?? '—',
-              )}
-            </Descriptions.Item>
-            <Descriptions.Item label="权益券号">
-              {String((redeemDetail.coupon as { couponNo?: string } | undefined)?.couponNo ?? '—')}
-            </Descriptions.Item>
-            <Descriptions.Item label="关联订单">
-              {String(
-                (redeemDetail.coupon as { order?: { orderNo?: string } } | undefined)?.order?.orderNo ??
-                  '—',
-              )}
-            </Descriptions.Item>
-            {Array.isArray(redeemDetail.allocations) &&
-            (redeemDetail.allocations as unknown[]).length > 0 ? (
-              <Descriptions.Item label="券分摊">
-                {(
-                  redeemDetail.allocations as Array<{
-                    couponNo?: string;
-                    orderNo?: string | null;
-                    amount?: number;
-                    sortOrder?: number;
-                  }>
-                )
-                  .map((a, idx) => {
-                    const role = idx === 0 ? '主' : '次';
-                    return `${role} ${a.couponNo ?? '—'}¥${Number(a.amount ?? 0).toFixed(2)}${
-                      a.orderNo ? `（订单 ${a.orderNo}）` : ''
-                    }`;
-                  })
-                  .join('；')}
-              </Descriptions.Item>
-            ) : null}
-            {redeemDetail.payout ? (
-              <Descriptions.Item label="门店结算单">
-                ¥{Number((redeemDetail.payout as { settleAmount?: number }).settleAmount ?? 0).toFixed(2)}
-                {' / '}
-                {String((redeemDetail.payout as { status?: string }).status ?? '—')}
-              </Descriptions.Item>
-            ) : null}
-            {redeemDetail.rating ? (
-              <Descriptions.Item label="评价">
-                服务 {(redeemDetail.rating as { serviceScore?: number }).serviceScore ?? '—'} 分 / 环境{' '}
-                {(redeemDetail.rating as { envScore?: number }).envScore ?? '—'} 分
-              </Descriptions.Item>
-            ) : null}
-          </Descriptions>
+          <RedeemRecordDetailDescriptions detail={redeemDetail} />
         ) : null}
       </Drawer>
     </div>

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

@@ -1,17 +1,22 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';
 import {
-  Button, Card, Col, Descriptions, Modal, Row, Space, Statistic, Table, Typography, message,
+  Button, Card, Col, DatePicker, Descriptions, Form, Modal, Row, Select, Space, Statistic, Table, Typography, message,
 } from 'antd';
 import { CloudUploadOutlined, ReloadOutlined } from '@ant-design/icons';
+import dayjs, { type Dayjs } from 'dayjs';
+import ReactECharts from 'echarts-for-react';
+import type { EChartsOption } from 'echarts';
 import {
   request,
+  type DashboardAnalytics,
   type DashboardStats,
   type DeployTriggerResult,
   type HqProfile,
+  type Paginated,
   type SystemVersion,
 } from '../lib/api';
-import { fmtTime } from '../lib/constants';
+import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 
 const STATUS_LABELS: Record<string, string> = {
   PENDING_PAY: '待付款',
@@ -31,6 +36,26 @@ const DEPLOYED_BY_LABELS: Record<string, string> = {
   admin: 'Admin 发布',
 };
 
+type CityOption = { id: string; name: string; code: string };
+type PromoOption = { id: string; code: string; name: string };
+
+type AnalyticsFilters = {
+  range: [Dayjs, Dayjs];
+  cityId?: string;
+  promoCodeId?: string;
+  partnerAccountId?: string;
+};
+
+function buildAnalyticsQs(f: AnalyticsFilters) {
+  const qs = new URLSearchParams();
+  qs.set('dateFrom', f.range[0].format('YYYY-MM-DD'));
+  qs.set('dateTo', f.range[1].format('YYYY-MM-DD'));
+  if (f.cityId) qs.set('cityId', f.cityId);
+  if (f.promoCodeId) qs.set('promoCodeId', f.promoCodeId);
+  if (f.partnerAccountId) qs.set('partnerAccountId', f.partnerAccountId);
+  return qs.toString();
+}
+
 export default function DashboardPage() {
   const [stats, setStats] = useState<DashboardStats | null>(null);
   const [version, setVersion] = useState<SystemVersion | null>(null);
@@ -40,6 +65,21 @@ export default function DashboardPage() {
   const [deploying, setDeploying] = useState(false);
   const isSuperAdmin = profile?.adminRole === 'SUPER_ADMIN';
 
+  const [filterForm] = Form.useForm<{
+    range: [Dayjs, Dayjs];
+    cityId?: string;
+    promoCodeId?: string;
+    partnerAccountId?: string;
+  }>();
+  const [filters, setFilters] = useState<AnalyticsFilters>({
+    range: [dayjs().subtract(29, 'day'), dayjs()],
+  });
+  const [analytics, setAnalytics] = useState<DashboardAnalytics | null>(null);
+  const [analyticsLoading, setAnalyticsLoading] = useState(true);
+  const [cities, setCities] = useState<CityOption[]>([]);
+  const [promos, setPromos] = useState<PromoOption[]>([]);
+  const [partners, setPartners] = useState<Array<{ id: string; companyName?: string | null; name: string }>>([]);
+
   const loadVersion = useCallback(() => {
     setVersionLoading(true);
     return request<SystemVersion | null>('/admin/dashboard/version')
@@ -48,6 +88,17 @@ export default function DashboardPage() {
       .finally(() => setVersionLoading(false));
   }, []);
 
+  const loadAnalytics = useCallback((f: AnalyticsFilters) => {
+    setAnalyticsLoading(true);
+    return request<DashboardAnalytics>(`/admin/dashboard/analytics?${buildAnalyticsQs(f)}`)
+      .then(setAnalytics)
+      .catch((e) => {
+        message.error(e instanceof Error ? e.message : '加载统计失败');
+        setAnalytics(null);
+      })
+      .finally(() => setAnalyticsLoading(false));
+  }, []);
+
   useEffect(() => {
     request<DashboardStats>('/admin/dashboard/stats')
       .then(setStats)
@@ -64,8 +115,64 @@ export default function DashboardPage() {
       .catch(() => {
         setVersionLoading(false);
       });
+    void request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setCities(res.items ?? []))
+      .catch(() => setCities([]));
+    void request<Paginated<PromoOption>>(`/admin/promo-codes?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setPromos(res.items ?? []))
+      .catch(() => setPromos([]));
+    void request<Paginated<{ id: string; companyName?: string | null; name: string }>>(
+      `/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
+    )
+      .then((res) => setPartners(res.items ?? []))
+      .catch(() => setPartners([]));
   }, [loadVersion]);
 
+  useEffect(() => {
+    void loadAnalytics(filters);
+  }, [filters, loadAnalytics]);
+
+  function applyFilters(values: {
+    range?: [Dayjs, Dayjs];
+    cityId?: string;
+    promoCodeId?: string;
+    partnerAccountId?: string;
+  }) {
+    const next: AnalyticsFilters = {
+      range: values.range ?? filters.range,
+      cityId: values.cityId || undefined,
+      promoCodeId: values.promoCodeId || undefined,
+      partnerAccountId: values.partnerAccountId || undefined,
+    };
+    setFilters(next);
+  }
+
+  function setCityFilter(cityId: string) {
+    const next = { ...filters, cityId: cityId === filters.cityId ? undefined : cityId };
+    filterForm.setFieldsValue({ cityId: next.cityId });
+    setFilters(next);
+  }
+
+  function setPromoFilter(promoCodeId: string) {
+    const key = promoCodeId === 'null' || promoCodeId === '' ? 'none' : promoCodeId;
+    const next = {
+      ...filters,
+      promoCodeId: key === filters.promoCodeId ? undefined : key,
+    };
+    filterForm.setFieldsValue({ promoCodeId: next.promoCodeId });
+    setFilters(next);
+  }
+
+  function setPartnerFilter(partnerAccountId: string) {
+    const next = {
+      ...filters,
+      partnerAccountId:
+        partnerAccountId === filters.partnerAccountId ? undefined : partnerAccountId,
+    };
+    filterForm.setFieldsValue({ partnerAccountId: next.partnerAccountId });
+    setFilters(next);
+  }
+
   function handleDeploy() {
     Modal.confirm({
       title: '确认发布更新？',
@@ -89,6 +196,176 @@ export default function DashboardPage() {
 
   const shortSha = version?.commitId ? version.commitId.slice(0, 7) : '—';
 
+  const ordersDrillQs = useMemo(() => {
+    const qs = new URLSearchParams();
+    qs.set('createdFrom', filters.range[0].format('YYYY-MM-DD'));
+    qs.set('createdTo', filters.range[1].format('YYYY-MM-DD'));
+    if (filters.cityId && filters.cityId !== 'none') qs.set('cityId', filters.cityId);
+    return qs.toString();
+  }, [filters]);
+
+  const byDateOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byDate ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['新增用户', '订单数'] },
+      grid: { left: 40, right: 20, top: 40, bottom: 40 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.date.slice(5)),
+        axisLabel: { rotate: rows.length > 14 ? 45 : 0 },
+      },
+      yAxis: { type: 'value', minInterval: 1 },
+      series: [
+        { name: '新增用户', type: 'line', smooth: true, data: rows.map((r) => r.users) },
+        { name: '订单数', type: 'line', smooth: true, data: rows.map((r) => r.orders) },
+      ],
+    };
+  }, [analytics]);
+
+  const byCityOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byCity ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['用户', '订单'] },
+      grid: { left: 48, right: 20, top: 40, bottom: 48 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.cityName),
+        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
+      },
+      yAxis: { type: 'value', minInterval: 1 },
+      series: [
+        { name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 },
+        { name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 },
+      ],
+    };
+  }, [analytics]);
+
+  const byPromoOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byPromo ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['用户', '订单'] },
+      grid: { left: 48, right: 20, top: 40, bottom: 64 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.name || r.code),
+        axisLabel: { interval: 0, rotate: rows.length > 3 ? 30 : 0 },
+      },
+      yAxis: { type: 'value', minInterval: 1 },
+      series: [
+        { name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 },
+        { name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 },
+      ],
+    };
+  }, [analytics]);
+
+  const opsByDateOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byDate ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['新增合伙人', '新签门店', '核销笔数', '核销金额'] },
+      grid: { left: 48, right: 48, top: 48, bottom: 40 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.date.slice(5)),
+        axisLabel: { rotate: rows.length > 14 ? 45 : 0 },
+      },
+      yAxis: [
+        { type: 'value', name: '数量', minInterval: 1 },
+        { type: 'value', name: '金额', minInterval: 1 },
+      ],
+      series: [
+        { name: '新增合伙人', type: 'line', smooth: true, data: rows.map((r) => r.partners) },
+        { name: '新签门店', type: 'line', smooth: true, data: rows.map((r) => r.stores) },
+        { name: '核销笔数', type: 'line', smooth: true, data: rows.map((r) => r.redeems) },
+        {
+          name: '核销金额',
+          type: 'line',
+          smooth: true,
+          yAxisIndex: 1,
+          data: rows.map((r) => r.redeemAmount),
+        },
+      ],
+    };
+  }, [analytics]);
+
+  const opsByCityOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byCity ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['合伙人', '门店', '核销笔数'] },
+      grid: { left: 48, right: 20, top: 40, bottom: 48 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.cityName),
+        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
+      },
+      yAxis: { type: 'value', minInterval: 1 },
+      series: [
+        { name: '合伙人', type: 'bar', data: rows.map((r) => r.partners), barMaxWidth: 28 },
+        { name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 },
+        { name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 },
+      ],
+    };
+  }, [analytics]);
+
+  const opsByPartnerOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byPartner ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['门店', '核销笔数', '核销金额'] },
+      grid: { left: 48, right: 48, top: 40, bottom: 64 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.companyName),
+        axisLabel: { interval: 0, rotate: rows.length > 3 ? 30 : 0 },
+      },
+      yAxis: [
+        { type: 'value', name: '数量', minInterval: 1 },
+        { type: 'value', name: '金额' },
+      ],
+      series: [
+        { name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 },
+        { name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 },
+        {
+          name: '核销金额',
+          type: 'line',
+          yAxisIndex: 1,
+          data: rows.map((r) => r.redeemAmount),
+        },
+      ],
+    };
+  }, [analytics]);
+
+  const redeemByCityOption = useMemo<EChartsOption>(() => {
+    const rows = analytics?.byCity ?? [];
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: ['核销笔数', '核销金额'] },
+      grid: { left: 48, right: 48, top: 40, bottom: 48 },
+      xAxis: {
+        type: 'category',
+        data: rows.map((r) => r.cityName),
+        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
+      },
+      yAxis: [
+        { type: 'value', name: '笔数', minInterval: 1 },
+        { type: 'value', name: '金额' },
+      ],
+      series: [
+        { name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 36 },
+        {
+          name: '核销金额',
+          type: 'line',
+          yAxisIndex: 1,
+          data: rows.map((r) => r.redeemAmount),
+        },
+      ],
+    };
+  }, [analytics]);
+
   return (
     <div>
       <Typography.Title level={4}>数据概览</Typography.Title>
@@ -176,6 +453,237 @@ export default function DashboardPage() {
         </Col>
       </Row>
 
+      <Card
+        title="数据统计筛选"
+        style={{ marginBottom: 24 }}
+        extra={
+          <Button
+            icon={<ReloadOutlined />}
+            size="small"
+            onClick={() => void loadAnalytics(filters)}
+          >
+            刷新
+          </Button>
+        }
+      >
+        <Form
+          form={filterForm}
+          layout="inline"
+          initialValues={{ range: filters.range }}
+          onFinish={applyFilters}
+        >
+          <Form.Item name="range" label="日期" rules={[{ required: true, message: '请选择日期' }]}>
+            <DatePicker.RangePicker allowClear={false} />
+          </Form.Item>
+          <Form.Item name="cityId" label="城市">
+            <Select
+              allowClear
+              placeholder="全部开城"
+              style={{ width: 160 }}
+              options={[
+                { value: 'none', label: '未选城' },
+                ...cities.map((c) => ({ value: c.id, label: c.name })),
+              ]}
+            />
+          </Form.Item>
+          <Form.Item name="promoCodeId" label="推广码">
+            <Select
+              allowClear
+              placeholder="全部来源"
+              style={{ width: 200 }}
+              options={[
+                { value: 'none', label: '自然量 / 无推广码' },
+                ...promos.map((p) => ({ value: p.id, label: `${p.name}（${p.code}）` })),
+              ]}
+            />
+          </Form.Item>
+          <Form.Item name="partnerAccountId" label="合伙人">
+            <Select
+              allowClear
+              placeholder="全部合伙人"
+              style={{ width: 200 }}
+              options={partners.map((p) => ({
+                value: p.id,
+                label: p.companyName || p.name,
+              }))}
+            />
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit">查询</Button>
+          </Form.Item>
+        </Form>
+      </Card>
+
+      <Card
+        title="用户 / 订单统计"
+        style={{ marginBottom: 24 }}
+        extra={
+          <Space>
+            <Link to={`/orders?${ordersDrillQs}`}>查看订单</Link>
+            <Link to="/users">查看用户</Link>
+          </Space>
+        }
+      >
+        <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
+          <Col xs={24} sm={8}>
+            <Statistic title="区间新增用户" value={analytics?.summary.users ?? 0} />
+          </Col>
+          <Col xs={24} sm={8}>
+            <Statistic title="区间订单数" value={analytics?.summary.orders ?? 0} />
+          </Col>
+          <Col xs={24} sm={8}>
+            <Statistic title="区间付费用户" value={analytics?.summary.payingUsers ?? 0} />
+          </Col>
+        </Row>
+
+        <Row gutter={[16, 16]}>
+          <Col xs={24}>
+            <Card type="inner" title="按日趋势" loading={analyticsLoading} size="small">
+              <ReactECharts option={byDateOption} style={{ height: 320 }} notMerge />
+            </Card>
+          </Col>
+          <Col xs={24} lg={12}>
+            <Card
+              type="inner"
+              title="按城市（点击柱联动筛选）"
+              loading={analyticsLoading}
+              size="small"
+            >
+              <ReactECharts
+                option={byCityOption}
+                style={{ height: 300 }}
+                notMerge
+                onEvents={{
+                  click: (params: { name?: string }) => {
+                    const row = (analytics?.byCity ?? []).find((r) => r.cityName === params.name);
+                    if (row) setCityFilter(row.cityId);
+                  },
+                }}
+              />
+            </Card>
+          </Col>
+          <Col xs={24} lg={12}>
+            <Card
+              type="inner"
+              title="按推广码（点击柱联动筛选）"
+              loading={analyticsLoading}
+              size="small"
+            >
+              <ReactECharts
+                option={byPromoOption}
+                style={{ height: 300 }}
+                notMerge
+                onEvents={{
+                  click: (params: { name?: string }) => {
+                    const row = (analytics?.byPromo ?? []).find(
+                      (r) => (r.name || r.code) === params.name,
+                    );
+                    if (row) setPromoFilter(row.promoCodeId ?? 'none');
+                  },
+                }}
+              />
+            </Card>
+          </Col>
+        </Row>
+      </Card>
+
+      <Card
+        title="合伙人 / 门店 / 核销统计"
+        style={{ marginBottom: 24 }}
+        extra={
+          <Space>
+            <Link to="/city-partners">查看合伙人</Link>
+            <Link to="/stores">查看门店</Link>
+            <Link to="/redeem-records">查看核销</Link>
+          </Space>
+        }
+      >
+        <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
+          <Col xs={24} sm={6}>
+            <Statistic title="区间新增合伙人" value={analytics?.summary.partners ?? 0} />
+          </Col>
+          <Col xs={24} sm={6}>
+            <Statistic title="区间新签门店" value={analytics?.summary.stores ?? 0} />
+          </Col>
+          <Col xs={24} sm={6}>
+            <Statistic title="区间核销笔数" value={analytics?.summary.redeems ?? 0} />
+          </Col>
+          <Col xs={24} sm={6}>
+            <Statistic title="区间核销金额" value={analytics?.summary.redeemAmount ?? 0} precision={2} />
+          </Col>
+        </Row>
+
+        <Row gutter={[16, 16]}>
+          <Col xs={24}>
+            <Card type="inner" title="按日趋势（合伙人 / 门店 / 核销）" loading={analyticsLoading} size="small">
+              <ReactECharts option={opsByDateOption} style={{ height: 320 }} notMerge />
+            </Card>
+          </Col>
+          <Col xs={24} lg={12}>
+            <Card
+              type="inner"
+              title="按城市（点击柱联动筛选）"
+              loading={analyticsLoading}
+              size="small"
+            >
+              <ReactECharts
+                option={opsByCityOption}
+                style={{ height: 300 }}
+                notMerge
+                onEvents={{
+                  click: (params: { name?: string }) => {
+                    const row = (analytics?.byCity ?? []).find((r) => r.cityName === params.name);
+                    if (row) setCityFilter(row.cityId);
+                  },
+                }}
+              />
+            </Card>
+          </Col>
+          <Col xs={24} lg={12}>
+            <Card
+              type="inner"
+              title="按城市核销金额"
+              loading={analyticsLoading}
+              size="small"
+            >
+              <ReactECharts
+                option={redeemByCityOption}
+                style={{ height: 300 }}
+                notMerge
+                onEvents={{
+                  click: (params: { name?: string }) => {
+                    const row = (analytics?.byCity ?? []).find((r) => r.cityName === params.name);
+                    if (row) setCityFilter(row.cityId);
+                  },
+                }}
+              />
+            </Card>
+          </Col>
+          <Col xs={24}>
+            <Card
+              type="inner"
+              title="按合伙人（门店 / 核销，点击联动筛选）"
+              loading={analyticsLoading}
+              size="small"
+            >
+              <ReactECharts
+                option={opsByPartnerOption}
+                style={{ height: 320 }}
+                notMerge
+                onEvents={{
+                  click: (params: { name?: string }) => {
+                    const row = (analytics?.byPartner ?? []).find(
+                      (r) => r.companyName === params.name,
+                    );
+                    if (row) setPartnerFilter(row.partnerAccountId);
+                  },
+                }}
+              />
+            </Card>
+          </Col>
+        </Row>
+      </Card>
+
       <Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
         <Col xs={24} sm={12} lg={8}>
           <Card
@@ -209,6 +717,26 @@ export default function DashboardPage() {
             />
           </Card>
         </Col>
+        <Col xs={24} sm={12} lg={8}>
+          <Card
+            loading={loading}
+            title="待审门店提现"
+            extra={<Link to="/finance/store-bills?kind=WITHDRAW">去处理</Link>}
+          >
+            <Statistic
+              value={stats?.pendingStoreWithdrawals ?? 0}
+              suffix="笔"
+              valueStyle={{
+                color: (stats?.overdueStoreWithdrawals ?? 0) > 0 ? '#cf1322' : (stats?.pendingStoreWithdrawals ?? 0) > 0 ? '#fa8c16' : undefined,
+              }}
+            />
+            <Typography.Text type="secondary">
+              {(stats?.overdueStoreWithdrawals ?? 0) > 0
+                ? `超时未审 ${stats?.overdueStoreWithdrawals} 笔（FIN-003）`
+                : '工作日 T+0 审完'}
+            </Typography.Text>
+          </Card>
+        </Col>
         <Col xs={24} sm={12} lg={8}>
           <Card loading={loading} title="待处理工单">
             <Statistic value={stats?.openTickets ?? 0} suffix="个" />

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

@@ -0,0 +1,103 @@
+import { useEffect, useState } from 'react';
+import { Button, Collapse, Form, Input, Select, Typography, message } from 'antd';
+import type {
+  DevPlanSettingsDto,
+  KnowledgeBaseOptionDto,
+  LlmApiConfigOptionDto,
+} from '@dukang/shared-types';
+import { request } from '../lib/api';
+
+export default function DevPlanSettingsPage() {
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [llmOptions, setLlmOptions] = useState<LlmApiConfigOptionDto[]>([]);
+  const [kbOptions, setKbOptions] = useState<KnowledgeBaseOptionDto[]>([]);
+  const [settingsForm] = Form.useForm();
+
+  async function loadAll() {
+    setLoading(true);
+    try {
+      const [s, llm, kb] = await Promise.all([
+        request<DevPlanSettingsDto>('/admin/dev-plan/settings'),
+        request<LlmApiConfigOptionDto[]>('/admin/llm-configs/options'),
+        request<KnowledgeBaseOptionDto[]>('/admin/knowledge-bases/options'),
+      ]);
+      setLlmOptions(llm);
+      setKbOptions(kb);
+      settingsForm.setFieldsValue({
+        reviewAssistantLlmConfigId: s.reviewAssistantLlmConfigId,
+        reviewAssistantKnowledgeBaseId: s.reviewAssistantKnowledgeBaseId,
+        reviewAssistantPrompt: s.reviewAssistantPrompt,
+      });
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载失败');
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    void loadAll();
+  }, []);
+
+  async function saveSettings() {
+    const values = await settingsForm.validateFields();
+    setSaving(true);
+    try {
+      await request<DevPlanSettingsDto>('/admin/dev-plan/settings', {
+        method: 'PUT',
+        body: JSON.stringify(values),
+      });
+      message.success('设置已保存');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  return (
+    <div>
+      <Typography.Title level={4}>开发计划 · 开发设置</Typography.Title>
+      <Typography.Paragraph type="secondary">
+        任务评审派发 Webhook 已迁移至「企微机器人 → 消息推送」，勾选「开发任务评审派发」条件即可。
+      </Typography.Paragraph>
+
+      <Collapse
+        defaultActiveKey={['review-ai']}
+        style={{ marginTop: 16 }}
+        items={[
+          {
+            key: 'review-ai',
+            label: '本地审核 AI 助手',
+            children: (
+              <Form form={settingsForm} layout="vertical" disabled={loading}>
+                <Typography.Paragraph type="secondary">
+                  仅用于技术支持批量预审（只读知识库 + LLM），preview 阶段不写库。
+                </Typography.Paragraph>
+                <Form.Item name="reviewAssistantLlmConfigId" label="语言模型">
+                  <Select
+                    allowClear
+                    options={llmOptions.map((o) => ({ value: o.id, label: o.name }))}
+                  />
+                </Form.Item>
+                <Form.Item name="reviewAssistantKnowledgeBaseId" label="知识库">
+                  <Select
+                    allowClear
+                    options={kbOptions.map((o) => ({ value: o.id, label: o.name }))}
+                  />
+                </Form.Item>
+                <Form.Item name="reviewAssistantPrompt" label="审核提示词">
+                  <Input.TextArea rows={5} />
+                </Form.Item>
+                <Button type="primary" loading={saving} onClick={() => void saveSettings()}>
+                  保存
+                </Button>
+              </Form>
+            ),
+          },
+        ]}
+      />
+    </div>
+  );
+}

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

@@ -0,0 +1,382 @@
+import { useEffect, useState } from 'react';
+import {
+  Button,
+  Form,
+  Input,
+  Modal,
+  Popconfirm,
+  Select,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  DEV_PLAN_TASK_STATUS_LABELS,
+  DEV_PLAN_TASK_TYPE_LABELS,
+  SUPPORT_TICKET_STATUS_LABELS,
+  type DevPlanTaskDto,
+  type DevPlanTaskStatusDto,
+  type DevPlanTaskTypeDto,
+  type DevPlanVersionDto,
+  type SupportTicketDto,
+} from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+import { useAdminList } from '../lib/useAdminList';
+
+const TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map((v) => ({
+  value: v,
+  label: DEV_PLAN_TASK_TYPE_LABELS[v],
+}));
+
+const STATUS_OPTIONS = (Object.keys(DEV_PLAN_TASK_STATUS_LABELS) as DevPlanTaskStatusDto[]).map(
+  (v) => ({ value: v, label: DEV_PLAN_TASK_STATUS_LABELS[v] }),
+);
+
+const STATUS_COLOR: Record<DevPlanTaskStatusDto, string> = {
+  TODO: 'default',
+  DEVELOPED: 'blue',
+  RELEASED: 'green',
+};
+
+const DEFAULT_DISPATCH_SUPPLEMENT = '请按以下任务进入开发流程';
+
+export default function DevPlanTasksPage() {
+  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
+  const [modalOpen, setModalOpen] = useState(false);
+  const [dispatchOpen, setDispatchOpen] = useState(false);
+  const [batchEditOpen, setBatchEditOpen] = useState(false);
+  const [batchSaving, setBatchSaving] = useState(false);
+  const [versions, setVersions] = useState<DevPlanVersionDto[]>([]);
+  const [supportTickets, setSupportTickets] = useState<SupportTicketDto[]>([]);
+  const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
+  const [saving, setSaving] = useState(false);
+  const [dispatching, setDispatching] = useState(false);
+  const [form] = Form.useForm();
+  const [dispatchForm] = Form.useForm<{ supplement?: string }>();
+  const [batchForm] = Form.useForm<{ status?: DevPlanTaskStatusDto; versionId?: string }>();
+
+  useEffect(() => {
+    if (!batchEditOpen) return;
+    request<{ items: DevPlanVersionDto[] }>('/admin/dev-plan/versions?pageSize=100')
+      .then((res) => setVersions(res.items ?? []))
+      .catch(() => setVersions([]));
+  }, [batchEditOpen]);
+
+  useEffect(() => {
+    if (!modalOpen || editing) return;
+    request<{ items: SupportTicketDto[] }>('/admin/support-tickets?pageSize=100')
+      .then((res) => setSupportTickets(res.items ?? []))
+      .catch(() => setSupportTickets([]));
+  }, [modalOpen, editing]);
+
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<DevPlanTaskDto>(
+    '/admin/dev-plan/tasks',
+    () => {
+      const qs = new URLSearchParams();
+      if (filters.status) qs.set('status', filters.status);
+      if (filters.type) qs.set('type', filters.type);
+      if (filters.keyword) qs.set('keyword', filters.keyword);
+      return qs;
+    },
+    [filters],
+  );
+
+  function openCreate() {
+    setEditing(null);
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
+    setModalOpen(true);
+  }
+
+  function openEdit(row: DevPlanTaskDto) {
+    setEditing(row);
+    form.setFieldsValue({ content: row.content, type: row.type, status: row.status });
+    setModalOpen(true);
+  }
+
+  async function save() {
+    const values = await form.validateFields();
+    setSaving(true);
+    try {
+      if (editing) {
+        await request(`/admin/dev-plan/tasks/${editing.id}`, {
+          method: 'PUT',
+          body: JSON.stringify(values),
+        });
+        message.success('已更新');
+      } else {
+        await request('/admin/dev-plan/tasks', {
+          method: 'POST',
+          body: JSON.stringify({
+            content: values.content,
+            type: values.type,
+            supportTicketId: values.supportTicketId || undefined,
+          }),
+        });
+        message.success('已创建');
+      }
+      setModalOpen(false);
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function remove(id: string) {
+    try {
+      await request(`/admin/dev-plan/tasks/${id}`, { method: 'DELETE' });
+      message.success('已删除');
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    }
+  }
+
+  function openDispatch() {
+    dispatchForm.setFieldsValue({
+      supplement: DEFAULT_DISPATCH_SUPPLEMENT,
+    });
+    setDispatchOpen(true);
+  }
+
+  function openBatchEdit() {
+    batchForm.setFieldsValue({ status: undefined, versionId: undefined });
+    setBatchEditOpen(true);
+  }
+
+  async function submitBatchEdit() {
+    const values = await batchForm.validateFields();
+    if (!values.status && !values.versionId) {
+      message.warning('请至少选择状态或关联版本');
+      return;
+    }
+    setBatchSaving(true);
+    try {
+      await request('/admin/dev-plan/tasks/batch-update', {
+        method: 'POST',
+        body: JSON.stringify({
+          taskIds: selectedRowKeys,
+          status: values.status || undefined,
+          versionId: values.versionId || undefined,
+        }),
+      });
+      message.success('批量更新成功');
+      setBatchEditOpen(false);
+      setSelectedRowKeys([]);
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '批量更新失败');
+    } finally {
+      setBatchSaving(false);
+    }
+  }
+
+  async function submitDispatch() {
+    const values = await dispatchForm.validateFields();
+    setDispatching(true);
+    try {
+      await request('/admin/dev-plan/tasks/dispatch', {
+        method: 'POST',
+        body: JSON.stringify({
+          taskIds: selectedRowKeys,
+          supplement: values.supplement?.trim() || undefined,
+        }),
+      });
+      message.success('已派发到企微群');
+      setDispatchOpen(false);
+      setSelectedRowKeys([]);
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '派发失败');
+    } finally {
+      setDispatching(false);
+    }
+  }
+
+  const columns: ColumnsType<DevPlanTaskDto> = [
+    { title: '任务号', dataIndex: 'taskNo', width: 160 },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      width: 80,
+      render: (t: DevPlanTaskTypeDto) => DEV_PLAN_TASK_TYPE_LABELS[t],
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 90,
+      render: (s: DevPlanTaskStatusDto) => (
+        <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_TASK_STATUS_LABELS[s]}</Tag>
+      ),
+    },
+    { title: '内容', dataIndex: 'content', ellipsis: true },
+    { title: '来源工单', dataIndex: 'supportTicketNo', width: 140, render: (v) => v || '—' },
+    { title: '创建人', dataIndex: 'creatorName', width: 90 },
+    { title: '创建时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+    {
+      title: '操作',
+      width: 120,
+      render: (_, row) => (
+        <Space>
+          <Button type="link" size="small" onClick={() => openEdit(row)}>
+            编辑
+          </Button>
+          <Popconfirm title="确认删除？" onConfirm={() => void remove(row.id)}>
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+        <Typography.Title level={4} style={{ margin: 0 }}>
+          开发计划 · 任务列表
+        </Typography.Title>
+        <Space>
+          <Button disabled={!selectedRowKeys.length} onClick={openBatchEdit}>
+            批量编辑
+          </Button>
+          <Button disabled={!selectedRowKeys.length} onClick={openDispatch}>
+            评审
+          </Button>
+          <Button type="primary" onClick={openCreate}>
+            新建任务
+          </Button>
+        </Space>
+      </div>
+
+      <Form
+        layout="inline"
+        style={{ marginBottom: 16 }}
+        onFinish={(v) => {
+          setFilters(v);
+          setPage(1);
+        }}
+      >
+        <Form.Item name="type" label="类型">
+          <Select allowClear style={{ width: 100 }} options={TYPE_OPTIONS} />
+        </Form.Item>
+        <Form.Item name="status" label="状态">
+          <Select allowClear style={{ width: 100 }} options={STATUS_OPTIONS} />
+        </Form.Item>
+        <Form.Item name="keyword" label="关键词">
+          <Input allowClear placeholder="任务号/内容" style={{ width: 160 }} />
+        </Form.Item>
+        <Button type="primary" htmlType="submit">
+          筛选
+        </Button>
+      </Form>
+
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        rowSelection={{
+          selectedRowKeys,
+          onChange: (keys) => setSelectedRowKeys(keys as string[]),
+        }}
+        scroll={{ x: 1100 }}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+
+      <Modal
+        title={editing ? '编辑任务' : '新建任务'}
+        open={modalOpen}
+        onCancel={() => setModalOpen(false)}
+        onOk={() => void save()}
+        confirmLoading={saving}
+        destroyOnClose
+      >
+        <Form form={form} layout="vertical">
+          <Form.Item name="content" label="任务内容" rules={[{ required: true }]}>
+            <Input.TextArea rows={4} maxLength={4000} showCount />
+          </Form.Item>
+          <Form.Item name="type" label="类型" rules={[{ required: true }]}>
+            <Select options={TYPE_OPTIONS} />
+          </Form.Item>
+          {editing ? (
+            <Form.Item name="status" label="状态" rules={[{ required: true }]}>
+              <Select options={STATUS_OPTIONS} />
+            </Form.Item>
+          ) : (
+            <Form.Item name="supportTicketId" label="绑定技术支持工单">
+              <Select
+                allowClear
+                showSearch
+                optionFilterProp="label"
+                placeholder="可选：关联工单"
+                options={supportTickets.map((t) => ({
+                  value: t.id,
+                  label: `${t.ticketNo} · ${SUPPORT_TICKET_STATUS_LABELS[t.status]} · ${t.title}`,
+                }))}
+              />
+            </Form.Item>
+          )}
+        </Form>
+      </Modal>
+
+      <Modal
+        title="评审派发"
+        open={dispatchOpen}
+        onCancel={() => setDispatchOpen(false)}
+        onOk={() => void submitDispatch()}
+        confirmLoading={dispatching}
+        destroyOnClose
+      >
+        <Typography.Paragraph type="secondary">
+          已选 {selectedRowKeys.length} 条任务，将通过「企微机器人 → 消息推送」中勾选「开发任务评审派发」的实例推送到开发群（@
+          userid 由各推送配置）。
+        </Typography.Paragraph>
+        <Form form={dispatchForm} layout="vertical">
+          <Form.Item name="supplement" label="补充说明">
+            <Input.TextArea rows={3} placeholder="默认任务说明；@ 成员由消息推送配置决定" />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Modal
+        title="批量编辑任务"
+        open={batchEditOpen}
+        onCancel={() => setBatchEditOpen(false)}
+        onOk={() => void submitBatchEdit()}
+        confirmLoading={batchSaving}
+        destroyOnClose
+      >
+        <Typography.Paragraph type="secondary">已选 {selectedRowKeys.length} 条任务</Typography.Paragraph>
+        <Form form={batchForm} layout="vertical">
+          <Form.Item name="status" label="状态（不修改请留空）">
+            <Select allowClear placeholder="不修改" options={STATUS_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="versionId" label="关联版本（追加关联，不修改请留空）">
+            <Select
+              allowClear
+              placeholder="不修改"
+              options={versions.map((v) => ({ value: v.id, label: v.versionNo }))}
+            />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </div>
+  );
+}

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

@@ -0,0 +1,241 @@
+import { useEffect, useState } from 'react';
+import {
+  Button,
+  Form,
+  Input,
+  Modal,
+  Popconfirm,
+  Select,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  DEV_PLAN_VERSION_STATUS_LABELS,
+  type DevPlanTaskDto,
+  type DevPlanVersionDto,
+  type DevPlanVersionStatusDto,
+} from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+import { useAdminList } from '../lib/useAdminList';
+
+
+const STATUS_OPTIONS = (Object.keys(DEV_PLAN_VERSION_STATUS_LABELS) as DevPlanVersionStatusDto[]).map(
+  (v) => ({ value: v, label: DEV_PLAN_VERSION_STATUS_LABELS[v] }),
+);
+
+const STATUS_COLOR: Record<DevPlanVersionStatusDto, string> = {
+  PENDING: 'default',
+  IN_PROGRESS: 'processing',
+  TESTING: 'purple',
+  RELEASED: 'green',
+};
+
+function formatDuration(minutes?: number | null) {
+  if (minutes == null) return '—';
+  if (minutes < 60) return `${minutes} 分钟`;
+  return `${Math.floor(minutes / 60)} 小时 ${minutes % 60} 分`;
+}
+
+export default function DevPlanVersionsPage() {
+  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [modalOpen, setModalOpen] = useState(false);
+  const [editing, setEditing] = useState<DevPlanVersionDto | null>(null);
+  const [saving, setSaving] = useState(false);
+  const [allTasks, setAllTasks] = useState<DevPlanTaskDto[]>([]);
+  const [form] = Form.useForm();
+
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } =
+    useAdminList<DevPlanVersionDto>('/admin/dev-plan/versions', () => {
+      const qs = new URLSearchParams();
+      if (filters.status) qs.set('status', filters.status);
+      return qs;
+    }, [filters]);
+
+  useEffect(() => {
+    void request<{ items: DevPlanTaskDto[] }>('/admin/dev-plan/tasks?page=1&pageSize=500')
+      .then((res) => setAllTasks(res.items ?? []))
+      .catch(() => setAllTasks([]));
+  }, []);
+
+  async function openEdit(row: DevPlanVersionDto) {
+    const detail = await request<DevPlanVersionDto>(`/admin/dev-plan/versions/${row.id}`);
+    setEditing(detail);
+    form.setFieldsValue({
+      versionNo: detail.versionNo,
+      content: detail.content ?? '',
+      status: detail.status,
+      taskIds: detail.taskIds ?? [],
+    });
+    setModalOpen(true);
+  }
+
+  function openCreate() {
+    setEditing(null);
+    form.setFieldsValue({ versionNo: '', content: '', status: 'PENDING', taskIds: [] });
+    setModalOpen(true);
+  }
+
+  async function save() {
+    const values = await form.validateFields();
+    setSaving(true);
+    try {
+      const body = {
+        versionNo: values.versionNo.trim(),
+        content: values.content?.trim() || undefined,
+        status: values.status,
+        taskIds: values.taskIds ?? [],
+      };
+      if (editing) {
+        await request(`/admin/dev-plan/versions/${editing.id}`, {
+          method: 'PUT',
+          body: JSON.stringify(body),
+        });
+        message.success('已更新');
+      } else {
+        await request('/admin/dev-plan/versions', { method: 'POST', body: JSON.stringify(body) });
+        message.success('已创建');
+      }
+      setModalOpen(false);
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function remove(id: string) {
+    try {
+      await request(`/admin/dev-plan/versions/${id}`, { method: 'DELETE' });
+      message.success('已删除');
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    }
+  }
+
+  const columns: ColumnsType<DevPlanVersionDto> = [
+    { title: '版本号', dataIndex: 'versionNo', width: 120 },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 100,
+      render: (s: DevPlanVersionStatusDto) => (
+        <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_VERSION_STATUS_LABELS[s]}</Tag>
+      ),
+    },
+    { title: '内容', dataIndex: 'content', ellipsis: true, render: (v) => v || '—' },
+    { title: '开发起始', dataIndex: 'devStartedAt', width: 160, render: (v) => (v ? fmtTime(v) : '—') },
+    { title: '开发完成', dataIndex: 'devCompletedAt', width: 160, render: (v) => (v ? fmtTime(v) : '—') },
+    { title: '上线时间', dataIndex: 'releasedAt', width: 160, render: (v) => (v ? fmtTime(v) : '—') },
+    {
+      title: '用时',
+      dataIndex: 'durationMinutes',
+      width: 100,
+      render: (v) => formatDuration(v),
+    },
+    { title: '创建时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+    {
+      title: '操作',
+      width: 120,
+      render: (_, row) => (
+        <Space>
+          <Button type="link" size="small" onClick={() => void openEdit(row)}>
+            编辑
+          </Button>
+          <Popconfirm title="确认删除？（不删除关联任务）" onConfirm={() => void remove(row.id)}>
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+        <Typography.Title level={4} style={{ margin: 0 }}>
+          开发计划 · 版本列表
+        </Typography.Title>
+        <Button type="primary" onClick={openCreate}>
+          新建版本
+        </Button>
+      </div>
+
+      <Form
+        layout="inline"
+        style={{ marginBottom: 16 }}
+        onFinish={(v) => {
+          setFilters(v);
+          setPage(1);
+        }}
+      >
+        <Form.Item name="status" label="状态">
+          <Select allowClear style={{ width: 120 }} options={STATUS_OPTIONS} />
+        </Form.Item>
+        <Button type="primary" htmlType="submit">
+          筛选
+        </Button>
+      </Form>
+
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1100 }}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+
+      <Modal
+        title={editing ? '编辑版本' : '新建版本'}
+        open={modalOpen}
+        onCancel={() => setModalOpen(false)}
+        onOk={() => void save()}
+        confirmLoading={saving}
+        destroyOnClose
+        width={640}
+      >
+        <Form form={form} layout="vertical">
+          <Form.Item name="versionNo" label="版本号" rules={[{ required: true }]}>
+            <Input placeholder="如 v3.4.11" maxLength={32} />
+          </Form.Item>
+          <Form.Item name="status" label="状态" rules={[{ required: true }]}>
+            <Select options={STATUS_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="content" label="内容">
+            <Input.TextArea placeholder="版本描述 / 更新日志" rows={3} maxLength={500} showCount />
+          </Form.Item>
+          <Form.Item name="taskIds" label="关联任务">
+            <Select
+              mode="multiple"
+              allowClear
+              showSearch
+              optionFilterProp="label"
+              options={allTasks.map((t) => ({
+                value: t.id,
+                label: `${t.taskNo} · ${t.content.slice(0, 40)}`,
+              }))}
+            />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </div>
+  );
+}

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

@@ -0,0 +1,127 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { Card, Descriptions, Drawer, Select, Space, Table, Tag } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+
+type Row = {
+  id: string;
+  eventType: string;
+  refType: string;
+  refId: string;
+  status?: string | null;
+  param1?: string | null;
+  param2?: string | null;
+  param3?: string | null;
+  remark?: string | null;
+  createdAt: string;
+};
+
+const EVENT_OPTIONS = [
+  { value: '', label: '全部领域事件' },
+  { value: 'ORDER_STATUS', label: '订单状态' },
+  { value: 'BENEFIT_LEDGER', label: '权益流水' },
+  { value: 'STORE_AUDIT', label: '门店审核' },
+  { value: 'TICKET_COLLAB', label: '工单协作' },
+  { value: 'PROMO_TOUCH', label: '推广触达' },
+];
+
+export default function DomainEventsPage() {
+  const [params, setParams] = useSearchParams();
+  const eventType = params.get('eventType') ?? '';
+  const refType = params.get('refType') ?? '';
+  const refId = params.get('refId') ?? '';
+  const [data, setData] = useState<{ items: Row[]; total: number; page: number; pageSize: number } | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [detail, setDetail] = useState<Row | null>(null);
+
+  const load = useCallback(() => {
+    setLoading(true);
+    const q = new URLSearchParams();
+    if (eventType) q.set('eventType', eventType);
+    if (refType) q.set('refType', refType);
+    if (refId) q.set('refId', refId);
+    q.set('page', params.get('page') ?? '1');
+    q.set('pageSize', '20');
+    request<{ items: Row[]; total: number; page: number; pageSize: number }>(
+      `/admin/logs/domain-events?${q.toString()}`,
+    )
+      .then(setData)
+      .finally(() => setLoading(false));
+  }, [eventType, refType, refId, params]);
+
+  useEffect(() => {
+    load();
+  }, [load]);
+
+  const columns: ColumnsType<Row> = [
+    { title: '时间', dataIndex: 'createdAt', width: 170, render: (v) => fmtTime(v) },
+    { title: '类型', dataIndex: 'eventType', width: 130, render: (v) => <Tag>{v}</Tag> },
+    { title: '关联', render: (_, r) => `${r.refType} #${r.refId}` },
+    { title: '状态', dataIndex: 'status', width: 100 },
+    { title: '摘要', render: (_, r) => r.param1 || r.remark || '—' },
+    {
+      title: '操作',
+      width: 80,
+      render: (_, r) => (
+        <a
+          onClick={async () => {
+            setDetail(await request<Row>(`/admin/logs/domain-events/${r.id}`));
+          }}
+        >
+          详情
+        </a>
+      ),
+    },
+  ];
+
+  return (
+    <Card title="领域事件">
+      <Space wrap style={{ marginBottom: 16 }}>
+        <Select
+          style={{ width: 180 }}
+          value={eventType}
+          options={EVENT_OPTIONS}
+          onChange={(v) => {
+            const next = new URLSearchParams(params);
+            if (v) next.set('eventType', v);
+            else next.delete('eventType');
+            next.set('page', '1');
+            setParams(next);
+          }}
+        />
+      </Space>
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        pagination={{
+          current: data?.page ?? 1,
+          pageSize: data?.pageSize ?? 20,
+          total: data?.total ?? 0,
+          onChange: (p) => {
+            const next = new URLSearchParams(params);
+            next.set('page', String(p));
+            setParams(next);
+          },
+        }}
+      />
+      <Drawer open={!!detail} title="事件详情" width={520} onClose={() => setDetail(null)}>
+        {detail && (
+          <Descriptions column={1} size="small">
+            <Descriptions.Item label="ID">{detail.id}</Descriptions.Item>
+            <Descriptions.Item label="类型">{detail.eventType}</Descriptions.Item>
+            <Descriptions.Item label="关联">{`${detail.refType} #${detail.refId}`}</Descriptions.Item>
+            <Descriptions.Item label="param1">{detail.param1}</Descriptions.Item>
+            <Descriptions.Item label="param2">{detail.param2}</Descriptions.Item>
+            <Descriptions.Item label="param3">{detail.param3}</Descriptions.Item>
+            <Descriptions.Item label="备注">{detail.remark}</Descriptions.Item>
+            <Descriptions.Item label="时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
+          </Descriptions>
+        )}
+      </Drawer>
+    </Card>
+  );
+}

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

@@ -18,6 +18,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { UploadOutlined } from '@ant-design/icons';
 import type {
   KnowledgeBaseDto,
+  KnowledgeDocumentDetailDto,
   KnowledgeDocumentDto,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
@@ -49,6 +50,10 @@ export default function KnowledgeBasesPage() {
   const [docsLoading, setDocsLoading] = useState(false);
   const [docModalOpen, setDocModalOpen] = useState(false);
   const [docSaving, setDocSaving] = useState(false);
+  const [editingDoc, setEditingDoc] = useState<KnowledgeDocumentDto | null>(null);
+  const [editDocModalOpen, setEditDocModalOpen] = useState(false);
+  const [editDocSaving, setEditDocSaving] = useState(false);
+  const [editDocForm] = Form.useForm<DocForm>();
 
   const { data, loading, page, pageSize, setPage, setPageSize, reload } =
     useAdminList<KnowledgeBaseDto>(
@@ -195,28 +200,52 @@ export default function KnowledgeBasesPage() {
     },
     {
       title: '操作',
-      width: 80,
+      width: 140,
       render: (_, row) =>
         drawerKb?.canEditFull ? (
-          <Popconfirm
-            title="删除文档？"
-            onConfirm={async () => {
-              try {
-                await request(`/admin/knowledge-bases/${drawerKb.id}/documents/${row.id}`, {
-                  method: 'DELETE',
-                });
-                message.success('已删除');
-                void loadDocs(drawerKb);
-                reload();
-              } catch (e) {
-                message.error(e instanceof Error ? e.message : String(e));
-              }
-            }}
-          >
-            <Button type="link" size="small" danger>
-              删除
+          <Space>
+            <Button
+              type="link"
+              size="small"
+              onClick={async () => {
+                if (!drawerKb) return;
+                try {
+                  const detail = await request<KnowledgeDocumentDetailDto>(
+                    `/admin/knowledge-bases/${drawerKb.id}/documents/${row.id}`,
+                  );
+                  setEditingDoc(row);
+                  editDocForm.setFieldsValue({
+                    title: detail.title,
+                    contentText: detail.contentText || '',
+                  });
+                  setEditDocModalOpen(true);
+                } catch (e) {
+                  message.error(e instanceof Error ? e.message : String(e));
+                }
+              }}
+            >
+              编辑
             </Button>
-          </Popconfirm>
+            <Popconfirm
+              title="删除文档？"
+              onConfirm={async () => {
+                try {
+                  await request(`/admin/knowledge-bases/${drawerKb.id}/documents/${row.id}`, {
+                    method: 'DELETE',
+                  });
+                  message.success('已删除');
+                  void loadDocs(drawerKb);
+                  reload();
+                } catch (e) {
+                  message.error(e instanceof Error ? e.message : String(e));
+                }
+              }}
+            >
+              <Button type="link" size="small" danger>
+                删除
+              </Button>
+            </Popconfirm>
+          </Space>
         ) : null,
     },
   ];
@@ -398,6 +427,50 @@ export default function KnowledgeBasesPage() {
           </Form.Item>
         </Form>
       </Modal>
+
+      <Modal
+        title="编辑知识文档"
+        open={editDocModalOpen}
+        onCancel={() => {
+          setEditDocModalOpen(false);
+          setEditingDoc(null);
+        }}
+        confirmLoading={editDocSaving}
+        onOk={async () => {
+          if (!drawerKb || !editingDoc) return;
+          const values = await editDocForm.validateFields();
+          setEditDocSaving(true);
+          try {
+            await request(`/admin/knowledge-bases/${drawerKb.id}/documents/${editingDoc.id}`, {
+              method: 'PUT',
+              body: JSON.stringify({
+                title: values.title,
+                contentText: values.contentText || null,
+              }),
+            });
+            message.success('已保存');
+            setEditDocModalOpen(false);
+            setEditingDoc(null);
+            void loadDocs(drawerKb);
+            reload();
+          } catch (e) {
+            message.error(e instanceof Error ? e.message : String(e));
+          } finally {
+            setEditDocSaving(false);
+          }
+        }}
+        destroyOnClose
+        width={640}
+      >
+        <Form form={editDocForm} layout="vertical">
+          <Form.Item name="title" label="标题" rules={[{ required: true }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item name="contentText" label="正文（可粘贴）">
+            <Input.TextArea rows={8} placeholder="支持 Markdown / 纯文本" />
+          </Form.Item>
+        </Form>
+      </Modal>
     </div>
   );
 }

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

@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Button, Card, Form, Input, Tabs, message, Typography } from 'antd';
+import { MOCK_SMS_FIXED_CODE } from '@dukang/shared-types';
 import { saveAuth, request } from '../lib/api';
 
 type LoginResult = { accessToken: string; refreshToken: string };
@@ -117,14 +118,14 @@ export default function LoginPage() {
                   form={smsForm}
                   layout="vertical"
                   onFinish={onSmsFinish}
-                  initialValues={{ phone: '13600000001', code: '123456' }}
+                  initialValues={{ phone: '13600000001', code: MOCK_SMS_FIXED_CODE }}
                 >
                   <Form.Item name="phone" label="手机号" rules={[{ required: true, message: '请输入手机号' }]}>
                     <Input placeholder="13600000001" maxLength={11} />
                   </Form.Item>
                   <Form.Item name="code" label="验证码" rules={[{ required: true, message: '请输入验证码' }]}>
                     <Input
-                      placeholder="123456"
+                      placeholder={MOCK_SMS_FIXED_CODE}
                       addonAfter={
                         <Button type="link" size="small" disabled={codeCooldown > 0} onClick={() => void sendCode()}>
                           {codeCooldown > 0 ? `${codeCooldown}s` : '获取验证码'}

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

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Link } from 'react-router-dom';
 import {
   Alert,
   Button,
@@ -24,9 +25,11 @@ import {
   DELIVERY_PROVIDER_LABELS,
   ORDER_STATUS_COLORS,
   ORDER_STATUS_LABELS,
+  ORDER_STATUS_OPERATOR_LABELS,
   fmtTime,
 } from '../lib/constants';
 import { FULFILLMENT_HOLD_REASON_LABELS } from '@dukang/shared-types';
+import ProxyOrderModal from '../components/ProxyOrderModal';
 
 type ShipDefaults = {
   provider: string;
@@ -102,7 +105,13 @@ type OrderDetail = AdminOrderRow & {
   listUnitPrice?: number;
   items?: AdminOrderItem[];
   payment?: Record<string, unknown> | null;
-  statusLogs?: Array<{ fromStatus: string | null; toStatus: string; createdAt: string }>;
+  statusLogs?: Array<{
+    fromStatus: string | null;
+    toStatus: string;
+    operator?: string | null;
+    remark?: string | null;
+    createdAt: string;
+  }>;
   benefitCoupons?: Array<Record<string, unknown>>;
   redeemSummary?: OrderRedeemSummary | null;
   redeemRecords?: OrderRedeemRecord[];
@@ -167,6 +176,7 @@ export default function OrdersPage() {
   const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
   const [batchDeleteOpen, setBatchDeleteOpen] = useState(false);
   const [batchDeleting, setBatchDeleting] = useState(false);
+  const [deletingId, setDeletingId] = useState<string | null>(null);
   const [shipDefaults, setShipDefaults] = useState<ShipDefaults | null>(null);
   const [shipping, setShipping] = useState(false);
   const [logisticsShipping, setLogisticsShipping] = useState(false);
@@ -175,7 +185,9 @@ export default function OrdersPage() {
   const [shipTarget, setShipTarget] = useState<OrderDetail | null>(null);
   const [shipMode, setShipMode] = useState<ShipMode>('EXPRESS');
   const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
+  const [proxyOpen, setProxyOpen] = useState(false);
   const canDeleteOrders = (profile?.permissionKeys ?? []).includes('orders_delete');
+  const canProxyOrder = (profile?.permissionKeys ?? []).includes('orders');
 
   const selectedOrders = useMemo(
     () => (data?.items ?? []).filter((row) => selectedRowKeys.includes(row.id)),
@@ -207,6 +219,7 @@ export default function OrdersPage() {
       const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
       if (values.orderNo) qs.set('orderNo', values.orderNo);
       if (values.status) qs.set('status', values.status);
+      if (values.orderType) qs.set('orderType', values.orderType);
       if (values.cityId) qs.set('cityId', values.cityId);
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
       if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true');
@@ -379,6 +392,43 @@ export default function OrdersPage() {
     }
   }
 
+  function askDeleteOrder(id: string, orderNo?: string) {
+    Modal.confirm({
+      title: '确认删除订单？',
+      content: (
+        <div>
+          <p>将永久删除订单{orderNo ? ` ${orderNo}` : ''} 及其配送、权益券、核销、发票等关联数据。</p>
+          <p style={{ color: 'var(--ant-color-error)', marginBottom: 0 }}>此操作不可恢复，请确认不是真实线上订单。</p>
+        </div>
+      ),
+      okText: '确认删除',
+      okType: 'danger',
+      cancelText: '取消',
+      onOk: () => deleteOrder(id),
+    });
+  }
+
+  async function deleteOrder(id: string) {
+    setDeletingId(id);
+    try {
+      const res = await request<{ deleted: number; message: string }>(`/admin/orders/${id}`, {
+        method: 'DELETE',
+      });
+      message.success(res.message || '订单已删除');
+      if (detail?.id === id) {
+        setDrawerOpen(false);
+        setDetail(null);
+      }
+      setSelectedRowKeys((prev) => prev.filter((k) => k !== id));
+      void load();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+      throw e;
+    } finally {
+      setDeletingId(null);
+    }
+  }
+
   const columns: ColumnsType<AdminOrderRow> = [
     { title: '订单号', dataIndex: 'orderNo', width: 180 },
     {
@@ -408,6 +458,11 @@ export default function OrdersPage() {
         <Space size={4} wrap>
           <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
           {row.fulfillmentHold ? <Tag color="orange">大单待确认</Tag> : null}
+          {row.orderType === 'PROXY' || row.isProxyOrder ? (
+            <Tag color="purple" title={row.proxyPartnerName || undefined}>
+              代下单
+            </Tag>
+          ) : null}
         </Space>
       ),
     },
@@ -415,7 +470,8 @@ export default function OrdersPage() {
       title: '配送',
       dataIndex: 'deliveryType',
       width: 90,
-      render: (v) => (v === 'LOCAL' ? '同城' : '跨城'),
+      render: (v) =>
+        v === 'ON_SITE_PICKUP' ? '现场提货' : v === 'LOCAL' ? '同城' : '跨城',
     },
     { title: '实付', dataIndex: 'payAmount', width: 90, render: (v) => `¥${v}` },
     { title: '收货人', dataIndex: 'receiverName', width: 90 },
@@ -439,7 +495,7 @@ export default function OrdersPage() {
     },
     {
       title: '操作',
-      width: 140,
+      width: 180,
       fixed: 'right',
       render: (_, row) => (
         <Space size={0}>
@@ -451,6 +507,17 @@ export default function OrdersPage() {
               配送
             </Button>
           )}
+          {canDeleteOrders && (
+            <Button
+              type="link"
+              size="small"
+              danger
+              loading={deletingId === row.id}
+              onClick={() => askDeleteOrder(row.id, row.orderNo)}
+            >
+              删除
+            </Button>
+          )}
         </Space>
       ),
     },
@@ -460,16 +527,38 @@ export default function OrdersPage() {
     <div>
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
         <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
-        {canDeleteOrders ? (
-          <Button
-            danger
-            disabled={!selectedRowKeys.length}
-            onClick={() => setBatchDeleteOpen(true)}
-          >
-            批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
-          </Button>
-        ) : null}
+        <Space>
+          {canProxyOrder ? (
+            <Button type="primary" onClick={() => setProxyOpen(true)}>
+              代下单
+            </Button>
+          ) : null}
+          {canDeleteOrders ? (
+            <Button
+              danger
+              disabled={!selectedRowKeys.length}
+              onClick={() => setBatchDeleteOpen(true)}
+            >
+              批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
+            </Button>
+          ) : null}
+        </Space>
       </Space>
+
+      {!canDeleteOrders && profile ? (
+        <Alert
+          type="info"
+          showIcon
+          style={{ marginBottom: 16 }}
+          message="当前账号无「删除订单」权限"
+          description={
+            <span>
+              非超管账号需在 <Link to="/hq-permissions">权限分配</Link> 中勾选危险操作「删除订单」。
+            </span>
+          }
+        />
+      ) : null}
+
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
         <Form.Item name="orderNo" label="订单号">
           <Input placeholder="DK..." allowClear />
@@ -477,6 +566,17 @@ export default function OrdersPage() {
         <Form.Item name="status" label="状态">
           <Select allowClear style={{ width: 120 }} options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
         </Form.Item>
+        <Form.Item name="orderType" label="类型">
+          <Select
+            allowClear
+            style={{ width: 120 }}
+            placeholder="全部"
+            options={[
+              { value: 'NORMAL', label: '普通订单' },
+              { value: 'PROXY', label: '代下单' },
+            ]}
+          />
+        </Form.Item>
         <Form.Item name="cityId" label="城市">
           <Select
             allowClear
@@ -540,6 +640,15 @@ export default function OrdersPage() {
                 配送发货
               </Button>
             )}
+            {canDeleteOrders && (
+              <Button
+                danger
+                loading={deletingId === detail.id}
+                onClick={() => askDeleteOrder(detail.id, detail.orderNo)}
+              >
+                删除订单
+              </Button>
+            )}
             <Typography.Text type="secondary">调试改状态</Typography.Text>
             <Select
               value={detail.status}
@@ -581,8 +690,16 @@ export default function OrdersPage() {
                         '大单待确认'}
                     </Tag>
                   ) : null}
+                  {detail.orderType === 'PROXY' || detail.isProxyOrder ? (
+                    <Tag color="purple">代下单</Tag>
+                  ) : null}
                 </Space>
               </Descriptions.Item>
+              {detail.orderType === 'PROXY' || detail.isProxyOrder || detail.proxyPartnerName ? (
+                <Descriptions.Item label="代下单人">
+                  {[detail.proxyPartnerName, detail.proxyPartnerPhone].filter(Boolean).join(' / ') || '—'}
+                </Descriptions.Item>
+              ) : null}
               <Descriptions.Item label="用户">{detail.user?.userNo} / {detail.user?.nickname}</Descriptions.Item>
               <Descriptions.Item label="商品额">¥{detail.productAmount}</Descriptions.Item>
               <Descriptions.Item label="实付">¥{detail.payAmount}</Descriptions.Item>
@@ -765,13 +882,40 @@ export default function OrdersPage() {
                 <Typography.Title level={5} style={{ marginTop: 16 }}>状态流转</Typography.Title>
                 <Table
                   size="small"
-                  rowKey="createdAt"
+                  rowKey={(_, i) => String(i)}
                   pagination={false}
                   dataSource={detail.statusLogs}
                   columns={[
-                    { title: '从', dataIndex: 'fromStatus', render: (v) => v || '—' },
-                    { title: '到', dataIndex: 'toStatus', render: (v) => ORDER_STATUS_LABELS[v] || v },
-                    { title: '时间', dataIndex: 'createdAt', render: (v) => new Date(v).toLocaleString('zh-CN') },
+                    {
+                      title: '从',
+                      dataIndex: 'fromStatus',
+                      width: 100,
+                      render: (v) => (v ? ORDER_STATUS_LABELS[v] || v : '—'),
+                    },
+                    {
+                      title: '到',
+                      dataIndex: 'toStatus',
+                      width: 100,
+                      render: (v) => ORDER_STATUS_LABELS[v] || v,
+                    },
+                    {
+                      title: '操作人',
+                      dataIndex: 'operator',
+                      width: 120,
+                      render: (v) => ORDER_STATUS_OPERATOR_LABELS[v] || v || '—',
+                    },
+                    {
+                      title: '备注',
+                      dataIndex: 'remark',
+                      ellipsis: true,
+                      render: (v) => v || '—',
+                    },
+                    {
+                      title: '时间',
+                      dataIndex: 'createdAt',
+                      width: 170,
+                      render: (v) => new Date(v).toLocaleString('zh-CN'),
+                    },
                   ]}
                 />
               </>
@@ -1078,6 +1222,16 @@ export default function OrdersPage() {
           ]}
         />
       </Modal>
+
+      <ProxyOrderModal
+        open={proxyOpen}
+        onClose={() => setProxyOpen(false)}
+        onSuccess={(order) => {
+          setProxyOpen(false);
+          void load();
+          void openDetail(order.id);
+        }}
+      />
     </div>
   );
 }

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

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import {
   Button, Descriptions, Divider, Drawer, Form, Input, InputNumber, Modal, Popconfirm, Select, Space,
   Switch, Table, Tabs, Tag, Typography, message,
@@ -32,6 +32,10 @@ type Row = {
   status: string;
   sortOrder: number;
   allowOnSitePickup?: boolean;
+  allowOnlinePurchase?: boolean;
+  allowCrossCityDelivery?: boolean;
+  visibilityWhitelistEnabled?: boolean;
+  visibilityPhones?: string[];
   mainImageUrl?: string | null;
   carouselUrls?: string[];
   detailImageUrls?: string[];
@@ -51,6 +55,10 @@ type ProductFormValues = {
   status?: string;
   sortOrder?: number;
   allowOnSitePickup?: boolean;
+  allowOnlinePurchase?: boolean;
+  allowCrossCityDelivery?: boolean;
+  visibilityWhitelistEnabled?: boolean;
+  visibilityPhones?: string[];
   coverUrl?: string;
   carouselUrls?: string[];
   detailImageUrls?: string[];
@@ -59,13 +67,26 @@ 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: ((d as Row).carouselUrls?.length ? (d as Row).carouselUrls : ['']) as string[],
-    detailImageUrls: ((d as Row).detailImageUrls?.length ? (d as 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,
+    visibilityWhitelistEnabled: !!row.visibilityWhitelistEnabled,
+    visibilityPhones: (row.visibilityPhones ?? []) as string[],
     storyTitle: detail.storyTitle ?? '',
     storyText: detail.storyText ?? '',
     features: detail.features?.length
@@ -91,8 +112,11 @@ function buildProductPayload(v: ProductFormValues) {
     features: features.length ? features : undefined,
   };
 
+  const visibilityPhones = (v.visibilityPhones ?? [])
+    .map((p) => String(p || '').replace(/\D/g, '').trim())
+    .filter(Boolean);
+
   return {
-    skuCode: v.skuCode,
     barcode69: v.barcode69,
     name: v.name,
     subtitle: v.subtitle,
@@ -103,6 +127,11 @@ function buildProductPayload(v: ProductFormValues) {
     status: v.status,
     sortOrder: v.sortOrder,
     allowOnSitePickup: !!v.allowOnSitePickup,
+    allowOnlinePurchase: v.allowOnlinePurchase !== false,
+    allowCrossCityDelivery:
+      v.allowOnlinePurchase === false ? false : v.allowCrossCityDelivery !== false,
+    visibilityWhitelistEnabled: !!v.visibilityWhitelistEnabled,
+    visibilityPhones,
     coverUrl: v.coverUrl,
     carouselUrls,
     detailImageUrls,
@@ -139,10 +168,10 @@ function ProductDetailFields({ form, aromaType }: { form: FormInstance; aromaTyp
     <>
       <ProductDetailTemplatePicker form={form} aromaType={aromaType} />
       <Divider />
-      <Typography.Text type="secondary">详情页轮播（CAROUSEL）</Typography.Text>
+      <Typography.Text type="secondary">详情页轮播（CAROUSEL，单张最大 10MB）</Typography.Text>
       <ImageUrlList name="carouselUrls" label="轮播图" bizType="CAROUSEL" />
       <Divider />
-      <Typography.Text type="secondary">详情长图（DETAIL，可逐张修改）</Typography.Text>
+      <Typography.Text type="secondary">详情长图（DETAIL，可逐张修改，单张最大 10MB）</Typography.Text>
       <DetailImageUrlList label="详情图" bizType="DETAIL" />
       <Divider />
       <Form.Item name="storyTitle" label="故事标题">
@@ -183,13 +212,94 @@ function ProductDetailFields({ form, aromaType }: { form: FormInstance; aromaTyp
   );
 }
 
-function BaseInfoFields({ mode }: { mode: 'create' | 'edit' }) {
+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 (
+    <>
+      <Form.Item
+        name="visibilityWhitelistEnabled"
+        label="可见白名单"
+        valuePropName="checked"
+        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>
+        </>
+      ) : null}
+    </>
+  );
+}
+
+function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormInstance }) {
   return (
     <>
       {mode === 'create' && (
         <>
-          <Form.Item name="skuCode" label="SKU" rules={[{ required: true }]}>
-            <Input />
+          <Form.Item label="SKU">
+            <Input disabled placeholder="保存后自动生成" />
           </Form.Item>
           <Form.Item name="barcode69" label="69码" rules={[{ required: true }]}>
             <Input />
@@ -220,9 +330,40 @@ function BaseInfoFields({ mode }: { mode: 'create' | 'edit' }) {
       <Form.Item name="sortOrder" label="排序">
         <InputNumber min={0} style={{ width: '100%' }} />
       </Form.Item>
+      <Form.Item
+        name="allowOnlinePurchase"
+        label="允许线上购买"
+        valuePropName="checked"
+        extra="配送到址（同城）"
+      >
+        <Switch
+          checkedChildren="开"
+          unCheckedChildren="关"
+          onChange={(checked) => {
+            if (!checked) form.setFieldsValue({ allowCrossCityDelivery: false });
+          }}
+        />
+      </Form.Item>
+      <Form.Item noStyle shouldUpdate={(prev, cur) => prev.allowOnlinePurchase !== cur.allowOnlinePurchase}>
+        {() => (
+          <Form.Item
+            name="allowCrossCityDelivery"
+            label="允许跨城配送"
+            valuePropName="checked"
+            extra="须先开启线上购买"
+          >
+            <Switch
+              checkedChildren="开"
+              unCheckedChildren="关"
+              disabled={!form.getFieldValue('allowOnlinePurchase')}
+            />
+          </Form.Item>
+        )}
+      </Form.Item>
       <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
         <Switch checkedChildren="开" unCheckedChildren="关" />
       </Form.Item>
+      <VisibilityWhitelistFields form={form} />
       <Form.Item name="coverUrl" label="封面">
         <OssUpload bizType="COVER" mediaType="IMAGE" />
       </Form.Item>
@@ -264,7 +405,7 @@ export default function ProductsPage() {
     }
   }
 
-  const columns: ColumnsType<Row> = [
+  const columns: ColumnsType<Row> = useMemo(() => [
     { title: 'SKU', dataIndex: 'skuCode', width: 90 },
     { title: '商品名', dataIndex: 'name', width: 180, ellipsis: true },
     { title: '香型', dataIndex: 'aromaType', width: 80, render: (v) => AROMA_TYPE_LABELS[v] || v },
@@ -275,10 +416,26 @@ export default function ProductsPage() {
       <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
     ) },
     {
-      title: '现场取货',
-      dataIndex: 'allowOnSitePickup',
+      title: '白名单',
+      dataIndex: 'visibilityWhitelistEnabled',
       width: 90,
-      render: (v: boolean) => (v ? <Tag color="green">允许</Tag> : <Tag>否</Tag>),
+      render: (v: boolean, row) =>
+        v ? <Tag color="orange">限{row.visibilityPhones?.length ?? 0}人</Tag> : <Tag>公开</Tag>,
+    },
+    {
+      title: '履约',
+      key: 'fulfillment',
+      width: 160,
+      render: (_, row) => (
+        <Space size={[0, 4]} wrap>
+          {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
+          {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
+            <Tag color="cyan">跨城</Tag>
+          ) : null}
+          {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
+          {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
+        </Space>
+      ),
     },
     { title: '排序', dataIndex: 'sortOrder', width: 60 },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
@@ -305,7 +462,7 @@ export default function ProductsPage() {
         </Space>
       ),
     },
-  ];
+  ], [detail, editForm]);
 
   return (
     <div>
@@ -323,12 +480,16 @@ export default function ProductsPage() {
         </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1140 }}
+      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1320 }}
         pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
       <Drawer title="编辑商品" width={720} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Button type="primary" onClick={async () => {
             const v = await editForm.validateFields();
+            if (!v.allowOnlinePurchase && !v.allowOnSitePickup) {
+              message.error('请至少勾选「允许线上购买」或「允许现场取货」之一');
+              return;
+            }
             const payload = buildProductPayload(v);
             await request(`/admin/products/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
             message.success('已保存');
@@ -345,7 +506,7 @@ export default function ProductsPage() {
             </Descriptions>
             <Form form={editForm} layout="vertical">
               <Tabs items={[
-                { key: 'base', label: '基础信息', children: <BaseInfoFields mode="edit" /> },
+                { key: 'base', label: '基础信息', children: <BaseInfoFields mode="edit" form={editForm} /> },
                 {
                   key: 'detail',
                   label: '详情页',
@@ -363,6 +524,10 @@ export default function ProductsPage() {
       </Drawer>
       <Modal title="新建商品" open={createOpen} onCancel={() => setCreateOpen(false)} onOk={async () => {
         const v = await createForm.validateFields();
+        if (!v.allowOnlinePurchase && !v.allowOnSitePickup) {
+          message.error('请至少勾选「允许线上购买」或「允许现场取货」之一');
+          return;
+        }
         const payload = buildProductPayload(v);
         await request('/admin/products', { method: 'POST', body: JSON.stringify(payload) });
         message.success('已创建');
@@ -371,12 +536,14 @@ export default function ProductsPage() {
         void reload();
       }} width={720}>
         <Form form={createForm} layout="vertical" initialValues={{
-          aromaType: 'QINGXIANG', status: 'DRAFT', sortOrder: 0, allowOnSitePickup: false,
+          aromaType: 'QINGXIANG', status: 'DRAFT', sortOrder: 0,
+          allowOnlinePurchase: true, allowCrossCityDelivery: true, allowOnSitePickup: false,
+          visibilityWhitelistEnabled: false, visibilityPhones: [],
           carouselUrls: [''], detailImageUrls: [''],
           features: [{ icon: 'water_drop', title: '', desc: '' }],
         }}>
           <Tabs items={[
-            { key: 'base', label: '基础信息', children: <BaseInfoFields mode="create" /> },
+            { key: 'base', label: '基础信息', children: <BaseInfoFields mode="create" form={createForm} /> },
             {
               key: 'detail',
               label: '详情页',

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

@@ -2,6 +2,7 @@ import { useState } from 'react';
 import {
   Button, Card, Col, Form, Input, InputNumber, Row, Space, Tabs, Typography, message,
 } from 'antd';
+import { MOCK_SMS_FIXED_CODE } from '@dukang/shared-types';
 import { request } from '../lib/api';
 
 type ApiResult = Record<string, unknown>;
@@ -255,7 +256,7 @@ export default function RedeemDebugPage() {
                   <Input />
                 </Form.Item>
                 <Form.Item name="code" label="验证码" rules={[{ required: true }]}>
-                  <Input placeholder="Mock 默认 123456" />
+                  <Input placeholder={`Mock 默认 ${MOCK_SMS_FIXED_CODE}`} />
                 </Form.Item>
                 <Button
                   loading={loading}
@@ -335,7 +336,7 @@ export default function RedeemDebugPage() {
                   <Input />
                 </Form.Item>
                 <Form.Item name="code" label="核销确认验证码" rules={[{ required: true }]}>
-                  <Input placeholder="Mock 默认 123456" />
+                  <Input placeholder={`Mock 默认 ${MOCK_SMS_FIXED_CODE}`} />
                 </Form.Item>
                 <Button
                   type="primary"

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

@@ -1,17 +1,29 @@
 import { useState } from 'react';
-import { Button, Descriptions, Drawer, Form, Input, Table, Typography } from 'antd';
+import { Button, 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';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 
 type Row = {
-  id: string; redeemNo: string; amount: number; settleAmount: number; createdAt: string;
-  user?: { userNo: string; phone: string | null };
+  id: string;
+  redeemNo: string;
+  amount: number;
+  settleAmount: number;
+  channel?: RedeemChannel;
+  createdAt: string;
+  user?: { userNo: string; phone: string | null; nickname?: string | null };
   store?: { name: string; cityName: string };
   coupon?: { couponNo: string };
 };
 
+function maskPhone(phone: string | null | undefined) {
+  if (!phone || phone.length < 7) return phone ?? '—';
+  return `${phone.slice(0, 3)}****${phone.slice(-4)}`;
+}
+
 export default function RedeemRecordsPage() {
   const [form] = Form.useForm();
   const [filters, setFilters] = useState<Record<string, string>>({});
@@ -21,28 +33,65 @@ export default function RedeemRecordsPage() {
       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);
       return qs;
     },
     [filters],
   );
   const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detailLoading, setDetailLoading] = useState(false);
+
+  async function openDetail(id: string) {
+    setDetailLoading(true);
+    setDrawerOpen(true);
+    try {
+      setDetail(await request(`/admin/redeem-records/${id}`));
+    } finally {
+      setDetailLoading(false);
+    }
+  }
 
   const columns: ColumnsType<Row> = [
     { title: '核销号', dataIndex: 'redeemNo', width: 180 },
-    { title: '用户', dataIndex: ['user', 'userNo'], width: 110 },
+    {
+      title: '方式',
+      dataIndex: 'channel',
+      width: 110,
+      render: (v: RedeemChannel | undefined) => {
+        const channel = v === 'PHONE' ? 'PHONE' : 'SCAN';
+        return (
+          <Tag color={channel === 'PHONE' ? 'purple' : 'blue'}>
+            {REDEEM_CHANNEL_LABELS[channel]}
+          </Tag>
+        );
+      },
+    },
+    { title: '用户编号', dataIndex: ['user', 'userNo'], width: 110 },
+    {
+      title: '用户昵称',
+      dataIndex: ['user', 'nickname'],
+      width: 100,
+      render: (v: string | null | undefined) => v || '—',
+    },
+    {
+      title: '用户手机',
+      dataIndex: ['user', 'phone'],
+      width: 120,
+      render: (v: string | null | undefined) => maskPhone(v),
+    },
     { title: '门店', dataIndex: ['store', 'name'] },
     { title: '核销额', dataIndex: 'amount', width: 90, render: (v) => `¥${v}` },
     { title: '结算额', dataIndex: 'settleAmount', width: 90, render: (v) => `¥${v}` },
     { title: '券号', dataIndex: ['coupon', 'couponNo'], width: 160 },
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
-      title: '操作', width: 80,
+      title: '操作',
+      width: 80,
       render: (_, row) => (
-        <Button type="link" size="small" onClick={async () => {
-          setDetail(await request(`/admin/redeem-records/${row.id}`));
-          setDrawerOpen(true);
-        }}>详情</Button>
+        <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+          详情
+        </Button>
       ),
     },
   ];
@@ -50,21 +99,69 @@ export default function RedeemRecordsPage() {
   return (
     <div>
       <Typography.Title level={4}>核销记录</Typography.Title>
-      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-        <Form.Item name="redeemNo" label="核销号"><Input allowClear /></Form.Item>
-        <Form.Item name="storeId" label="门店ID"><Input allowClear /></Form.Item>
+      <Form
+        form={form}
+        layout="inline"
+        style={{ marginBottom: 16 }}
+        onFinish={(v) => {
+          setFilters(v);
+          setPage(1);
+        }}
+      >
+        <Form.Item name="redeemNo" label="核销号">
+          <Input allowClear />
+        </Form.Item>
+        <Form.Item name="storeId" label="门店ID">
+          <Input allowClear />
+        </Form.Item>
+        <Form.Item name="channel" label="方式">
+          <Select
+            allowClear
+            style={{ width: 140 }}
+            options={[
+              { value: 'SCAN', label: '扫码核销' },
+              { value: 'PHONE', label: '手机号核销' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            查询
+          </Button>
+        </Form.Item>
       </Form>
-      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1000 }}
-        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-      <Drawer title="核销详情" width={520} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
-        {detail && (
-          <Descriptions column={1} bordered size="small">
-            <Descriptions.Item label="核销号">{String(detail.redeemNo)}</Descriptions.Item>
-            <Descriptions.Item label="核销额">¥{String(detail.amount)}</Descriptions.Item>
-            <Descriptions.Item label="结算额">¥{String(detail.settleAmount)}</Descriptions.Item>
-            <Descriptions.Item label="时间">{fmtTime(String(detail.createdAt))}</Descriptions.Item>
-          </Descriptions>
-        )}
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1300 }}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+      <Drawer
+        title="核销详情"
+        width={640}
+        open={drawerOpen}
+        onClose={() => {
+          setDrawerOpen(false);
+          setDetail(null);
+        }}
+        destroyOnClose
+      >
+        {detailLoading ? (
+          <Typography.Text type="secondary">加载中…</Typography.Text>
+        ) : detail ? (
+          <RedeemRecordDetailDescriptions detail={detail} />
+        ) : null}
       </Drawer>
     </div>
   );

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

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import {
   Button,
   Card,
@@ -6,6 +7,7 @@ import {
   Descriptions,
   Drawer,
   Form,
+  Input,
   Modal,
   Select,
   Space,
@@ -17,44 +19,61 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import type { Dayjs } from 'dayjs';
+import {
+  STORE_SETTLEMENT_KIND_LABELS,
+  STORE_SETTLEMENT_STATUS_LABELS,
+  storeSettlementStatusLabel,
+  type StoreSettlementKind,
+  type StoreSettlementStatus,
+} from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
 
 type Row = {
+  kind: StoreSettlementKind;
   id: string;
   billNo: string;
-  billDate: string;
-  redeemCount: number;
-  redeemAmount: number;
-  settlementRate: number;
-  payoutAmount: number;
-  status: string;
-  paidAt?: string | null;
-  store?: { id: string; name: string; cityName: string; phone?: string };
+  amount: number;
+  status: StoreSettlementStatus;
+  date: string;
+  overdue?: boolean;
+  redeemCount?: number | null;
+  redeemAmount?: number | null;
+  settlementRate?: number | null;
+  payoutCount?: number | null;
+  store?: { id: string; name: string; cityName: string; phone?: string | null };
 };
 
 type StoreOption = { id: string; name: string; phone: string };
 
-const STATUS_LABELS: Record<string, string> = {
-  UNPAID: '未打款',
-  PAID: '已打款',
-};
-
 const STATUS_COLORS: Record<string, string> = {
   UNPAID: 'red',
   PAID: 'green',
+  PENDING_REVIEW: 'orange',
+  REJECTED: 'red',
+};
+
+const KIND_COLORS: Record<StoreSettlementKind, string> = {
+  T1_BILL: 'blue',
+  WITHDRAW: 'purple',
 };
 
 export default function StoreBillsPage() {
+  const [searchParams] = useSearchParams();
+  const initialKind = searchParams.get('kind') === 'WITHDRAW' ? 'WITHDRAW' : '';
   const [form] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [filters, setFilters] = useState<Record<string, string>>({
+    kind: initialKind,
+    status: initialKind === 'WITHDRAW' ? 'PENDING_REVIEW' : '',
+  });
   const [stores, setStores] = useState<StoreOption[]>([]);
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
-    '/admin/store-bills',
+    '/admin/store-settlements',
     () => {
       const qs = new URLSearchParams();
+      if (filters.kind) qs.set('kind', filters.kind);
       if (filters.status) qs.set('status', filters.status);
       if (filters.storeId) qs.set('storeId', filters.storeId);
       if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
@@ -64,21 +83,38 @@ export default function StoreBillsPage() {
     [filters],
   );
   const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
+  const [detailKind, setDetailKind] = useState<StoreSettlementKind | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [exporting, setExporting] = useState(false);
   const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
   const [batchLoading, setBatchLoading] = useState(false);
+  const [overdueSummary, setOverdueSummary] = useState<{
+    pendingCount: number;
+    overdueCount: number;
+  } | null>(null);
+
+  useEffect(() => {
+    form.setFieldsValue({
+      kind: filters.kind || undefined,
+      status: filters.status || undefined,
+    });
+  }, [filters.kind, filters.status, form]);
 
   useEffect(() => {
     void request<Paginated<StoreOption>>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
       .then((res) => setStores(res.items))
       .catch(() => {});
+    void request<{ pendingCount: number; overdueCount: number }>(
+      '/admin/store-withdrawals/overdue-summary',
+    )
+      .then(setOverdueSummary)
+      .catch(() => {});
   }, []);
 
   function confirmPay(ids: string[], amountHint?: number) {
     Modal.confirm({
       title: '确认打款？',
-      content: `将确认 ${ids.length} 笔门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      content: `将确认 ${ids.length} 笔 T+1 门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
@@ -102,9 +138,75 @@ export default function StoreBillsPage() {
     });
   }
 
-  async function openDetail(id: string) {
-    const d = await request<Record<string, unknown>>(`/admin/store-bills/${id}`);
+  function approveWithdraw(id: string) {
+    let paymentRef = '';
+    Modal.confirm({
+      title: '审核通过并标记已结算？',
+      content: (
+        <Input
+          placeholder="打款凭证号（可选）"
+          onChange={(e) => {
+            paymentRef = e.target.value;
+          }}
+        />
+      ),
+      okText: '通过并结算',
+      cancelText: '取消',
+      onOk: async () => {
+        await request(`/admin/store-withdrawals/${id}/approve`, {
+          method: 'POST',
+          body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }),
+        });
+        message.success('已通过并标记已结算');
+        setDrawerOpen(false);
+        reload();
+        void request<{ pendingCount: number; overdueCount: number }>(
+          '/admin/store-withdrawals/overdue-summary',
+        )
+          .then(setOverdueSummary)
+          .catch(() => {});
+      },
+    });
+  }
+
+  function rejectWithdraw(id: string) {
+    let reason = '';
+    Modal.confirm({
+      title: '驳回提现申请？',
+      content: (
+        <Input.TextArea
+          rows={3}
+          placeholder="请填写驳回理由"
+          onChange={(e) => {
+            reason = e.target.value;
+          }}
+        />
+      ),
+      okText: '确认驳回',
+      okButtonProps: { danger: true },
+      cancelText: '取消',
+      onOk: async () => {
+        if (!reason.trim()) {
+          message.error('请填写驳回理由');
+          throw new Error('reason required');
+        }
+        await request(`/admin/store-withdrawals/${id}/reject`, {
+          method: 'POST',
+          body: JSON.stringify({ reason: reason.trim() }),
+        });
+        message.success('已驳回');
+        setDrawerOpen(false);
+        reload();
+      },
+    });
+  }
+
+  async function openDetail(row: Row) {
+    const path =
+      row.kind === 'WITHDRAW' ? `/admin/store-withdrawals/${row.id}` : `/admin/store-bills/${row.id}`;
+    const d = await request<Record<string, unknown>>(path);
     setDetail(d);
+    setDetailKind(row.kind);
     setDrawerOpen(true);
   }
 
@@ -118,88 +220,134 @@ export default function StoreBillsPage() {
       if (filters.dateTo) qs.set('dateTo', filters.dateTo);
       const result = await request<{ csv: string; count: number }>(`/admin/store-bills/export?${qs}`);
       downloadExcelCsv(result.csv, `门店对账单_${filters.dateFrom || 'all'}_${filters.dateTo || 'all'}.csv`);
-      message.success(`已导出 ${result.count} 条`);
+      message.success(`已导出 ${result.count} 条 T+1 账单`);
     } finally {
       setExporting(false);
     }
   }
 
   const summary = data?.summary;
-  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
-  const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.payoutAmount), 0);
+  const selectedRows = (data?.items ?? []).filter(
+    (r) =>
+      selectedKeys.includes(`${r.kind}-${r.id}`) &&
+      r.kind === 'T1_BILL' &&
+      r.status === 'UNPAID',
+  );
+  const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.amount), 0);
 
   const columns: ColumnsType<Row> = [
-    { title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
     {
-      title: '账单日',
-      dataIndex: 'billDate',
-      width: 110,
-      render: (v) => String(v || '').slice(0, 10),
+      title: '类型',
+      dataIndex: 'kind',
+      width: 100,
+      render: (k: StoreSettlementKind) => (
+        <Tag color={KIND_COLORS[k]}>{STORE_SETTLEMENT_KIND_LABELS[k] ?? k}</Tag>
+      ),
+    },
+    {
+      title: '单号',
+      dataIndex: 'billNo',
+      width: 180,
+      ellipsis: true,
+      render: (v, row) => (
+        <Space>
+          <span>{v}</span>
+          {row.overdue ? <Tag color="magenta">超时</Tag> : null}
+        </Space>
+      ),
+    },
+    {
+      title: '日期',
+      dataIndex: 'date',
+      width: 160,
+      render: (v, row) => (row.kind === 'T1_BILL' ? String(v || '').slice(0, 10) : fmtTime(v)),
     },
     { title: '门店', dataIndex: ['store', 'name'], width: 140, ellipsis: true },
     { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
     { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
-    { title: '核销笔数', dataIndex: 'redeemCount', width: 90 },
     {
-      title: '核销金额',
-      dataIndex: 'redeemAmount',
-      width: 110,
-      render: (v) => `¥${Number(v).toFixed(2)}`,
-    },
-    {
-      title: '结算比例',
-      dataIndex: 'settlementRate',
-      width: 90,
-      render: (v) => `${Math.round(Number(v) * 100)}%`,
+      title: '笔数',
+      width: 80,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? (row.redeemCount ?? '—') : (row.payoutCount ?? '—'),
     },
     {
       title: '应付金额',
-      dataIndex: 'payoutAmount',
+      dataIndex: 'amount',
       width: 110,
       render: (v) => `¥${Number(v).toFixed(2)}`,
     },
     {
       title: '状态',
       dataIndex: 'status',
-      width: 90,
-      render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
+      width: 100,
+      render: (s: string, row) => (
+        <Tag color={STATUS_COLORS[s] || 'default'}>{storeSettlementStatusLabel(row.kind, s)}</Tag>
+      ),
     },
     {
       title: '操作',
-      width: 160,
+      width: 200,
       fixed: 'right',
       render: (_, row) => (
         <Space size={0}>
-          <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
+          <Button type="link" size="small" onClick={() => void openDetail(row)}>
             明细
           </Button>
-          {row.status === 'UNPAID' && (
-            <Button type="link" size="small" onClick={() => confirmPay([row.id], Number(row.payoutAmount))}>
+          {row.kind === 'T1_BILL' && row.status === 'UNPAID' && (
+            <Button type="link" size="small" onClick={() => confirmPay([row.id], Number(row.amount))}>
               确认打款
             </Button>
           )}
+          {row.kind === 'WITHDRAW' && row.status === 'PENDING_REVIEW' && (
+            <>
+              <Button type="link" size="small" onClick={() => approveWithdraw(row.id)}>
+                通过
+              </Button>
+              <Button type="link" size="small" danger onClick={() => rejectWithdraw(row.id)}>
+                驳回
+              </Button>
+            </>
+          )}
         </Space>
       ),
     },
   ];
 
+  const withdrawDetailItems =
+    (detail?.items as Array<Record<string, unknown>> | undefined) ?? [];
+  const storeAccount = detail?.storeAccount as
+    | {
+        name?: string;
+        phone?: string;
+        bankAccountName?: string;
+        bankAccountNo?: string;
+        bankBranch?: string;
+      }
+    | undefined;
+
   return (
     <div>
       <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
         <Typography.Title level={4} style={{ margin: 0 }}>
-          门店对账单
+          门店账单
         </Typography.Title>
         <Typography.Text type="secondary">
-          按核销日汇总（每日 8:00 自动出账）；未打款红色、已打款绿色
+          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口
         </Typography.Text>
+        {overdueSummary && overdueSummary.overdueCount > 0 ? (
+          <Typography.Text type="danger">
+            手动提现超时未审 {overdueSummary.overdueCount} 笔（待审共 {overdueSummary.pendingCount}）
+          </Typography.Text>
+        ) : null}
       </Space>
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>
           <Space size="large" wrap>
-            <Statistic title="账单数" value={summary.count} />
+            <Statistic title="记录数" value={summary.count} />
             <Statistic title="核销金额合计" value={summary.redeemAmount ?? 0} prefix="¥" precision={2} />
-            <Statistic title="应付合计" value={summary.payoutAmount ?? 0} prefix="¥" precision={2} />
+            <Statistic title="应付合计" value={summary.payoutAmount ?? summary.totalAmount ?? 0} prefix="¥" precision={2} />
           </Space>
         </Card>
       )}
@@ -208,16 +356,37 @@ export default function StoreBillsPage() {
         form={form}
         layout="inline"
         style={{ marginBottom: 16 }}
-        onFinish={(v: { storeId?: string; status?: string; range?: [Dayjs, Dayjs] }) => {
+        initialValues={{
+          kind: filters.kind || undefined,
+          status: filters.status || undefined,
+        }}
+        onFinish={(v: {
+          kind?: string;
+          storeId?: string;
+          status?: string;
+          range?: [Dayjs, Dayjs];
+        }) => {
           setFilters({
+            kind: v.kind || '',
             storeId: v.storeId || '',
             status: v.status || '',
             dateFrom: v.range?.[0] ? v.range[0].format('YYYY-MM-DD') : '',
             dateTo: v.range?.[1] ? v.range[1].format('YYYY-MM-DD') : '',
           });
           setPage(1);
+          setSelectedKeys([]);
         }}
       >
+        <Form.Item name="kind" label="类型">
+          <Select
+            allowClear
+            style={{ width: 140 }}
+            options={Object.entries(STORE_SETTLEMENT_KIND_LABELS).map(([value, label]) => ({
+              value,
+              label,
+            }))}
+          />
+        </Form.Item>
         <Form.Item name="storeId" label="门店">
           <Select
             allowClear
@@ -232,10 +401,16 @@ export default function StoreBillsPage() {
           <Select
             allowClear
             style={{ width: 120 }}
-            options={Object.entries(STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+            options={Object.entries(STORE_SETTLEMENT_STATUS_LABELS).map(([value, label]) => ({
+              value,
+              label:
+                value === 'PAID'
+                  ? '已打款/已结算'
+                  : label,
+            }))}
           />
         </Form.Item>
-        <Form.Item name="range" label="账单日">
+        <Form.Item name="range" label="日期">
           <DatePicker.RangePicker />
         </Form.Item>
         <Form.Item>
@@ -249,6 +424,7 @@ export default function StoreBillsPage() {
               form.resetFields();
               setFilters({});
               setPage(1);
+              setSelectedKeys([]);
             }}
           >
             重置
@@ -256,33 +432,36 @@ export default function StoreBillsPage() {
         </Form.Item>
         <Form.Item>
           <Button loading={exporting} onClick={() => void exportExcel()}>
-            导出 Excel
+            导出 T+1 Excel
           </Button>
         </Form.Item>
         <Form.Item>
           <Button
             type="primary"
-            disabled={!selectedKeys.length}
+            disabled={!selectedRows.length}
             loading={batchLoading}
-            onClick={() => confirmPay(selectedKeys.map(String), selectedAmount)}
+            onClick={() => confirmPay(selectedRows.map((r) => r.id), selectedAmount)}
           >
-            批量确认打款 ({selectedKeys.length})
+            批量确认打款 ({selectedRows.length})
           </Button>
         </Form.Item>
       </Form>
 
       <Table
-        rowKey="id"
+        rowKey={(r) => `${r.kind}-${r.id}`}
         className="admin-table-nowrap"
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
+        rowClassName={(row) => (row.overdue ? 'ant-table-row-selected' : '')}
         rowSelection={{
           selectedRowKeys: selectedKeys,
           onChange: setSelectedKeys,
-          getCheckboxProps: (r) => ({ disabled: r.status !== 'UNPAID' }),
+          getCheckboxProps: (r) => ({
+            disabled: !(r.kind === 'T1_BILL' && r.status === 'UNPAID'),
+          }),
         }}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 1300 }}
         pagination={{
           current: page,
           pageSize,
@@ -295,14 +474,25 @@ export default function StoreBillsPage() {
         }}
       />
 
-      <Drawer title="门店对账单明细" open={drawerOpen} onClose={() => setDrawerOpen(false)} width={520}>
-        {detail && (
+      <Drawer
+        title={detailKind === 'WITHDRAW' ? '手动提现明细' : 'T+1 对账单明细'}
+        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
+        width={detailKind === 'WITHDRAW' ? 640 : 520}
+      >
+        {detail && detailKind === 'T1_BILL' && (
           <>
             <Descriptions column={1} size="small" bordered>
               <Descriptions.Item label="账单号">{String(detail.billNo)}</Descriptions.Item>
-              <Descriptions.Item label="账单日">{String(detail.billDate || '').slice(0, 10)}</Descriptions.Item>
-              <Descriptions.Item label="应付">¥{Number(detail.payoutAmount ?? 0).toFixed(2)}</Descriptions.Item>
-              <Descriptions.Item label="状态">{STATUS_LABELS[String(detail.status)] || String(detail.status)}</Descriptions.Item>
+              <Descriptions.Item label="账单日">
+                {String(detail.billDate || '').slice(0, 10)}
+              </Descriptions.Item>
+              <Descriptions.Item label="应付">
+                ¥{Number(detail.payoutAmount ?? 0).toFixed(2)}
+              </Descriptions.Item>
+              <Descriptions.Item label="状态">
+                {storeSettlementStatusLabel('T1_BILL', String(detail.status))}
+              </Descriptions.Item>
               <Descriptions.Item label="打款时间">
                 {detail.paidAt ? fmtTime(String(detail.paidAt)) : '—'}
               </Descriptions.Item>
@@ -318,7 +508,8 @@ export default function StoreBillsPage() {
               columns={[
                 {
                   title: '核销单号',
-                  render: (_, r) => String((r.redeemRecord as { redeemNo?: string })?.redeemNo || '—'),
+                  render: (_, r) =>
+                    String((r.redeemRecord as { redeemNo?: string })?.redeemNo || '—'),
                 },
                 {
                   title: '金额',
@@ -334,6 +525,83 @@ export default function StoreBillsPage() {
             />
           </>
         )}
+        {detail && detailKind === 'WITHDRAW' && (
+          <>
+            <Descriptions column={1} size="small" bordered>
+              <Descriptions.Item label="提现单号">{String(detail.withdrawNo)}</Descriptions.Item>
+              <Descriptions.Item label="金额">
+                ¥{Number(detail.amount ?? 0).toFixed(2)}
+              </Descriptions.Item>
+              <Descriptions.Item label="状态">
+                {storeSettlementStatusLabel('WITHDRAW', String(detail.status))}
+              </Descriptions.Item>
+              <Descriptions.Item label="申请时间">
+                {detail.appliedAt ? fmtTime(String(detail.appliedAt)) : '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="驳回理由">
+                {detail.rejectReason ? String(detail.rejectReason) : '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="打款凭证">
+                {detail.paymentRef ? String(detail.paymentRef) : '—'}
+              </Descriptions.Item>
+            </Descriptions>
+            {storeAccount ? (
+              <>
+                <Typography.Title level={5} style={{ marginTop: 16 }}>
+                  收款账户
+                </Typography.Title>
+                <Descriptions column={1} size="small" bordered>
+                  <Descriptions.Item label="户名">
+                    {storeAccount.bankAccountName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="账号">
+                    {storeAccount.bankAccountNo || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户行">
+                    {storeAccount.bankBranch || '—'}
+                  </Descriptions.Item>
+                </Descriptions>
+              </>
+            ) : null}
+            <Typography.Title level={5} style={{ marginTop: 16 }}>
+              提现明细
+            </Typography.Title>
+            <Table
+              size="small"
+              rowKey="id"
+              pagination={false}
+              dataSource={withdrawDetailItems}
+              columns={[
+                {
+                  title: '核销单号',
+                  render: (_, r) => {
+                    const payout = r.storePayout as
+                      | { redeemRecord?: { redeemNo?: string }; payoutAmount?: number }
+                      | undefined;
+                    return String(payout?.redeemRecord?.redeemNo || '—');
+                  },
+                },
+                {
+                  title: '应付',
+                  render: (_, r) => {
+                    const payout = r.storePayout as { payoutAmount?: number } | undefined;
+                    return `¥${Number(payout?.payoutAmount ?? 0).toFixed(2)}`;
+                  },
+                },
+              ]}
+            />
+            {String(detail.status) === 'PENDING_REVIEW' ? (
+              <Space style={{ marginTop: 16 }}>
+                <Button type="primary" onClick={() => approveWithdraw(String(detail.id))}>
+                  通过
+                </Button>
+                <Button danger onClick={() => rejectWithdraw(String(detail.id))}>
+                  驳回
+                </Button>
+              </Space>
+            ) : null}
+          </>
+        )}
       </Drawer>
     </div>
   );

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

@@ -0,0 +1,331 @@
+import { useEffect, useState } from 'react';
+import {
+  Button,
+  Drawer,
+  Input,
+  Modal,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import type {
+  StorePackageAuditDetailDto,
+  StorePackageChangeRequestDto,
+  StorePackageItemDto,
+  StorePackageViewDto,
+} from '@dukang/shared-types';
+import { STORE_PACKAGE_CHANGE_STATUS_LABELS } from '@dukang/shared-types';
+import { request, type Paginated } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+
+function packageKey(pkg: StorePackageItemDto | StorePackageViewDto, index: number) {
+  const name = String(pkg.name ?? '').trim();
+  return name ? `name:${name}` : `idx:${index}`;
+}
+
+function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto[]) {
+  const liveMap = new Map(live.map((p, i) => [packageKey(p, i), p]));
+  const proposedMap = new Map(proposed.map((p, i) => [packageKey(p, i), p]));
+  const keys = new Set([...liveMap.keys(), ...proposedMap.keys()]);
+  const rows: Array<{
+    key: string;
+    change: 'added' | 'removed' | 'changed' | 'unchanged';
+    live?: StorePackageViewDto;
+    proposed?: StorePackageItemDto;
+  }> = [];
+
+  for (const key of keys) {
+    const l = liveMap.get(key);
+    const p = proposedMap.get(key);
+    if (l && !p) {
+      rows.push({ key, change: 'removed', live: l });
+    } else if (!l && p) {
+      rows.push({ key, change: 'added', proposed: p });
+    } else if (l && p) {
+      const changed =
+        l.price !== p.price ||
+        l.dishes !== p.dishes ||
+        (l.usableTime ?? '') !== (p.usableTime ?? '') ||
+        (l.otherNotes ?? '') !== (p.otherNotes ?? '');
+      rows.push({ key, change: changed ? 'changed' : 'unchanged', live: l, proposed: p });
+    }
+  }
+  return rows;
+}
+
+const CHANGE_LABELS = {
+  added: { text: '新增', color: 'green' },
+  removed: { text: '删除', color: 'red' },
+  changed: { text: '变更', color: 'orange' },
+  unchanged: { text: '未变', color: 'default' },
+} as const;
+
+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 [rejectOpen, setRejectOpen] = useState(false);
+  const [rejectReason, setRejectReason] = useState('');
+  const [activeId, setActiveId] = useState<string | null>(null);
+  const [detailOpen, setDetailOpen] = useState(false);
+  const [detailLoading, setDetailLoading] = useState(false);
+  const [detail, setDetail] = useState<StorePackageAuditDetailDto | null>(null);
+
+  async function reload(nextPage = page, nextStatus = status) {
+    setLoading(true);
+    try {
+      const qs = new URLSearchParams({
+        page: String(nextPage),
+        pageSize: '20',
+      });
+      if (nextStatus) qs.set('status', nextStatus);
+      const data = await request<Paginated<StorePackageChangeRequestDto>>(
+        `/admin/store-package-audits?${qs}`,
+      );
+      setItems(data.items);
+      setTotal(data.total);
+      setPage(data.page);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载失败');
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    void reload(1, status);
+  }, [status]);
+
+  async function openDetail(id: string) {
+    setDetailOpen(true);
+    setDetailLoading(true);
+    setDetail(null);
+    try {
+      const data = await request<StorePackageAuditDetailDto>(`/admin/store-package-audits/${id}`);
+      setDetail(data);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载详情失败');
+      setDetailOpen(false);
+    } finally {
+      setDetailLoading(false);
+    }
+  }
+
+  async function audit(id: string, action: 'APPROVE' | 'REJECT', reason?: string) {
+    try {
+      await request(`/admin/store-package-audits/${id}/audit`, {
+        method: 'PUT',
+        body: JSON.stringify(
+          action === 'REJECT' ? { action, rejectReason: reason } : { action },
+        ),
+      });
+      message.success(action === 'APPROVE' ? '已通过' : '已驳回');
+      setDetailOpen(false);
+      void reload(page, status);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '操作失败');
+    }
+  }
+
+  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 columns: ColumnsType<StorePackageChangeRequestDto> = [
+    { title: '门店', dataIndex: 'storeName', render: (_, row) => row.storeName || row.storeId },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      render: (v: StorePackageChangeRequestDto['status']) => (
+        <Tag>{STORE_PACKAGE_CHANGE_STATUS_LABELS[v] ?? v}</Tag>
+      ),
+    },
+    {
+      title: '套餐数',
+      render: (_, row) => row.packages?.length ?? 0,
+    },
+    {
+      title: '提交方',
+      render: (_, row) => (row.submitterType === 'PARTNER' ? '合伙人' : '门店'),
+    },
+    { title: '提交时间', dataIndex: 'createdAt', render: (v) => fmtTime(String(v)) },
+    {
+      title: '操作',
+      render: (_, row) => (
+        <Space>
+          <Button type="link" onClick={() => void openDetail(row.id)}>
+            查看变更
+          </Button>
+          {row.status === 'PENDING' ? (
+            <>
+              <Button type="link" onClick={() => void audit(row.id, 'APPROVE')}>
+                通过
+              </Button>
+              <Button
+                type="link"
+                danger
+                onClick={() => {
+                  setActiveId(row.id);
+                  setRejectReason('');
+                  setRejectOpen(true);
+                }}
+              >
+                驳回
+              </Button>
+            </>
+          ) : (
+            row.rejectReason || null
+          )}
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <Typography.Title level={4}>套餐变更审核</Typography.Title>
+      <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] : '全部'}
+          </Button>
+        ))}
+      </Space>
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={items}
+        pagination={{
+          current: page,
+          total,
+          pageSize: 20,
+          onChange: (p) => void reload(p, status),
+        }}
+      />
+
+      <Drawer
+        title={detail ? `${detail.storeName || detail.storeId} · 套餐变更` : '套餐变更详情'}
+        width={720}
+        open={detailOpen}
+        onClose={() => setDetailOpen(false)}
+        extra={
+          detail?.status === 'PENDING' ? (
+            <Space>
+              <Button onClick={() => void audit(detail.id, 'APPROVE')}>通过</Button>
+              <Button
+                danger
+                onClick={() => {
+                  setActiveId(detail.id);
+                  setRejectReason('');
+                  setRejectOpen(true);
+                }}
+              >
+                驳回
+              </Button>
+            </Space>
+          ) : null
+        }
+      >
+        {detailLoading ? (
+          <Typography.Text type="secondary">加载中…</Typography.Text>
+        ) : detail ? (
+          <>
+            <Space style={{ marginBottom: 16 }}>
+              <Tag>{STORE_PACKAGE_CHANGE_STATUS_LABELS[detail.status]}</Tag>
+              <Typography.Text type="secondary">
+                提交方：{detail.submitterType === 'PARTNER' ? '合伙人' : '门店'} · {fmtTime(detail.createdAt)}
+              </Typography.Text>
+            </Space>
+            {detail.rejectReason ? (
+              <Typography.Paragraph type="danger">驳回原因：{detail.rejectReason}</Typography.Paragraph>
+            ) : null}
+            <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}
+            />
+          </>
+        ) : null}
+      </Drawer>
+
+      <Modal
+        title="驳回套餐变更"
+        open={rejectOpen}
+        onCancel={() => setRejectOpen(false)}
+        onOk={() => {
+          if (!activeId) return;
+          if (!rejectReason.trim()) {
+            message.warning('请填写驳回原因');
+            return;
+          }
+          void audit(activeId, 'REJECT', rejectReason.trim());
+          setRejectOpen(false);
+        }}
+      >
+        <Input.TextArea
+          rows={3}
+          value={rejectReason}
+          placeholder="驳回原因"
+          onChange={(e) => setRejectReason(e.target.value)}
+        />
+      </Modal>
+    </div>
+  );
+}

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

@@ -0,0 +1,104 @@
+import { useState } from 'react';
+import { Button, Form, Input, Table, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { useSearchParams } from 'react-router-dom';
+import { fmtTime } from '../lib/constants';
+import { useAdminList } from '../lib/useAdminList';
+
+type Row = {
+  id: string;
+  serviceScore: number;
+  envScore: number;
+  createdAt: string;
+  redeemNo: string;
+  redeemAmount: number;
+  store?: { id: string; name: string; cityName?: string };
+  user?: { userNo: string; phone: string | null; nickname: string | null };
+};
+
+export default function StoreRatingsPage() {
+  const [searchParams] = useSearchParams();
+  const initialStoreId = searchParams.get('storeId') || '';
+  const [form] = Form.useForm();
+  const [filters, setFilters] = useState<Record<string, string>>({
+    ...(initialStoreId ? { storeId: initialStoreId } : {}),
+  });
+
+  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
+    '/admin/store-ratings',
+    () => {
+      const qs = new URLSearchParams();
+      if (filters.storeId) qs.set('storeId', filters.storeId);
+      if (filters.redeemNo) qs.set('redeemNo', filters.redeemNo);
+      return qs;
+    },
+    [filters],
+  );
+
+  const columns: ColumnsType<Row> = [
+    { title: '核销号', dataIndex: 'redeemNo', width: 180 },
+    {
+      title: '门店',
+      dataIndex: ['store', 'name'],
+      render: (v, row) => (row.store?.cityName ? `${v}（${row.store.cityName}）` : v),
+    },
+    {
+      title: '用户',
+      width: 140,
+      render: (_, row) => row.user?.phone || row.user?.userNo || '-',
+    },
+    { title: '核销额', dataIndex: 'redeemAmount', width: 90, render: (v) => `¥${v}` },
+    { title: '服务分', dataIndex: 'serviceScore', width: 80 },
+    { title: '环境分', dataIndex: 'envScore', width: 80 },
+    { title: '评价时间', dataIndex: 'createdAt', width: 170, render: fmtTime },
+  ];
+
+  return (
+    <div>
+      <Typography.Title level={4} style={{ marginTop: 0 }}>
+        门店评价
+      </Typography.Title>
+      <Form
+        form={form}
+        layout="inline"
+        style={{ marginBottom: 16 }}
+        initialValues={filters}
+        onFinish={(v) => {
+          setFilters({
+            storeId: v.storeId || '',
+            redeemNo: v.redeemNo || '',
+          });
+          setPage(1);
+        }}
+      >
+        <Form.Item name="storeId" label="门店ID">
+          <Input allowClear placeholder="storeId" />
+        </Form.Item>
+        <Form.Item name="redeemNo" label="核销号">
+          <Input allowClear />
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            查询
+          </Button>
+        </Form.Item>
+      </Form>
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+    </div>
+  );
+}

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

@@ -0,0 +1,394 @@
+import { useEffect, useState } from 'react';
+import {
+  Button,
+  DatePicker,
+  Descriptions,
+  Drawer,
+  Form,
+  Input,
+  Modal,
+  Select,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import type { Dayjs } from 'dayjs';
+import { STORE_WITHDRAW_STATUS_LABELS, type StoreWithdrawStatus } from '@dukang/shared-types';
+import { request, type Paginated } from '../lib/api';
+import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
+import { useAdminList } from '../lib/useAdminList';
+
+type Row = {
+  id: string;
+  withdrawNo: string;
+  amount: number;
+  payoutCount: number;
+  status: StoreWithdrawStatus;
+  appliedAt: string;
+  reviewedAt?: string | null;
+  paidAt?: string | null;
+  paymentRef?: string | null;
+  rejectReason?: string | null;
+  overdue?: boolean;
+  store?: { id: string; name: string; cityName: string; phone?: string };
+};
+
+type StoreOption = { id: string; name: string; phone: string };
+
+const STATUS_COLORS: Record<string, string> = {
+  PENDING_REVIEW: 'orange',
+  REJECTED: 'red',
+  PAID: 'green',
+};
+
+export default function StoreWithdrawalsPage() {
+  const [form] = Form.useForm();
+  const [filters, setFilters] = useState<Record<string, string>>({ status: 'PENDING_REVIEW' });
+  const [stores, setStores] = useState<StoreOption[]>([]);
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
+    '/admin/store-withdrawals',
+    () => {
+      const qs = new URLSearchParams();
+      if (filters.status) qs.set('status', filters.status);
+      if (filters.storeId) qs.set('storeId', filters.storeId);
+      if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
+      if (filters.dateTo) qs.set('dateTo', filters.dateTo);
+      return qs;
+    },
+    [filters],
+  );
+  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
+  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [overdueSummary, setOverdueSummary] = useState<{
+    pendingCount: number;
+    overdueCount: number;
+  } | null>(null);
+
+  useEffect(() => {
+    void request<Paginated<StoreOption>>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setStores(res.items))
+      .catch(() => {});
+    void request<{ pendingCount: number; overdueCount: number }>(
+      '/admin/store-withdrawals/overdue-summary',
+    )
+      .then(setOverdueSummary)
+      .catch(() => {});
+  }, []);
+
+  async function openDetail(id: string) {
+    const d = await request<Record<string, unknown>>(`/admin/store-withdrawals/${id}`);
+    setDetail(d);
+    setDrawerOpen(true);
+  }
+
+  function approve(id: string) {
+    let paymentRef = '';
+    Modal.confirm({
+      title: '审核通过并标记已结算？',
+      content: (
+        <Input
+          placeholder="打款凭证号（可选）"
+          onChange={(e) => {
+            paymentRef = e.target.value;
+          }}
+        />
+      ),
+      okText: '通过并结算',
+      cancelText: '取消',
+      onOk: async () => {
+        await request(`/admin/store-withdrawals/${id}/approve`, {
+          method: 'POST',
+          body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }),
+        });
+        message.success('已通过并标记已结算');
+        setDrawerOpen(false);
+        reload();
+        void request<{ pendingCount: number; overdueCount: number }>(
+          '/admin/store-withdrawals/overdue-summary',
+        )
+          .then(setOverdueSummary)
+          .catch(() => {});
+      },
+    });
+  }
+
+  function reject(id: string) {
+    let reason = '';
+    Modal.confirm({
+      title: '驳回提现申请？',
+      content: (
+        <Input.TextArea
+          rows={3}
+          placeholder="请填写驳回理由"
+          onChange={(e) => {
+            reason = e.target.value;
+          }}
+        />
+      ),
+      okText: '确认驳回',
+      okButtonProps: { danger: true },
+      cancelText: '取消',
+      onOk: async () => {
+        if (!reason.trim()) {
+          message.error('请填写驳回理由');
+          throw new Error('reason required');
+        }
+        await request(`/admin/store-withdrawals/${id}/reject`, {
+          method: 'POST',
+          body: JSON.stringify({ reason: reason.trim() }),
+        });
+        message.success('已驳回');
+        setDrawerOpen(false);
+        reload();
+      },
+    });
+  }
+
+  const columns: ColumnsType<Row> = [
+    {
+      title: '提现单号',
+      dataIndex: 'withdrawNo',
+      width: 180,
+      render: (v, row) => (
+        <Space>
+          <Typography.Link onClick={() => void openDetail(row.id)}>{v}</Typography.Link>
+          {row.overdue ? <Tag color="magenta">超时</Tag> : null}
+        </Space>
+      ),
+    },
+    {
+      title: '门店',
+      dataIndex: ['store', 'name'],
+      width: 160,
+      render: (_, row) => (
+        <div>
+          <div>{row.store?.name || '—'}</div>
+          <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+            {row.store?.cityName} {row.store?.phone}
+          </Typography.Text>
+        </div>
+      ),
+    },
+    {
+      title: '金额',
+      dataIndex: 'amount',
+      width: 110,
+      render: (v) => `¥${Number(v).toFixed(2)}`,
+    },
+    { title: '明细笔数', dataIndex: 'payoutCount', width: 90 },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 100,
+      render: (v: StoreWithdrawStatus) => (
+        <Tag color={STATUS_COLORS[v]}>{STORE_WITHDRAW_STATUS_LABELS[v] ?? v}</Tag>
+      ),
+    },
+    {
+      title: '申请时间',
+      dataIndex: 'appliedAt',
+      width: 170,
+      render: (v) => fmtTime(v),
+    },
+    {
+      title: '操作',
+      key: 'actions',
+      width: 180,
+      fixed: 'right',
+      render: (_, row) => (
+        <Space>
+          <Button size="small" onClick={() => void openDetail(row.id)}>
+            详情
+          </Button>
+          {row.status === 'PENDING_REVIEW' ? (
+            <>
+              <Button size="small" type="primary" onClick={() => approve(row.id)}>
+                通过
+              </Button>
+              <Button size="small" danger onClick={() => reject(row.id)}>
+                驳回
+              </Button>
+            </>
+          ) : null}
+        </Space>
+      ),
+    },
+  ];
+
+  const detailItems = (detail?.items as Array<Record<string, unknown>> | undefined) ?? [];
+  const storeAccount = detail?.storeAccount as
+    | {
+        name?: string;
+        phone?: string;
+        bankAccountName?: string;
+        bankAccountNo?: string;
+        bankBranch?: string;
+      }
+    | undefined;
+
+  return (
+    <div>
+      <Typography.Title level={4} style={{ marginTop: 0 }}>
+        门店提现审
+      </Typography.Title>
+      {overdueSummary ? (
+        <Typography.Paragraph type="secondary">
+          待审 {overdueSummary.pendingCount} 笔
+          {overdueSummary.overdueCount > 0 ? (
+            <Typography.Text type="danger">
+              {' '}
+              · 超时未审 {overdueSummary.overdueCount} 笔（FIN-003）
+            </Typography.Text>
+          ) : null}
+        </Typography.Paragraph>
+      ) : null}
+
+      <Form
+        form={form}
+        layout="inline"
+        style={{ marginBottom: 16, gap: 8 }}
+        initialValues={{ status: 'PENDING_REVIEW' }}
+        onFinish={(v) => {
+          const range = v.range as [Dayjs, Dayjs] | undefined;
+          setFilters({
+            status: v.status || '',
+            storeId: v.storeId || '',
+            dateFrom: range?.[0]?.format('YYYY-MM-DD') || '',
+            dateTo: range?.[1]?.format('YYYY-MM-DD') || '',
+          });
+        }}
+      >
+        <Form.Item name="status" label="状态">
+          <Select
+            allowClear
+            style={{ width: 140 }}
+            options={[
+              { value: 'PENDING_REVIEW', label: '待审核' },
+              { value: 'PAID', label: '已结算' },
+              { value: 'REJECTED', label: '已驳回' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item name="storeId" label="门店">
+          <Select
+            allowClear
+            showSearch
+            optionFilterProp="label"
+            style={{ width: 220 }}
+            options={stores.map((s) => ({
+              value: s.id,
+              label: `${s.name} (${s.phone})`,
+            }))}
+          />
+        </Form.Item>
+        <Form.Item name="range" label="申请日">
+          <DatePicker.RangePicker />
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            查询
+          </Button>
+        </Form.Item>
+      </Form>
+
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1100 }}
+        rowClassName={(row) => (row.overdue ? 'ant-table-row-selected' : '')}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+
+      <Drawer
+        title="提现详情"
+        width={640}
+        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
+        extra={
+          detail?.status === 'PENDING_REVIEW' ? (
+            <Space>
+              <Button type="primary" onClick={() => approve(String(detail.id))}>
+                通过
+              </Button>
+              <Button danger onClick={() => reject(String(detail.id))}>
+                驳回
+              </Button>
+            </Space>
+          ) : null
+        }
+      >
+        {detail ? (
+          <>
+            <Descriptions column={1} size="small" bordered>
+              <Descriptions.Item label="提现单号">{String(detail.withdrawNo)}</Descriptions.Item>
+              <Descriptions.Item label="状态">
+                <Tag color={STATUS_COLORS[String(detail.status)]}>
+                  {STORE_WITHDRAW_STATUS_LABELS[detail.status as StoreWithdrawStatus] ??
+                    String(detail.status)}
+                </Tag>
+                {detail.overdue ? <Tag color="magenta">超时</Tag> : null}
+              </Descriptions.Item>
+              <Descriptions.Item label="金额">¥{Number(detail.amount).toFixed(2)}</Descriptions.Item>
+              <Descriptions.Item label="明细笔数">{String(detail.payoutCount)}</Descriptions.Item>
+              <Descriptions.Item label="申请时间">{fmtTime(String(detail.appliedAt))}</Descriptions.Item>
+              {detail.rejectReason ? (
+                <Descriptions.Item label="驳回理由">{String(detail.rejectReason)}</Descriptions.Item>
+              ) : null}
+              {detail.paymentRef ? (
+                <Descriptions.Item label="打款凭证">{String(detail.paymentRef)}</Descriptions.Item>
+              ) : null}
+              <Descriptions.Item label="收款户名">
+                {storeAccount?.bankAccountName || '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="收款账号">
+                {storeAccount?.bankAccountNo || '—'}
+              </Descriptions.Item>
+              <Descriptions.Item label="开户行">{storeAccount?.bankBranch || '—'}</Descriptions.Item>
+            </Descriptions>
+
+            <Typography.Title level={5} style={{ marginTop: 24 }}>
+              关联结算明细
+            </Typography.Title>
+            <Table
+              size="small"
+              rowKey={(r) => String((r as { id?: string }).id)}
+              pagination={false}
+              dataSource={detailItems}
+              columns={[
+                {
+                  title: '核销单号',
+                  render: (_, r) => {
+                    const payout = (r as { storePayout?: { redeemRecord?: { redeemNo?: string } } })
+                      .storePayout;
+                    return payout?.redeemRecord?.redeemNo || '—';
+                  },
+                },
+                {
+                  title: '结算额',
+                  render: (_, r) => {
+                    const payout = (r as { storePayout?: { payoutAmount?: number } }).storePayout;
+                    return `¥${Number(payout?.payoutAmount ?? 0).toFixed(2)}`;
+                  },
+                },
+              ]}
+            />
+          </>
+        ) : null}
+      </Drawer>
+    </div>
+  );
+}

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

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Alert,
@@ -13,6 +13,7 @@ import {
   Select,
   Space,
   Steps,
+  Switch,
   Table,
   Tabs,
   Tag,
@@ -20,6 +21,7 @@ import {
   message,
 } 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 { request, type Paginated } from '../lib/api';
 import {
@@ -39,6 +41,7 @@ import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
 import OssUpload from '../components/OssUpload';
 import TencentLocPickerModal from '../components/TencentLocPickerModal';
+import AdminStorePackagesSection from '../components/AdminStorePackagesSection';
 
 const CREATE_STEPS = [
   { title: '基本信息' },
@@ -274,6 +277,89 @@ function StoreAuditMediaSection({ detail }: { detail: Record<string, unknown> })
   );
 }
 
+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 (
+    <>
+      <Form.Item
+        name="visibilityWhitelistEnabled"
+        label="可见白名单"
+        valuePropName="checked"
+        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>
+        </>
+      ) : null}
+    </>
+  );
+}
+
 type StoreRow = {
   id: string;
   name: string;
@@ -287,8 +373,10 @@ type StoreRow = {
   intro: string | null;
   coverUrl: string | null;
   createdAt: string;
+  visibilityWhitelistEnabled?: boolean;
+  visibilityPhones?: string[];
   cityRef?: { name: string; code: string };
-  partner?: { companyName: string };
+  partner?: { id?: string; companyName?: string | null; name?: string | null; phone?: string | null };
   account?: {
     phone: string;
     name: string;
@@ -306,7 +394,15 @@ type StoreRow = {
   category?: { id: string; name: string; parentId?: string | null } | null;
 };
 
-type PartnerOption = { id: string; companyName: string };
+type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string | null };
+
+function partnerOptionLabel(p: PartnerOption): string {
+  const company = (p.companyName || '').trim();
+  const person = (p.name || '').trim();
+  const phone = (p.phone || '').trim();
+  if (company && person) return `${company}-${person}`;
+  return company || person || phone || p.id;
+}
 type CityOption = {
   id: string;
   name: string;
@@ -497,6 +593,10 @@ export default function StoresPage() {
       bankAccountName: account?.bankAccountName || undefined,
       bankAccountNo: account?.bankAccountNo || undefined,
       bankBranch: account?.bankBranch || undefined,
+      visibilityWhitelistEnabled: !!d.visibilityWhitelistEnabled,
+      visibilityPhones: Array.isArray(d.visibilityPhones)
+        ? (d.visibilityPhones as string[])
+        : [],
     });
     setDrawerOpen(true);
   }
@@ -536,6 +636,10 @@ export default function StoresPage() {
         bankAccountName: v.bankAccountName ?? null,
         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),
         ...(hasCoords
           ? { latitude: Number(v.latitude), longitude: Number(v.longitude) }
           : {}),
@@ -625,6 +729,8 @@ export default function StoresPage() {
       openTime2: undefined,
       closeTime2: undefined,
       avgPrice: undefined,
+      visibilityWhitelistEnabled: false,
+      visibilityPhones: [],
     });
     setCreateStep(0);
     setCreateError('');
@@ -706,6 +812,10 @@ export default function StoresPage() {
           bankAccountNo: values.bankAccountNo.replace(/\s/g, ''),
           bankBranch: values.bankBranch.trim(),
           settlementRate: Number(values.settlementRate ?? 60) / 100,
+          visibilityWhitelistEnabled: !!values.visibilityWhitelistEnabled,
+          visibilityPhones: (values.visibilityPhones ?? [])
+            .map((p: string) => String(p || '').replace(/\D/g, '').trim())
+            .filter(Boolean),
         }),
       });
       message.success('门店已创建');
@@ -758,14 +868,30 @@ export default function StoresPage() {
         );
       },
     },
-    { title: '开城合伙人', dataIndex: ['partner', 'companyName'], width: 120 },
+    {
+      title: '开城合伙人',
+      dataIndex: 'partner',
+      width: 140,
+      render: (partner: StoreRow['partner']) =>
+        partner ? partnerOptionLabel({ id: partner.id ?? '', ...partner }) : '—',
+    },
+    {
+      title: '可见',
+      dataIndex: 'visibilityWhitelistEnabled',
+      width: 90,
+      render: (v, row) =>
+        v ? <Tag color="orange">限{row.visibilityPhones?.length ?? 0}人</Tag> : <Tag>公开</Tag>,
+    },
     { title: '介绍', dataIndex: 'intro', width: 160, ellipsis: true, render: (v) => v || '—' },
     { title: '店长', dataIndex: ['account', 'name'], width: 90, render: (v) => v || '—' },
     { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
-      title: '操作', width: 80,
+      title: '操作', width: 140,
       render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openStoreDetail(row)}>详情</Button>
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => void openStoreDetail(row)}>详情</Button>
+          <Button type="link" size="small" onClick={() => navigate(`/store-ratings?storeId=${row.id}`)}>评价</Button>
+        </Space>
       ),
     },
   ];
@@ -799,7 +925,7 @@ export default function StoresPage() {
             optionFilterProp="label"
             style={{ width: 180 }}
             placeholder="全部"
-            options={filterPartners.map((p) => ({ value: p.id, label: p.companyName || p.id }))}
+            options={filterPartners.map((p) => ({ value: p.id, label: partnerOptionLabel(p) }))}
           />
         </Form.Item>
         <Form.Item name="status" label="营业状态">
@@ -1049,6 +1175,7 @@ export default function StoresPage() {
                           <Input type="time" style={{ width: 140 }} />
                         </Form.Item>
                       </Space>
+                      <StoreVisibilityWhitelistFields form={editForm} />
                     </>
                   ),
                 },
@@ -1095,6 +1222,11 @@ export default function StoresPage() {
                   label: '审核材料',
                   children: <StoreAuditMediaSection detail={detail} />,
                 },
+                {
+                  key: 'packages',
+                  label: '套餐',
+                  children: <AdminStorePackagesSection storeId={String(detail.id)} />,
+                },
               ]}
             />
           </Form>
@@ -1129,7 +1261,7 @@ export default function StoresPage() {
                   loading={optionsLoading}
                   optionFilterProp="label"
                   placeholder={optionsLoading ? '加载中…' : '请选择开城合伙人'}
-                  options={partners.map((p) => ({ value: p.id, label: p.companyName }))}
+                  options={partners.map((p) => ({ value: p.id, label: partnerOptionLabel(p) }))}
                   onChange={(partnerAccountId) => {
                     const codes = createForm.getFieldValue('regionCodes') as string[] | undefined;
                     if (codes?.length === 3) bindRegionSelection(codes, partnerAccountId);
@@ -1269,6 +1401,7 @@ export default function StoresPage() {
               >
                 <Input.TextArea rows={3} placeholder="选填，最多1000字" showCount maxLength={1000} />
               </Form.Item>
+              <StoreVisibilityWhitelistFields form={createForm} />
           </div>
           <div style={{ display: createStep === 1 ? 'block' : 'none' }}>
               <Typography.Paragraph type="secondary">
@@ -1278,14 +1411,20 @@ export default function StoresPage() {
                 <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) => (
+                {(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>

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

@@ -10,11 +10,18 @@ import {
   Select,
   Space,
   Table,
+  Tag,
   Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { TICKET_TYPE_LABELS, type TicketTypeDto } from '@dukang/shared-types';
+import {
+  TICKET_STATUS_LABELS,
+  TICKET_TYPE_LABELS,
+  ticketStatusLabel,
+  type TicketStatusDto,
+  type TicketTypeDto,
+} from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
@@ -31,6 +38,21 @@ type Row = {
   createdAt: string;
 };
 
+const STATUS_COLOR: Partial<Record<TicketStatusDto, string>> = {
+  PENDING: 'orange',
+  OPEN: 'blue',
+  COLLABORATING: 'cyan',
+  RESOLVED: 'green',
+  REJECTED: 'red',
+  COMPLETED: 'green',
+  CLOSED: 'default',
+};
+
+const STATUS_OPTIONS = (Object.keys(TICKET_STATUS_LABELS) as TicketStatusDto[]).map((value) => ({
+  value,
+  label: TICKET_STATUS_LABELS[value],
+}));
+
 export default function TicketsPage() {
   const [filters, setFilters] = useState<Record<string, string>>({});
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
@@ -101,7 +123,14 @@ export default function TicketsPage() {
       width: 110,
       render: (t: TicketTypeDto) => TICKET_TYPE_LABELS[t] ?? t,
     },
-    { title: '状态', dataIndex: 'status', width: 90 },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 100,
+      render: (s: string) => (
+        <Tag color={STATUS_COLOR[s as TicketStatusDto] ?? 'default'}>{ticketStatusLabel(s)}</Tag>
+      ),
+    },
     { title: '关联', width: 140, render: (_, r) => `${r.refType}#${r.refId}` },
     { title: '备注', dataIndex: 'remark', ellipsis: true },
     { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
@@ -159,12 +188,13 @@ export default function TicketsPage() {
               { value: 'RESHIPMENT', label: '破损补发' },
               { value: 'DAMAGE_RETURN', label: '破损退货' },
               { value: 'RETURN_REFUND', label: '退货退款' },
+              { value: 'PACKAGE_DISPUTE', label: '套餐异议' },
               { value: 'ALERT', label: '异常' },
             ]}
           />
         </Form.Item>
         <Form.Item name="status" label="状态">
-          <Input allowClear placeholder="PENDING" />
+          <Select allowClear style={{ width: 140 }} placeholder="全部" options={STATUS_OPTIONS} />
         </Form.Item>
         <Button type="primary" htmlType="submit">
           筛选
@@ -211,7 +241,11 @@ export default function TicketsPage() {
             <Descriptions.Item label="类型">
               {TICKET_TYPE_LABELS[detail.ticketType] ?? detail.ticketType}
             </Descriptions.Item>
-            <Descriptions.Item label="状态">{String(detail.status)}</Descriptions.Item>
+            <Descriptions.Item label="状态">
+              <Tag color={STATUS_COLOR[detail.status as TicketStatusDto] ?? 'default'}>
+                {ticketStatusLabel(detail.status)}
+              </Tag>
+            </Descriptions.Item>
             <Descriptions.Item label="关联">
               {String(detail.refType)} #{String(detail.refId)}
             </Descriptions.Item>

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

@@ -17,7 +17,7 @@ import {
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { USER_SOURCE_TYPE_LABELS, type UserSourceType } from '@dukang/shared-types';
+import { USER_SOURCE_TYPE_LABELS, resolveUserLogCategory, type UserSourceType } from '@dukang/shared-types';
 import { request, type AdminUserRow, type HqProfile, type Paginated } from '../lib/api';
 import { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 
@@ -30,6 +30,14 @@ type UserOrderRow = {
   createdAt: string;
 };
 
+type UserBehaviorLog = {
+  id: string;
+  eventName: string;
+  clientApp?: string | null;
+  createdAt: string;
+  extraJson?: Record<string, unknown> | null;
+};
+
 type UserDetail = AdminUserRow & {
   wxUnionId?: string | null;
   cityPref?: Record<string, unknown> | null;
@@ -72,6 +80,7 @@ export default function UsersPage() {
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(20);
   const [detail, setDetail] = useState<UserDetail | null>(null);
+  const [behaviorLogs, setBehaviorLogs] = useState<UserBehaviorLog[]>([]);
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [deleteOpen, setDeleteOpen] = useState(false);
   const [deleteConfirm, setDeleteConfirm] = useState('');
@@ -123,8 +132,14 @@ export default function UsersPage() {
   }, [location.state, location.pathname, navigate]);
 
   async function openDetail(id: string) {
-    const res = await request<UserDetail>(`/admin/users/${id}`);
+    const [res, logs] = await Promise.all([
+      request<UserDetail>(`/admin/users/${id}`),
+      request<{ items: UserBehaviorLog[] }>(`/admin/logs/users?userId=${id}&pageSize=50`).catch(
+        () => ({ items: [] as UserBehaviorLog[] }),
+      ),
+    ]);
     setDetail(res);
+    setBehaviorLogs(logs.items ?? []);
     setDrawerOpen(true);
   }
 
@@ -437,6 +452,28 @@ export default function UsersPage() {
               </Descriptions.Item>
             </Descriptions>
 
+            <Typography.Title level={5} style={{ marginTop: 16 }}>
+              行为时间线（最近 {behaviorLogs.length} 条）
+            </Typography.Title>
+            <Table
+              size="small"
+              rowKey="id"
+              pagination={false}
+              scroll={{ y: 200 }}
+              dataSource={behaviorLogs}
+              locale={{ emptyText: '暂无行为日志' }}
+              columns={[
+                { title: '时间', dataIndex: 'createdAt', width: 160, render: (v) => fmtTime(v) },
+                {
+                  title: '分类',
+                  width: 100,
+                  render: (_, r) => resolveUserLogCategory(r.eventName) ?? '—',
+                },
+                { title: '事件', dataIndex: 'eventName' },
+                { title: '端', dataIndex: 'clientApp', width: 90 },
+              ]}
+            />
+
             <Typography.Title level={5} style={{ marginTop: 16 }}>
               全部订单（{detail.orders?.length ?? 0}）
             </Typography.Title>

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

@@ -0,0 +1,129 @@
+import { useState } from 'react';
+import { Button, Descriptions, Drawer, Form, Input, Select, Space, Table, Tag, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { useAdminList } from '../lib/useAdminList';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+import type { WecomBotLogDto } from '@dukang/shared-types';
+
+export default function WecomBotLogsPage() {
+  const [form] = Form.useForm();
+  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [detail, setDetail] = useState<WecomBotLogDto | null>(null);
+
+  const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<WecomBotLogDto>(
+    '/admin/logs/wecom-bots',
+    () => {
+      const qs = new URLSearchParams();
+      if (filters.botId) qs.set('botId', filters.botId);
+      if (filters.wecomUserId) qs.set('wecomUserId', filters.wecomUserId);
+      if (filters.action) qs.set('action', filters.action);
+      if (filters.success) qs.set('success', filters.success);
+      return qs;
+    },
+    [filters],
+  );
+
+  const columns: ColumnsType<WecomBotLogDto> = [
+    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+    { title: '机器人', dataIndex: 'botName', width: 120, ellipsis: true, render: (v, r) => v || r.botKey || '—' },
+    { title: '企微用户', dataIndex: 'wecomUserId', width: 120, ellipsis: true },
+    { title: '动作', dataIndex: 'action', width: 160, ellipsis: true },
+    { title: '权限', dataIndex: 'permission', width: 140, ellipsis: true, render: (v) => v || '—' },
+    {
+      title: '结果',
+      dataIndex: 'success',
+      width: 80,
+      render: (v: boolean) => <Tag color={v ? 'green' : 'red'}>{v ? '成功' : '失败'}</Tag>,
+    },
+    { title: '耗时(ms)', dataIndex: 'latencyMs', width: 90, render: (v) => v ?? '—' },
+    { title: '输入摘要', dataIndex: 'inputSummary', ellipsis: true },
+    {
+      title: '操作',
+      width: 80,
+      render: (_, row) => (
+        <Button type="link" size="small" onClick={() => setDetail(row)}>
+          详情
+        </Button>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <Typography.Title level={4}>企微机器人日志</Typography.Title>
+      <Typography.Paragraph type="secondary">
+        记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。
+      </Typography.Paragraph>
+
+      <Form
+        form={form}
+        layout="inline"
+        style={{ marginBottom: 16 }}
+        onFinish={(v) => {
+          setFilters(v);
+          setPage(1);
+        }}
+      >
+        <Form.Item name="botId" label="机器人 ID">
+          <Input allowClear placeholder="wecom_bot.id" style={{ width: 140 }} />
+        </Form.Item>
+        <Form.Item name="wecomUserId" label="企微 userid">
+          <Input allowClear placeholder="userid" style={{ width: 140 }} />
+        </Form.Item>
+        <Form.Item name="action" label="动作">
+          <Input allowClear placeholder="order.read" style={{ width: 140 }} />
+        </Form.Item>
+        <Form.Item name="success" label="结果">
+          <Select
+            allowClear
+            style={{ width: 100 }}
+            options={[
+              { value: 'true', label: '成功' },
+              { value: 'false', label: '失败' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">
+            查询
+          </Button>
+        </Form.Item>
+      </Form>
+
+      <Table
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        scroll={{ x: 1100 }}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+
+      <Drawer title="日志详情" width={480} open={!!detail} onClose={() => setDetail(null)}>
+        {detail && (
+          <Descriptions column={1} size="small" bordered>
+            <Descriptions.Item label="时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
+            <Descriptions.Item label="机器人">{detail.botName || detail.botKey || '—'}</Descriptions.Item>
+            <Descriptions.Item label="企微用户">{detail.wecomUserId}</Descriptions.Item>
+            <Descriptions.Item label="动作">{detail.action}</Descriptions.Item>
+            <Descriptions.Item label="权限">{detail.permission || '—'}</Descriptions.Item>
+            <Descriptions.Item label="输入摘要">{detail.inputSummary || '—'}</Descriptions.Item>
+            <Descriptions.Item label="结果">{detail.success ? '成功' : '失败'}</Descriptions.Item>
+            <Descriptions.Item label="错误">{detail.errorMessage || '—'}</Descriptions.Item>
+            <Descriptions.Item label="耗时">{detail.latencyMs != null ? `${detail.latencyMs} ms` : '—'}</Descriptions.Item>
+          </Descriptions>
+        )}
+      </Drawer>
+    </div>
+  );
+}

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

@@ -20,13 +20,14 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
-  WECOM_BOT_PERMISSIONS,
+  WECOM_BOT_PERMISSION_GROUPS,
   WECOM_BOT_PERMISSION_LABELS,
   WECOM_BOT_ROLE_DEFAULT_PERMISSIONS,
   WECOM_BOT_ROLE_LABELS,
   WECOM_BOT_ROLES,
   type LlmApiConfigOptionDto,
   type KnowledgeBaseOptionDto,
+  type WecomAibotRuntimeDto,
   type WecomBotDto,
   type WecomBotPermission,
   type WecomBotRole,
@@ -36,17 +37,6 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 
-type ListRes = {
-  items: WecomBotDto[];
-  total: number;
-  page: number;
-  pageSize: number;
-  runtime?: {
-    masterEnabled: boolean;
-    bots: Array<{ id: string; connected: boolean; lastError: string | null }>;
-  };
-};
-
 type FormValues = {
   name: string;
   role: WecomBotRole;
@@ -55,6 +45,7 @@ type FormValues = {
   avatarUrl?: string;
   welcome?: string;
   permissions: WecomBotPermission[];
+  reviewSuperAdminWecomUserIds?: string;
   aiEnabled: boolean;
   llmConfigId?: string | null;
   knowledgeBaseId?: string | null;
@@ -62,18 +53,70 @@ type FormValues = {
   sortOrder: number;
 };
 
+function parseUserIdLines(text?: string): string[] {
+  if (!text?.trim()) return [];
+  return [...new Set(text.split(/[,，\s\n]+/).map((s) => s.trim()).filter(Boolean))];
+}
+
+function formatUserIdLines(ids?: string[]): string {
+  return (ids ?? []).join('\n');
+}
+
+function mapDtoToForm(row: WecomBotDto): FormValues {
+  return {
+    name: row.name,
+    role: row.role,
+    botId: row.botId,
+    secret: '',
+    avatarUrl: row.avatarUrl || '',
+    welcome: row.welcome || '',
+    permissions: [...row.permissions],
+    reviewSuperAdminWecomUserIds: formatUserIdLines(row.reviewSuperAdminWecomUserIds),
+    aiEnabled: row.aiEnabled,
+    llmConfigId: row.llmConfigId,
+    knowledgeBaseId: row.knowledgeBaseId,
+    enabled: row.enabled,
+    sortOrder: row.sortOrder,
+  };
+}
+
+function samePermissionSet(a: WecomBotPermission[], b: WecomBotPermission[]): boolean {
+  if (a.length !== b.length) return false;
+  const setB = new Set(b);
+  return a.every((p) => setB.has(p));
+}
+
+const CREATE_DEFAULTS: FormValues = {
+  name: '',
+  role: 'CUSTOMER_SERVICE',
+  botId: '',
+  secret: '',
+  avatarUrl: '',
+  welcome: '',
+  permissions: [...WECOM_BOT_ROLE_DEFAULT_PERMISSIONS.CUSTOMER_SERVICE],
+  reviewSuperAdminWecomUserIds: '',
+  aiEnabled: false,
+  llmConfigId: null,
+  knowledgeBaseId: null,
+  enabled: true,
+  sortOrder: 0,
+};
+
 export default function WecomBotsPage() {
   const [filterForm] = Form.useForm();
   const [form] = Form.useForm<FormValues>();
   const [filters, setFilters] = useState<Record<string, string>>({});
   const [modalOpen, setModalOpen] = useState(false);
   const [editing, setEditing] = useState<WecomBotDto | null>(null);
+  const [formInitial, setFormInitial] = useState<FormValues | null>(null);
+  const [formReady, setFormReady] = useState(false);
   const [saving, setSaving] = useState(false);
   const [detail, setDetail] = useState<WecomBotDto | null>(null);
-  const [runtime, setRuntime] = useState<ListRes['runtime']>();
+  const [runtime, setRuntime] = useState<WecomAibotRuntimeDto>();
   const [llmOptions, setLlmOptions] = useState<LlmApiConfigOptionDto[]>([]);
   const [kbOptions, setKbOptions] = useState<KnowledgeBaseOptionDto[]>([]);
   const roleWatch = Form.useWatch('role', form);
+  const permissionsWatch = Form.useWatch('permissions', form) as WecomBotPermission[] | undefined;
 
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<WecomBotDto>(
     '/admin/wecom-bots',
@@ -87,11 +130,13 @@ export default function WecomBotsPage() {
     [filters],
   );
 
-  useEffect(() => {
-    // useAdminList returns items; runtime comes from same API — fetch once for banner
-    void request<ListRes>('/admin/wecom-bots?page=1&pageSize=1')
-      .then((res) => setRuntime(res.runtime))
+  const loadRuntime = () =>
+    request<WecomAibotRuntimeDto>('/admin/wecom-bots/runtime')
+      .then(setRuntime)
       .catch(() => {});
+
+  useEffect(() => {
+    void loadRuntime();
   }, [data]);
 
   useEffect(() => {
@@ -109,46 +154,51 @@ export default function WecomBotsPage() {
       });
   }, []);
 
+  useEffect(() => {
+    if (!modalOpen || !formReady || !formInitial) return;
+    form.resetFields();
+    form.setFieldsValue(formInitial);
+  }, [modalOpen, formReady, formInitial, form]);
+
+  function closeModal() {
+    setModalOpen(false);
+    setFormReady(false);
+    setFormInitial(null);
+    setEditing(null);
+    form.resetFields();
+  }
+
   function openCreate() {
     setEditing(null);
-    form.setFieldsValue({
-      name: '',
-      role: 'CUSTOMER_SERVICE',
-      botId: '',
-      secret: '',
-      avatarUrl: '',
-      welcome: '',
-      permissions: [...WECOM_BOT_ROLE_DEFAULT_PERMISSIONS.CUSTOMER_SERVICE],
-      aiEnabled: false,
-      llmConfigId: null,
-      knowledgeBaseId: null,
-      enabled: true,
-      sortOrder: 0,
-    });
+    setFormInitial({ ...CREATE_DEFAULTS });
+    setFormReady(true);
     setModalOpen(true);
   }
 
-  function openEdit(row: WecomBotDto) {
+  async function openEdit(row: WecomBotDto) {
     setEditing(row);
-    form.setFieldsValue({
-      name: row.name,
-      role: row.role,
-      botId: row.botId,
-      secret: '',
-      avatarUrl: row.avatarUrl || '',
-      welcome: row.welcome || '',
-      permissions: row.permissions,
-      aiEnabled: row.aiEnabled,
-      llmConfigId: row.llmConfigId,
-      knowledgeBaseId: row.knowledgeBaseId,
-      enabled: row.enabled,
-      sortOrder: row.sortOrder,
-    });
+    setFormInitial(null);
+    setFormReady(false);
     setModalOpen(true);
+    try {
+      const detail = await request<WecomBotDto>(`/admin/wecom-bots/${row.id}`);
+      setEditing(detail);
+      setFormInitial(mapDtoToForm(detail));
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '加载机器人详情失败');
+      setFormInitial(mapDtoToForm(row));
+    } finally {
+      setFormReady(true);
+    }
   }
 
   async function submit() {
     const values = await form.validateFields();
+    const permissions = (form.getFieldValue('permissions') ?? values.permissions) as WecomBotPermission[];
+    if (!permissions?.length) {
+      message.error('请至少选择一项权限');
+      return;
+    }
     setSaving(true);
     try {
       const payload = {
@@ -157,7 +207,8 @@ export default function WecomBotsPage() {
         botId: values.botId.trim(),
         avatarUrl: values.avatarUrl?.trim() || null,
         welcome: values.welcome?.trim() || null,
-        permissions: values.permissions,
+        permissions,
+        reviewSuperAdminWecomUserIds: parseUserIdLines(values.reviewSuperAdminWecomUserIds),
         aiEnabled: values.aiEnabled,
         llmConfigId: values.llmConfigId || null,
         knowledgeBaseId: values.knowledgeBaseId || null,
@@ -165,13 +216,20 @@ export default function WecomBotsPage() {
         sortOrder: values.sortOrder,
       };
       if (editing) {
-        await request(`/admin/wecom-bots/${editing.id}`, {
+        const saved = await request<WecomBotDto>(`/admin/wecom-bots/${editing.id}`, {
           method: 'PUT',
           body: JSON.stringify({
             ...payload,
             secret: values.secret?.trim() || undefined,
           }),
         });
+        if (!samePermissionSet(permissions, saved.permissions)) {
+          message.warning('权限与保存结果不一致，已用服务端数据刷新表单');
+          setFormInitial(mapDtoToForm(saved));
+          setEditing(saved);
+          reload();
+          return;
+        }
         message.success('已更新');
       } else {
         if (!values.secret?.trim()) {
@@ -187,7 +245,7 @@ export default function WecomBotsPage() {
         });
         message.success('已创建');
       }
-      setModalOpen(false);
+      closeModal();
       reload();
     } catch (e) {
       message.error(e instanceof Error ? e.message : '保存失败');
@@ -208,10 +266,10 @@ export default function WecomBotsPage() {
 
   async function reloadConnections() {
     try {
-      const st = await request<{
-        masterEnabled: boolean;
-        bots: Array<{ id: string; connected: boolean; lastError: string | null }>;
-      }>('/admin/wecom-bots/reload', { method: 'POST', body: '{}' });
+      const st = await request<WecomAibotRuntimeDto>('/admin/wecom-bots/reload', {
+        method: 'POST',
+        body: '{}',
+      });
       message.success('已重载长连接');
       setRuntime(st);
       reload();
@@ -287,7 +345,7 @@ export default function WecomBotsPage() {
       fixed: 'right',
       render: (_, row) => (
         <Space>
-          <Button type="link" size="small" onClick={() => openEdit(row)}>
+          <Button type="link" size="small" onClick={() => void openEdit(row)}>
             编辑
           </Button>
           <Button
@@ -386,23 +444,39 @@ export default function WecomBotsPage() {
       <Modal
         title={editing ? '编辑企微机器人' : '创建企微机器人'}
         open={modalOpen}
-        onCancel={() => setModalOpen(false)}
+        onCancel={closeModal}
         onOk={() => void submit()}
         confirmLoading={saving}
         width={640}
         destroyOnClose
       >
-        <Form form={form} layout="vertical">
+        {formReady && formInitial ? (
+        <Form
+          key={editing ? `edit-${editing.id}` : 'create'}
+          form={form}
+          layout="vertical"
+          preserve={false}
+          initialValues={formInitial}
+        >
           <Form.Item name="name" label="名称" rules={[{ required: true, message: '请填写名称' }]}>
             <Input placeholder="如：客服机器人" maxLength={64} />
           </Form.Item>
           <Form.Item name="role" label="角色" rules={[{ required: true }]}>
             <Select
               options={WECOM_BOT_ROLES.map((r) => ({ value: r, label: WECOM_BOT_ROLE_LABELS[r] }))}
-              onChange={(role: WecomBotRole) => {
+            />
+          </Form.Item>
+          <Form.Item>
+            <Button
+              size="small"
+              onClick={() => {
+                const role = form.getFieldValue('role') as WecomBotRole | undefined;
+                if (!role) return;
                 form.setFieldValue('permissions', [...WECOM_BOT_ROLE_DEFAULT_PERMISSIONS[role]]);
               }}
-            />
+            >
+              应用当前角色默认权限
+            </Button>
           </Form.Item>
           <Form.Item name="avatarUrl" label="头像">
             <OssUpload bizType="WECOM_BOT_AVATAR" />
@@ -420,21 +494,48 @@ export default function WecomBotsPage() {
           </Form.Item>
           <Form.Item
             name="permissions"
-            label="权限"
-            rules={[{ required: true, message: '请至少选择一项权限' }]}
+            label="权限（按模块）"
+            rules={[
+              {
+                validator: (_, v: WecomBotPermission[] | undefined) =>
+                  v?.length ? Promise.resolve() : Promise.reject(new Error('请至少选择一项权限')),
+              },
+            ]}
             extra={
-              roleWatch
-                ? `角色默认：${WECOM_BOT_ROLE_DEFAULT_PERMISSIONS[roleWatch as WecomBotRole]?.map((p) => WECOM_BOT_PERMISSION_LABELS[p]).join('、') || '无'}`
-                : undefined
+              <>
+                {roleWatch
+                  ? `角色默认：${WECOM_BOT_ROLE_DEFAULT_PERMISSIONS[roleWatch as WecomBotRole]?.map((p) => WECOM_BOT_PERMISSION_LABELS[p]).join('、') || '无'}`
+                  : null}
+                {permissionsWatch?.length ? (
+                  <Typography.Text type="secondary"> · 已选 {permissionsWatch.length} 项</Typography.Text>
+                ) : null}
+              </>
             }
           >
-            <Checkbox.Group
-              options={WECOM_BOT_PERMISSIONS.map((p) => ({
-                value: p,
-                label: WECOM_BOT_PERMISSION_LABELS[p],
-              }))}
-            />
+            <Checkbox.Group style={{ width: '100%' }}>
+              {WECOM_BOT_PERMISSION_GROUPS.map((group) => (
+                <div key={group.key} style={{ marginBottom: 12 }}>
+                  <Typography.Text strong>{group.label}</Typography.Text>
+                  <div style={{ marginTop: 4 }}>
+                    {group.permissions.map((p) => (
+                      <Checkbox key={p} value={p} style={{ marginInlineStart: 0, marginRight: 12 }}>
+                        {WECOM_BOT_PERMISSION_LABELS[p]}
+                      </Checkbox>
+                    ))}
+                  </div>
+                </div>
+              ))}
+            </Checkbox.Group>
           </Form.Item>
+          {(roleWatch === 'TECH_SUPPORT' || permissionsWatch?.includes('support_ticket.review')) && (
+            <Form.Item
+              name="reviewSuperAdminWecomUserIds"
+              label="审批白名单（企微 userid）"
+              extra="填写成员企微 userid（如 woDacESQAAD…），不是姓名/昵称；每行或逗号分隔。发「状态」或在服务端日志 inbound user= 可核对"
+            >
+              <Input.TextArea rows={3} placeholder="zhangsan&#10;lisi" />
+            </Form.Item>
+          )}
           <Form.Item name="welcome" label="欢迎语">
             <Input.TextArea rows={3} placeholder="进入会话时的欢迎语，可空" />
           </Form.Item>
@@ -475,6 +576,9 @@ export default function WecomBotsPage() {
             </Form.Item>
           </Space>
         </Form>
+        ) : (
+          <Typography.Text type="secondary">加载中…</Typography.Text>
+        )}
       </Modal>
 
       <Drawer title="机器人详情" width={480} open={!!detail} onClose={() => setDetail(null)}>
@@ -496,6 +600,11 @@ export default function WecomBotsPage() {
             <Descriptions.Item label="权限">
               {detail.permissions.map((p) => WECOM_BOT_PERMISSION_LABELS[p] || p).join('、')}
             </Descriptions.Item>
+            <Descriptions.Item label="审批白名单">
+              {detail.reviewSuperAdminWecomUserIds?.length
+                ? detail.reviewSuperAdminWecomUserIds.join('、')
+                : '—'}
+            </Descriptions.Item>
             <Descriptions.Item label="欢迎语">{detail.welcome || '—'}</Descriptions.Item>
             <Descriptions.Item label="AI 问答">{detail.aiEnabled ? '开' : '关'}</Descriptions.Item>
             <Descriptions.Item label="语言模型">{detail.llmConfigName || '—'}</Descriptions.Item>

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

@@ -0,0 +1,405 @@
+import { useState } from 'react';
+import {
+  Avatar,
+  Button,
+  Checkbox,
+  Descriptions,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  Popconfirm,
+  Select,
+  Space,
+  Switch,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  WECOM_PUSH_CONDITION_GROUPS,
+  WECOM_PUSH_CONDITION_LABELS,
+  type WecomMessagePushDto,
+  type WecomPushCondition,
+} from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+import { useAdminList } from '../lib/useAdminList';
+import OssUpload from '../components/OssUpload';
+
+type FormValues = {
+  name: string;
+  avatarUrl?: string;
+  webhookUrl: string;
+  enabled: boolean;
+  mentionWecomUserId?: string;
+  pushConditions: WecomPushCondition[];
+  sortOrder: number;
+};
+
+function WecomPushConditionPicker({
+  value,
+  onChange,
+}: {
+  value?: WecomPushCondition[];
+  onChange?: (next: WecomPushCondition[]) => void;
+}) {
+  const selected = new Set(value ?? []);
+
+  function toggle(cond: WecomPushCondition, checked: boolean) {
+    const next = new Set(selected);
+    if (checked) next.add(cond);
+    else next.delete(cond);
+    onChange?.([...next]);
+  }
+
+  return (
+    <div style={{ width: '100%' }}>
+      {WECOM_PUSH_CONDITION_GROUPS.map((group) => (
+        <div key={group.key} style={{ marginBottom: 12 }}>
+          <Typography.Text strong>{group.label}</Typography.Text>
+          <div style={{ marginTop: 8 }}>
+            {group.conditions.map((c) => (
+              <div key={c}>
+                <Checkbox
+                  checked={selected.has(c)}
+                  onChange={(e) => toggle(c, e.target.checked)}
+                >
+                  {WECOM_PUSH_CONDITION_LABELS[c]}
+                </Checkbox>
+              </div>
+            ))}
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default function WecomMessagePushesPage() {
+  const [filterForm] = Form.useForm();
+  const [form] = Form.useForm<FormValues>();
+  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [modalOpen, setModalOpen] = useState(false);
+  const [editing, setEditing] = useState<WecomMessagePushDto | null>(null);
+  const [saving, setSaving] = useState(false);
+  const [detail, setDetail] = useState<WecomMessagePushDto | null>(null);
+  const [testingId, setTestingId] = useState<string | null>(null);
+
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } =
+    useAdminList<WecomMessagePushDto>(
+      '/admin/wecom-message-pushes',
+      () => {
+        const qs = new URLSearchParams();
+        if (filters.name) qs.set('name', filters.name);
+        if (filters.enabled) qs.set('enabled', filters.enabled);
+        return qs;
+      },
+      [filters],
+    );
+
+  const conditionsWatch = Form.useWatch('pushConditions', form) as WecomPushCondition[] | undefined;
+
+  function openCreate() {
+    setEditing(null);
+    form.resetFields();
+    form.setFieldsValue({
+      enabled: true,
+      pushConditions: ['alert.ops'],
+      sortOrder: 0,
+    });
+    setModalOpen(true);
+  }
+
+  function openEdit(row: WecomMessagePushDto) {
+    setEditing(row);
+    form.setFieldsValue({
+      name: row.name,
+      avatarUrl: row.avatarUrl ?? undefined,
+      webhookUrl: row.webhookUrl,
+      enabled: row.enabled,
+      mentionWecomUserId: row.mentionWecomUserId ?? undefined,
+      pushConditions: row.pushConditions,
+      sortOrder: row.sortOrder,
+    });
+    setModalOpen(true);
+  }
+
+  async function save() {
+    const values = await form.validateFields();
+    setSaving(true);
+    try {
+      const body = {
+        name: values.name,
+        avatarUrl: values.avatarUrl || null,
+        webhookUrl: values.webhookUrl,
+        enabled: values.enabled,
+        mentionWecomUserId: values.mentionWecomUserId?.trim() || null,
+        pushConditions: values.pushConditions,
+        sortOrder: values.sortOrder ?? 0,
+      };
+      if (editing) {
+        await request(`/admin/wecom-message-pushes/${editing.id}`, {
+          method: 'PUT',
+          body: JSON.stringify(body),
+        });
+        message.success('已更新');
+      } else {
+        await request('/admin/wecom-message-pushes', {
+          method: 'POST',
+          body: JSON.stringify(body),
+        });
+        message.success('已创建');
+      }
+      setModalOpen(false);
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function remove(id: string) {
+    try {
+      await request(`/admin/wecom-message-pushes/${id}`, { method: 'DELETE' });
+      message.success('已删除');
+      reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    }
+  }
+
+  async function testPush(id: string) {
+    setTestingId(id);
+    try {
+      const res = await request<{ ok: boolean; message: string }>(
+        `/admin/wecom-message-pushes/${id}/test`,
+        { method: 'POST', body: '{}' },
+      );
+      message.success(res.message || '已发送测试消息');
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '测试失败');
+    } finally {
+      setTestingId(null);
+    }
+  }
+
+  const columns: ColumnsType<WecomMessagePushDto> = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      render: (name: string, row) => (
+        <Space>
+          <Avatar src={row.avatarUrl ?? undefined}>{name.slice(0, 1)}</Avatar>
+          <span>{name}</span>
+        </Space>
+      ),
+    },
+    {
+      title: 'Webhook',
+      dataIndex: 'webhookUrlMasked',
+      ellipsis: true,
+    },
+    {
+      title: '推送条件',
+      dataIndex: 'pushConditions',
+      render: (conds: WecomPushCondition[]) =>
+        conds.map((c) => (
+          <Tag key={c} style={{ marginBottom: 4 }}>
+            {WECOM_PUSH_CONDITION_LABELS[c]}
+          </Tag>
+        )),
+    },
+    {
+      title: '启用',
+      dataIndex: 'enabled',
+      width: 72,
+      render: (v: boolean) => (v ? <Tag color="green">是</Tag> : <Tag>否</Tag>),
+    },
+    { title: '排序', dataIndex: 'sortOrder', width: 64 },
+    {
+      title: '操作',
+      key: 'actions',
+      width: 220,
+      render: (_, row) => (
+        <Space wrap>
+          <Button type="link" size="small" onClick={() => openEdit(row)}>
+            编辑
+          </Button>
+          <Button
+            type="link"
+            size="small"
+            loading={testingId === row.id}
+            onClick={() => void testPush(row.id)}
+          >
+            测试
+          </Button>
+          <Button
+            type="link"
+            size="small"
+            onClick={() => {
+              void request<WecomMessagePushDto>(`/admin/wecom-message-pushes/${row.id}`).then(setDetail);
+            }}
+          >
+            详情
+          </Button>
+          <Popconfirm title="确认删除？" onConfirm={() => void remove(row.id)}>
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <Typography.Title level={4}>企微机器人 · 消息推送</Typography.Title>
+      <Typography.Paragraph type="secondary">
+        配置群机器人 Webhook 多实例，按推送条件分发运营告警、技术支持工单、开发任务派发等消息。运行时不再读取
+        .env 中的 Webhook URL。
+      </Typography.Paragraph>
+
+      <Form
+        form={filterForm}
+        layout="inline"
+        style={{ marginBottom: 16 }}
+        onFinish={(v) => setFilters(v as Record<string, string>)}
+      >
+        <Form.Item name="name" label="名称">
+          <Input allowClear placeholder="搜索" />
+        </Form.Item>
+        <Form.Item name="enabled" label="启用">
+          <Select
+            allowClear
+            placeholder="全部"
+            style={{ width: 100 }}
+            options={[
+              { value: 'true', label: '启用' },
+              { value: 'false', label: '停用' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item>
+          <Space>
+            <Button type="primary" htmlType="submit">
+              查询
+            </Button>
+            <Button
+              onClick={() => {
+                filterForm.resetFields();
+                setFilters({});
+              }}
+            >
+              重置
+            </Button>
+            <Button type="primary" onClick={openCreate}>
+              新建推送
+            </Button>
+          </Space>
+        </Form.Item>
+      </Form>
+
+      <Table<WecomMessagePushDto>
+        rowKey="id"
+        loading={loading}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        pagination={{
+          current: page,
+          pageSize,
+          total: data?.total ?? 0,
+          showSizeChanger: true,
+          onChange: (p, ps) => {
+            setPage(p);
+            setPageSize(ps);
+          },
+        }}
+      />
+
+      <Modal
+        title={editing ? '编辑消息推送' : '新建消息推送'}
+        open={modalOpen}
+        onCancel={() => setModalOpen(false)}
+        onOk={() => void save()}
+        confirmLoading={saving}
+        width={640}
+        destroyOnClose
+      >
+        <Form form={form} layout="vertical">
+          <Form.Item name="name" label="名称" rules={[{ required: true, message: '请填写名称' }]}>
+            <Input placeholder="如：运营告警" />
+          </Form.Item>
+          <Form.Item name="avatarUrl" label="头像（HQ 列表展示）">
+            <OssUpload />
+          </Form.Item>
+          <Form.Item
+            name="webhookUrl"
+            label="Webhook URL"
+            rules={[{ required: true, message: '请填写 Webhook URL' }]}
+          >
+            <Input.Password placeholder="企微群机器人 Webhook" />
+          </Form.Item>
+          <Form.Item name="enabled" label="启用" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            name="mentionWecomUserId"
+            label="企微 userid（可选）"
+            extra="markdown 推送用 <@userid> @ 群成员；任务派发等场景生效"
+          >
+            <Input placeholder="如 woDacESQAAD..." allowClear />
+          </Form.Item>
+          <Form.Item
+            name="pushConditions"
+            label="推送条件"
+            rules={[
+              {
+                validator: (_, v: WecomPushCondition[] | undefined) =>
+                  v?.length ? Promise.resolve() : Promise.reject(new Error('请至少勾选一项推送条件')),
+              },
+            ]}
+          >
+            <WecomPushConditionPicker />
+          </Form.Item>
+          {conditionsWatch?.length ? (
+            <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 16 }}>
+              已选 {conditionsWatch.length} 项：
+              {conditionsWatch.map((c) => WECOM_PUSH_CONDITION_LABELS[c]).join('、')}
+            </Typography.Text>
+          ) : null}
+          <Form.Item name="sortOrder" label="排序">
+            <InputNumber min={0} style={{ width: '100%' }} />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Modal
+        title="消息推送详情"
+        open={!!detail}
+        onCancel={() => setDetail(null)}
+        footer={null}
+        width={560}
+      >
+        {detail ? (
+          <Descriptions column={1} bordered size="small">
+            <Descriptions.Item label="名称">{detail.name}</Descriptions.Item>
+            <Descriptions.Item label="Webhook">{detail.webhookUrlMasked}</Descriptions.Item>
+            <Descriptions.Item label="启用">{detail.enabled ? '是' : '否'}</Descriptions.Item>
+            <Descriptions.Item label="userid">{detail.mentionWecomUserId || '—'}</Descriptions.Item>
+            <Descriptions.Item label="推送条件">
+              {detail.pushConditions.map((c) => WECOM_PUSH_CONDITION_LABELS[c]).join('、')}
+            </Descriptions.Item>
+            <Descriptions.Item label="排序">{detail.sortOrder}</Descriptions.Item>
+            <Descriptions.Item label="创建时间">{fmtTime(detail.createdAt)}</Descriptions.Item>
+            <Descriptions.Item label="更新时间">{fmtTime(detail.updatedAt)}</Descriptions.Item>
+          </Descriptions>
+        ) : null}
+      </Modal>
+    </div>
+  );
+}

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

@@ -258,7 +258,7 @@ export default function WineryBillsPage() {
             酒厂对账单
           </Typography.Title>
           <Typography.Text type="secondary">
-            每日 8:00 汇总昨日已付订单（实付 × {ratePct}%）；未打款红色、已打款绿色，可展开订单明细
+            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色，可展开订单明细
           </Typography.Text>
         </Space>
         {canEditWineryBank ? (

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

@@ -24,6 +24,7 @@ import {
 import { request } from '../../lib/api';
 import { fmtTime } from '../../lib/constants';
 import type { PromoCodeDetailContext } from './PromoCodeDetailLayout';
+import PromoCodeMetricsPanel from './PromoCodeMetricsPanel';
 
 const descLabelStyle: CSSProperties = {
   whiteSpace: 'nowrap',
@@ -212,6 +213,14 @@ export default function PromoCodeDetailPage() {
             <Statistic title="扫码进入次数" value={stats?.scanCount ?? detail.scanCount} />
           </Card>
         </Col>
+        <Col xs={12} sm={6}>
+          <Card size="small">
+            <Statistic
+              title="归因用户数"
+              value={stats?.attributionCount ?? 0}
+            />
+          </Card>
+        </Col>
         <Col xs={12} sm={6}>
           <Card size="small">
             <Statistic
@@ -235,6 +244,8 @@ export default function PromoCodeDetailPage() {
         </Col>
       </Row>
 
+      <PromoCodeMetricsPanel promoId={detail.id} />
+
       <Modal
         title="编辑推广码"
         open={editOpen}

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

@@ -0,0 +1,258 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  Card,
+  DatePicker,
+  Radio,
+  Select,
+  Space,
+  Table,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import dayjs, { type Dayjs } from 'dayjs';
+import ReactECharts from 'echarts-for-react';
+import type { EChartsOption } from 'echarts';
+import {
+  PROMO_METRIC_EVENT_LABELS,
+  type PromoMetricEventItem,
+  type PromoMetricEventType,
+  type PromoMetricTimelineDto,
+} from '@dukang/shared-types';
+import { request, type Paginated } from '../../lib/api';
+import { fmtTime } from '../../lib/constants';
+
+type Props = {
+  promoId: string;
+};
+
+const SERIES = [
+  { key: 'scan', name: '扫码进入', color: '#1677ff' },
+  { key: 'attribution', name: '归因用户', color: '#52c41a' },
+  { key: 'register', name: '扫码注册', color: '#faad14' },
+  { key: 'order', name: '订单', color: '#eb2f96' },
+] as const;
+
+function buildTimelineQs(promoId: string, range: [Dayjs, Dayjs], granularity: 'day' | 'hour') {
+  const qs = new URLSearchParams();
+  qs.set('dateFrom', range[0].format('YYYY-MM-DD'));
+  qs.set('dateTo', range[1].format('YYYY-MM-DD'));
+  qs.set('granularity', granularity);
+  return `/admin/promo-codes/${promoId}/metrics/timeline?${qs.toString()}`;
+}
+
+function buildEventsQs(
+  promoId: string,
+  page: number,
+  pageSize: number,
+  range: [Dayjs, Dayjs],
+  eventType?: PromoMetricEventType,
+) {
+  const qs = new URLSearchParams();
+  qs.set('page', String(page));
+  qs.set('pageSize', String(pageSize));
+  qs.set('dateFrom', range[0].format('YYYY-MM-DD'));
+  qs.set('dateTo', range[1].format('YYYY-MM-DD'));
+  if (eventType) qs.set('eventType', eventType);
+  return `/admin/promo-codes/${promoId}/metrics/events?${qs.toString()}`;
+}
+
+function formatRefId(row: PromoMetricEventItem): string {
+  if (row.orderId) return `订单 ${row.orderId}`;
+  if (row.userId) return `用户 ${row.userId}`;
+  if (row.sessionId) return `会话 ${row.sessionId}`;
+  return '—';
+}
+
+function formatLocation(row: PromoMetricEventItem): string {
+  const parts = [row.ipProvince, row.ipCity].filter(Boolean);
+  if (parts.length) return parts.join(' ');
+  return '—';
+}
+
+export default function PromoCodeMetricsPanel({ promoId }: Props) {
+  const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs().subtract(6, 'day'), dayjs()]);
+  const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
+  const [timeline, setTimeline] = useState<PromoMetricTimelineDto | null>(null);
+  const [timelineLoading, setTimelineLoading] = useState(false);
+  const [eventType, setEventType] = useState<PromoMetricEventType | undefined>();
+  const [eventsPage, setEventsPage] = useState(1);
+  const [events, setEvents] = useState<Paginated<PromoMetricEventItem> | null>(null);
+  const [eventsLoading, setEventsLoading] = useState(false);
+
+  const loadTimeline = useCallback(() => {
+    setTimelineLoading(true);
+    return request<PromoMetricTimelineDto>(buildTimelineQs(promoId, range, granularity))
+      .then(setTimeline)
+      .catch((e) => {
+        message.error(e instanceof Error ? e.message : '加载趋势失败');
+        setTimeline(null);
+      })
+      .finally(() => setTimelineLoading(false));
+  }, [promoId, range, granularity]);
+
+  const loadEvents = useCallback(() => {
+    setEventsLoading(true);
+    return request<Paginated<PromoMetricEventItem>>(
+      buildEventsQs(promoId, eventsPage, 20, range, eventType),
+    )
+      .then(setEvents)
+      .catch((e) => {
+        message.error(e instanceof Error ? e.message : '加载事件失败');
+        setEvents(null);
+      })
+      .finally(() => setEventsLoading(false));
+  }, [promoId, eventsPage, range, eventType]);
+
+  useEffect(() => {
+    void loadTimeline();
+  }, [loadTimeline]);
+
+  useEffect(() => {
+    void loadEvents();
+  }, [loadEvents]);
+
+  const chartOption = useMemo<EChartsOption>(() => {
+    const buckets = timeline?.buckets ?? [];
+    const xData = buckets.map((b) => b.key);
+
+    return {
+      tooltip: { trigger: 'axis' },
+      legend: { data: SERIES.map((s) => s.name), bottom: 0 },
+      grid: { left: 48, right: 24, top: 24, bottom: 48 },
+      xAxis: {
+        type: 'category',
+        data: xData,
+        axisLabel: {
+          rotate: granularity === 'hour' ? 45 : 0,
+          formatter: (v: string) => (granularity === 'hour' ? v.slice(5, 16) : v.slice(5)),
+        },
+      },
+      yAxis: { type: 'value', minInterval: 1 },
+      series: SERIES.map((s) => ({
+        name: s.name,
+        type: 'line',
+        smooth: true,
+        data: buckets.map((b) => b[s.key]),
+        itemStyle: { color: s.color },
+        markPoint: {
+          symbol: 'pin',
+          symbolSize: 42,
+          data: (() => {
+            const peak = timeline?.peak[s.key];
+            if (!peak || peak.count <= 0) return [];
+            return [{ name: '高峰', coord: [peak.key, peak.count], value: peak.count }];
+          })(),
+        },
+      })),
+    };
+  }, [timeline, granularity]);
+
+  const columns: ColumnsType<PromoMetricEventItem> = [
+    {
+      title: '时间',
+      dataIndex: 'createdAt',
+      width: 168,
+      render: (v: string) => fmtTime(v),
+    },
+    {
+      title: '类型',
+      dataIndex: 'eventType',
+      width: 108,
+      render: (v: PromoMetricEventType) => PROMO_METRIC_EVENT_LABELS[v],
+    },
+    {
+      title: 'ID',
+      key: 'ref',
+      render: (_, row) => formatRefId(row),
+    },
+    {
+      title: 'IP',
+      dataIndex: 'clientIp',
+      width: 128,
+      render: (v: string | null) => v ?? '—',
+    },
+    {
+      title: '地点',
+      key: 'location',
+      width: 120,
+      render: (_, row) => formatLocation(row),
+    },
+  ];
+
+  return (
+    <Card
+      title="数据趋势"
+      style={{ marginTop: 16 }}
+      extra={
+        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+          仅统计功能上线后的新事件
+        </Typography.Text>
+      }
+    >
+      <Space wrap style={{ marginBottom: 16 }}>
+        <DatePicker.RangePicker
+          value={range}
+          onChange={(v) => {
+            if (v?.[0] && v[1]) {
+              setRange([v[0], v[1]]);
+              setEventsPage(1);
+            }
+          }}
+          allowClear={false}
+        />
+        <Radio.Group
+          value={granularity}
+          onChange={(e) => setGranularity(e.target.value as 'day' | 'hour')}
+          optionType="button"
+          buttonStyle="solid"
+          options={[
+            { label: '按日', value: 'day' },
+            { label: '按时', value: 'hour' },
+          ]}
+        />
+      </Space>
+
+      <ReactECharts
+        option={chartOption}
+        style={{ height: 360 }}
+        showLoading={timelineLoading}
+        notMerge
+      />
+
+      <Typography.Title level={5} style={{ marginTop: 24, marginBottom: 12 }}>
+        事件日志
+      </Typography.Title>
+      <Space wrap style={{ marginBottom: 12 }}>
+        <Select
+          allowClear
+          placeholder="全部类型"
+          style={{ width: 160 }}
+          value={eventType}
+          onChange={(v) => {
+            setEventType(v);
+            setEventsPage(1);
+          }}
+          options={Object.entries(PROMO_METRIC_EVENT_LABELS).map(([value, label]) => ({
+            value,
+            label,
+          }))}
+        />
+      </Space>
+      <Table
+        rowKey="id"
+        size="small"
+        columns={columns}
+        dataSource={events?.items ?? []}
+        loading={eventsLoading}
+        pagination={{
+          current: eventsPage,
+          pageSize: events?.pageSize ?? 20,
+          total: events?.total ?? 0,
+          showSizeChanger: false,
+          onChange: (p) => setEventsPage(p),
+        }}
+      />
+    </Card>
+  );
+}

apps/h5-partner/package.json

@@ -9,15 +9,18 @@
     "lint": "echo ok"
   },
   "dependencies": {
-    "@dukang/shared-ui": "workspace:*",
+    "@dukang/client-logging": "workspace:*",
     "@dukang/shared-types": "workspace:*",
+    "@dukang/shared-ui": "workspace:*",
     "@dukang/weixin-sdk": "workspace:*",
     "element-china-area-data": "^6.1.0",
+    "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.26.0"
   },
   "devDependencies": {
+    "@types/qrcode": "^1.5.6",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",

apps/h5-partner/public/MP_verify_ayPJ4CQqbUcec3jX.txt

@@ -0,0 +1 @@
+ayPJ4CQqbUcec3jX

apps/h5-partner/src/PartnerAppRoutes.tsx

@@ -6,6 +6,7 @@ import SubAccountLayout from './layouts/SubAccountLayout';
 import HomePage from './pages/HomePage';
 import StoreListPage from './pages/StoreListPage';
 import StoreDetailPage from './pages/StoreDetailPage';
+import StorePackagesPage from './pages/StorePackagesPage';
 import StoreCreatePage from './pages/StoreCreatePage';
 import OrderListPage from './pages/OrderListPage';
 import OrderDetailPage from './pages/OrderDetailPage';
@@ -16,6 +17,8 @@ import SettlementPage from './pages/SettlementPage';
 import WeeklyReportPage from './pages/WeeklyReportPage';
 import ProxyOrderPage from './pages/ProxyOrderPage';
 import ProxyOrderProductsPage from './pages/ProxyOrderProductsPage';
+import ProxyOrderListPage from './pages/ProxyOrderListPage';
+import ProxyOrderDetailPage from './pages/ProxyOrderDetailPage';
 import StaffListPage from './pages/StaffListPage';
 import StaffCreatePage from './pages/StaffCreatePage';
 import LeaderboardPage from './pages/LeaderboardPage';
@@ -29,10 +32,13 @@ function PrimaryRoutes() {
         <Route path="/center" element={<CenterPage />} />
       </Route>
       <Route path="/stores/new" element={<StoreCreatePage />} />
+      <Route path="/stores/:id/packages" element={<StorePackagesPage />} />
       <Route path="/center/bills" element={<BillsPage />} />
       <Route path="/center/settlement" element={<SettlementPage />} />
       <Route path="/center/staff" element={<StaffListPage />} />
       <Route path="/center/staff/new" element={<StaffCreatePage />} />
+      <Route path="/center/proxy-orders" element={<ProxyOrderListPage />} />
+      <Route path="/center/proxy-orders/:id" element={<ProxyOrderDetailPage />} />
       <Route path="/proxy-order" element={<ProxyOrderPage />} />
       <Route path="/proxy-order/products" element={<ProxyOrderProductsPage />} />
       <Route path="/reports/weekly" element={<WeeklyReportPage />} />
@@ -64,6 +70,7 @@ function SubAccountRoutes() {
       {!isWarehouse && (
         <>
           <Route path="/stores/new" element={<StoreCreatePage />} />
+          <Route path="/stores/:id/packages" element={<StorePackagesPage />} />
           <Route path="/stores/:id" element={<StoreDetailPage />} />
         </>
       )}

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

@@ -1,5 +1,5 @@
 import { Navigate, useLocation } from 'react-router-dom';
-import { getPartnerProfile } from '../lib/api';
+import { getPartnerProfile, hasPartnerWxSession } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';
 
@@ -18,6 +18,10 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
   }
 
   if (!authenticated && !PUBLIC_PATHS.has(location.pathname)) {
+    const profile = getPartnerProfile();
+    if (profile && hasPartnerWxSession() && profile.hasWechat) {
+      return <Navigate to="/login?quick=1" replace state={{ from: location }} />;
+    }
     return <Navigate to="/login" replace state={{ from: location }} />;
   }
 

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

@@ -1,6 +1,8 @@
-import { useRef, useState } from 'react';
+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 } from '../lib/toast';
 
 type OssUploadFieldProps = {
@@ -12,9 +14,28 @@ type OssUploadFieldProps = {
   wide?: boolean;
   compact?: boolean;
   label?: string;
+  /** 兼容现有调用：选图不再依赖 openId 绑定 */
+  wechatReady?: boolean;
+  onWechatReadyChange?: (ready: boolean) => void;
 };
 
-const DEFAULT_MAX_MB = 10;
+function isCancelError(msg: string): boolean {
+  return /cancel|取消/i.test(msg);
+}
+
+function formatWechatUploadError(e: unknown): string {
+  const msg = e instanceof Error ? e.message : '无法打开相册';
+  const formatted = formatChooseImageFailMessage(msg);
+  if (formatted) return formatted;
+  if (/invalid signature/i.test(msg)) {
+    return '微信 JSSDK 签名校验失败：请确认公众号已配置 JS 接口安全域名，并刷新页面后重试';
+  }
+  return msg;
+}
+
+function acceptsImages(accept: string) {
+  return accept.includes('image');
+}
 
 export default function OssUploadField({
   value,
@@ -27,8 +48,10 @@ export default function OssUploadField({
   label,
 }: OssUploadFieldProps) {
   const inputRef = useRef<HTMLInputElement>(null);
+  const pickingRef = useRef(false);
   const [uploading, setUploading] = useState(false);
   const [error, setError] = useState('');
+  const [showAlbumFallback, setShowAlbumFallback] = useState(false);
 
   function showUploadError(text: string) {
     setError(text);
@@ -37,16 +60,23 @@ export default function OssUploadField({
 
   const resolvedAccept =
     accept ?? (mediaType === 'VIDEO' ? 'video/*' : mediaType === 'FILE' ? 'image/*,.pdf' : 'image/*');
+  const inWechat = isWechatEnv();
+  const useWechatPicker =
+    inWechat && (mediaType === 'IMAGE' || (mediaType === 'FILE' && acceptsImages(resolvedAccept)));
+
+  useEffect(() => {
+    if (!useWechatPicker) return;
+    // 仅预热，勿在每次点击时 reset，否则取消后再点常无法调起
+    void weixinSdk.init().catch(() => {
+      /* 点击上传时会再次初始化 */
+    });
+  }, [useWechatPicker]);
 
   async function persistUpload(file: File) {
     if (!file.size) {
       showUploadError('图片读取失败，请重新选择');
       return;
     }
-    if (file.size > DEFAULT_MAX_MB * 1024 * 1024) {
-      showUploadError(`文件不能超过 ${DEFAULT_MAX_MB}MB`);
-      return;
-    }
     const result = await uploadFileToOss(file, { bizType, mediaType });
     onChange?.(result.url);
   }
@@ -64,21 +94,66 @@ export default function OssUploadField({
     }
   }
 
-  function pickFile() {
-    if (uploading) return;
+  async function pickWechatImage() {
+    if (pickingRef.current || uploading) return;
+    pickingRef.current = true;
     setError('');
+    try {
+      // 不要每次 reset：会打断 JSSDK，取消后再点经常无法调起相机/相册
+      await weixinSdk.init();
+      const files = await weixinSdk.chooseImages({
+        count: 1,
+        sourceType: ['album', 'camera'],
+      });
+      // 取消或未选图：直接结束，允许再次点击
+      if (!files?.length) return;
+
+      setUploading(true);
+      try {
+        // 仅串行化实际上传，选图本身不占上传锁，避免取消后锁态异常
+        await enqueueUpload(() => persistUpload(files[0]!));
+      } finally {
+        setUploading(false);
+      }
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : '无法打开相册';
+      if (isCancelError(msg)) return;
+      throw e;
+    } finally {
+      pickingRef.current = false;
+    }
+  }
+
+  async function pickFile() {
+    if (uploading || pickingRef.current) return;
+    setError('');
+
+    if (useWechatPicker) {
+      try {
+        await pickWechatImage();
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : '无法打开相册';
+        if (isCancelError(msg)) return;
+        const formatted = formatWechatUploadError(e);
+        setError(`${formatted}，可改从系统相册选择`);
+        setShowAlbumFallback(true);
+        inputRef.current?.click();
+      }
+      return;
+    }
+
     inputRef.current?.click();
   }
 
   const isImage = mediaType === 'IMAGE' && value;
   const isFile = mediaType === 'FILE' && value;
   const busy = uploading;
-  const pickerLabel = label ?? (mediaType === 'IMAGE' ? '从系统相册选择' : '点击上传');
+  const pickerLabel = label ?? (useWechatPicker ? '拍照 / 从相册选择' : '点击上传');
 
   const triggerProps = {
     type: 'button' as const,
     disabled: busy,
-    onClick: pickFile,
+    onClick: () => void pickFile(),
   };
 
   return (
@@ -92,6 +167,7 @@ export default function OssUploadField({
         onChange={(e) => {
           const file = e.target.files?.[0];
           if (file) {
+            setShowAlbumFallback(false);
             void uploadSelectedFile(file);
           }
         }}
@@ -120,13 +196,24 @@ export default function OssUploadField({
           className={`partner-upload-dashed${wide ? ' partner-upload-dashed--wide' : ''}${compact ? ' partner-upload-dashed--compact' : ''}`}
         >
           <span className="material-symbols-outlined text-primary" style={{ fontSize: compact ? 28 : 36 }}>
-            {busy ? 'hourglass_top' : 'photo_library'}
+            {busy ? 'hourglass_top' : 'add_a_photo'}
           </span>
           <span className="text-primary" style={{ fontWeight: 500 }}>
             {uploading ? '上传中…' : pickerLabel}
           </span>
         </button>
       )}
+      {showAlbumFallback && useWechatPicker && (
+        <button
+          type="button"
+          className="partner-btn-outline"
+          style={{ marginTop: 8, width: '100%' }}
+          disabled={busy}
+          onClick={() => inputRef.current?.click()}
+        >
+          从系统相册选择
+        </button>
+      )}
       {error && <p className="partner-form-error" role="alert">{error}</p>}
     </div>
   );

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

@@ -0,0 +1,169 @@
+import { useState } from 'react';
+import type { PackageFormItem } from '../lib/storePackages';
+import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import { emptyPackage } from '../lib/storePackages';
+import OssUploadField from './OssUploadField';
+
+type Props = {
+  items: PackageFormItem[];
+  onChange: (items: PackageFormItem[]) => void;
+  disabled?: boolean;
+  /** 嵌入拓店流程时不重复外层卡片边距 */
+  embedded?: boolean;
+};
+
+export default function StorePackagesForm({ items, onChange, disabled, embedded }: Props) {
+  const [collapsed, setCollapsed] = useState<Record<number, boolean>>({});
+
+  function updateAt(index: number, patch: Partial<PackageFormItem>) {
+    const next = items.map((item, i) => (i === index ? { ...item, ...patch } : item));
+    onChange(next);
+  }
+
+  function addItem() {
+    if (items.length >= STORE_PACKAGE_MAX_COUNT) return;
+    onChange([...items, emptyPackage(items.length)]);
+  }
+
+  function removeAt(index: number) {
+    onChange(items.filter((_, i) => i !== index).map((item, i) => ({ ...item, sortOrder: i })));
+    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;
+    });
+  }
+
+  function toggleCollapse(index: number) {
+    setCollapsed((prev) => ({ ...prev, [index]: !prev[index] }));
+  }
+
+  const list = items.length ? items : [emptyPackage(0)];
+
+  return (
+    <div className={`partner-packages-form${embedded ? ' partner-packages-form--embedded' : ''}`}>
+      {list.map((item, index) => {
+        const isCollapsed = !!collapsed[index];
+        const displayName = item.name.trim() || `套餐 ${index + 1}`;
+        return (
+          <section
+            key={index}
+            className={`partner-form-card partner-packages-item${isCollapsed ? ' partner-packages-item--collapsed' : ''}`}
+            style={embedded ? { marginLeft: 0, marginRight: 0 } : undefined}
+          >
+            <div className="partner-packages-item-head">
+              <button
+                type="button"
+                className="partner-packages-toggle"
+                onClick={() => toggleCollapse(index)}
+                aria-expanded={!isCollapsed}
+                aria-label={isCollapsed ? '展开套餐' : '收起套餐'}
+              >
+                <span className="material-symbols-outlined">
+                  {isCollapsed ? 'expand_more' : 'expand_less'}
+                </span>
+                <span className="headline-md">{displayName}</span>
+              </button>
+              {!disabled && list.length > 1 ? (
+                <button type="button" className="partner-packages-remove" onClick={() => removeAt(index)}>
+                  删除
+                </button>
+              ) : null}
+            </div>
+
+            {!isCollapsed ? (
+              <>
+                <div className="partner-field">
+                  <label>套餐名称 <span className="text-primary">*</span></label>
+                  <div className="partner-field-input">
+                    <span className="material-symbols-outlined">restaurant</span>
+                    <input
+                      placeholder="如：套餐A"
+                      value={item.name}
+                      disabled={disabled}
+                      onChange={(e) => updateAt(index, { name: e.target.value })}
+                    />
+                  </div>
+                </div>
+
+                <div className="partner-field">
+                  <label>价格（元） <span className="text-primary">*</span></label>
+                  <div className="partner-field-input">
+                    <span className="material-symbols-outlined">payments</span>
+                    <input
+                      type="number"
+                      min={0}
+                      step={0.01}
+                      placeholder="198"
+                      value={item.price}
+                      disabled={disabled}
+                      onChange={(e) => updateAt(index, { price: e.target.value })}
+                    />
+                  </div>
+                </div>
+
+                <div className="partner-field">
+                  <label>菜品 <span className="text-primary">*</span></label>
+                  <textarea
+                    rows={3}
+                    placeholder="红烧肉、红烧鱼、油焖茄子"
+                    value={item.dishes}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { dishes: e.target.value })}
+                  />
+                </div>
+
+                <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>
+                </div>
+
+                <div className="partner-field">
+                  <label>套餐图片</label>
+                  <OssUploadField
+                    bizType="STORE_PACKAGE"
+                    value={item.imageUrl || ''}
+                    disabled={disabled}
+                    onChange={(url) => updateAt(index, { imageUrl: url })}
+                  />
+                </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>
+                </div>
+              </>
+            ) : null}
+          </section>
+        );
+      })}
+
+      {!disabled && list.length < STORE_PACKAGE_MAX_COUNT ? (
+        <button type="button" className="partner-packages-add" onClick={addItem}>
+          <span className="material-symbols-outlined">add_circle</span>
+          添加套餐
+        </button>
+      ) : null}
+    </div>
+  );
+}

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

@@ -1,8 +1,9 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
+import type { ClientRuntimeConfig } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import {
-  placeToPicked,
-  type LbsPlaceItem,
+  buildTencentLocPickerUrl,
+  parseTencentLocPickerMessage,
   type TencentPickedLocation,
 } from '../lib/tencentLocPicker';
 
@@ -12,117 +13,84 @@ type Props = {
   onPick: (loc: TencentPickedLocation) => void;
   latitude?: number | null;
   longitude?: number | null;
+  /** 保留兼容，iframe 选点不使用 */
   region?: string | null;
 };
 
+let cachedKey: string | null | undefined;
+
+async function loadTencentLbsKey(): Promise<string> {
+  if (cachedKey) return cachedKey;
+  const cfg = await request<ClientRuntimeConfig>('PARTNER_H5', '/common/client-config', {
+    silent: true,
+  });
+  const key = (cfg.tencentLbsKey || '').trim();
+  if (!key) {
+    throw new Error('未配置腾讯位置服务 Key，请联系管理员在系统设置中配置');
+  }
+  cachedKey = key;
+  return key;
+}
+
 export default function TencentLocPickerOverlay({
   open,
   onClose,
   onPick,
   latitude,
   longitude,
-  region,
 }: Props) {
-  const [keyword, setKeyword] = useState('');
-  const [items, setItems] = useState<LbsPlaceItem[]>([]);
+  const [key, setKey] = useState<string | null>(cachedKey ?? null);
   const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+  /** 选点结果仅存内存，界面不展示经纬度 */
   const [pending, setPending] = useState<TencentPickedLocation | null>(null);
-  const [hint, setHint] = useState('输入地点名称搜索');
-  const seqRef = useRef(0);
+  const [iframeReady, setIframeReady] = useState(false);
 
   useEffect(() => {
     if (!open) {
-      setKeyword('');
-      setItems([]);
       setPending(null);
-      setHint('输入地点名称搜索');
+      setIframeReady(false);
+      setError('');
       return;
     }
-    const lat = latitude != null ? Number(latitude) : NaN;
-    const lng = longitude != null ? Number(longitude) : NaN;
-    if (Number.isFinite(lat) && Number.isFinite(lng) && !(lat === 0 && lng === 0)) {
-      void loadNearby(lat, lng);
+    let cancelled = false;
+    if (key) return;
+    setLoading(true);
+    void loadTencentLbsKey()
+      .then((k) => {
+        if (!cancelled) setKey(k);
+      })
+      .catch((e) => {
+        if (!cancelled) setError(e instanceof Error ? e.message : '加载地图配置失败');
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [open, key]);
+
+  useEffect(() => {
+    if (!open) return;
+    function onMessage(event: MessageEvent) {
+      const picked = parseTencentLocPickerMessage(event.data);
+      if (!picked) return;
+      setPending(picked);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    window.addEventListener('message', onMessage);
+    return () => window.removeEventListener('message', onMessage);
   }, [open]);
 
-  async function loadNearby(lat: number, lng: number) {
-    const seq = ++seqRef.current;
-    setLoading(true);
-    setHint('正在加载附近地点…');
-    try {
-      const res = await request<{ items: LbsPlaceItem[] }>(
-        'PARTNER_H5',
-        `/common/lbs/nearby?lat=${encodeURIComponent(String(lat))}&lng=${encodeURIComponent(String(lng))}`,
-        { silent: true },
-      );
-      if (seq !== seqRef.current) return;
-      setItems(res.items ?? []);
-      setHint(res.items?.length ? `附近 ${res.items.length} 个地点` : '附近暂无地点，请搜索');
-    } catch (e) {
-      if (seq !== seqRef.current) return;
-      setItems([]);
-      setHint(e instanceof Error ? e.message : '加载附近地点失败');
-    } finally {
-      if (seq === seqRef.current) setLoading(false);
-    }
-  }
-
-  async function runSearch() {
-    const trimmed = keyword.trim();
-    if (!trimmed) {
-      setHint('请输入搜索关键词');
-      return;
-    }
-    const seq = ++seqRef.current;
-    setLoading(true);
-    setHint('搜索中…');
-    try {
-      const params = new URLSearchParams({ keyword: trimmed });
-      if (region?.trim()) params.set('region', region.trim());
-      const lat = latitude != null ? Number(latitude) : NaN;
-      const lng = longitude != null ? Number(longitude) : NaN;
-      if (Number.isFinite(lat) && Number.isFinite(lng)) {
-        params.set('lat', String(lat));
-        params.set('lng', String(lng));
-      }
-      const res = await request<{ items: LbsPlaceItem[] }>(
-        'PARTNER_H5',
-        `/common/lbs/suggest?${params.toString()}`,
-        { silent: true },
-      );
-      if (seq !== seqRef.current) return;
-      setItems(res.items ?? []);
-      setHint(res.items?.length ? `找到 ${res.items.length} 个结果` : '无匹配结果');
-    } catch (e) {
-      if (seq !== seqRef.current) return;
-      setItems([]);
-      setHint(e instanceof Error ? e.message : '搜索失败');
-    } finally {
-      if (seq === seqRef.current) setLoading(false);
-    }
-  }
-
-  function useBrowserLocation() {
-    if (!navigator.geolocation) {
-      setHint('当前浏览器不支持定位');
-      return;
-    }
-    setLoading(true);
-    navigator.geolocation.getCurrentPosition(
-      (pos) => {
-        const lat = pos.coords.latitude;
-        const lng = pos.coords.longitude;
-        setPending({ latitude: lat, longitude: lng, name: '当前位置' });
-        void loadNearby(lat, lng);
-      },
-      () => {
-        setLoading(false);
-        setHint('定位失败，请检查定位权限');
-      },
-      { enableHighAccuracy: true, timeout: 12000 },
-    );
-  }
+  const src = useMemo(() => {
+    if (!key) return '';
+    const lat = latitude != null ? Number(latitude) : undefined;
+    const lng = longitude != null ? Number(longitude) : undefined;
+    return buildTencentLocPickerUrl(key, {
+      latitude: lat != null && Number.isFinite(lat) ? lat : undefined,
+      longitude: lng != null && Number.isFinite(lng) ? lng : undefined,
+    });
+  }, [key, latitude, longitude]);
 
   if (!open) return null;
 
@@ -134,6 +102,7 @@ export default function TencentLocPickerOverlay({
 
   return (
     <div
+      className="partner-locpicker-overlay"
       style={{
         position: 'fixed',
         inset: 0,
@@ -141,123 +110,124 @@ export default function TencentLocPickerOverlay({
         background: '#fff',
         display: 'flex',
         flexDirection: 'column',
+        height: '100dvh',
+        maxHeight: '-webkit-fill-available',
+        paddingTop: 'env(safe-area-inset-top)',
+        paddingBottom: 'env(safe-area-inset-bottom)',
+        boxSizing: 'border-box',
       }}
     >
       <div
         style={{
           display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'space-between',
-          padding: '12px 16px',
+          flexDirection: 'column',
+          padding: '12px 12px 10px',
           borderBottom: '1px solid rgba(0,0,0,0.06)',
           flexShrink: 0,
-          gap: 8,
+          gap: 10,
+          background: '#fff',
         }}
       >
-        <button type="button" className="partner-btn-outline" style={{ padding: '6px 12px' }} onClick={onClose}>
-          关闭
-        </button>
-        <span style={{ fontWeight: 600 }}>地图选点</span>
-        <button
-          type="button"
-          className="partner-btn-primary"
-          style={{ padding: '6px 12px', opacity: pending ? 1 : 0.45, width: 'auto' }}
-          disabled={!pending}
-          onClick={confirmPick}
+        <h2
+          style={{
+            margin: 0,
+            textAlign: 'center',
+            fontWeight: 700,
+            fontSize: 17,
+            lineHeight: 1.3,
+          }}
         >
-          确认
-        </button>
-      </div>
-
-      <div style={{ padding: '12px 16px', borderBottom: '1px solid rgba(0,0,0,0.04)', flexShrink: 0 }}>
-        <div style={{ display: 'flex', gap: 8 }}>
-          <input
-            value={keyword}
-            onChange={(e) => setKeyword(e.target.value)}
-            onKeyDown={(e) => {
-              if (e.key === 'Enter') void runSearch();
-            }}
-            placeholder="输入小区 / 写字楼 / 门店名称"
-            style={{
-              flex: 1,
-              padding: '10px 12px',
-              border: '1px solid rgba(0,0,0,0.12)',
-              borderRadius: 8,
-              fontSize: 14,
-            }}
-          />
+          地图选点
+        </h2>
+        <div style={{ display: 'flex', alignItems: 'center', gap: 10 }}>
           <button
             type="button"
             className="partner-btn-primary"
-            style={{ width: 'auto', padding: '8px 14px' }}
-            disabled={loading}
-            onClick={() => void runSearch()}
+            style={{
+              flex: 1,
+              padding: '12px 16px',
+              fontSize: 15,
+              fontWeight: 600,
+              opacity: pending ? 1 : 0.45,
+              width: 'auto',
+            }}
+            disabled={!pending}
+            onClick={confirmPick}
           >
-            搜索
+            确认
           </button>
-        </div>
-        <div style={{ display: 'flex', gap: 8, marginTop: 8, alignItems: 'center' }}>
           <button
             type="button"
             className="partner-btn-outline"
-            style={{ padding: '6px 12px' }}
-            disabled={loading}
-            onClick={useBrowserLocation}
+            style={{ padding: '12px 16px', minWidth: 72, flexShrink: 0 }}
+            onClick={onClose}
           >
-            定位当前位置
+            关闭
           </button>
-          <span className="label-md text-muted">{hint}</span>
         </div>
-        {pending ? (
-          <p className="label-md text-muted" style={{ margin: '8px 0 0' }}>
-            已选 {pending.latitude.toFixed(6)}, {pending.longitude.toFixed(6)}
-            {pending.name ? ` · ${pending.name}` : ''}
-          </p>
-        ) : null}
       </div>
 
-      <div style={{ flex: 1, minHeight: 0, overflow: 'auto', WebkitOverflowScrolling: 'touch' }}>
-        {loading && !items.length ? (
+      <p
+        className="label-md text-muted"
+        style={{
+          margin: 0,
+          padding: '8px 14px',
+          borderBottom: '1px solid rgba(0,0,0,0.04)',
+          flexShrink: 0,
+          fontSize: 12,
+        }}
+      >
+        {pending ? '已选定位置，请点右上角「确认」' : '在地图上点选或搜索地点，选中后点右上角「确认」'}
+      </p>
+
+      <div style={{ flex: 1, minHeight: 0, position: 'relative', background: '#f5f5f5' }}>
+        {loading ? (
           <p className="label-md text-muted" style={{ padding: 24, textAlign: 'center' }}>
-            加载中…
+            正在加载地图…
           </p>
-        ) : items.length ? (
-          <ul style={{ listStyle: 'none', margin: 0, padding: 0 }}>
-            {items.map((item) => {
-              const active =
-                pending?.latitude === item.latitude && pending?.longitude === item.longitude;
-              return (
-                <li key={`${item.id}-${item.latitude}-${item.longitude}`}>
-                  <button
-                    type="button"
-                    onClick={() => setPending(placeToPicked(item))}
-                    style={{
-                      width: '100%',
-                      textAlign: 'left',
-                      padding: '12px 16px',
-                      border: 0,
-                      borderBottom: '1px solid rgba(0,0,0,0.06)',
-                      background: active ? 'rgba(166, 29, 36, 0.06)' : '#fff',
-                      cursor: 'pointer',
-                    }}
-                  >
-                    <div style={{ fontWeight: 600, fontSize: 15 }}>{item.title}</div>
-                    <div className="label-md text-muted" style={{ marginTop: 4 }}>
-                      {item.address}
-                    </div>
-                    <div className="label-md text-muted" style={{ marginTop: 2, fontSize: 12 }}>
-                      {item.latitude.toFixed(6)}, {item.longitude.toFixed(6)}
-                    </div>
-                  </button>
-                </li>
-              );
-            })}
-          </ul>
-        ) : (
-          <p className="label-md text-muted" style={{ padding: 24, textAlign: 'center' }}>
-            {hint}
-          </p>
-        )}
+        ) : error ? (
+          <div style={{ padding: 24 }}>
+            <p className="label-md" style={{ color: 'var(--color-heritage-red, #a61d24)' }}>
+              {error}
+            </p>
+            <p className="label-md text-muted" style={{ marginTop: 12 }}>
+              请确认系统设置中已配置腾讯位置服务 Key，并白名单 apis.map.qq.com。
+            </p>
+          </div>
+        ) : src ? (
+          <>
+            {!iframeReady ? (
+              <p
+                className="label-md text-muted"
+                style={{
+                  position: 'absolute',
+                  inset: 0,
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  margin: 0,
+                  zIndex: 1,
+                  pointerEvents: 'none',
+                }}
+              >
+                地图加载中…
+              </p>
+            ) : null}
+            <iframe
+              title="地图选点"
+              src={src}
+              allow="geolocation *"
+              onLoad={() => setIframeReady(true)}
+              style={{
+                width: '100%',
+                height: '100%',
+                border: 0,
+                display: 'block',
+                background: '#fff',
+              }}
+            />
+          </>
+        ) : null}
       </div>
     </div>
   );

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

@@ -0,0 +1,16 @@
+import { createPartnerTracker } from '@dukang/client-logging';
+import { apiBase } from './api';
+
+const tracker = createPartnerTracker({
+  apiBase,
+  clientApp: 'PARTNER_H5',
+  getToken: () => localStorage.getItem('partnerAccessToken'),
+});
+
+export function trackPartner(eventName: string, params?: Record<string, unknown>) {
+  tracker.track(eventName, params);
+}
+
+export function trackPartnerPageView(eventName: string, params?: Record<string, unknown>) {
+  tracker.trackPageView(eventName, params);
+}

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

@@ -1,4 +1,5 @@
 import type { PartnerMe, PartnerStaffRole } from '@dukang/shared-types';
+import { reportApiError } from '@dukang/client-logging';
 import { isOnAppPath, toAppPath } from '@dukang/weixin-sdk';
 import { showPartnerToast } from './toast';
 
@@ -113,6 +114,10 @@ export function clearAuth(options?: { keepProfile?: boolean }) {
   }
 }
 
+export function getToken() {
+  return localStorage.getItem(ACCESS_TOKEN);
+}
+
 export function isLoggedIn() {
   return !!localStorage.getItem(ACCESS_TOKEN);
 }
@@ -155,6 +160,12 @@ async function rawRequest<T>(
   if (json.code !== 0) {
     const err = new Error(json.message || '请求失败') as Error & { status?: number };
     err.status = json.code === 401 ? 401 : json.code;
+    if (json.code === 400) {
+      reportApiError(
+        { apiBase, clientApp: CLIENT_APP, getToken: () => localStorage.getItem(ACCESS_TOKEN) },
+        { message: json.message || '请求失败', status: 400, url: path, category: 'validation_error' },
+      );
+    }
     throw err;
   }
   return json.data as T;

apps/h5-partner/src/lib/client-error.ts

@@ -0,0 +1,90 @@
+import { apiBase, getToken } from './api';
+
+const CLIENT_APP = 'PARTNER_H5';
+
+export type ClientErrorLevel = 'fatal' | 'error' | 'warn';
+export type ClientErrorCategory =
+  | 'js_error'
+  | 'unhandled_rejection'
+  | 'api_error'
+  | 'network'
+  | 'render'
+  | 'bridge'
+  | 'other';
+
+export type ClientErrorPayload = {
+  level: ClientErrorLevel;
+  category: ClientErrorCategory;
+  message: string;
+  stack?: string;
+  pagePath?: string;
+  extra?: Record<string, unknown>;
+};
+
+function currentPagePath(): string | undefined {
+  try {
+    return typeof window !== 'undefined' ? window.location.pathname : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** 上报客户端错误（失败静默，避免递归） */
+export function reportClientError(payload: ClientErrorPayload): void {
+  const body = {
+    level: payload.level,
+    category: payload.category,
+    message: String(payload.message || 'unknown').slice(0, 1000),
+    stack: payload.stack ? String(payload.stack).slice(0, 4000) : undefined,
+    pagePath: (payload.pagePath || currentPagePath() || '').slice(0, 128) || undefined,
+    clientApp: CLIENT_APP,
+    extra: payload.extra,
+  };
+
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+    'X-Client-App': CLIENT_APP,
+  };
+  const token = getToken();
+  if (token) headers.Authorization = `Bearer ${token}`;
+
+  void fetch(`${apiBase}/common/client-errors`, {
+    method: 'POST',
+    headers,
+    body: JSON.stringify(body),
+    keepalive: true,
+  }).catch(() => {});
+}
+
+let installed = false;
+
+/** 安装 H5 全局未捕获错误钩子（幂等） */
+export function installClientErrorReporting(): void {
+  if (installed || typeof window === 'undefined') return;
+  installed = true;
+
+  window.addEventListener('error', (ev) => {
+    reportClientError({
+      level: 'fatal',
+      category: 'js_error',
+      message: ev.message || 'window.error',
+      stack: ev.error instanceof Error ? ev.error.stack : undefined,
+      extra: { filename: ev.filename, lineno: ev.lineno, colno: ev.colno },
+    });
+  });
+
+  window.addEventListener('unhandledrejection', (ev) => {
+    const reason = ev.reason;
+    reportClientError({
+      level: 'error',
+      category: 'unhandled_rejection',
+      message:
+        reason instanceof Error
+          ? reason.message
+          : typeof reason === 'string'
+            ? reason
+            : 'unhandledrejection',
+      stack: reason instanceof Error ? reason.stack : undefined,
+    });
+  });
+}

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

@@ -0,0 +1,56 @@
+import type { PartnerProxyDeliveryMode } from '@dukang/shared-types';
+
+const PROXY_ORDER_DRAFT_KEY = 'partner_proxy_order_draft_v2';
+
+export type ProxyOrderDraft = {
+  phone: string;
+  receiverName: string;
+  regionCodes: string[];
+  addressDetail: string;
+  productId: string;
+  quantity: number;
+  promoCodeId: string;
+  deliveryMode: PartnerProxyDeliveryMode;
+  autoReceive: boolean;
+};
+
+export function saveProxyOrderDraft(draft: ProxyOrderDraft) {
+  try {
+    sessionStorage.setItem(PROXY_ORDER_DRAFT_KEY, JSON.stringify(draft));
+  } catch {
+    /* ignore quota / private mode */
+  }
+}
+
+export function loadProxyOrderDraft(): ProxyOrderDraft | null {
+  try {
+    const raw = sessionStorage.getItem(PROXY_ORDER_DRAFT_KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as Partial<ProxyOrderDraft>;
+    if (!parsed || typeof parsed !== 'object') return null;
+    return {
+      phone: typeof parsed.phone === 'string' ? parsed.phone : '',
+      receiverName: typeof parsed.receiverName === 'string' ? parsed.receiverName : '',
+      regionCodes: Array.isArray(parsed.regionCodes)
+        ? parsed.regionCodes.filter((c): c is string => typeof c === 'string')
+        : [],
+      addressDetail: typeof parsed.addressDetail === 'string' ? parsed.addressDetail : '',
+      productId: typeof parsed.productId === 'string' ? parsed.productId : '',
+      quantity: typeof parsed.quantity === 'number' && parsed.quantity >= 1 ? parsed.quantity : 2,
+      promoCodeId: typeof parsed.promoCodeId === 'string' ? parsed.promoCodeId : '',
+      deliveryMode: parsed.deliveryMode === 'ON_SITE_PICKUP' ? 'ON_SITE_PICKUP' : 'ADDRESS',
+      autoReceive: parsed.autoReceive === true,
+    };
+  } catch {
+    return null;
+  }
+}
+
+export function clearProxyOrderDraft() {
+  try {
+    sessionStorage.removeItem(PROXY_ORDER_DRAFT_KEY);
+    sessionStorage.removeItem('partner_proxy_order_draft_v1');
+  } catch {
+    /* ignore */
+  }
+}

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

@@ -0,0 +1,36 @@
+const STATUS_LABELS: Record<string, string> = {
+  PENDING_PAY: '待付款',
+  PENDING_SHIP: '待发货',
+  OUT_WAREHOUSE: '已出库',
+  SHIPPING: '配送中',
+  PENDING_RECEIVE: '待收货',
+  COMPLETED: '已完成',
+  CANCELLED: '已取消',
+  REFUNDING: '退款中',
+  REFUNDED: '已退款',
+};
+
+const PAY_LABELS: Record<string, string> = {
+  UNPAID: '未支付',
+  PAYING: '支付中',
+  PAID: '已付款',
+  REFUNDING: '退款中',
+  REFUNDED: '已退款',
+};
+
+export function proxyOrderStatusLabel(status?: string | null) {
+  if (!status) return '—';
+  return STATUS_LABELS[status] || status;
+}
+
+export function proxyOrderPayLabel(payStatus?: string | null) {
+  if (!payStatus) return '—';
+  return PAY_LABELS[payStatus] || payStatus;
+}
+
+export function proxyOrderStatusColor(status?: string | null) {
+  if (status === 'PENDING_PAY') return 'var(--color-warning, #d48806)';
+  if (status === 'COMPLETED') return 'var(--color-success-green)';
+  if (status === 'CANCELLED' || status === 'REFUNDED') return 'var(--color-text-muted, #999)';
+  return 'var(--color-primary, #8b1e1e)';
+}

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

@@ -29,6 +29,8 @@ export type StoreDraftForm = {
   bankAccountName: string;
   bankAccountNo: string;
   bankBranch: string;
+  /** 门店套餐（拓店第 4 步，可空） */
+  packages: import('@dukang/shared-types').StorePackageItemDto[];
 };
 
 export type StoreDraft = {
@@ -68,6 +70,7 @@ export const defaultStoreForm = (): StoreDraftForm => ({
   bankAccountName: '',
   bankAccountNo: '',
   bankBranch: '',
+  packages: [],
 });
 
 const TIME_RE = /^([01]\d|2[0-3]):([0-5]\d)$/;
@@ -79,12 +82,18 @@ function timeToMinutes(hhmm: string): number {
   return h * 60 + m;
 }
 
+export const MIN_ENV_PHOTO_COUNT = 3;
+
 export function normalizeStringArray(urls: unknown, minLen: number): string[] {
   const arr = Array.isArray(urls) ? urls.map((u) => String(u ?? '')) : [];
   while (arr.length < minLen) arr.push('');
   return arr;
 }
 
+export function addEnvPhotoSlot(urls: string[]): string[] {
+  return [...urls, ''];
+}
+
 export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | undefined): StoreDraftForm {
   const base = defaultStoreForm();
   if (!raw) return base;
@@ -101,7 +110,17 @@ export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | un
     openTime2: String(raw.openTime2 ?? base.openTime2),
     closeTime2: String(raw.closeTime2 ?? base.closeTime2),
     avgPrice: String(raw.avgPrice ?? base.avgPrice),
-    envPhotoUrls: normalizeStringArray(raw.envPhotoUrls, 3),
+    envPhotoUrls: normalizeStringArray(raw.envPhotoUrls, MIN_ENV_PHOTO_COUNT),
+    packages: Array.isArray(raw.packages)
+      ? raw.packages.map((p, i) => ({
+          name: String((p as { name?: string }).name ?? ''),
+          price: String((p as { price?: string | number }).price ?? ''),
+          dishes: String((p as { dishes?: string }).dishes ?? ''),
+          usableTime: (p as { usableTime?: string }).usableTime ?? '',
+          otherNotes: (p as { otherNotes?: string }).otherNotes ?? '',
+          sortOrder: i,
+        }))
+      : [],
   };
 }
 
@@ -202,13 +221,14 @@ export function validateStoreStep2(
 ): string | null {
   if (!form.coverUrl.trim()) return '请上传门头照';
   const envCount = form.envPhotoUrls.filter((u) => u.trim()).length;
-  if (envCount < 3) return '请上传至少 3 张环境照片';
+  if (envCount < MIN_ENV_PHOTO_COUNT) return `请上传至少 ${MIN_ENV_PHOTO_COUNT} 张环境照片`;
   if (!form.contractUrl.trim()) return '请上传签约合同';
   return null;
 }
 
 export function patchEnvPhotoAt(urls: string[], index: number, url: string): string[] {
-  const envPhotoUrls = normalizeStringArray(urls, 3);
+  const envPhotoUrls = [...urls];
+  while (envPhotoUrls.length <= index) envPhotoUrls.push('');
   envPhotoUrls[index] = url;
   return envPhotoUrls;
 }

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

@@ -0,0 +1,54 @@
+import type { StorePackageItemDto } from '@dukang/shared-types';
+import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+
+export type PackageFormItem = StorePackageItemDto;
+
+export function emptyPackage(index = 0): PackageFormItem {
+  return {
+    name: '',
+    price: '',
+    dishes: '',
+    usableTime: '',
+    otherNotes: '',
+    imageUrl: '',
+    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,
+    }))
+    .filter(
+      (item) =>
+        item.name || item.price || item.dishes || item.usableTime || item.otherNotes || item.imageUrl,
+    );
+}
+
+export function validatePackageFormItems(items: PackageFormItem[]): string | null {
+  const filled = normalizePackageFormItems(items);
+  if (filled.length > STORE_PACKAGE_MAX_COUNT) {
+    return `套餐最多 ${STORE_PACKAGE_MAX_COUNT} 条`;
+  }
+  for (let i = 0; i < filled.length; i++) {
+    const item = filled[i];
+    if (!item.name) return `第 ${i + 1} 条套餐名称不能为空`;
+    const price = Number(item.price);
+    if (!Number.isFinite(price) || price < 0) return `第 ${i + 1} 条套餐价格须为非负数字`;
+    if (!item.dishes) return `第 ${i + 1} 条套餐菜品不能为空`;
+  }
+  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-partner/src/lib/tencentLocPicker.ts

@@ -24,3 +24,78 @@ export function placeToPicked(item: LbsPlaceItem): TencentPickedLocation {
     cityname: item.city || undefined,
   };
 }
+
+type LocPickerMessage = {
+  module?: string;
+  latlng?: { lat?: number; lng?: number };
+  poiaddress?: string;
+  poiname?: string;
+  cityname?: string;
+};
+
+const REFERER = 'dukang';
+
+function coerceMessageData(data: unknown): LocPickerMessage | null {
+  if (data == null) return null;
+  if (typeof data === 'string') {
+    const trimmed = data.trim();
+    if (!trimmed || (trimmed[0] !== '{' && trimmed[0] !== '[')) return null;
+    try {
+      return JSON.parse(trimmed) as LocPickerMessage;
+    } catch {
+      return null;
+    }
+  }
+  if (typeof data === 'object') return data as LocPickerMessage;
+  return null;
+}
+
+/** 腾讯地图选点组件（iframe） */
+export function buildTencentLocPickerUrl(
+  key: string,
+  options?: { latitude?: number; longitude?: number },
+): string {
+  const params = new URLSearchParams({
+    search: '1',
+    type: '1',
+    key,
+    referer: REFERER,
+    policy: '1',
+    total: '20',
+    radius: '2000',
+    mapdraggable: '1',
+  });
+  const lat = options?.latitude;
+  const lng = options?.longitude;
+  if (
+    lat != null &&
+    lng != null &&
+    Number.isFinite(lat) &&
+    Number.isFinite(lng) &&
+    !(lat === 0 && lng === 0)
+  ) {
+    params.set('coord', `${lat},${lng}`);
+    params.set('coordtype', '5');
+  }
+  return `https://apis.map.qq.com/tools/locpicker?${params.toString()}`;
+}
+
+export function parseTencentLocPickerMessage(data: unknown): TencentPickedLocation | null {
+  const loc = coerceMessageData(data);
+  if (!loc || loc.module !== 'locationPicker') return null;
+  const lat = Number(loc.latlng?.lat);
+  const lng = Number(loc.latlng?.lng);
+  if (!Number.isFinite(lat) || !Number.isFinite(lng)) return null;
+
+  let name = loc.poiname?.trim() || undefined;
+  const address = loc.poiaddress?.trim() || undefined;
+  if (name === '我的位置' && address) name = address;
+
+  return {
+    latitude: lat,
+    longitude: lng,
+    address,
+    name,
+    cityname: loc.cityname?.trim() || undefined,
+  };
+}

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

@@ -1,4 +1,9 @@
 import { apiBase, request } from './api';
+import {
+  compressImageFileIfNeeded,
+  DEFAULT_OSS_MAX_UPLOAD_BYTES,
+  formatOssMaxSizeMb,
+} from '@dukang/shared-ui/compressImage';
 
 const UPLOAD_TIMEOUT_MS = 120_000;
 
@@ -11,13 +16,23 @@ export type UploadFileResult = {
   mock: boolean;
 };
 
+async function prepareUploadFile(file: File, mediaType: OssMediaType): Promise<File> {
+  if (mediaType !== 'IMAGE') return file;
+  const compressed = await compressImageFileIfNeeded(file);
+  if (compressed.size > DEFAULT_OSS_MAX_UPLOAD_BYTES) {
+    throw new Error(`图片压缩后仍超过 ${formatOssMaxSizeMb()}MB，请换一张较小的图片`);
+  }
+  return compressed;
+}
+
 async function uploadFileToOssInner(
   file: File,
   options: { bizType: string; mediaType?: OssMediaType },
 ): Promise<UploadFileResult> {
   const mediaType = options.mediaType ?? (file.type.startsWith('video/') ? 'VIDEO' : 'IMAGE');
+  const prepared = await prepareUploadFile(file, mediaType);
   const formData = new FormData();
-  formData.append('file', file);
+  formData.append('file', prepared);
   formData.append('bizType', options.bizType);
   formData.append('mediaType', mediaType);
 

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

@@ -0,0 +1,11 @@
+import { useEffect, useRef } from 'react';
+import { trackPartnerPageView } from './analytics';
+
+export function usePartnerPageView(eventName: string, params?: Record<string, unknown>) {
+  const fired = useRef(false);
+  useEffect(() => {
+    if (fired.current) return;
+    fired.current = true;
+    trackPartnerPageView(eventName, params);
+  }, [eventName, params]);
+}

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

@@ -48,6 +48,19 @@ export async function canPartnerUseWechatLogin(options: {
   }
 }
 
+/** 短信登录/发码前：校验手机号对应合伙人存在且未暂停 */
+export async function checkPartnerPhoneForLogin(phone: string): Promise<PartnerPhoneCheckResponse> {
+  const normalized = phone.trim();
+  if (!/^1\d{10}$/.test(normalized)) {
+    throw new Error('请输入正确的手机号');
+  }
+  return request<PartnerPhoneCheckResponse>('PARTNER_H5', '/partner/auth/phone/check', {
+    method: 'POST',
+    body: JSON.stringify({ phone: normalized }),
+    silent: true,
+  });
+}
+
 export async function fetchClientConfig(): Promise<ClientRuntimeConfig> {
   return request<ClientRuntimeConfig>('PARTNER_H5', '/common/client-config');
 }

apps/h5-partner/src/main.tsx

@@ -5,9 +5,17 @@ import { getRouterBasename } from '@dukang/weixin-sdk';
 import App from './App';
 import { PartnerSessionProvider } from './contexts/PartnerSessionContext';
 import { PartnerToastProvider } from './contexts/PartnerToastContext';
+import { installClientErrorReporting } from '@dukang/client-logging';
+import { apiBase } from './lib/api';
 import './styles.css';
 import './styles/legal.css';
 
+installClientErrorReporting({
+  apiBase,
+  clientApp: 'PARTNER_H5',
+  getToken: () => localStorage.getItem('partnerAccessToken'),
+});
+
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <BrowserRouter basename={getRouterBasename()}>

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

@@ -5,6 +5,7 @@ import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import type { PartnerBillDto } from '@dukang/shared-types';
 import { isLoggedIn, request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
+import { usePartnerPageView } from '../lib/usePageView';
 
 function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
@@ -25,6 +26,7 @@ function canConfirm(status: string) {
 }
 
 export default function BillsPage() {
+  usePartnerPageView('partner_bills_view');
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const [bills, setBills] = useState<PartnerBillDto[]>([]);

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

@@ -219,6 +219,15 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
                   <span className="material-symbols-outlined text-muted">chevron_right</span>
                 </div>
               </Link>
+              <Link to="/center/proxy-orders" className="partner-menu-item">
+                <div className="partner-menu-item-left">
+                  <div className="partner-menu-icon">
+                    <span className="material-symbols-outlined">receipt_long</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>代下单列表</span>
+                </div>
+                <span className="material-symbols-outlined text-muted">chevron_right</span>
+              </Link>
               <Link to="/stores?audit=pending" className="partner-menu-item">
                 <div className="partner-menu-item-left">
                   <div className="partner-menu-icon">

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

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import type { PartnerLeaderboardEntry } from '@dukang/shared-types';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
+import { usePartnerPageView } from '../lib/usePageView';
 import { isLoggedIn, request } from '../lib/api';
 import { fetchPartnerLeaderboard } from '../lib/leaderboard';
 import {
@@ -137,6 +138,7 @@ function LeaderboardPreview({ entries }: { entries: PartnerLeaderboardEntry[] })
 }
 
 export default function HomePage() {
+  usePartnerPageView('partner_home_view');
   const navigate = useNavigate();
   const { account } = usePartnerSession();
   const navKind = getPartnerNavKind(account);

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

@@ -6,6 +6,7 @@ import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { fetchPartnerLeaderboard } from '../lib/leaderboard';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { isPrimaryAccount } from '../lib/partnerAccess';
+import { usePartnerPageView } from '../lib/usePageView';
 
 const PERIOD_TABS: { key: PartnerLeaderboardPeriod; label: string }[] = [
   { key: 'month', label: '本月' },
@@ -26,6 +27,7 @@ function periodSubLabel(period: PartnerLeaderboardPeriod): string {
 }
 
 export default function LeaderboardPage() {
+  usePartnerPageView('partner_leaderboard_view');
   const navigate = useNavigate();
   const { account } = usePartnerSession();
   const showStaffFab = isPrimaryAccount(account);

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

@@ -1,14 +1,26 @@
-import { useRef, useState, type RefObject } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
+import { useEffect, useRef, useState, type RefObject } from 'react';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import { isWxAuthorizeEnabled } from '@dukang/shared-types';
+import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
 import {
   getLastPhone,
   getPartnerProfile,
+  hasPartnerWxSession,
   request,
   saveRememberedSession,
   type PartnerSessionPayload,
 } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';
+import type { PartnerPhoneCheckResponse } from '@dukang/shared-types';
+import {
+  bindPartnerWechatAfterSmsLogin,
+  checkPartnerPhoneForLogin,
+  fetchClientConfig,
+  loginPartnerWithWechat,
+} from '../lib/wechat-auth';
+import { toastError } from '../lib/toast';
+import { isWechatEnv } from '../lib/weixin';
 
 const REMEMBER_PHONE_KEY = 'partner_remember_phone';
 const REMEMBER_FLAG_KEY = 'partner_remember_account';
@@ -39,6 +51,11 @@ function AgreementCheckbox({
   );
 }
 
+function maskPhone(phone: string) {
+  if (phone.length < 7) return phone;
+  return `${phone.slice(0, 3)} **** ${phone.slice(-4)}`;
+}
+
 function loadRememberedPhone(): { phone: string; remember: boolean } {
   try {
     const remember = localStorage.getItem(REMEMBER_FLAG_KEY) === '1';
@@ -54,8 +71,19 @@ function formatPartnerError(e: unknown): string {
   if (text.includes('合伙人账号不存在') || text.includes('未找到合伙人账号')) {
     return '未找到合伙人账号';
   }
-  if (text.includes('合伙人账号已停用')) {
-    return '合伙人账号已停用';
+  if (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('手机验证码')) {
+    return '该微信尚未绑定合伙人账号，请先使用手机验证码登录，登录后将自动关联微信';
   }
   return text;
 }
@@ -63,6 +91,8 @@ function formatPartnerError(e: unknown): string {
 export default function LoginPage() {
   const navigate = useNavigate();
   const { applySession, refresh, account } = usePartnerSession();
+  const [params] = useSearchParams();
+  const quick = params.get('quick') === '1';
   const savedProfile = getPartnerProfile();
   const remembered = loadRememberedPhone();
   const [phone, setPhone] = useState(remembered.phone || getLastPhone());
@@ -70,13 +100,27 @@ export default function LoginPage() {
   const [rememberAccount, setRememberAccount] = useState(remembered.remember);
   const [agreed, setAgreed] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [wxLoading, setWxLoading] = useState(false);
   const [msg, setMsg] = useState('');
   const [codeCooldown, setCodeCooldown] = useState(0);
+  const [wxAuthorize, setWxAuthorize] = useState(false);
   const agreementRef = useRef<HTMLLabelElement>(null);
 
+  useEffect(() => {
+    fetchClientConfig()
+      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
+      .catch(() => setWxAuthorize(false));
+  }, []);
+
+  const quickName = savedProfile?.name ?? '城市合伙人';
+  const quickCompany = savedProfile?.companyName ?? '';
+  const quickPhone = savedProfile?.phone || phone;
+
   function ensureAgreed() {
     if (!agreed) {
-      setMsg('请先勾选并同意用户协议');
+      const tip = '请先勾选并同意用户协议';
+      setMsg(tip);
+      toastError(tip);
       agreementRef.current?.scrollIntoView({ behavior: 'smooth', block: 'center' });
       return false;
     }
@@ -99,11 +143,21 @@ export default function LoginPage() {
 
   async function sendCode() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    if (!trimmedPhone) {
+      setMsg('请输入手机号');
+      return;
+    }
+    if (!/^1\d{10}$/.test(trimmedPhone)) {
+      setMsg('请输入正确的手机号');
+      return;
+    }
     setMsg('');
     try {
+      await checkPartnerPhoneForLogin(trimmedPhone);
       await request('PARTNER_H5', '/partner/auth/sms/send', {
         method: 'POST',
-        body: JSON.stringify({ phone, scene: 'PARTNER_LOGIN' }),
+        body: JSON.stringify({ phone: trimmedPhone, scene: 'PARTNER_LOGIN' }),
         silent: true,
       });
       setMsg('验证码已发送');
@@ -129,17 +183,37 @@ export default function LoginPage() {
 
   async function login() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    const trimmedCode = code.trim();
+    if (!trimmedPhone) {
+      setMsg('请输入手机号');
+      return;
+    }
+    if (!/^1\d{10}$/.test(trimmedPhone)) {
+      setMsg('请输入正确的手机号');
+      return;
+    }
+    if (!trimmedCode) {
+      setMsg('请输入验证码');
+      return;
+    }
     setLoading(true);
     setMsg('');
     try {
+      await checkPartnerPhoneForLogin(trimmedPhone);
       const data = await request<PartnerSessionPayload>('PARTNER_H5', '/partner/auth/login/sms', {
         method: 'POST',
-        body: JSON.stringify({ phone, code }),
+        body: JSON.stringify({ phone: trimmedPhone, code: trimmedCode }),
         silent: true,
       });
       saveRememberedSession(data);
       applySession(data);
       persistRememberAccount(phone);
+      if (isWechatEnv() && wxAuthorize) {
+        setMsg('登录成功，正在关联微信…');
+        await bindPartnerWechatAfterSmsLogin();
+        return;
+      }
       await finishLoginNavigate();
     } catch (e) {
       setMsg(formatPartnerError(e));
@@ -148,6 +222,119 @@ export default function LoginPage() {
     }
   }
 
+  async function wechatLogin() {
+    if (!ensureAgreed()) return;
+    setMsg('');
+    if (!isWechatEnv()) {
+      setMsg(WECHAT_INAPP_REQUIRED_MSG);
+      toastError(WECHAT_INAPP_REQUIRED_MSG);
+      return;
+    }
+    setWxLoading(true);
+    try {
+      // 直接发起 OAuth；未绑定账号由后端返回「请先短信登录」提示
+      const session = await loginPartnerWithWechat();
+      if (session) {
+        applySession(session);
+        await finishLoginNavigate();
+        return;
+      }
+      if (session === null) {
+        const tip = '微信授权暂未开启，请使用验证码登录';
+        setMsg(tip);
+        toastError(tip);
+      }
+      // session === undefined：已跳转微信授权页
+    } catch (e) {
+      const tip = formatWechatError(e);
+      setMsg(tip);
+      toastError(tip);
+    } finally {
+      setWxLoading(false);
+    }
+  }
+
+  if (quick) {
+    const canWechatQuick =
+      wxAuthorize &&
+      isWechatEnv() &&
+      hasPartnerWxSession() &&
+      !!savedProfile &&
+      savedProfile.hasWechat === true;
+
+    return (
+      <div className="partner-auth-page partner-auth-page--quick">
+        <header className="partner-auth-brand">
+          <div className="partner-quick-avatar" style={{ width: 120, height: 120, margin: '0 auto 16px' }}>
+            <span className="material-symbols-outlined" style={{ fontSize: 48 }}>wine_bar</span>
+          </div>
+          <h1 className="partner-auth-title" style={{ fontSize: 20 }}>杜康好客</h1>
+          <p className="partner-auth-subtitle" style={{ fontSize: 12, letterSpacing: '0.2em', textTransform: 'uppercase' }}>城市合伙人端</p>
+        </header>
+
+        <section className="partner-glass-card">
+          <div className="partner-quick-badge">已识别账号</div>
+          <div className="partner-quick-avatar">
+            <span className="material-symbols-outlined">person</span>
+          </div>
+          <div style={{ textAlign: 'center' }}>
+            <h2 className="headline-md">
+              {quickName}
+              {quickCompany ? (
+                <span className="text-muted body-md" style={{ fontWeight: 400 }}> ({quickCompany})</span>
+              ) : null}
+            </h2>
+            <p className="text-muted body-md" style={{ letterSpacing: '0.1em', marginTop: 4 }}>
+              {quickPhone ? maskPhone(quickPhone) : '暂无已保存账号'}
+            </p>
+          </div>
+        </section>
+
+        <nav style={{ width: '100%', maxWidth: 384, marginTop: 16 }}>
+          {msg && <p className="partner-auth-msg" style={{ color: 'var(--color-error, #d33)', fontSize: 13, textAlign: 'center', marginBottom: 12 }}>{msg}</p>}
+          <AgreementCheckbox
+            agreed={agreed}
+            onChange={setAgreed}
+            inputRef={agreementRef}
+          />
+          {canWechatQuick ? (
+            <button
+              type="button"
+              className="partner-btn-primary"
+              style={{ marginTop: 16 }}
+              disabled={wxLoading}
+              onClick={() => void wechatLogin()}
+            >
+              <span className="material-symbols-outlined">chat</span>
+              <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
+            </button>
+          ) : (
+            <p className="partner-auth-msg" style={{ textAlign: 'center', marginTop: 12, marginBottom: 12 }}>
+              {wxAuthorize && !isWechatEnv()
+                ? '请在微信内打开以使用一键登录'
+                : '请使用验证码登录并绑定微信后，即可 7 天内免登录'}
+            </p>
+          )}
+          {!canWechatQuick && (
+            <Link to="/login" className="partner-btn-primary" style={{ display: 'block', textAlign: 'center', textDecoration: 'none', marginTop: 12 }}>
+              验证码登录
+            </Link>
+          )}
+          <Link to="/login" className="partner-btn-ghost" style={{ display: 'block', marginTop: 12 }}>切换账号</Link>
+        </nav>
+
+        <footer className="partner-auth-footer">
+          <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+            <span className="material-symbols-outlined">verified_user</span>
+            <span className="label-md" style={{ fontSize: 10, letterSpacing: '0.1em', textTransform: 'uppercase' }}>
+              {canWechatQuick ? '微信验证 · 7 天内免登录' : 'Secured by Dukang Heritage'}
+            </span>
+          </div>
+        </footer>
+      </div>
+    );
+  }
+
   return (
     <div className="partner-auth-page">
       <div className="partner-auth-brand">
@@ -214,12 +401,34 @@ export default function LoginPage() {
             <span>{loading ? '登录中...' : '登录'}</span>
             {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
           </button>
+
+          {wxAuthorize && (
+            <>
+              <div className="partner-auth-divider"><span>其他登录方式</span></div>
+              <button type="button" className="partner-btn-wechat" onClick={() => void wechatLogin()} disabled={wxLoading}>
+                <svg viewBox="0 0 24 24" fill="#07C160" aria-hidden>
+                  <path d="M8.25 4.5C4.52 4.5 1.5 7.04 1.5 10.17c0 1.78.98 3.37 2.5 4.48l-.63 1.88 2.19-1.09c.84.24 1.74.38 2.69.38.25 0 .5 0 .75-.03-.16-.53-.25-1.09-.25-1.66 0-3.13 3.02-5.67 6.75-5.67.57 0 1.13.06 1.66.17C15.17 6.13 12 4.5 8.25 4.5zm10.5 6.33c-3.11 0-5.62 2.12-5.62 4.73 0 2.61 2.51 4.73 5.62 4.73.79 0 1.54-.14 2.24-.38l1.83.91-.53-1.57c1.27-.92 2.08-2.25 2.08-3.73 0-2.61-2.51-4.73-5.62-4.73z" />
+                </svg>
+                <span>{wxLoading ? '跳转授权中...' : '微信一键登录'}</span>
+              </button>
+              {msg && (
+                <p className="partner-auth-msg" style={{ color: 'var(--color-error, #d33)', fontSize: 13, textAlign: 'center' }}>
+                  {msg}
+                </p>
+              )}
+            </>
+          )}
+
           <p className="partner-auth-msg" style={{ textAlign: 'center' }}>
-            手机号验证成功后，7 天内无需再次输入验证码
+            请在微信内打开；首次请先用验证码登录，成功后将自动关联微信，之后可一键登录
           </p>
         </div>
       </main>
 
+      {hasPartnerWxSession() && savedProfile?.hasWechat && (
+        <Link to="/login?quick=1" className="partner-link">微信快捷登录</Link>
+      )}
+
       <footer className="partner-auth-footer">
         <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
           <span className="material-symbols-outlined">verified_user</span>

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

@@ -3,6 +3,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import { request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
+import { usePartnerPageView } from '../lib/usePageView';
 
 const TIMELINE = [
   { key: 'confirm', label: '待确认' },
@@ -36,6 +37,7 @@ function canShip(status: string) {
 
 export default function OrderDetailPage() {
   const { id } = useParams();
+  usePartnerPageView('partner_order_detail_view', id ? { orderId: id } : undefined);
   const navigate = useNavigate();
   const [order, setOrder] = useState<Record<string, unknown> | null>(null);
   const [shipping, setShipping] = useState(false);

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

@@ -5,6 +5,7 @@ import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { isLoggedIn, request } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { hasWarehouseAccess } from '../lib/partnerAccess';
+import { usePartnerPageView } from '../lib/usePageView';
 
 type DateFilter = 'today' | '7d' | '30d';
 type StatusFilter = 'ALL' | 'PENDING_SHIP' | 'SHIPPING' | 'COMPLETED' | 'ABNORMAL';
@@ -44,6 +45,7 @@ type OrdersResponse = {
 };
 
 export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
+  usePartnerPageView('partner_order_list_view');
   const navigate = useNavigate();
   const { account } = usePartnerSession();
   const warehouseOk = hasWarehouseAccess(account);

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

@@ -0,0 +1,437 @@
+import { useEffect, useRef, useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import QRCode from 'qrcode';
+import PageHeader from '@dukang/shared-ui/PageHeader';
+import { invokeWechatPay } from '@dukang/weixin-sdk';
+import type { PartnerProxyOrderListItem, ProxyOrderPayResponse, ProxyPayMethod } from '@dukang/shared-types';
+import { getToken, request } from '../lib/api';
+import {
+  proxyOrderPayLabel,
+  proxyOrderStatusColor,
+  proxyOrderStatusLabel,
+} from '../lib/proxyOrderStatus';
+import { toastError, toastSuccess } from '../lib/toast';
+import { isWechatEnv } from '../lib/weixin';
+import { fetchPartnerProfile, partnerHasWechatBinding } from '../lib/wechat-auth';
+
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
+function fmtTime(value: string | undefined) {
+  if (!value) return '—';
+  const d = new Date(value);
+  if (Number.isNaN(d.getTime())) return value;
+  const pad = (n: number) => String(n).padStart(2, '0');
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+
+function deliveryLabel(order: PartnerProxyOrderListItem) {
+  const t = String(order.deliveryType || '').toUpperCase();
+  if (t === 'ON_SITE_PICKUP') return '现场提货';
+  if (t === 'CROSS_CITY') return '跨城配送';
+  if (t === 'LOCAL') return '同城配送';
+  return '代下单';
+}
+
+type TrackNode = {
+  time?: string;
+  status?: string;
+  description?: string;
+};
+
+type TrackResult = {
+  nodes?: TrackNode[];
+  trackingNo?: string | null;
+  provider?: string | null;
+  manualQueryUrl?: string | null;
+};
+
+export default function ProxyOrderDetailPage() {
+  const { id } = useParams();
+  const navigate = useNavigate();
+  const [order, setOrder] = useState<PartnerProxyOrderListItem | null>(null);
+  const [error, setError] = useState('');
+  const [track, setTrack] = useState<TrackResult | null>(null);
+  const [trackError, setTrackError] = useState('');
+  const [paying, setPaying] = useState(false);
+  const [payMsg, setPayMsg] = useState('');
+  const [payMethod, setPayMethod] = useState<ProxyPayMethod>('NATIVE');
+  const [codeUrl, setCodeUrl] = useState<string | null>(null);
+  const [qrDataUrl, setQrDataUrl] = useState<string | null>(null);
+  const [cancelling, setCancelling] = useState(false);
+  const pollRef = useRef<number | null>(null);
+
+  function stopPoll() {
+    if (pollRef.current != null) {
+      window.clearInterval(pollRef.current);
+      pollRef.current = null;
+    }
+  }
+
+  useEffect(() => () => stopPoll(), []);
+
+  useEffect(() => {
+    document.title = '代下单详情';
+  }, []);
+
+  useEffect(() => {
+    if (!id) return;
+    void request<PartnerProxyOrderListItem>('PARTNER_H5', `/partner/proxy-orders/${id}`)
+      .then((data) => {
+        setOrder(data);
+        if (data.proxyPayMethod) {
+          setPayMethod(data.proxyPayMethod);
+        }
+      })
+      .catch((e) => setError(e instanceof Error ? e.message : '加载失败'));
+  }, [id]);
+
+  useEffect(() => {
+    if (!id || !order) return;
+    const dt = String(order.deliveryType || '').toUpperCase();
+    if (dt === 'ON_SITE_PICKUP' || order.payStatus !== 'PAID') {
+      setTrack(null);
+      return;
+    }
+    void request<TrackResult>('PARTNER_H5', `/partner/proxy-orders/${id}/track`, { silent: true })
+      .then(setTrack)
+      .catch((e) => setTrackError(e instanceof Error ? e.message : '物流暂不可用'));
+  }, [id, order]);
+
+  useEffect(() => {
+    if (!codeUrl) {
+      setQrDataUrl(null);
+      return;
+    }
+    void QRCode.toDataURL(codeUrl, { width: 220, margin: 1 })
+      .then(setQrDataUrl)
+      .catch(() => setQrDataUrl(null));
+  }, [codeUrl]);
+
+  const unpaid = order?.payStatus === 'UNPAID' || order?.status === 'PENDING_PAY';
+
+  function startPoll(orderId: string) {
+    stopPoll();
+    pollRef.current = window.setInterval(() => {
+      void request<{ payStatus: string; orderNo: string }>(
+        'PARTNER_H5',
+        `/partner/proxy-orders/${orderId}/pay-status`,
+        { silent: true },
+      )
+        .then((st) => {
+          if (st.payStatus === 'PAID') {
+            stopPoll();
+            toastSuccess(`支付成功：${st.orderNo}`);
+            void request<PartnerProxyOrderListItem>('PARTNER_H5', `/partner/proxy-orders/${orderId}`)
+              .then(setOrder)
+              .catch(() => undefined);
+            setCodeUrl(null);
+          }
+        })
+        .catch(() => undefined);
+    }, 2000);
+  }
+
+  async function startPay(method: ProxyPayMethod) {
+    if (!id) return;
+    const locked = order?.proxyPayMethod;
+    if (locked && locked !== method) {
+      setPayMsg(
+        locked === 'JSAPI'
+          ? '该订单已发起微信代付，请先取消支付后重新下单'
+          : '该订单已生成收款码，请先取消支付后重新下单',
+      );
+      return;
+    }
+    setPaying(true);
+    setPayMsg('');
+    setPayMethod(method);
+    try {
+      if (method === 'JSAPI') {
+        if (!isWechatEnv()) {
+          throw new Error('请在微信内打开合伙人端以使用微信代付');
+        }
+        const profile = await fetchPartnerProfile();
+        if (!partnerHasWechatBinding(profile)) {
+          throw new Error('请先绑定微信后再代付');
+        }
+      }
+
+      const pay = await request<ProxyOrderPayResponse>(
+        'PARTNER_H5',
+        `/partner/proxy-orders/${id}/pay`,
+        {
+          method: 'POST',
+          body: JSON.stringify({ payMethod: method }),
+          silent: true,
+        },
+      );
+
+      if (pay.mode === 'mock') {
+        toastSuccess('支付成功');
+        const refreshed = await request<PartnerProxyOrderListItem>(
+          'PARTNER_H5',
+          `/partner/proxy-orders/${id}`,
+        );
+        setOrder(refreshed);
+        setCodeUrl(null);
+        return;
+      }
+
+      if (pay.mode === 'native' && pay.codeUrl) {
+        setCodeUrl(pay.codeUrl);
+        setOrder((prev) => (prev ? { ...prev, proxyPayMethod: method } : prev));
+        startPoll(id);
+        return;
+      }
+
+      if (pay.mode === 'jsapi' && pay.prepay) {
+        setCodeUrl(null);
+        setOrder((prev) => (prev ? { ...prev, proxyPayMethod: method } : prev));
+        await invokeWechatPay(pay.prepay, {
+          apiBase: '/api/v1',
+          clientApp: 'PARTNER_H5',
+          getAccessToken: getToken,
+          platform: 'wechat-h5',
+        });
+        startPoll(id);
+        return;
+      }
+
+      throw new Error('支付发起失败');
+    } catch (e) {
+      setPayMsg(e instanceof Error ? e.message : '支付失败');
+      toastError(e instanceof Error ? e.message : '支付失败');
+    } finally {
+      setPaying(false);
+    }
+  }
+
+  async function cancelPay() {
+    if (!id) return;
+    setCancelling(true);
+    setPayMsg('');
+    stopPoll();
+    try {
+      await request('PARTNER_H5', `/partner/proxy-orders/${id}/cancel-pay`, {
+        method: 'POST',
+        body: '{}',
+      });
+      toastSuccess('已取消支付，可重新下单并选择其他支付方式');
+      navigate('/center/proxy-orders');
+    } catch (e) {
+      setPayMsg(e instanceof Error ? e.message : '取消失败');
+      toastError(e instanceof Error ? e.message : '取消失败');
+    } finally {
+      setCancelling(false);
+    }
+  }
+
+  const lockedPayMethod = order?.proxyPayMethod ?? null;
+
+  const img = order?.imageResource?.url || '';
+  const isOnSite = String(order?.deliveryType || '').toUpperCase() === 'ON_SITE_PICKUP';
+
+  return (
+    <div className="page-no-tab partner-orders-page">
+      <PageHeader title="代下单详情" onBack={() => navigate('/center/proxy-orders')} />
+
+      {error && (
+        <p className="partner-form-error" role="alert" style={{ margin: '16px 20px' }}>
+          {error}
+        </p>
+      )}
+
+      {!order && !error && <p className="label-md text-muted" style={{ margin: 20 }}>加载中…</p>}
+
+      {order && (
+        <div style={{ padding: '0 16px 32px' }}>
+          <div className="partner-order-card" style={{ pointerEvents: 'none' }}>
+            <div className="partner-order-card-top">
+              <span className="label-md text-muted">NO. {order.orderNo}</span>
+              <span
+                className="label-md"
+                style={{ color: proxyOrderStatusColor(order.status), fontWeight: 600 }}
+              >
+                {proxyOrderStatusLabel(order.status)}
+              </span>
+            </div>
+            <div className="partner-order-product">
+              <div
+                className="partner-order-product-img"
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  overflow: 'hidden',
+                  background: img ? `center/cover no-repeat url(${img})` : undefined,
+                }}
+              >
+                {!img && <span className="material-symbols-outlined text-muted">liquor</span>}
+              </div>
+              <div style={{ flex: 1, minWidth: 0 }}>
+                <h3 className="headline-md">{order.productName || '杜康好酒'}</h3>
+                {order.productSpec && (
+                  <p className="label-md text-muted" style={{ marginTop: 4 }}>
+                    {order.productSpec}
+                  </p>
+                )}
+                <p className="body-md" style={{ marginTop: 8 }}>
+                  ×{order.quantity} · ¥{fmtMoney(Number(order.payAmount || 0))}
+                </p>
+                <p className="label-md text-muted" style={{ marginTop: 4 }}>
+                  权益 ¥{fmtMoney(Number(order.benefitAmount || 0))}
+                </p>
+              </div>
+            </div>
+          </div>
+
+          <section className="partner-form-card" style={{ marginTop: 12 }}>
+            <h3 className="headline-md" style={{ marginBottom: 12 }}>客户信息</h3>
+            <p className="body-md">姓名：{order.receiverName || '—'}</p>
+            <p className="body-md" style={{ marginTop: 8 }}>手机：{order.receiverPhone || '—'}</p>
+            <p className="body-md" style={{ marginTop: 8 }}>
+              地址：{order.receiverAddress || (isOnSite ? '现场提货' : '—')}
+            </p>
+          </section>
+
+          <section className="partner-form-card" style={{ marginTop: 12 }}>
+            <h3 className="headline-md" style={{ marginBottom: 12 }}>订单信息</h3>
+            <p className="body-md">配送方式：{deliveryLabel(order)}</p>
+            <p className="body-md" style={{ marginTop: 8 }}>下单时间：{fmtTime(order.createdAt)}</p>
+            <p className="body-md" style={{ marginTop: 8 }}>
+              支付状态：{proxyOrderPayLabel(order.payStatus)}
+            </p>
+            <p className="body-md" style={{ marginTop: 8 }}>
+              订单状态：{proxyOrderStatusLabel(order.status)}
+            </p>
+          </section>
+
+          {unpaid ? (
+            <section className="partner-form-card" style={{ marginTop: 12 }}>
+              <h3 className="headline-md" style={{ marginBottom: 12 }}>继续支付</h3>
+              <div className="partner-proxy-mode-tabs">
+                <button
+                  type="button"
+                  className={`partner-proxy-mode-tab${payMethod === 'NATIVE' ? ' is-active' : ''}`}
+                  disabled={!!lockedPayMethod && lockedPayMethod !== 'NATIVE'}
+                  onClick={() => void startPay('NATIVE')}
+                >
+                  收款码
+                </button>
+                <button
+                  type="button"
+                  className={`partner-proxy-mode-tab${payMethod === 'JSAPI' ? ' is-active' : ''}`}
+                  disabled={!!lockedPayMethod && lockedPayMethod !== 'JSAPI'}
+                  onClick={() => void startPay('JSAPI')}
+                >
+                  微信代付
+                </button>
+              </div>
+              {lockedPayMethod ? (
+                <p className="label-md text-muted" style={{ marginTop: 8 }}>
+                  已选择{lockedPayMethod === 'NATIVE' ? '收款码' : '微信代付'}，切换方式请先取消支付
+                </p>
+              ) : (
+                <p className="label-md text-muted" style={{ marginTop: 8 }}>
+                  请选择支付方式并点击下方按钮发起支付
+                </p>
+              )}
+
+              {payMethod === 'NATIVE' ? (
+                <div style={{ textAlign: 'center', marginTop: 16 }}>
+                  {qrDataUrl ? (
+                    <img src={qrDataUrl} alt="收款码" width={220} height={220} style={{ margin: '0 auto' }} />
+                  ) : (
+                    <p className="label-md text-muted">{paying ? '生成收款码中…' : '暂无收款码'}</p>
+                  )}
+                  <p className="label-md text-muted" style={{ marginTop: 8 }}>
+                    请使用微信扫码支付，支付成功后自动更新
+                  </p>
+                  <button
+                    type="button"
+                    className="btn btn-block"
+                    style={{ marginTop: 12 }}
+                    disabled={paying}
+                    onClick={() => void startPay('NATIVE')}
+                  >
+                    {paying ? '生成中…' : '重新生成收款码'}
+                  </button>
+                </div>
+              ) : (
+                <div style={{ marginTop: 16 }}>
+                  <p className="label-md text-muted">将调起微信支付，由合伙人微信完成代付</p>
+                  <button
+                    type="button"
+                    className="btn btn-primary btn-block"
+                    style={{ marginTop: 12 }}
+                    disabled={paying}
+                    onClick={() => void startPay('JSAPI')}
+                  >
+                    {paying ? '支付中…' : '调起微信代付'}
+                  </button>
+                </div>
+              )}
+
+              {payMsg ? (
+                <p className="partner-form-error" role="alert" style={{ marginTop: 12 }}>
+                  {payMsg}
+                </p>
+              ) : null}
+
+              <button
+                type="button"
+                className="btn btn-block"
+                style={{ marginTop: 16 }}
+                disabled={cancelling || paying}
+                onClick={() => void cancelPay()}
+              >
+                {cancelling ? '取消中…' : '取消支付'}
+              </button>
+            </section>
+          ) : null}
+
+          {!isOnSite && order.payStatus === 'PAID' ? (
+            <section className="partner-form-card" style={{ marginTop: 12 }}>
+              <h3 className="headline-md" style={{ marginBottom: 12 }}>物流信息</h3>
+              {trackError ? (
+                <p className="label-md text-muted">{trackError}</p>
+              ) : !track ? (
+                <p className="label-md text-muted">加载物流…</p>
+              ) : (
+                <>
+                  {track.trackingNo ? (
+                    <p className="body-md" style={{ marginBottom: 8 }}>
+                      运单号：{track.trackingNo}
+                      {track.provider ? `（${track.provider}）` : ''}
+                    </p>
+                  ) : null}
+                  {track.manualQueryUrl ? (
+                    <p className="body-md" style={{ marginBottom: 8 }}>
+                      <a href={track.manualQueryUrl} target="_blank" rel="noreferrer">
+                        查看物流官网
+                      </a>
+                    </p>
+                  ) : null}
+                  {(track.nodes ?? []).length === 0 ? (
+                    <p className="label-md text-muted">暂无物流轨迹（待总部发货后更新）</p>
+                  ) : (
+                    <ul style={{ paddingLeft: 18, margin: 0 }}>
+                      {(track.nodes ?? []).map((n, i) => (
+                        <li key={`${n.time}-${i}`} className="body-md" style={{ marginBottom: 8 }}>
+                          <div className="label-md text-muted">{fmtTime(n.time)}</div>
+                          <div>{n.description || n.status || '—'}</div>
+                        </li>
+                      ))}
+                    </ul>
+                  )}
+                </>
+              )}
+            </section>
+          ) : null}
+        </div>
+      )}
+    </div>
+  );
+}

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

@@ -0,0 +1,149 @@
+import { useCallback, useEffect, useState, type FormEvent } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import PageHeader from '@dukang/shared-ui/PageHeader';
+import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
+import type { PartnerProxyOrderListItem, PartnerProxyOrderListResponse } from '@dukang/shared-types';
+import { isLoggedIn, request } from '../lib/api';
+import {
+  proxyOrderStatusColor,
+  proxyOrderStatusLabel,
+} from '../lib/proxyOrderStatus';
+
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
+function fmtTime(value: string | undefined) {
+  if (!value) return '—';
+  const d = new Date(value);
+  if (Number.isNaN(d.getTime())) return value;
+  const pad = (n: number) => String(n).padStart(2, '0');
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+
+function deliveryLabel(item: PartnerProxyOrderListItem) {
+  const t = String(item.deliveryType || '').toUpperCase();
+  if (t === 'ON_SITE_PICKUP') return '现场提货';
+  if (t === 'CROSS_CITY') return '跨城配送';
+  if (t === 'LOCAL') return '同城配送';
+  return '线下代下单';
+}
+
+function coverUrl(item: PartnerProxyOrderListItem) {
+  return item.imageResource?.url || '';
+}
+
+export default function ProxyOrderListPage() {
+  const navigate = useNavigate();
+  const [list, setList] = useState<PartnerProxyOrderListItem[]>([]);
+  const [total, setTotal] = useState(0);
+  const [keyword, setKeyword] = useState('');
+  const [q, setQ] = useState('');
+  const [loading, setLoading] = useState(true);
+
+  const loadList = useCallback(() => {
+    if (!isLoggedIn()) {
+      navigate('/login');
+      return Promise.resolve();
+    }
+    setLoading(true);
+    const params = new URLSearchParams({ page: '1', pageSize: '50' });
+    if (q.trim()) params.set('keyword', q.trim());
+    return request<PartnerProxyOrderListResponse>('PARTNER_H5', `/partner/proxy-orders?${params}`)
+      .then((res) => {
+        setList(Array.isArray(res.list) ? res.list : []);
+        setTotal(Number(res.total) || 0);
+      })
+      .catch(() => {
+        setList([]);
+        setTotal(0);
+      })
+      .finally(() => setLoading(false));
+  }, [navigate, q]);
+
+  useEffect(() => {
+    document.title = '代下单列表';
+  }, []);
+
+  useEffect(() => {
+    void loadList();
+  }, [loadList]);
+
+  function submitSearch(e: FormEvent) {
+    e.preventDefault();
+    setQ(keyword.trim());
+  }
+
+  return (
+    <PullToRefresh onRefresh={loadList} className="page-no-tab partner-orders-page">
+      <PageHeader title="代下单列表" onBack={() => navigate('/center')} />
+
+      <div style={{ padding: '0 20px 12px' }}>
+        <form className="partner-search" onSubmit={submitSearch}>
+          <span className="material-symbols-outlined">search</span>
+          <input
+            placeholder="订单号 / 手机号 / 姓名 / 商品"
+            value={keyword}
+            onChange={(e) => setKeyword(e.target.value)}
+          />
+        </form>
+        <p className="label-md text-muted" style={{ marginTop: 8 }}>
+          {loading ? '加载中…' : `共 ${total} 笔代下单`}
+        </p>
+      </div>
+
+      <div style={{ padding: '0 16px 24px' }}>
+        {!loading && list.length === 0 && <div className="empty">暂无代下单记录</div>}
+
+        {list.map((o) => {
+          const orderId = String(o.id);
+          const img = coverUrl(o);
+          return (
+            <Link key={orderId} to={`/center/proxy-orders/${orderId}`} className="partner-order-card" style={{ marginBottom: 12 }}>
+              <div className="partner-order-card-top">
+                <span className="label-md text-muted">NO. {o.orderNo}</span>
+                <span
+                  className="label-md"
+                  style={{ color: proxyOrderStatusColor(o.status), fontWeight: 600 }}
+                >
+                  {proxyOrderStatusLabel(o.status)}
+                </span>
+              </div>
+              <div className="partner-order-product">
+                <div
+                  className="partner-order-product-img"
+                  style={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    overflow: 'hidden',
+                    background: img ? `center/cover no-repeat url(${img})` : undefined,
+                  }}
+                >
+                  {!img && <span className="material-symbols-outlined text-muted">liquor</span>}
+                </div>
+                <div style={{ flex: 1, minWidth: 0 }}>
+                  <h3 className="headline-md line-2-clamp">{o.productName || '杜康好酒'}</h3>
+                  <p className="text-variant body-md" style={{ marginTop: 4 }}>
+                    ×{o.quantity} · ¥{fmtMoney(Number(o.payAmount || 0))}
+                  </p>
+                  <p className="label-md text-muted" style={{ marginTop: 4 }}>
+                    {deliveryLabel(o)} · {fmtTime(o.createdAt)}
+                  </p>
+                </div>
+              </div>
+              <div className="partner-order-address">
+                <span className="material-symbols-outlined" style={{ fontSize: 18 }}>person</span>
+                <p className="line-2-clamp">
+                  {o.receiverName || '客户'}
+                  {o.receiverPhone ? ` · ${o.receiverPhone}` : ''}
+                  {o.receiverAddress ? ` · ${o.receiverAddress}` : ''}
+                </p>
+              </div>
+            </Link>
+          );
+        })}
+      </div>
+    </PullToRefresh>
+  );
+}

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

@@ -1,48 +1,116 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
+import QRCode from 'qrcode';
 import PageHeader from '@dukang/shared-ui/PageHeader';
+import { invokeWechatPay } from '@dukang/weixin-sdk';
 import ChinaRegionPicker from '../components/ChinaRegionPicker';
-import { request } from '../lib/api';
+import { getToken, request } from '../lib/api';
 import { formatRegionLabel, parseRegionCodes } from '../lib/china-region';
+import {
+  clearProxyOrderDraft,
+  loadProxyOrderDraft,
+  saveProxyOrderDraft,
+  type ProxyOrderDraft,
+} from '../lib/proxyOrderDraft';
 import { toastError, toastSuccess } from '../lib/toast';
+import { isWechatEnv } from '../lib/weixin';
+import { fetchPartnerProfile, partnerHasWechatBinding } from '../lib/wechat-auth';
 import type {
   PartnerProxyDeliveryMode,
   PartnerProxyOrderCreateRequest,
   PartnerProxyOrderOptions,
   PartnerProxyOrderPreviewResult,
+  ProxyOrderCreateResponse,
+  ProxyOrderPayResponse,
+  ProxyPayMethod,
 } from '@dukang/shared-types';
+import { usePartnerPageView } from '../lib/usePageView';
 
 function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
 
+function initialDraft(): ProxyOrderDraft {
+  return (
+    loadProxyOrderDraft() ?? {
+      phone: '',
+      receiverName: '',
+      regionCodes: [],
+      addressDetail: '',
+      productId: '',
+      quantity: 2,
+      promoCodeId: '',
+      deliveryMode: 'ADDRESS',
+      autoReceive: false,
+    }
+  );
+}
+
 export default function ProxyOrderPage() {
+  usePartnerPageView('partner_proxy_order_view');
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
+  const draft0 = useMemo(() => initialDraft(), []);
   const [options, setOptions] = useState<PartnerProxyOrderOptions | null>(null);
   const [loadingOptions, setLoadingOptions] = useState(true);
-  const [phone, setPhone] = useState('');
-  const [customerSmsCode, setCustomerSmsCode] = useState('');
-  const [partnerSmsCode, setPartnerSmsCode] = useState('');
-  const [receiverName, setReceiverName] = useState('');
-  const [regionCodes, setRegionCodes] = useState<string[]>([]);
-  const [addressDetail, setAddressDetail] = useState('');
-  const [productId, setProductId] = useState('');
-  const [quantity, setQuantity] = useState(2);
-  const [promoCodeId, setPromoCodeId] = useState('');
-  const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>('ADDRESS');
-  const [autoReceive, setAutoReceive] = useState(false);
-  const [confirmStep, setConfirmStep] = useState(false);
+  const [phone, setPhone] = useState(draft0.phone);
+  const [receiverName, setReceiverName] = useState(draft0.receiverName);
+  const [regionCodes, setRegionCodes] = useState<string[]>(draft0.regionCodes);
+  const [addressDetail, setAddressDetail] = useState(draft0.addressDetail);
+  const [productId, setProductId] = useState(draft0.productId);
+  const [quantity, setQuantity] = useState(draft0.quantity);
+  const [promoCodeId, setPromoCodeId] = useState(draft0.promoCodeId);
+  const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>(draft0.deliveryMode);
+  const [autoReceive, setAutoReceive] = useState(draft0.autoReceive);
   const [preview, setPreview] = useState<PartnerProxyOrderPreviewResult | null>(null);
   const [previewLoading, setPreviewLoading] = useState(false);
-  const [customerCooldown, setCustomerCooldown] = useState(0);
-  const [partnerCooldown, setPartnerCooldown] = useState(0);
   const [submitting, setSubmitting] = useState(false);
   const [msg, setMsg] = useState('');
+  const [step, setStep] = useState<'form' | 'pay'>('form');
+  const [created, setCreated] = useState<ProxyOrderCreateResponse | null>(null);
+  const [payMethod, setPayMethod] = useState<ProxyPayMethod>('NATIVE');
+  const [codeUrl, setCodeUrl] = useState<string | null>(null);
+  const [qrDataUrl, setQrDataUrl] = useState<string | null>(null);
+  const [paying, setPaying] = useState(false);
+  const [cancelling, setCancelling] = useState(false);
+  const [lockedPayMethod, setLockedPayMethod] = useState<ProxyPayMethod | null>(null);
+  const pollRef = useRef<number | null>(null);
 
   const region = useMemo(() => parseRegionCodes(regionCodes), [regionCodes]);
   const regionLabel = region ? formatRegionLabel(region) : '';
 
+  function stopPoll() {
+    if (pollRef.current != null) {
+      window.clearInterval(pollRef.current);
+      pollRef.current = null;
+    }
+  }
+
+  useEffect(() => () => stopPoll(), []);
+
+  useEffect(() => {
+    if (!codeUrl) {
+      setQrDataUrl(null);
+      return;
+    }
+    void QRCode.toDataURL(codeUrl, { width: 220, margin: 1 }).then(setQrDataUrl).catch(() => setQrDataUrl(null));
+  }, [codeUrl]);
+
+  function persistDraft(overrides?: Partial<ProxyOrderDraft>) {
+    saveProxyOrderDraft({
+      phone,
+      receiverName,
+      regionCodes,
+      addressDetail,
+      productId,
+      quantity,
+      promoCodeId,
+      deliveryMode,
+      autoReceive,
+      ...overrides,
+    });
+  }
+
   useEffect(() => {
     request<PartnerProxyOrderOptions>('PARTNER_H5', '/partner/proxy-orders/options')
       .then((data) => {
@@ -53,6 +121,7 @@ export default function ProxyOrderPage() {
         const fromQuery = searchParams.get('productId');
         if (fromQuery && data.products.some((p) => p.id === fromQuery)) {
           setProductId(fromQuery);
+          persistDraft({ productId: fromQuery });
         } else if (data.products[0] && !productId) {
           setProductId(data.products[0].id);
         }
@@ -64,9 +133,44 @@ export default function ProxyOrderPage() {
 
   useEffect(() => {
     const fromQuery = searchParams.get('productId');
-    if (fromQuery) setProductId(fromQuery);
+    if (fromQuery) {
+      setProductId(fromQuery);
+      persistDraft({ productId: fromQuery });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- only sync productId from URL
   }, [searchParams]);
 
+  useEffect(() => {
+    persistDraft();
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- keep draft in sync for product-picker roundtrip
+  }, [
+    phone,
+    receiverName,
+    regionCodes,
+    addressDetail,
+    productId,
+    quantity,
+    promoCodeId,
+    deliveryMode,
+    autoReceive,
+  ]);
+
+  const selectedProduct = options?.products.find((p) => p.id === productId);
+  const allowOnline = selectedProduct ? selectedProduct.allowOnlinePurchase !== false : true;
+  const allowOnSite = !!selectedProduct?.allowOnSitePickup;
+  const allowCrossCity = selectedProduct ? selectedProduct.allowCrossCityDelivery !== false : true;
+
+  useEffect(() => {
+    if (!selectedProduct) return;
+    if (!allowOnline && allowOnSite && deliveryMode !== 'ON_SITE_PICKUP') {
+      setDeliveryMode('ON_SITE_PICKUP');
+      return;
+    }
+    if (allowOnline && !allowOnSite && deliveryMode !== 'ADDRESS') {
+      setDeliveryMode('ADDRESS');
+    }
+  }, [selectedProduct, allowOnline, allowOnSite, deliveryMode]);
+
   useEffect(() => {
     if (!productId || quantity < 1) {
       setPreview(null);
@@ -85,89 +189,154 @@ export default function ProxyOrderPage() {
         }),
         silent: true,
       })
-        .then(setPreview)
-        .catch(() => setPreview(null))
+        .then((data) => {
+          setPreview(data);
+          setMsg('');
+        })
+        .catch((e) => {
+          setPreview(null);
+          setMsg(e instanceof Error ? e.message : '费用预览失败');
+        })
         .finally(() => setPreviewLoading(false));
     }, 300);
     return () => clearTimeout(timer);
   }, [productId, quantity, deliveryMode, region?.city, region?.district]);
 
-  function startCooldown(setter: (n: number | ((s: number) => number)) => void) {
-    setter(60);
-    const timer = setInterval(() => {
-      setter((s) => {
-        if (s <= 1) {
-          clearInterval(timer);
-          return 0;
-        }
-        return s - 1;
-      });
-    }, 1000);
-  }
-
-  async function sendCustomerSms() {
-    setMsg('');
-    if (!/^1\d{10}$/.test(phone.trim())) {
-      setMsg('请输入有效手机号');
-      return;
-    }
-    try {
-      const res = await request<{ maskedPhone: string }>(
-        'PARTNER_H5',
-        '/partner/proxy-orders/send-customer-sms',
-        {
-          method: 'POST',
-          body: JSON.stringify({ phone: phone.trim() }),
-          silent: true,
-        },
-      );
-      setMsg(`客户验证码已发送至 ${res.maskedPhone}`);
-      startCooldown(setCustomerCooldown);
-    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '发送失败');
-    }
-  }
-
-  async function sendPartnerSms() {
-    setMsg('');
-    try {
-      const res = await request<{ maskedPhone: string }>(
-        'PARTNER_H5',
-        '/partner/proxy-orders/send-partner-sms',
-        { method: 'POST', body: '{}', silent: true },
-      );
-      setMsg(`确认验证码已发送至合伙人手机 ${res.maskedPhone}`);
-      startCooldown(setPartnerCooldown);
-    } catch (e) {
-      setMsg(e instanceof Error ? e.message : '发送失败');
-    }
-  }
-
   function validateForm(): string | null {
     if (!/^1\d{10}$/.test(phone.trim())) return '请输入有效手机号';
-    if (!customerSmsCode.trim()) return '请输入客户验证码';
     if (!productId) return '请选择商品';
-    if (deliveryMode !== 'ADDRESS') {
-      // 现场提货不需要地址与门店
-    } else {
+    if (deliveryMode === 'ADDRESS') {
+      if (!allowOnline) return '该商品不支持线上购买';
       if (!region?.province || !region?.city || !region?.district) return '请选择省市区';
       if (!addressDetail.trim()) return '请填写详细地址';
       if (!autoReceive) return '配送到址须勾选同意自动收货';
+    } else if (!allowOnSite) {
+      return '该商品不支持现场提货';
     }
-    if (!preview) return '请等待费用计算完成';
+    if (!preview) return msg || '请等待费用计算完成';
     return null;
   }
 
-  async function openConfirmStep() {
-    setMsg('');
-    const err = validateForm();
-    if (err) {
-      setMsg(err);
+  function startPoll(orderId: string) {
+    stopPoll();
+    pollRef.current = window.setInterval(() => {
+      void request<{ payStatus: string; orderNo: string }>(
+        'PARTNER_H5',
+        `/partner/proxy-orders/${orderId}/pay-status`,
+        { silent: true },
+      )
+        .then((st) => {
+          if (st.payStatus === 'PAID') {
+            stopPoll();
+            toastSuccess(`支付成功：${st.orderNo}`);
+            clearProxyOrderDraft();
+            navigate(`/center/proxy-orders/${orderId}`, { replace: true });
+          }
+        })
+        .catch(() => undefined);
+    }, 2000);
+  }
+
+  async function startPay(orderId: string, method: ProxyPayMethod) {
+    if (lockedPayMethod && lockedPayMethod !== method) {
+      setMsg(
+        lockedPayMethod === 'JSAPI'
+          ? '该订单已发起微信代付，请先取消支付后重新下单'
+          : '该订单已生成收款码，请先取消支付后重新下单',
+      );
       return;
     }
-    setConfirmStep(true);
-    setPartnerSmsCode('');
-    await sendPartnerSms();
+    setPaying(true);
+    setMsg('');
+    setPayMethod(method);
+    try {
+      if (method === 'JSAPI') {
+        if (!isWechatEnv()) {
+          throw new Error('请在微信内打开合伙人端以使用微信代付');
+        }
+        const profile = await fetchPartnerProfile();
+        if (!partnerHasWechatBinding(profile)) {
+          throw new Error('请先绑定微信后再代付');
+        }
+      }
+
+      const pay = await request<ProxyOrderPayResponse>(
+        'PARTNER_H5',
+        `/partner/proxy-orders/${orderId}/pay`,
+        {
+          method: 'POST',
+          body: JSON.stringify({ payMethod: method }),
+          silent: true,
+        },
+      );
+
+      if (pay.mode === 'mock') {
+        toastSuccess('支付成功');
+        clearProxyOrderDraft();
+        navigate(`/center/proxy-orders/${orderId}`, { replace: true });
+        return;
+      }
+
+      if (pay.mode === 'native' && pay.codeUrl) {
+        setCodeUrl(pay.codeUrl);
+        setLockedPayMethod(method);
+        startPoll(orderId);
+        return;
+      }
+
+      if (pay.mode === 'jsapi' && pay.prepay) {
+        setCodeUrl(null);
+        setLockedPayMethod(method);
+        await invokeWechatPay(pay.prepay, {
+          apiBase: '/api/v1',
+          clientApp: 'PARTNER_H5',
+          getAccessToken: getToken,
+          platform: 'wechat-h5',
+        });
+        startPoll(orderId);
+        return;
+      }
+
+      throw new Error('支付发起失败');
+    } catch (e) {
+      setMsg(e instanceof Error ? e.message : '支付失败');
+    } finally {
+      setPaying(false);
+    }
+  }
+
+  async function cancelPay(orderId: string) {
+    setCancelling(true);
+    setMsg('');
+    stopPoll();
+    try {
+      await request('PARTNER_H5', `/partner/proxy-orders/${orderId}/cancel-pay`, {
+        method: 'POST',
+        body: '{}',
+      });
+      toastSuccess('已取消支付，可重新下单并选择其他支付方式');
+      setStep('form');
+      setCreated(null);
+      setCodeUrl(null);
+      setLockedPayMethod(null);
+    } catch (e) {
+      setMsg(e instanceof Error ? e.message : '取消失败');
+    } finally {
+      setCancelling(false);
+    }
+  }
+
+  function switchPayMethod(method: ProxyPayMethod) {
+    if (lockedPayMethod && lockedPayMethod !== method) {
+      setMsg(
+        lockedPayMethod === 'JSAPI'
+          ? '该订单已发起微信代付，请先取消支付后重新下单'
+          : '该订单已生成收款码，请先取消支付后重新下单',
+      );
+      return;
+    }
+    setPayMethod(method);
+    setMsg('');
   }
 
   async function submit() {
@@ -177,15 +346,9 @@ export default function ProxyOrderPage() {
       setMsg(err);
       return;
     }
-    if (!partnerSmsCode.trim()) {
-      setMsg('请输入合伙人确认验证码');
-      return;
-    }
 
     const payload: PartnerProxyOrderCreateRequest = {
       phone: phone.trim(),
-      customerSmsCode: customerSmsCode.trim(),
-      partnerSmsCode: partnerSmsCode.trim(),
       deliveryMode,
       autoReceive: deliveryMode === 'ADDRESS' ? true : undefined,
       receiverName: receiverName.trim() || undefined,
@@ -200,13 +363,17 @@ export default function ProxyOrderPage() {
 
     setSubmitting(true);
     try {
-      const order = await request<{ id: string; orderNo: string }>('PARTNER_H5', '/partner/proxy-orders', {
+      const order = await request<ProxyOrderCreateResponse>('PARTNER_H5', '/partner/proxy-orders', {
         method: 'POST',
         body: JSON.stringify(payload),
         silent: true,
       });
-      toastSuccess(`代下单成功：${order.orderNo}`);
-      navigate(`/orders/${order.id}`);
+      clearProxyOrderDraft();
+      setCreated(order);
+      setStep('pay');
+      setCodeUrl(null);
+      setLockedPayMethod(null);
+      await startPay(order.id, payMethod);
     } catch (e) {
       setMsg(e instanceof Error ? e.message : '下单失败');
     } finally {
@@ -214,7 +381,6 @@ export default function ProxyOrderPage() {
     }
   }
 
-  const selectedProduct = options?.products.find((p) => p.id === productId);
   const deliveryLabel =
     preview?.deliveryType === 'ON_SITE_PICKUP'
       ? '现场提货'
@@ -224,43 +390,110 @@ export default function ProxyOrderPage() {
 
   return (
     <div className="page partner-proxy-order-page">
-      <PageHeader title="代下单" onBack={() => navigate(-1)} />
+      <PageHeader title={step === 'pay' ? '代下单支付' : '代下单'} onBack={() => navigate(-1)} />
 
       <main className="partner-form-card" style={{ margin: '0 16px 24px' }}>
-        {loadingOptions ? (
+        {step === 'pay' && created ? (
+          <>
+            <p className="body-md">
+              订单 {created.orderNo} · 应付 ¥{fmtMoney(created.payAmount)}
+            </p>
+            <p className="label-md text-muted" style={{ marginTop: 8 }}>
+              {created.deliveryType === 'ON_SITE_PICKUP'
+                ? '支付成功后订单即为已完成，并发放好客权益'
+                : '支付成功后进入待发货，由总部履约'}
+            </p>
+
+            <section className="partner-form-section" style={{ marginTop: 16 }}>
+              <label className="partner-form-label">支付方式</label>
+              <div className="partner-proxy-mode-tabs">
+                <button
+                  type="button"
+                  className={`partner-proxy-mode-tab${payMethod === 'NATIVE' ? ' is-active' : ''}`}
+                  disabled={!!lockedPayMethod && lockedPayMethod !== 'NATIVE'}
+                  onClick={() => switchPayMethod('NATIVE')}
+                >
+                  收款码
+                </button>
+                <button
+                  type="button"
+                  className={`partner-proxy-mode-tab${payMethod === 'JSAPI' ? ' is-active' : ''}`}
+                  disabled={!!lockedPayMethod && lockedPayMethod !== 'JSAPI'}
+                  onClick={() => switchPayMethod('JSAPI')}
+                >
+                  微信代付
+                </button>
+              </div>
+              {lockedPayMethod ? (
+                <p className="label-md text-muted" style={{ marginTop: 8 }}>
+                  已选择{lockedPayMethod === 'NATIVE' ? '收款码' : '微信代付'}，切换方式请先取消支付
+                </p>
+              ) : null}
+            </section>
+
+            {payMethod === 'NATIVE' ? (
+              <div style={{ textAlign: 'center', marginTop: 16 }}>
+                {qrDataUrl ? (
+                  <img src={qrDataUrl} alt="收款码" width={220} height={220} style={{ margin: '0 auto' }} />
+                ) : (
+                  <p className="label-md text-muted">{paying ? '生成收款码中…' : '暂无收款码'}</p>
+                )}
+                <p className="label-md text-muted" style={{ marginTop: 8 }}>
+                  请使用微信扫码支付，支付成功后自动跳转
+                </p>
+                <button
+                  type="button"
+                  className="btn btn-block"
+                  style={{ marginTop: 16 }}
+                  disabled={paying}
+                  onClick={() => void startPay(created.id, 'NATIVE')}
+                >
+                  {paying ? '生成中…' : '重新生成收款码'}
+                </button>
+              </div>
+            ) : (
+              <div style={{ marginTop: 16 }}>
+                <p className="label-md text-muted">将调起微信支付，由合伙人微信完成代付</p>
+                <button
+                  type="button"
+                  className="btn btn-primary btn-block"
+                  style={{ marginTop: 12 }}
+                  disabled={paying}
+                  onClick={() => void startPay(created.id, 'JSAPI')}
+                >
+                  {paying ? '支付中…' : '重新调起微信代付'}
+                </button>
+              </div>
+            )}
+
+            {msg ? (
+              <p className="partner-form-error" role="alert" style={{ marginTop: 12 }}>
+                {msg}
+              </p>
+            ) : null}
+
+            <button
+              type="button"
+              className="btn btn-block"
+              style={{ marginTop: 16 }}
+              disabled={cancelling || paying}
+              onClick={() => void cancelPay(created.id)}
+            >
+              {cancelling ? '取消中…' : '取消支付'}
+            </button>
+          </>
+        ) : loadingOptions ? (
           <p className="label-md text-muted">加载商品…</p>
         ) : (
           <>
             <section className="partner-form-section">
               <label className="partner-form-label">用户手机号</label>
-              <div className="partner-input-row">
-                <div className="partner-input-wrap" style={{ flex: 1 }}>
-                  <input
-                    className="partner-input"
-                    placeholder="11 位手机号"
-                    value={phone}
-                    onChange={(e) => setPhone(e.target.value.replace(/\D/g, '').slice(0, 11))}
-                  />
-                </div>
-                <button
-                  type="button"
-                  className="btn btn-secondary"
-                  disabled={customerCooldown > 0}
-                  onClick={() => void sendCustomerSms()}
-                >
-                  {customerCooldown > 0 ? `${customerCooldown}s` : '获取验证码'}
-                </button>
-              </div>
-            </section>
-
-            <section className="partner-form-section">
-              <label className="partner-form-label">客户验证码</label>
               <div className="partner-input-wrap">
                 <input
                   className="partner-input"
-                  placeholder="发至客户手机"
-                  value={customerSmsCode}
-                  onChange={(e) => setCustomerSmsCode(e.target.value.replace(/\D/g, '').slice(0, 6))}
+                  placeholder="11 位手机号"
+                  value={phone}
+                  onChange={(e) => setPhone(e.target.value.replace(/\D/g, '').slice(0, 11))}
                 />
               </div>
             </section>
@@ -270,11 +503,12 @@ export default function ProxyOrderPage() {
               <button
                 type="button"
                 className="partner-proxy-product-picker"
-                onClick={() =>
+                onClick={() => {
+                  persistDraft();
                   navigate(
                     `/proxy-order/products${productId ? `?selected=${encodeURIComponent(productId)}` : ''}`,
-                  )
-                }
+                  );
+                }}
               >
                 {selectedProduct ? (
                   <>
@@ -329,25 +563,37 @@ export default function ProxyOrderPage() {
 
             <section className="partner-form-section">
               <label className="partner-form-label">履约方式</label>
-              <div className="partner-proxy-mode-tabs">
-                <button
-                  type="button"
-                  className={`partner-proxy-mode-tab${deliveryMode === 'ADDRESS' ? ' is-active' : ''}`}
-                  onClick={() => setDeliveryMode('ADDRESS')}
-                >
-                  配送到址
-                </button>
-                <button
-                  type="button"
-                  className={`partner-proxy-mode-tab${deliveryMode === 'ON_SITE_PICKUP' ? ' is-active' : ''}`}
-                  onClick={() => setDeliveryMode('ON_SITE_PICKUP')}
-                >
-                  现场提货
-                </button>
-              </div>
+              {allowOnline && allowOnSite ? (
+                <div className="partner-proxy-mode-tabs">
+                  <button
+                    type="button"
+                    className={`partner-proxy-mode-tab${deliveryMode === 'ADDRESS' ? ' is-active' : ''}`}
+                    onClick={() => setDeliveryMode('ADDRESS')}
+                  >
+                    配送到址
+                  </button>
+                  <button
+                    type="button"
+                    className={`partner-proxy-mode-tab${deliveryMode === 'ON_SITE_PICKUP' ? ' is-active' : ''}`}
+                    onClick={() => setDeliveryMode('ON_SITE_PICKUP')}
+                  >
+                    现场提货
+                  </button>
+                </div>
+              ) : (
+                <p className="label-md text-muted">
+                  {!allowOnline && allowOnSite
+                    ? '该商品仅支持现场提货'
+                    : allowOnline && !allowOnSite
+                      ? allowCrossCity
+                        ? '该商品仅支持配送到址（含跨城）'
+                        : '该商品仅支持配送到址（不可跨城）'
+                      : '该商品暂无可选履约方式'}
+                </p>
+              )}
             </section>
 
-            {deliveryMode === 'ADDRESS' ? (
+            {deliveryMode === 'ADDRESS' && allowOnline ? (
               <>
                 <section className="partner-form-section">
                   <label className="partner-form-label">收货人（选填）</label>
@@ -389,11 +635,36 @@ export default function ProxyOrderPage() {
                     checked={autoReceive}
                     onChange={(e) => setAutoReceive(e.target.checked)}
                   />
-                  <span>同意自动收货（线下代下单提交后视为已送达并发放权益）</span>
+                  <span>同意自动收货（配送到址必选）</span>
                 </label>
               </>
             ) : null}
 
+            <section className="partner-form-section">
+              <label className="partner-form-label">支付方式</label>
+              <div className="partner-proxy-mode-tabs">
+                <button
+                  type="button"
+                  className={`partner-proxy-mode-tab${payMethod === 'NATIVE' ? ' is-active' : ''}`}
+                  onClick={() => setPayMethod('NATIVE')}
+                >
+                  收款码
+                </button>
+                <button
+                  type="button"
+                  className={`partner-proxy-mode-tab${payMethod === 'JSAPI' ? ' is-active' : ''}`}
+                  onClick={() => setPayMethod('JSAPI')}
+                >
+                  微信代付
+                </button>
+              </div>
+              <p className="label-md text-muted" style={{ marginTop: 8, lineHeight: 1.5 }}>
+                {payMethod === 'NATIVE'
+                  ? '提交后展示商家收款码，客户或现场扫码支付'
+                  : '提交后在微信内由您代客户完成支付（需已绑定微信）'}
+              </p>
+            </section>
+
             <section className="partner-proxy-fee-card">
               <h3 className="headline-md">费用明细</h3>
               {previewLoading ? (
@@ -428,73 +699,24 @@ export default function ProxyOrderPage() {
               )}
             </section>
 
-            {confirmStep ? (
-              <section className="partner-form-section partner-proxy-confirm">
-                <label className="partner-form-label">合伙人确认验证码</label>
-                <p className="label-md text-muted" style={{ marginBottom: 8 }}>
-                  确认线下已收款后，将向您的登录手机号发送验证码
-                </p>
-                <div className="partner-input-row">
-                  <div className="partner-input-wrap" style={{ flex: 1 }}>
-                    <input
-                      className="partner-input"
-                      placeholder="发至合伙人手机"
-                      value={partnerSmsCode}
-                      onChange={(e) => setPartnerSmsCode(e.target.value.replace(/\D/g, '').slice(0, 6))}
-                    />
-                  </div>
-                  <button
-                    type="button"
-                    className="btn btn-secondary"
-                    disabled={partnerCooldown > 0}
-                    onClick={() => void sendPartnerSms()}
-                  >
-                    {partnerCooldown > 0 ? `${partnerCooldown}s` : '重新发送'}
-                  </button>
-                </div>
-              </section>
-            ) : null}
-
             {msg ? (
               <p className="partner-form-error" role="alert">
                 {msg}
               </p>
             ) : null}
 
-            {!confirmStep ? (
-              <button
-                type="button"
-                className="btn btn-primary btn-block"
-                disabled={!preview}
-                onClick={() => void openConfirmStep()}
-                style={{ marginTop: 16 }}
-              >
-                确认代下单
-              </button>
-            ) : (
-              <div style={{ display: 'flex', gap: 8, marginTop: 16 }}>
-                <button
-                  type="button"
-                  className="btn btn-secondary"
-                  style={{ flex: 1 }}
-                  onClick={() => setConfirmStep(false)}
-                >
-                  返回修改
-                </button>
-                <button
-                  type="button"
-                  className="btn btn-primary"
-                  style={{ flex: 1 }}
-                  disabled={submitting || !preview}
-                  onClick={() => void submit()}
-                >
-                  {submitting ? '提交中…' : '验证并提交'}
-                </button>
-              </div>
-            )}
+            <button
+              type="button"
+              className="btn btn-primary btn-block"
+              disabled={submitting || paying || !preview}
+              onClick={() => void submit()}
+              style={{ marginTop: 16 }}
+            >
+              {submitting || paying ? '处理中…' : '提交并支付'}
+            </button>
 
             <p className="label-md text-muted" style={{ marginTop: 12, lineHeight: 1.5 }}>
-              线下已收款确认后，将自动创建/关联用户，订单标记为代下单并直接完成，同时发放对应权益。客户订单列表会显示您的姓名。
+              提交后进入在线支付；支付成功后发放权益。配送单将进入待发货由总部履约，现场提货走自提闭环。
             </p>
           </>
         )}

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

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import { request } from '../lib/api';
@@ -9,12 +9,30 @@ function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
 
+type FulfillmentFilter = 'ALL' | 'ONLINE' | 'CROSS_CITY' | 'ON_SITE';
+
+const FILTERS: Array<{ key: FulfillmentFilter; label: string }> = [
+  { key: 'ALL', label: '全部' },
+  { key: 'ONLINE', label: '线上' },
+  { key: 'CROSS_CITY', label: '跨城' },
+  { key: 'ON_SITE', label: '现场' },
+];
+
+function matchFilter(p: PartnerProxyOrderProductOption, filter: FulfillmentFilter): boolean {
+  if (filter === 'ALL') return true;
+  if (filter === 'ONLINE') return p.allowOnlinePurchase !== false;
+  if (filter === 'CROSS_CITY') return p.allowCrossCityDelivery !== false;
+  return !!p.allowOnSitePickup;
+}
+
 export default function ProxyOrderProductsPage() {
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const selectedId = searchParams.get('selected') || '';
   const [products, setProducts] = useState<PartnerProxyOrderProductOption[]>([]);
   const [loading, setLoading] = useState(true);
+  const [keyword, setKeyword] = useState('');
+  const [filter, setFilter] = useState<FulfillmentFilter>('ALL');
 
   useEffect(() => {
     request<PartnerProxyOrderOptions>('PARTNER_H5', '/partner/proxy-orders/options')
@@ -23,6 +41,15 @@ export default function ProxyOrderProductsPage() {
       .finally(() => setLoading(false));
   }, []);
 
+  const filtered = useMemo(() => {
+    const q = keyword.trim().toLowerCase();
+    return products.filter((p) => {
+      if (!matchFilter(p, filter)) return false;
+      if (!q) return true;
+      return `${p.name} ${p.spec}`.toLowerCase().includes(q);
+    });
+  }, [products, keyword, filter]);
+
   function pick(product: PartnerProxyOrderProductOption) {
     navigate(`/proxy-order?productId=${encodeURIComponent(product.id)}`, { replace: true });
   }
@@ -30,12 +57,32 @@ export default function ProxyOrderProductsPage() {
   return (
     <div className="page partner-proxy-order-page">
       <PageHeader title="选择酒品" onBack={() => navigate(-1)} />
+      <div className="partner-proxy-product-toolbar">
+        <input
+          className="partner-input"
+          placeholder="搜索酒品名称 / 规格"
+          value={keyword}
+          onChange={(e) => setKeyword(e.target.value)}
+        />
+        <div className="partner-proxy-product-filters">
+          {FILTERS.map((f) => (
+            <button
+              key={f.key}
+              type="button"
+              className={`partner-proxy-product-filter${filter === f.key ? ' is-active' : ''}`}
+              onClick={() => setFilter(f.key)}
+            >
+              {f.label}
+            </button>
+          ))}
+        </div>
+      </div>
       <main className="partner-proxy-product-list">
         {loading ? <p className="label-md text-muted">加载中…</p> : null}
-        {!loading && products.length === 0 ? (
-          <p className="label-md text-muted">暂无可售商品</p>
+        {!loading && filtered.length === 0 ? (
+          <p className="label-md text-muted">暂无符合条件的商品</p>
         ) : null}
-        {products.map((p) => {
+        {filtered.map((p) => {
           const benefit = p.benefitAmount != null ? Number(p.benefitAmount) : Number(p.price);
           const active = p.id === selectedId;
           return (
@@ -59,6 +106,11 @@ export default function ProxyOrderProductsPage() {
                 </div>
                 <p className="partner-proxy-product-spec">{p.spec}</p>
                 <p className="partner-proxy-product-benefit">好客权益 ¥{fmtMoney(benefit)}</p>
+                <div className="partner-proxy-product-tags">
+                  {p.allowOnlinePurchase !== false ? <span className="partner-proxy-tag">线上</span> : null}
+                  {p.allowCrossCityDelivery !== false ? <span className="partner-proxy-tag">跨城</span> : null}
+                  {p.allowOnSitePickup ? <span className="partner-proxy-tag">现场</span> : null}
+                </div>
               </div>
             </button>
           );

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

@@ -9,8 +9,10 @@ import {
   type PartnerStaffItem,
 } from '@dukang/shared-types';
 import { deletePartnerStaff, listPartnerStaff, updatePartnerStaff } from '../lib/staff';
+import { usePartnerPageView } from '../lib/usePageView';
 
 export default function StaffListPage() {
+  usePartnerPageView('partner_staff_list_view');
   const navigate = useNavigate();
   const [staff, setStaff] = useState<PartnerStaffItem[]>([]);
   const [q, setQ] = useState('');

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

@@ -13,13 +13,14 @@ import { resolveRegionBinding } from '../lib/china-region';
 
 import { checkStorePhoneAvailable } from '../lib/storePhone';
 
-import { formatStoreCoords, locateStorePosition } from '../lib/storeLocate';
-
 import { fetchPartnerCities, type OpenCityOption } from '../lib/upload';
 
+import { isWechatEnv, weixinSdk } from '../lib/weixin';
+
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 
 import TencentLocPickerOverlay from '../components/TencentLocPickerOverlay';
+import { usePartnerPageView } from '../lib/usePageView';
 
 import {
 
@@ -40,12 +41,13 @@ import {
   validateStoreStep3,
 
   patchEnvPhotoAt,
-
+  addEnvPhotoSlot,
+  MIN_ENV_PHOTO_COUNT,
 } from '../lib/storeDraft';
+import StorePackagesForm from '../components/StorePackagesForm';
+import { normalizePackageFormItems, validatePackageFormItems } from '../lib/storePackages';
 
-
-
-const STEPS = ['基本信息', '照片上传', '结算资质'] as const;
+const STEPS = ['基本信息', '照片上传', '结算资质', '门店套餐'] as const;
 
 type StoreCategoryNode = {
   id: string;
@@ -77,6 +79,8 @@ function isPhoneValidationMessage(message: string) {
 
 export default function StoreCreatePage() {
 
+  usePartnerPageView('partner_store_create_view');
+
   const navigate = useNavigate();
 
   const { account } = usePartnerSession();
@@ -101,9 +105,8 @@ export default function StoreCreatePage() {
 
   const [categoryTree, setCategoryTree] = useState<StoreCategoryNode[]>([]);
 
-  const [locating, setLocating] = useState(false);
-
   const [mapPickerOpen, setMapPickerOpen] = useState(false);
+  const [stepErrorModal, setStepErrorModal] = useState<string | null>(null);
 
   const draftSaveDisabledRef = useRef(false);
 
@@ -111,9 +114,14 @@ export default function StoreCreatePage() {
     setSubmitError(message);
   }
 
+  function reportStepError(message: string) {
+    setSubmitError(message);
+    setStepErrorModal(message);
+  }
+
   const stepFromUrl = Number(params.get('step') || 0);
 
-  const step = stepFromUrl >= 1 && stepFromUrl <= 3 ? stepFromUrl : (saved?.step ?? 1);
+  const step = stepFromUrl >= 1 && stepFromUrl <= 4 ? stepFromUrl : (saved?.step ?? 1);
 
 
 
@@ -134,7 +142,12 @@ export default function StoreCreatePage() {
     saveStoreDraft({ step, form }, accountId);
   }, [step, form, accountId]);
 
-
+  useEffect(() => {
+    if (step !== 2 || !isWechatEnv()) return;
+    void weixinSdk.init().catch(() => {
+      /* OssUploadField 点击时会再次初始化 */
+    });
+  }, [step]);
 
   useEffect(() => {
 
@@ -298,7 +311,7 @@ export default function StoreCreatePage() {
       const msg = validateStoreStep1(form);
 
       if (msg) {
-        reportFormError(msg);
+        reportStepError(msg);
         return;
       }
 
@@ -309,19 +322,32 @@ export default function StoreCreatePage() {
       const msg = validateStoreStep2(form);
 
       if (msg) {
-        reportFormError(msg);
+        reportStepError(msg);
         return;
       }
 
     }
 
+    if (step === 3) {
+      const msg = validateStoreStep3(form);
+      if (msg) {
+        if (isPhoneValidationMessage(msg)) {
+          setFieldErrors({ phone: msg });
+          reportStepError(msg);
+          return;
+        }
+        reportStepError(msg);
+        return;
+      }
+    }
+
     goStep(step + 1);
 
   }
 
 
 
-  async function submit() {
+  async function submit(skipPackages = false) {
 
     const msg = validateStoreStep3(form);
 
@@ -334,6 +360,15 @@ export default function StoreCreatePage() {
       return;
     }
 
+    const packagesToSubmit = skipPackages ? [] : form.packages || [];
+    if (!skipPackages) {
+      const pkgMsg = validatePackageFormItems(packagesToSubmit);
+      if (pkgMsg) {
+        reportFormError(pkgMsg);
+        return;
+      }
+    }
+
     const step1Msg = validateStoreStep1(form);
 
     if (step1Msg) {
@@ -469,6 +504,15 @@ export default function StoreCreatePage() {
 
       draftSaveDisabledRef.current = true;
       clearAllStoreDrafts(accountId);
+      const packages = normalizePackageFormItems(packagesToSubmit);
+      if (packages.length) {
+        await request('PARTNER_H5', `/partner/stores/${result.store.id}/packages`, {
+          method: 'PUT',
+          body: JSON.stringify({
+            packages: packages.map((p) => ({ ...p, price: Number(p.price).toFixed(2) })),
+          }),
+        });
+      }
       setForm(defaultStoreForm());
       setFieldErrors({});
       setSubmitError('');
@@ -493,7 +537,7 @@ export default function StoreCreatePage() {
 
 
 
-  const progress = step === 1 ? 0 : step === 2 ? 50 : 100;
+  const progress = step === 1 ? 0 : step === 2 ? 33 : step === 3 ? 66 : 100;
 
   const nextDisabled = submitting;
 
@@ -662,31 +706,6 @@ export default function StoreCreatePage() {
               <textarea rows={2} placeholder="请输入详细门牌号" value={form.address} onChange={(e) => patchForm({ address: e.target.value })} />
 
               <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 8, flexWrap: 'wrap' }}>
-                <button
-                  type="button"
-                  className="partner-btn-outline"
-                  style={{ padding: '8px 12px', fontSize: 13 }}
-                  disabled={locating}
-                  onClick={() => {
-                    void (async () => {
-                      setLocating(true);
-                      try {
-                        const pos = await locateStorePosition();
-                        patchForm({
-                          latitude: String(pos.latitude),
-                          longitude: String(pos.longitude),
-                        });
-                        toastSuccess('已获取当前坐标');
-                      } catch (e) {
-                        toastError(e instanceof Error ? e.message : '定位失败');
-                      } finally {
-                        setLocating(false);
-                      }
-                    })();
-                  }}
-                >
-                  {locating ? '定位中…' : '获取当前位置'}
-                </button>
                 <button
                   type="button"
                   className="partner-btn-outline"
@@ -696,11 +715,12 @@ export default function StoreCreatePage() {
                   地图选点
                 </button>
                 <span className="label-md text-muted">
-                  {formatStoreCoords(form.latitude, form.longitude)
-                    ? `坐标：${formatStoreCoords(form.latitude, form.longitude)}`
-                    : '未定位（可定位或地图选点）'}
+                  {form.latitude.trim() && form.longitude.trim() ? '已选点' : '未选点'}
                 </span>
               </div>
+              {/* 经纬度仅内存/提交用，界面不展示 */}
+              <input type="hidden" name="latitude" value={form.latitude} readOnly />
+              <input type="hidden" name="longitude" value={form.longitude} readOnly />
 
             </div>
 
@@ -928,7 +948,7 @@ export default function StoreCreatePage() {
 
               onChange={(coverUrl) => patchForm({ coverUrl })}
 
-              label="从系统相册选择"
+              label="拍照 / 从相册选择"
 
             />
 
@@ -940,7 +960,7 @@ 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' }}>至少 3 张，展示店内整洁环境</p>
+            <p className="label-md text-muted" style={{ margin: '4px 0 12px' }}>至少 {MIN_ENV_PHOTO_COUNT} 张，展示店内整洁环境</p>
 
             <div className="partner-upload-grid">
 
@@ -966,6 +986,17 @@ export default function StoreCreatePage() {
 
             </div>
 
+            <button
+              type="button"
+              className="partner-btn-outline"
+              style={{ width: '100%', marginTop: 12 }}
+              onClick={() =>
+                setForm((prev) => ({ ...prev, envPhotoUrls: addEnvPhotoSlot(prev.envPhotoUrls) }))
+              }
+            >
+              添加环境照片
+            </button>
+
           </section>
 
 
@@ -974,7 +1005,7 @@ 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' }}>拍照上传签约协议首页与盖章页</p>
 
             <OssUploadField
 
@@ -1117,6 +1148,26 @@ export default function StoreCreatePage() {
 
       )}
 
+      {step === 4 && (
+        <>
+          <section className="partner-form-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 }}>
+              可选填写；提交后将进入总部审核。也可在最后一页点击「跳过」。
+            </p>
+            <StorePackagesForm
+              items={form.packages?.length ? form.packages : [{ name: '', price: '', dishes: '', usableTime: '', otherNotes: '', sortOrder: 0 }]}
+              onChange={(packages) => setForm((prev) => ({ ...prev, packages }))}
+              disabled={submitting}
+              embedded
+            />
+          </section>
+        </>
+      )}
+
 
 
       <footer className="partner-sticky-footer">
@@ -1131,7 +1182,7 @@ export default function StoreCreatePage() {
 
         )}
 
-        {step < 3 ? (
+        {step < 4 ? (
 
           <button type="button" className="partner-btn-primary" onClick={() => void handleNext()} disabled={nextDisabled}>
 
@@ -1143,16 +1194,37 @@ export default function StoreCreatePage() {
 
         ) : (
 
-          <button type="button" className="partner-btn-primary" onClick={() => void submit()} disabled={submitting}>
+          <>
+            <button type="button" className="partner-btn-outline" onClick={() => void submit(true)} disabled={submitting}>
+              跳过
+            </button>
+            <button type="button" className="partner-btn-primary" onClick={() => void submit(false)} disabled={submitting}>
 
-            {submitting ? '提交中…' : '提交'}
+              {submitting ? '提交中…' : '提交'}
 
-          </button>
+            </button>
+          </>
 
         )}
 
       </footer>
 
+      {stepErrorModal ? (
+        <div className="partner-ship-modal-backdrop" role="presentation" onClick={() => setStepErrorModal(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.6, whiteSpace: 'pre-wrap' }}>
+              {stepErrorModal}
+            </p>
+            <div className="partner-ship-actions">
+              <button type="button" className="partner-btn-primary" onClick={() => setStepErrorModal(null)}>
+                我知道了
+              </button>
+            </div>
+          </div>
+        </div>
+      ) : null}
+
       <TencentLocPickerOverlay
         open={mapPickerOpen}
         onClose={() => setMapPickerOpen(false)}
@@ -1164,9 +1236,7 @@ export default function StoreCreatePage() {
             longitude: String(loc.longitude),
             ...(loc.address && !form.address.trim() ? { address: loc.address } : {}),
           });
-          toastSuccess(
-            `已选点 ${loc.latitude.toFixed(6)}, ${loc.longitude.toFixed(6)}${loc.name ? `（${loc.name}）` : ''}`,
-          );
+          toastSuccess(loc.name ? `已选定：${loc.name}` : '位置已选定');
         }}
       />
 

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

@@ -5,8 +5,7 @@ import { request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { canManagePartnerStore } from '../lib/partnerAccess';
-import { normalizeStringArray, patchEnvPhotoAt } from '../lib/storeDraft';
-import { formatStoreCoords, locateStorePosition } from '../lib/storeLocate';
+import { MIN_ENV_PHOTO_COUNT, normalizeStringArray, patchEnvPhotoAt, addEnvPhotoSlot } from '../lib/storeDraft';
 import OssUploadField from '../components/OssUploadField';
 import TencentLocPickerOverlay from '../components/TencentLocPickerOverlay';
 import {
@@ -17,9 +16,9 @@ import {
   storeStatusPillClass,
   type StoreStatusValue,
 } from '../lib/storeStatus';
+import { usePartnerPageView } from '../lib/usePageView';
 
 const STATUS_OPTIONS: StoreStatusValue[] = ['OPEN', 'PAUSED', 'CLOSED'];
-const ENV_SLOT_COUNT = 3;
 
 function uniqueEnvUrls(urls: string[]): string[] {
   const seen = new Set<string>();
@@ -35,6 +34,7 @@ function uniqueEnvUrls(urls: string[]): string[] {
 
 export default function StoreDetailPage() {
   const { id } = useParams();
+  usePartnerPageView('partner_store_detail_view', id ? { storeId: id } : undefined);
   const navigate = useNavigate();
   const { account } = usePartnerSession();
   const canMutate = canManagePartnerStore(account);
@@ -55,7 +55,6 @@ export default function StoreDetailPage() {
   const [statusSaving, setStatusSaving] = useState(false);
   const [saving, setSaving] = useState(false);
   const [mediaSaving, setMediaSaving] = useState(false);
-  const [locating, setLocating] = useState(false);
   const [mapPickerOpen, setMapPickerOpen] = useState(false);
   const [actionError, setActionError] = useState('');
   const [closeConfirmOpen, setCloseConfirmOpen] = useState(false);
@@ -83,7 +82,7 @@ export default function StoreDetailPage() {
             .map((m) => String(m.url || '')),
         )
       : [];
-    setEnvPhotoUrls(normalizeStringArray(envFromMedia, ENV_SLOT_COUNT));
+    setEnvPhotoUrls(normalizeStringArray(envFromMedia, MIN_ENV_PHOTO_COUNT));
   }
 
   useEffect(() => {
@@ -198,8 +197,8 @@ export default function StoreDetailPage() {
       setActionError('请上传门头照');
       return;
     }
-    if (nextEnv.length < ENV_SLOT_COUNT) {
-      setActionError(`请上传至少 ${ENV_SLOT_COUNT} 张环境照片`);
+    if (nextEnv.length < MIN_ENV_PHOTO_COUNT) {
+      setActionError(`请上传至少 ${MIN_ENV_PHOTO_COUNT} 张环境照片`);
       return;
     }
     setMediaSaving(true);
@@ -279,6 +278,18 @@ export default function StoreDetailPage() {
           )}
         </section>
 
+        {canMutate && !auditPending && status !== 'CLOSED' && (
+          <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>
+            </div>
+            <p className="label-md text-muted" style={{ marginTop: 8 }}>维护可核销套餐信息，提交后由总部审核。</p>
+          </section>
+        )}
+
         {canMutate && (
         <section className="partner-form-card" style={{ margin: '0 0 16px' }}>
           <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
@@ -326,7 +337,7 @@ export default function StoreDetailPage() {
                 mediaType="IMAGE"
                 value={coverUrl}
                 onChange={setCoverUrl}
-                label="从系统相册选择"
+                label="拍照 / 从相册选择"
               />
             </div>
           )}
@@ -346,35 +357,6 @@ export default function StoreDetailPage() {
             <textarea disabled={readOnly} rows={2} value={form.address} onChange={(e) => setForm({ ...form, address: e.target.value })} />
             {!readOnly ? (
               <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 8, flexWrap: 'wrap' }}>
-                <button
-                  type="button"
-                  className="partner-btn-outline"
-                  style={{ padding: '8px 12px', fontSize: 13 }}
-                  disabled={locating}
-                  onClick={() => {
-                    void (async () => {
-                      setLocating(true);
-                      setActionError('');
-                      try {
-                        const pos = await locateStorePosition();
-                        setForm((prev) => ({
-                          ...prev,
-                          latitude: String(pos.latitude),
-                          longitude: String(pos.longitude),
-                        }));
-                        toastSuccess('已获取当前坐标');
-                      } catch (e) {
-                        const msg = e instanceof Error ? e.message : '定位失败';
-                        setActionError(msg);
-                        toastError(msg);
-                      } finally {
-                        setLocating(false);
-                      }
-                    })();
-                  }}
-                >
-                  {locating ? '定位中…' : '获取当前位置'}
-                </button>
                 <button
                   type="button"
                   className="partner-btn-outline"
@@ -384,16 +366,12 @@ export default function StoreDetailPage() {
                   地图选点
                 </button>
                 <span className="label-md text-muted">
-                  {formatStoreCoords(form.latitude, form.longitude)
-                    ? `坐标：${formatStoreCoords(form.latitude, form.longitude)}`
-                    : '未定位'}
+                  {form.latitude.trim() && form.longitude.trim() ? '已选点' : '未选点'}
                 </span>
               </div>
-            ) : formatStoreCoords(form.latitude, form.longitude) ? (
-              <p className="label-md text-muted" style={{ marginTop: 6 }}>
-                坐标：{formatStoreCoords(form.latitude, form.longitude)}
-              </p>
             ) : null}
+            <input type="hidden" name="latitude" value={form.latitude} readOnly />
+            <input type="hidden" name="longitude" value={form.longitude} readOnly />
           </div>
           <div className="partner-field">
             <label>门店简介</label>
@@ -423,7 +401,7 @@ export default function StoreDetailPage() {
             <h3 className="headline-md" style={{ borderLeft: '4px solid var(--color-heritage-red)', paddingLeft: 12 }}>店内环境</h3>
             <span className="label-md text-muted">
               {canMutate && !readOnly
-                ? `需 ${ENV_SLOT_COUNT} 张 · 已选 ${uniqueEnvUrls(envPhotoUrls).length} 张`
+                ? `至少 ${MIN_ENV_PHOTO_COUNT} 张 · 已选 ${uniqueEnvUrls(envPhotoUrls).length} 张`
                 : envPhotos.length
                   ? `已上传 ${envPhotos.length} 张`
                   : '暂无照片'}
@@ -443,6 +421,14 @@ export default function StoreDetailPage() {
                   />
                 ))}
               </div>
+              <button
+                type="button"
+                className="partner-btn-outline"
+                style={{ width: '100%', marginTop: 12 }}
+                onClick={() => setEnvPhotoUrls((prev) => addEnvPhotoSlot(prev))}
+              >
+                添加环境照片
+              </button>
               <button
                 type="button"
                 className="partner-btn-outline"
@@ -523,9 +509,7 @@ export default function StoreDetailPage() {
             longitude: String(loc.longitude),
             ...(loc.address && !prev.address.trim() ? { address: loc.address } : {}),
           }));
-          toastSuccess(
-            `已选点 ${loc.latitude.toFixed(6)}, ${loc.longitude.toFixed(6)}${loc.name ? `（${loc.name}）` : ''}`,
-          );
+          toastSuccess(loc.name ? `已选定：${loc.name}` : '位置已选定');
         }}
       />
     </div>

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

@@ -13,6 +13,7 @@ import {
   storeStatusPillClass,
   type StoreStatusValue,
 } from '../lib/storeStatus';
+import { usePartnerPageView } from '../lib/usePageView';
 
 type StatusFilter = 'ALL' | StoreStatusValue | 'PENDING_AUDIT' | 'REJECTED';
 
@@ -26,6 +27,7 @@ const FILTERS: { key: StatusFilter; label: string }[] = [
 ];
 
 export default function StoreListPage() {
+  usePartnerPageView('partner_store_list_view');
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const { account } = usePartnerSession();

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

@@ -0,0 +1,143 @@
+import { useEffect, useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import type { StorePackagesResponse } from '@dukang/shared-types';
+import StorePackagesForm from '../components/StorePackagesForm';
+import { request } from '../lib/api';
+import { toastError, toastSuccess } from '../lib/toast';
+import {
+  emptyPackage,
+  normalizePackageFormItems,
+  validatePackageFormItems,
+  type PackageFormItem,
+} from '../lib/storePackages';
+
+export default function StorePackagesPage() {
+  const { id } = useParams();
+  const navigate = useNavigate();
+  const [items, setItems] = useState<PackageFormItem[]>([emptyPackage()]);
+  const [pending, setPending] = useState<StorePackagesResponse['pendingRequest']>(null);
+  const [loading, setLoading] = useState(true);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState('');
+
+  useEffect(() => {
+    if (!id) return;
+    setLoading(true);
+    request<StorePackagesResponse>('PARTNER_H5', `/partner/stores/${id}/packages`)
+      .then((data) => {
+        const base = data.pendingRequest?.packages?.length
+          ? data.pendingRequest.packages
+          : data.live?.length
+            ? data.live
+            : [emptyPackage()];
+        setItems(base.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i })));
+        setPending(data.pendingRequest ?? null);
+      })
+      .catch((e) => setError(e instanceof Error ? e.message : '加载失败'))
+      .finally(() => setLoading(false));
+  }, [id]);
+
+  async function submitAudit() {
+    if (!id) return;
+    const msg = validatePackageFormItems(items);
+    if (msg) {
+      toastError(msg);
+      return;
+    }
+    if (pending?.status === 'PENDING') {
+      toastError('已有套餐变更审核中，请等待总部处理');
+      return;
+    }
+    setSubmitting(true);
+    try {
+      const packages = normalizePackageFormItems(items).map((p) => ({
+        ...p,
+        price: Number(p.price).toFixed(2),
+      }));
+      await request('PARTNER_H5', `/partner/stores/${id}/packages`, {
+        method: 'PUT',
+        body: JSON.stringify({ packages }),
+      });
+      toastSuccess('已提交审核');
+      navigate(`/stores/${id}`);
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '提交失败');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  if (loading) {
+    return (
+      <div className="partner-detail-page partner-home--flush-top">
+        <main style={{ padding: '24px 20px' }}>
+          <p className="label-md text-muted">加载中…</p>
+        </main>
+      </div>
+    );
+  }
+
+  return (
+    <div className="partner-page-sticky partner-home--flush-top">
+      <header className="partner-packages-page-header">
+        <button type="button" className="partner-packages-back" onClick={() => navigate(`/stores/${id}`)}>
+          <span className="material-symbols-outlined">arrow_back</span>
+        </button>
+        <h1 className="headline-md">门店套餐</h1>
+      </header>
+
+      <main className="partner-packages-page-main">
+        {error ? <p className="partner-form-error" role="alert">{error}</p> : null}
+
+        {pending?.status === 'PENDING' ? (
+          <div className="partner-info-banner">
+            <span className="material-symbols-outlined" style={{ color: 'var(--color-heritage-red)' }}>hourglass_top</span>
+            <p className="body-md">套餐变更审核中，C 端仍展示上一版生效套餐。</p>
+          </div>
+        ) : null}
+
+        {pending?.status === 'REJECTED' && pending.rejectReason ? (
+          <div className="partner-info-banner" style={{ background: 'rgba(180,35,24,0.06)', borderColor: 'rgba(180,35,24,0.15)' }}>
+            <span className="material-symbols-outlined" style={{ color: 'var(--color-heritage-red)' }}>error</span>
+            <p className="body-md">上次驳回：{pending.rejectReason}</p>
+          </div>
+        ) : null}
+
+        <section className="partner-form-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 }}>
+            提交后将由总部审核，通过后 C 端展示生效套餐。
+          </p>
+          <StorePackagesForm
+            items={items}
+            onChange={setItems}
+            disabled={pending?.status === 'PENDING' || submitting}
+            embedded
+          />
+        </section>
+      </main>
+
+      <footer className="partner-sticky-footer">
+        <button
+          type="button"
+          className="partner-btn-outline"
+          onClick={() => navigate(`/stores/${id}`)}
+          disabled={submitting}
+        >
+          返回
+        </button>
+        <button
+          type="button"
+          className="partner-btn-primary"
+          disabled={submitting || pending?.status === 'PENDING'}
+          onClick={() => void submitAudit()}
+        >
+          {submitting ? '提交中…' : '提交审核'}
+        </button>
+      </footer>
+    </div>
+  );
+}

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

@@ -4,6 +4,7 @@ import type { PartnerWeeklyReportResponse } from '@dukang/shared-types';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { fetchPartnerWeeklyReport } from '../lib/weeklyReport';
+import { usePartnerPageView } from '../lib/usePageView';
 
 function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 0 });
@@ -15,6 +16,7 @@ function fmtGrowth(n: number) {
 }
 
 export default function WeeklyReportPage() {
+  usePartnerPageView('partner_weekly_report_view');
   const navigate = useNavigate();
   const [selectedStart, setSelectedStart] = useState<string | undefined>();
   const [data, setData] = useState<PartnerWeeklyReportResponse | null>(null);

apps/h5-partner/src/styles.css

@@ -3374,6 +3374,50 @@ body {
   color: var(--color-muted, #999);
 }
 
+.partner-proxy-product-toolbar {
+  padding: 0 16px 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.partner-proxy-product-filters {
+  display: flex;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.partner-proxy-product-filter {
+  border: 1px solid var(--color-border);
+  background: #fff;
+  border-radius: 999px;
+  padding: 4px 12px;
+  font-size: 12px;
+  color: var(--color-muted, #888);
+}
+
+.partner-proxy-product-filter.is-active {
+  border-color: var(--color-heritage-red);
+  color: var(--color-heritage-red);
+  background: rgba(166, 29, 36, 0.06);
+}
+
+.partner-proxy-product-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  margin-top: 6px;
+}
+
+.partner-proxy-tag {
+  font-size: 11px;
+  line-height: 16px;
+  padding: 1px 6px;
+  border-radius: 4px;
+  background: rgba(0, 0, 0, 0.04);
+  color: var(--color-muted, #666);
+}
+
 .partner-proxy-product-list {
   padding: 0 16px 24px;
   display: flex;
@@ -3590,3 +3634,107 @@ header:has(> .app-page-title:only-child),
   border: none !important;
   box-shadow: none !important;
 }
+
+/* ─── 门店套餐 ─── */
+.partner-packages-page-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 12px var(--space-page) 8px;
+  background: var(--color-surface);
+  border-bottom: 1px solid rgba(226, 190, 188, 0.12);
+}
+
+.partner-packages-back {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 40px;
+  height: 40px;
+  border: none;
+  background: transparent;
+  color: var(--color-on-surface);
+  padding: 0;
+}
+
+.partner-packages-page-main {
+  padding-bottom: 88px;
+}
+
+.partner-packages-form--embedded .partner-packages-item {
+  margin-bottom: var(--space-md);
+  box-shadow: none;
+  border: 1px solid rgba(226, 190, 188, 0.2);
+}
+
+.partner-packages-form--embedded .partner-packages-item:last-of-type {
+  margin-bottom: 0;
+}
+
+.partner-packages-item-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: var(--space-md);
+}
+
+.partner-packages-item--collapsed .partner-packages-item-head {
+  margin-bottom: 0;
+}
+
+.partner-packages-toggle {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  border: none;
+  background: transparent;
+  padding: 0;
+  color: inherit;
+  cursor: pointer;
+  text-align: left;
+  flex: 1;
+  min-width: 0;
+}
+
+.partner-packages-toggle .material-symbols-outlined {
+  font-size: 20px;
+  color: var(--color-on-surface-variant, #666);
+  flex-shrink: 0;
+}
+
+.partner-packages-toggle .headline-md {
+  margin: 0;
+}
+
+.partner-packages-remove {
+  border: none;
+  background: transparent;
+  color: var(--color-heritage-red);
+  font-size: 13px;
+  padding: 4px 0;
+}
+
+.partner-packages-add {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  width: calc(100% - var(--space-page) * 2);
+  margin: 0 var(--space-page) var(--space-md);
+  min-height: 48px;
+  border: 1px dashed rgba(166, 29, 36, 0.35);
+  border-radius: var(--radius-md);
+  background: rgba(166, 29, 36, 0.04);
+  color: var(--color-heritage-red);
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.partner-packages-add .material-symbols-outlined {
+  font-size: 20px;
+}
+
+.partner-packages-form:not(.partner-packages-form--embedded) .partner-packages-item {
+  margin-left: var(--space-page);
+  margin-right: var(--space-page);
+}

apps/h5-shop/package.json

@@ -9,6 +9,7 @@
     "lint": "echo ok"
   },
   "dependencies": {
+    "@dukang/client-logging": "workspace:*",
     "@dukang/shared-ui": "workspace:*",
     "@dukang/shared-types": "workspace:*",
     "@dukang/weixin-sdk": "workspace:*",

apps/h5-shop/public/MP_verify_ayPJ4CQqbUcec3jX.txt

@@ -0,0 +1 @@
+ayPJ4CQqbUcec3jX

apps/h5-shop/src/App.tsx

@@ -5,12 +5,15 @@ import LoginPage from './pages/LoginPage';
 import LegalPage from './pages/LegalPage';
 import SelectStorePage from './pages/SelectStorePage';
 import HomePage from './pages/HomePage';
+import RedeemConfirmPage from './pages/RedeemConfirmPage';
 import PhoneRedeemPage from './pages/PhoneRedeemPage';
 import RedeemSuccessPage from './pages/RedeemSuccessPage';
 import RecordsPage from './pages/RecordsPage';
 import StatusPage from './pages/StatusPage';
 import MinePage from './pages/MinePage';
 import StaffPage from './pages/StaffPage';
+import WithdrawPage from './pages/WithdrawPage';
+import PackagesPage from './pages/PackagesPage';
 
 export default function App() {
   return (
@@ -21,7 +24,9 @@ export default function App() {
         <Route path="/legal/privacy-policy" element={<LegalPage docId="privacy-policy" />} />
         <Route path="/select-store" element={<SelectStorePage />} />
         <Route path="/staff" element={<StaffPage />} />
-        <Route path="/redeem" element={<Navigate to="/redeem/phone" replace />} />
+        <Route path="/withdraw" element={<WithdrawPage />} />
+        <Route path="/packages" element={<PackagesPage />} />
+        <Route path="/redeem" element={<RedeemConfirmPage />} />
         <Route path="/redeem/phone" element={<PhoneRedeemPage />} />
         <Route path="/redeem/success" element={<RedeemSuccessPage />} />
         <Route element={<TabLayout />}>

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

@@ -1,4 +1,5 @@
 import { Navigate, useLocation } from 'react-router-dom';
+import { getStoreProfile, hasShopWxSession } from '../lib/api';
 import { useStoreSession } from '../contexts/StoreSessionContext';
 
 const PUBLIC_PATHS = new Set(['/login', '/legal/user-agreement', '/legal/privacy-policy']);
@@ -25,6 +26,10 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
   }
 
   if (!authenticated && !PUBLIC_PATHS.has(location.pathname)) {
+    const profile = getStoreProfile();
+    if (profile && hasShopWxSession() && location.pathname !== '/login') {
+      return <Navigate to="/login?quick=1" replace state={{ from: location }} />;
+    }
     return <Navigate to="/login" replace state={{ from: location }} />;
   }
 

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

@@ -0,0 +1,187 @@
+import { useRef, useState } from 'react';
+import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import { emptyPackage, type PackageFormItem } from '../lib/storePackages';
+import { uploadFileToOss } from '../lib/upload';
+
+type Props = {
+  items: PackageFormItem[];
+  onChange: (items: PackageFormItem[]) => void;
+  disabled?: boolean;
+};
+
+export default function ShopPackagesForm({ items, onChange, disabled }: Props) {
+  const [collapsed, setCollapsed] = useState<Record<number, boolean>>({});
+  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);
+    try {
+      const result = await uploadFileToOss(file, 'STORE_PACKAGE');
+      updateAt(index, { imageUrl: result.url });
+    } finally {
+      setUploadingIndex(null);
+    }
+  }
+
+  function updateAt(index: number, patch: Partial<PackageFormItem>) {
+    onChange(items.map((item, i) => (i === index ? { ...item, ...patch } : item)));
+  }
+
+  function addItem() {
+    if (items.length >= STORE_PACKAGE_MAX_COUNT) return;
+    onChange([...items, emptyPackage(items.length)]);
+  }
+
+  function removeAt(index: number) {
+    onChange(items.filter((_, i) => i !== index).map((item, i) => ({ ...item, sortOrder: i })));
+    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;
+    });
+  }
+
+  function toggleCollapse(index: number) {
+    setCollapsed((prev) => ({ ...prev, [index]: !prev[index] }));
+  }
+
+  const list = items.length ? items : [emptyPackage(0)];
+
+  return (
+    <div className="shop-packages-form">
+      {list.map((item, index) => {
+        const isCollapsed = !!collapsed[index];
+        const displayName = item.name.trim() || `套餐 ${index + 1}`;
+        return (
+          <section key={index} className={`shop-packages-card${isCollapsed ? ' shop-packages-card--collapsed' : ''}`}>
+            <div className="shop-packages-card-head">
+              <button
+                type="button"
+                className="shop-packages-toggle"
+                onClick={() => toggleCollapse(index)}
+                aria-expanded={!isCollapsed}
+                aria-label={isCollapsed ? '展开套餐' : '收起套餐'}
+              >
+                <span className="material-symbols-outlined">
+                  {isCollapsed ? 'expand_more' : 'expand_less'}
+                </span>
+                <span className="shop-packages-card-title">{displayName}</span>
+              </button>
+              {!disabled && list.length > 1 ? (
+                <button type="button" className="shop-packages-remove" onClick={() => removeAt(index)}>
+                  删除
+                </button>
+              ) : null}
+            </div>
+
+            {!isCollapsed ? (
+              <>
+                <label className="shop-packages-field">
+                  <span className="shop-packages-label">套餐名称 *</span>
+                  <input
+                    className="shop-packages-input"
+                    placeholder="如：套餐A"
+                    value={item.name}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { name: e.target.value })}
+                  />
+                </label>
+
+                <label className="shop-packages-field">
+                  <span className="shop-packages-label">价格（元） *</span>
+                  <input
+                    className="shop-packages-input"
+                    type="number"
+                    min={0}
+                    step={0.01}
+                    placeholder="198"
+                    value={item.price}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { price: e.target.value })}
+                  />
+                </label>
+
+                <label className="shop-packages-field">
+                  <span className="shop-packages-label">菜品 *</span>
+                  <textarea
+                    className="shop-packages-textarea"
+                    rows={3}
+                    placeholder="红烧肉、红烧鱼、油焖茄子"
+                    value={item.dishes}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { dishes: e.target.value })}
+                  />
+                </label>
+
+                <label className="shop-packages-field">
+                  <span className="shop-packages-label">使用时间</span>
+                  <input
+                    className="shop-packages-input"
+                    placeholder="节假日除外"
+                    value={item.usableTime || ''}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { usableTime: e.target.value })}
+                  />
+                </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 }}
+                    />
+                  ) : null}
+                  <input
+                    ref={(el) => {
+                      fileRefs.current[index] = el;
+                    }}
+                    type="file"
+                    accept="image/*"
+                    hidden
+                    disabled={disabled}
+                    onChange={(e) => void pickPackageImage(index, e.target.files?.[0])}
+                  />
+                  <button
+                    type="button"
+                    className="shop-packages-add"
+                    style={{ marginTop: 0 }}
+                    disabled={disabled || uploadingIndex === index}
+                    onClick={() => fileRefs.current[index]?.click()}
+                  >
+                    {uploadingIndex === index ? '上传中…' : item.imageUrl ? '更换图片' : '上传图片'}
+                  </button>
+                </label>
+
+                <label className="shop-packages-field">
+                  <span className="shop-packages-label">其他说明</span>
+                  <input
+                    className="shop-packages-input"
+                    placeholder="不可叠加"
+                    value={item.otherNotes || ''}
+                    disabled={disabled}
+                    onChange={(e) => updateAt(index, { otherNotes: e.target.value })}
+                  />
+                </label>
+              </>
+            ) : null}
+          </section>
+        );
+      })}
+
+      {!disabled && list.length < STORE_PACKAGE_MAX_COUNT ? (
+        <button type="button" className="shop-packages-add" onClick={addItem}>
+          <span className="material-symbols-outlined">add_circle</span>
+          添加套餐
+        </button>
+      ) : null}
+    </div>
+  );
+}

apps/h5-shop/src/contexts/StoreSessionContext.tsx

@@ -7,6 +7,8 @@ import {
   useState,
   type ReactNode,
 } from 'react';
+import { stripOAuthParamsFromLocation } from '@dukang/weixin-sdk';
+import { isWxAuthorizeEnabled } from '@dukang/shared-types';
 import {
   clearAuth,
   ensureSession,
@@ -14,6 +16,16 @@ import {
   type ShopSessionPayload,
   type StoreSessionStore,
 } from '../lib/api';
+import {
+  fetchClientConfig,
+  handleShopWechatCallback,
+  handleShopWechatCallbackOnce,
+  handleShopWechatLoginResult,
+  isShopWechatUnboundError,
+  SHOP_WX_NEED_PHONE_LOGIN_MSG,
+  stashShopWechatLoginHint,
+} from '../lib/wechat-auth';
+import { isWechatEnv } from '../lib/weixin';
 
 type StoreSessionContextValue = {
   ready: boolean;
@@ -26,6 +38,12 @@ type StoreSessionContextValue = {
 
 const StoreSessionContext = createContext<StoreSessionContextValue | null>(null);
 
+function deriveSelectStore(session: ShopSessionPayload, nextStore: StoreSessionStore | null) {
+  const storeId = nextStore?.storeId || session.selectedStoreId || '';
+  const stores = session.stores ?? nextStore?.stores ?? [];
+  return stores.length > 1 && !storeId;
+}
+
 export function StoreSessionProvider({ children }: { children: ReactNode }) {
   const [ready, setReady] = useState(false);
   const [authenticated, setAuthenticated] = useState(false);
@@ -43,9 +61,7 @@ export function StoreSessionProvider({ children }: { children: ReactNode }) {
         }
       : null;
     setStore(nextStore);
-    const storeId = nextStore?.storeId || session.selectedStoreId || '';
-    const stores = session.stores ?? nextStore?.stores ?? [];
-    setNeedsSelectStore(stores.length > 1 && !storeId);
+    setNeedsSelectStore(deriveSelectStore(session, nextStore));
   }, []);
 
   const resetSession = useCallback(() => {
@@ -59,6 +75,27 @@ export function StoreSessionProvider({ children }: { children: ReactNode }) {
     let cancelled = false;
     (async () => {
       try {
+        const params = new URLSearchParams(window.location.search);
+        if (isWechatEnv() && params.get('code')) {
+          try {
+            const config = await fetchClientConfig();
+            if (isWxAuthorizeEnabled(config)) {
+              const result = await handleShopWechatCallbackOnce();
+              if (result && !cancelled) {
+                const session = handleShopWechatLoginResult(result);
+                if (session) applySession(session);
+              }
+              stripOAuthParamsFromLocation();
+            }
+          } catch (e) {
+            const raw = e instanceof Error ? e.message : '';
+            if (isShopWechatUnboundError(raw)) {
+              stashShopWechatLoginHint(SHOP_WX_NEED_PHONE_LOGIN_MSG);
+            }
+            stripOAuthParamsFromLocation();
+          }
+        }
+
         const result = await ensureSession();
         if (cancelled) return;
         setAuthenticated(result.authenticated);
@@ -73,7 +110,7 @@ export function StoreSessionProvider({ children }: { children: ReactNode }) {
     return () => {
       cancelled = true;
     };
-  }, [resetSession]);
+  }, [applySession, resetSession]);
 
   const value = useMemo(
     () => ({ ready, authenticated, needsSelectStore, store, applySession, resetSession }),

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

@@ -0,0 +1,26 @@
+import { createStoreTracker } from '@dukang/client-logging';
+import { apiBase } from './api';
+
+const tracker = createStoreTracker({
+  apiBase,
+  clientApp: 'SHOP_H5',
+  getToken: () => localStorage.getItem('shopAccessToken'),
+  getStoreId: () => {
+    try {
+      const raw = localStorage.getItem('shopSession');
+      if (!raw) return null;
+      const parsed = JSON.parse(raw) as { storeId?: string };
+      return parsed.storeId ?? null;
+    } catch {
+      return null;
+    }
+  },
+});
+
+export function trackStore(eventName: string, params?: Record<string, unknown>) {
+  tracker.track(eventName, params);
+}
+
+export function trackStorePageView(eventName: string, params?: Record<string, unknown>) {
+  tracker.trackPageView(eventName, params);
+}

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

@@ -1,3 +1,5 @@
+import { reportApiError } from '@dukang/client-logging';
+
 export const apiBase = '/api/v1';
 const CLIENT_APP = 'SHOP_H5';
 
@@ -213,6 +215,12 @@ async function rawRequest<T>(
   if (json.code !== 0) {
     const err = new Error(json.message || '请求失败') as Error & { status?: number };
     err.status = res.status >= 500 ? res.status : json.code;
+    if (json.code === 400) {
+      reportApiError(
+        { apiBase, clientApp: CLIENT_APP, getToken: () => localStorage.getItem(ACCESS_TOKEN) },
+        { message: json.message || '请求失败', status: 400, url: path, category: 'validation_error' },
+      );
+    }
     throw err;
   }
   return json.data as T;

apps/h5-shop/src/lib/client-error.ts

@@ -0,0 +1,99 @@
+import { apiBase } from './api';
+
+const CLIENT_APP = 'SHOP_H5';
+const ACCESS_TOKEN = 'accessToken';
+
+export type ClientErrorLevel = 'fatal' | 'error' | 'warn';
+export type ClientErrorCategory =
+  | 'js_error'
+  | 'unhandled_rejection'
+  | 'api_error'
+  | 'network'
+  | 'render'
+  | 'bridge'
+  | 'other';
+
+export type ClientErrorPayload = {
+  level: ClientErrorLevel;
+  category: ClientErrorCategory;
+  message: string;
+  stack?: string;
+  pagePath?: string;
+  extra?: Record<string, unknown>;
+};
+
+function currentPagePath(): string | undefined {
+  try {
+    return typeof window !== 'undefined' ? window.location.pathname : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function getToken(): string {
+  try {
+    return localStorage.getItem(ACCESS_TOKEN) || '';
+  } catch {
+    return '';
+  }
+}
+
+/** 上报客户端错误（失败静默，避免递归） */
+export function reportClientError(payload: ClientErrorPayload): void {
+  const body = {
+    level: payload.level,
+    category: payload.category,
+    message: String(payload.message || 'unknown').slice(0, 1000),
+    stack: payload.stack ? String(payload.stack).slice(0, 4000) : undefined,
+    pagePath: (payload.pagePath || currentPagePath() || '').slice(0, 128) || undefined,
+    clientApp: CLIENT_APP,
+    extra: payload.extra,
+  };
+
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+    'X-Client-App': CLIENT_APP,
+  };
+  const token = getToken();
+  if (token) headers.Authorization = `Bearer ${token}`;
+
+  void fetch(`${apiBase}/common/client-errors`, {
+    method: 'POST',
+    headers,
+    body: JSON.stringify(body),
+    keepalive: true,
+  }).catch(() => {});
+}
+
+let installed = false;
+
+/** 安装 H5 全局未捕获错误钩子（幂等） */
+export function installClientErrorReporting(): void {
+  if (installed || typeof window === 'undefined') return;
+  installed = true;
+
+  window.addEventListener('error', (ev) => {
+    reportClientError({
+      level: 'fatal',
+      category: 'js_error',
+      message: ev.message || 'window.error',
+      stack: ev.error instanceof Error ? ev.error.stack : undefined,
+      extra: { filename: ev.filename, lineno: ev.lineno, colno: ev.colno },
+    });
+  });
+
+  window.addEventListener('unhandledrejection', (ev) => {
+    const reason = ev.reason;
+    reportClientError({
+      level: 'error',
+      category: 'unhandled_rejection',
+      message:
+        reason instanceof Error
+          ? reason.message
+          : typeof reason === 'string'
+            ? reason
+            : 'unhandledrejection',
+      stack: reason instanceof Error ? reason.stack : undefined,
+    });
+  });
+}

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

@@ -0,0 +1,33 @@
+import { isIosDevice } from '@dukang/weixin-sdk';
+
+/** 扫码前发起 OAuth 时标记，回跳后在首页续扫 */
+export const SHOP_PENDING_SCAN_KEY = 'shop_pending_scan';
+
+export function markPendingScanAfterAuth(): void {
+  try {
+    sessionStorage.setItem(SHOP_PENDING_SCAN_KEY, '1');
+  } catch {
+    /* ignore */
+  }
+}
+
+export function peekPendingScanAfterAuth(): boolean {
+  try {
+    return sessionStorage.getItem(SHOP_PENDING_SCAN_KEY) === '1';
+  } catch {
+    return false;
+  }
+}
+
+export function clearPendingScanAfterAuth(): void {
+  try {
+    sessionStorage.removeItem(SHOP_PENDING_SCAN_KEY);
+  } catch {
+    /* ignore */
+  }
+}
+
+/** OAuth 回跳后延迟再调 scanQRCode（iOS JSSDK 离线校验更慢） */
+export function getPostAuthScanDelayMs(): number {
+  return isIosDevice() ? 1200 : 600;
+}

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

@@ -0,0 +1,48 @@
+import type { StorePackageItemDto } from '@dukang/shared-types';
+import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+
+export type PackageFormItem = StorePackageItemDto;
+
+export function emptyPackage(index = 0): PackageFormItem {
+  return {
+    name: '',
+    price: '',
+    dishes: '',
+    usableTime: '',
+    otherNotes: '',
+    imageUrl: '',
+    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,
+    }))
+    .filter(
+      (item) =>
+        item.name || item.price || item.dishes || item.usableTime || item.otherNotes || item.imageUrl,
+    );
+}
+
+export function validatePackageFormItems(items: PackageFormItem[]): string | null {
+  const filled = normalizePackageFormItems(items);
+  if (filled.length > STORE_PACKAGE_MAX_COUNT) {
+    return `套餐最多 ${STORE_PACKAGE_MAX_COUNT} 条`;
+  }
+  for (let i = 0; i < filled.length; i++) {
+    const item = filled[i];
+    if (!item.name) return `第 ${i + 1} 条套餐名称不能为空`;
+    const price = Number(item.price);
+    if (!Number.isFinite(price) || price < 0) return `第 ${i + 1} 条套餐价格须为非负数字`;
+    if (!item.dishes) return `第 ${i + 1} 条套餐菜品不能为空`;
+  }
+  return null;
+}

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

@@ -1,5 +1,10 @@
 import { apiBase } from './api';
 import { getStoreProfile } from './api';
+import {
+  compressImageFileIfNeeded,
+  DEFAULT_OSS_MAX_UPLOAD_BYTES,
+  formatOssMaxSizeMb,
+} from '@dukang/shared-ui/compressImage';
 
 const UPLOAD_TIMEOUT_MS = 120_000;
 
@@ -15,9 +20,13 @@ export type RegisteredResource = {
   url: string;
 };
 
-async function uploadFileToOss(file: File, bizType: string): Promise<UploadFileResult> {
+export async function uploadFileToOss(file: File, bizType: string): Promise<UploadFileResult> {
+  const compressed = await compressImageFileIfNeeded(file);
+  if (compressed.size > DEFAULT_OSS_MAX_UPLOAD_BYTES) {
+    throw new Error(`图片压缩后仍超过 ${formatOssMaxSizeMb()}MB，请换一张较小的图片`);
+  }
   const formData = new FormData();
-  formData.append('file', file);
+  formData.append('file', compressed);
   formData.append('bizType', bizType);
   formData.append('mediaType', 'IMAGE');
 

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

@@ -0,0 +1,11 @@
+import { useEffect, useRef } from 'react';
+import { trackStorePageView } from './analytics';
+
+export function useStorePageView(eventName: string, params?: Record<string, unknown>) {
+  const fired = useRef(false);
+  useEffect(() => {
+    if (fired.current) return;
+    fired.current = true;
+    trackStorePageView(eventName, params);
+  }, [eventName, params]);
+}

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

@@ -15,6 +15,40 @@ export type ShopAccountProfile = {
   store?: { name: string };
 };
 
+/** 微信未绑定门店账号时的登录提示 */
+export const SHOP_WX_NEED_PHONE_LOGIN_MSG = '请先用手机号登录';
+
+const SHOP_WX_LOGIN_HINT_KEY = 'shop_wx_login_hint';
+
+export function isShopWechatUnboundError(message: string): boolean {
+  return message.includes('首次登录') || message.includes('手机验证码') || message.includes('请先用手机号');
+}
+
+export function formatShopWechatError(e: unknown): string {
+  const text = e instanceof Error ? e.message : '微信登录失败';
+  if (isShopWechatUnboundError(text)) return SHOP_WX_NEED_PHONE_LOGIN_MSG;
+  return text;
+}
+
+/** OAuth 在启动层失败时暂存提示，供登录页展示 */
+export function stashShopWechatLoginHint(message: string): void {
+  try {
+    sessionStorage.setItem(SHOP_WX_LOGIN_HINT_KEY, message);
+  } catch {
+    /* ignore */
+  }
+}
+
+export function consumeShopWechatLoginHint(): string | null {
+  try {
+    const hint = sessionStorage.getItem(SHOP_WX_LOGIN_HINT_KEY);
+    if (hint) sessionStorage.removeItem(SHOP_WX_LOGIN_HINT_KEY);
+    return hint;
+  } catch {
+    return null;
+  }
+}
+
 export async function fetchClientConfig(): Promise<ClientRuntimeConfig> {
   return request<ClientRuntimeConfig>('SHOP_H5', '/common/client-config');
 }
@@ -104,6 +138,20 @@ export async function handleShopWechatCallback(): Promise<WechatLoginResult | nu
   return weixinSdk.handleOAuthCallback();
 }
 
+let oauthCallbackInflight: Promise<WechatLoginResult | null> | null = null;
+
+/** 全局单例：避免 Context 与页面 effect 重复消费 OAuth code */
+export async function handleShopWechatCallbackOnce(): Promise<WechatLoginResult | null> {
+  if (!isWechatEnv()) return null;
+  const params = new URLSearchParams(window.location.search);
+  if (!params.get('code')) return null;
+  if (oauthCallbackInflight) return oauthCallbackInflight;
+  oauthCallbackInflight = handleShopWechatCallback().finally(() => {
+    oauthCallbackInflight = null;
+  });
+  return oauthCallbackInflight;
+}
+
 /**
  * 微信一键登录（已绑定微信的门店账号免验证码）。
  * 返回 session = 已登录；void = 已跳转授权页等待回调。

apps/h5-shop/src/main.tsx

@@ -3,10 +3,18 @@ import ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { getRouterBasename } from '@dukang/weixin-sdk';
 import { StoreSessionProvider } from './contexts/StoreSessionContext';
+import { installClientErrorReporting } from '@dukang/client-logging';
 import App from './App';
+import { apiBase } from './lib/api';
 import './styles.css';
 import './styles/legal.css';
 
+installClientErrorReporting({
+  apiBase,
+  clientApp: 'SHOP_H5',
+  getToken: () => localStorage.getItem('shopAccessToken'),
+});
+
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <BrowserRouter basename={getRouterBasename()}>

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

@@ -1,137 +1,293 @@
-import { useCallback, useEffect, useState } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
-import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
-import { request } from '../lib/api';
-
-function formatMoney(n: number) {
-  return n.toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
-}
-
-export default function HomePage() {
-  const navigate = useNavigate();
-  const [dash, setDash] = useState<Record<string, unknown> | null>(null);
-
-  const loadDashboard = useCallback(() => {
-    return request<Record<string, unknown>>('SHOP_H5', '/shop/dashboard')
-      .then((d) => {
-        setDash(d);
-      })
-      .catch(() => {});
-  }, []);
-
-  useEffect(() => {
-    void loadDashboard();
-  }, [loadDashboard]);
-
-  useEffect(() => {
-    function onResume() {
-      void loadDashboard();
-    }
-    function onVisibility() {
-      if (document.visibilityState === 'visible') onResume();
-    }
-    document.addEventListener('visibilitychange', onVisibility);
-    window.addEventListener('pageshow', onResume);
-    window.addEventListener('focus', onResume);
-    return () => {
-      document.removeEventListener('visibilitychange', onVisibility);
-      window.removeEventListener('pageshow', onResume);
-      window.removeEventListener('focus', onResume);
-    };
-  }, [loadDashboard]);
-
-  const store = dash?.store as Record<string, unknown> | undefined;
-  const recent = (dash?.recentRecords as Array<Record<string, unknown>>) || [];
-  const status = String(store?.status || '');
-  const open = status === 'OPEN';
-  const hoursParts: string[] = [];
-  if (store?.openTime && store?.closeTime) hoursParts.push(`${store.openTime} - ${store.closeTime}`);
-  if (store?.openTime2 && store?.closeTime2) hoursParts.push(`${store.openTime2} - ${store.closeTime2}`);
-  const hoursText = hoursParts.length ? hoursParts.join('，') : '10:00 - 22:00';
-  const statusText =
-    status === 'CLOSED' ? '永久关闭' : open ? '当前正在营业中' : '当前临时闭店';
-
-  return (
-    <PullToRefresh onRefresh={loadDashboard} className="shop-home-page">
-      <header className="shop-home-header">
-        <h1 className="app-page-title">门店管理中心</h1>
-      </header>
-
-      <div className="shop-home-content">
-        <section className="shop-home-hero">
-          <div className="shop-home-hero-store">
-            <span className="material-symbols-outlined shop-fill-icon">store</span>
-            <h2>{String(store?.name || '门店')}</h2>
-          </div>
-          <div className="shop-home-stats">
-            <div className="shop-home-stat">
-              <p className="shop-home-stat-label">今日核销笔数</p>
-              <p className="shop-home-stat-value">{Number(dash?.todayCount || 0)}</p>
-            </div>
-            <div className="shop-home-stat">
-              <p className="shop-home-stat-label">今日到账金额</p>
-              <p className="shop-home-stat-value">
-                <span style={{ fontSize: 18 }}>¥</span>
-                {formatMoney(Number(dash?.todayAmount || 0))}
-              </p>
-            </div>
-          </div>
-        </section>
-
-        <section className="shop-home-scan">
-          <Link
-            to="/redeem/phone"
-            className="shop-home-scan-btn"
-          >
-            <span className="material-symbols-outlined">smartphone</span>
-          </Link>
-          <p className="shop-home-scan-label">手机号核销</p>
-        </section>
-
-        <section className="shop-home-status">
-          <div className="shop-home-status-left">
-            <div className={`shop-home-status-icon${open ? '' : ' closed'}`}>
-              <span className="material-symbols-outlined shop-fill-icon">schedule</span>
-            </div>
-            <div>
-              <p className="shop-home-status-title">营业状态</p>
-              <p className="shop-home-status-sub">{statusText}</p>
-              <p className="shop-home-status-sub">营业时间: {hoursText}</p>
-            </div>
-          </div>
-          <label className="shop-home-switch" onClick={() => navigate('/status')}>
-            <input type="checkbox" checked={open && status !== 'CLOSED'} readOnly tabIndex={-1} />
-            <span className="shop-home-switch-track" />
-          </label>
-        </section>
-
-        <section>
-          <div className="shop-home-records-head">
-            <h3 className="shop-home-records-title">核销记录</h3>
-            <Link to="/records" className="shop-home-records-link">
-              查看全部
-              <span className="material-symbols-outlined" style={{ fontSize: 16 }}>chevron_right</span>
-            </Link>
-          </div>
-          <div className="shop-home-record-list">
-            {recent.length === 0 && (
-              <p className="shop-home-status-sub" style={{ textAlign: 'center', padding: '16px 0' }}>暂无核销记录</p>
-            )}
-            {recent.map((r) => (
-              <div key={String(r.id)} className="shop-home-record-item">
-                <div>
-                  <p className="shop-home-record-time">核销时间</p>
-                  <p className="shop-home-record-value">
-                    {new Date(String(r.createdAt)).toLocaleString('zh-CN')}
-                  </p>
-                </div>
-                <p className="shop-home-record-amount">¥{formatMoney(Number(r.amount))}</p>
-              </div>
-            ))}
-          </div>
-        </section>
-      </div>
-
-    </PullToRefresh>
-  );
-}
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
+import { isScanPermissionWarmupError } from '@dukang/weixin-sdk';
+import { useStoreSession } from '../contexts/StoreSessionContext';
+import { request } from '../lib/api';
+import { parseRedeemTokenFromScan } from '../lib/redeem-scan';
+import {
+  authorizeShopWechat,
+  checkNeedsWechatAuth,
+  fetchShopAccount,
+} from '../lib/wechat-auth';
+import { isWechatEnv, weixinSdk } from '../lib/weixin';
+import {
+  clearPendingScanAfterAuth,
+  getPostAuthScanDelayMs,
+  markPendingScanAfterAuth,
+  peekPendingScanAfterAuth,
+} from '../lib/shop-scan-auth';
+import WechatScanAuthModal from '../components/WechatScanAuthModal';
+import { useStorePageView } from '../lib/usePageView';
+import { trackStore } from '../lib/analytics';
+
+function formatMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
+}
+
+function formatScanError(e: unknown, opts?: { afterAuth?: boolean }): string {
+  const msg = e instanceof Error ? e.message : '扫码失败，请重试';
+  if (/invalid signature/i.test(msg)) {
+    return '微信 JSSDK 签名校验失败：请确认公众号已配置 JS 接口安全域名，并刷新页面后重试';
+  }
+  if (isScanPermissionWarmupError(msg)) {
+    if (opts?.afterAuth) {
+      return '微信授权已完成，扫码权限仍在准备中，请再点一次「扫码核销」';
+    }
+    return '微信权限校验尚未完成，请等待 1～2 秒后再次点击扫码（首次绑定微信时较常见）';
+  }
+  return msg;
+}
+
+export default function HomePage() {
+  useStorePageView('store_home_view');
+  const navigate = useNavigate();
+  const { ready, authenticated } = useStoreSession();
+  const [searchParams] = useSearchParams();
+  const [dash, setDash] = useState<Record<string, unknown> | null>(null);
+  const [scanMsg, setScanMsg] = useState('');
+  const [scanning, setScanning] = useState(false);
+  const [authModalOpen, setAuthModalOpen] = useState(false);
+  const [authLoading, setAuthLoading] = useState(false);
+  const [authError, setAuthError] = useState('');
+  const pendingScanStartedRef = useRef(false);
+
+  const loadDashboard = useCallback(() => {
+    return request<Record<string, unknown>>('SHOP_H5', '/shop/dashboard')
+      .then((d) => {
+        setDash(d);
+      })
+      .catch(() => {});
+  }, []);
+
+  useEffect(() => {
+    void loadDashboard();
+  }, [loadDashboard]);
+
+  useEffect(() => {
+    function onResume() {
+      setScanning(false);
+      void loadDashboard();
+    }
+    function onVisibility() {
+      if (document.visibilityState === 'visible') onResume();
+    }
+    document.addEventListener('visibilitychange', onVisibility);
+    window.addEventListener('pageshow', onResume);
+    window.addEventListener('focus', onResume);
+    return () => {
+      document.removeEventListener('visibilitychange', onVisibility);
+      window.removeEventListener('pageshow', onResume);
+      window.removeEventListener('focus', onResume);
+    };
+  }, [loadDashboard]);
+
+  const runScan = useCallback(
+    async (opts?: { postAuthWarmup?: boolean }) => {
+      trackStore('store_redeem_scan_start');
+      if (!isWechatEnv()) {
+        setScanMsg('请在微信内打开门店端进行扫码核销');
+        return;
+      }
+      setScanning(true);
+      if (!opts?.postAuthWarmup) {
+        setScanMsg('');
+      }
+      try {
+        if (opts?.postAuthWarmup) {
+          weixinSdk.reset();
+        }
+        await weixinSdk.init();
+        const raw = await weixinSdk.scanQrCode(
+          opts?.postAuthWarmup ? { postAuthWarmup: true } : undefined,
+        );
+        if (!raw) {
+          void loadDashboard();
+          return;
+        }
+        const token = parseRedeemTokenFromScan(raw);
+        if (!token) {
+          setScanMsg('无法识别核销码，请扫描用户出示的核销二维码');
+          return;
+        }
+        navigate(`/redeem?token=${encodeURIComponent(token)}`);
+      } catch (e) {
+        setScanMsg(formatScanError(e, { afterAuth: opts?.postAuthWarmup }));
+      } finally {
+        setScanning(false);
+      }
+    },
+    [loadDashboard, navigate],
+  );
+
+  // OAuth 由 StoreSessionContext 单例处理；此处仅在授权完成后续扫
+  useEffect(() => {
+    if (!ready || !authenticated || !isWechatEnv()) return;
+    if (searchParams.get('code')) return;
+    if (!peekPendingScanAfterAuth() || pendingScanStartedRef.current) return;
+
+    pendingScanStartedRef.current = true;
+    clearPendingScanAfterAuth();
+    setAuthModalOpen(false);
+    setAuthLoading(false);
+    setAuthError('');
+    setScanMsg('微信授权成功，正在准备扫码…');
+
+    const timer = window.setTimeout(() => {
+      void runScan({ postAuthWarmup: true });
+    }, getPostAuthScanDelayMs());
+
+    return () => window.clearTimeout(timer);
+  }, [ready, authenticated, searchParams, runScan]);
+
+  async function handleScan() {
+    setScanMsg('');
+    if (!isWechatEnv()) {
+      setScanMsg('请在微信内打开门店端进行扫码核销');
+      return;
+    }
+    try {
+      const profile = await fetchShopAccount();
+      if (await checkNeedsWechatAuth(profile)) {
+        pendingScanStartedRef.current = false;
+        setAuthModalOpen(true);
+        return;
+      }
+      await runScan();
+    } catch (e) {
+      setScanMsg(e instanceof Error ? e.message : '无法发起扫码');
+    }
+  }
+
+  async function startWechatAuth() {
+    setAuthLoading(true);
+    setAuthError('');
+    try {
+      pendingScanStartedRef.current = false;
+      markPendingScanAfterAuth();
+      await authorizeShopWechat();
+    } catch (e) {
+      clearPendingScanAfterAuth();
+      setAuthError(e instanceof Error ? e.message : '微信授权失败');
+      setAuthLoading(false);
+    }
+  }
+
+  const store = dash?.store as Record<string, unknown> | undefined;
+  const recent = (dash?.recentRecords as Array<Record<string, unknown>>) || [];
+  const status = String(store?.status || '');
+  const open = status === 'OPEN';
+  const hoursParts: string[] = [];
+  if (store?.openTime && store?.closeTime) hoursParts.push(`${store.openTime} - ${store.closeTime}`);
+  if (store?.openTime2 && store?.closeTime2) hoursParts.push(`${store.openTime2} - ${store.closeTime2}`);
+  const hoursText = hoursParts.length ? hoursParts.join('，') : '10:00 - 22:00';
+  const statusText =
+    status === 'CLOSED' ? '永久关闭' : open ? '当前正在营业中' : '当前临时闭店';
+
+  return (
+    <PullToRefresh onRefresh={loadDashboard} className="shop-home-page">
+      <header className="shop-home-header">
+        <h1 className="app-page-title">门店管理中心</h1>
+      </header>
+
+      <div className="shop-home-content">
+        <section className="shop-home-hero">
+          <div className="shop-home-hero-store">
+            <span className="material-symbols-outlined shop-fill-icon">store</span>
+            <h2>{String(store?.name || '门店')}</h2>
+          </div>
+          <div className="shop-home-stats">
+            <div className="shop-home-stat">
+              <p className="shop-home-stat-label">今日核销笔数</p>
+              <p className="shop-home-stat-value">{Number(dash?.todayCount || 0)}</p>
+              <p className="shop-home-stat-sub">
+                扫码 {Number(dash?.todayScanCount || 0)} · 手机号 {Number(dash?.todayPhoneCount || 0)}
+              </p>
+            </div>
+            <div className="shop-home-stat">
+              <p className="shop-home-stat-label">今日到账金额</p>
+              <p className="shop-home-stat-value">
+                <span style={{ fontSize: 18 }}>¥</span>
+                {formatMoney(Number(dash?.todayAmount || 0))}
+              </p>
+            </div>
+          </div>
+        </section>
+
+        <section className="shop-home-scan">
+          <button
+            type="button"
+            className="shop-home-scan-btn"
+            disabled={scanning}
+            onClick={() => void handleScan()}
+          >
+            <span className="material-symbols-outlined">qr_code_scanner</span>
+          </button>
+          <p className="shop-home-scan-label">{scanning ? '正在打开相机…' : '扫码核销'}</p>
+          {scanMsg && <p className="shop-home-scan-msg" role="alert">{scanMsg}</p>}
+          <Link to="/redeem/phone" className="shop-home-phone-link">
+            <span className="material-symbols-outlined">smartphone</span>
+            手机号核销
+          </Link>
+        </section>
+
+        <section className="shop-home-status">
+          <div className="shop-home-status-left">
+            <div className={`shop-home-status-icon${open ? '' : ' closed'}`}>
+              <span className="material-symbols-outlined shop-fill-icon">schedule</span>
+            </div>
+            <div>
+              <p className="shop-home-status-title">营业状态</p>
+              <p className="shop-home-status-sub">{statusText}</p>
+              <p className="shop-home-status-sub">营业时间: {hoursText}</p>
+            </div>
+          </div>
+          <label className="shop-home-switch" onClick={() => navigate('/status')}>
+            <input type="checkbox" checked={open && status !== 'CLOSED'} readOnly tabIndex={-1} />
+            <span className="shop-home-switch-track" />
+          </label>
+        </section>
+
+        <section>
+          <div className="shop-home-records-head">
+            <h3 className="shop-home-records-title">核销记录</h3>
+            <Link to="/records" className="shop-home-records-link">
+              查看全部
+              <span className="material-symbols-outlined" style={{ fontSize: 16 }}>chevron_right</span>
+            </Link>
+          </div>
+          <div className="shop-home-record-list">
+            {recent.length === 0 && (
+              <p className="shop-home-status-sub" style={{ textAlign: 'center', padding: '16px 0' }}>暂无核销记录</p>
+            )}
+            {recent.map((r) => (
+              <div key={String(r.id)} className="shop-home-record-item">
+                <div>
+                  <p className="shop-home-record-time">核销时间</p>
+                  <p className="shop-home-record-value">
+                    {new Date(String(r.createdAt)).toLocaleString('zh-CN')}
+                  </p>
+                </div>
+                <p className="shop-home-record-amount">¥{formatMoney(Number(r.amount))}</p>
+              </div>
+            ))}
+          </div>
+        </section>
+      </div>
+
+      <WechatScanAuthModal
+        open={authModalOpen}
+        loading={authLoading}
+        error={authError}
+        onAuthorize={() => void startWechatAuth()}
+        onCancel={() => {
+          setAuthModalOpen(false);
+          setAuthError('');
+          clearPendingScanAfterAuth();
+          pendingScanStartedRef.current = false;
+        }}
+      />
+    </PullToRefresh>
+  );
+}
+

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

@@ -1,14 +1,33 @@
-import { useRef, useState, type RefObject } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
+import { useEffect, useRef, useState, type RefObject } from 'react';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import AppImage from '@dukang/shared-ui/AppImage';
+import { isWxAuthorizeEnabled } from '@dukang/shared-types';
+import { stripOAuthParamsFromLocation } from '@dukang/weixin-sdk';
 import { useStoreSession } from '../contexts/StoreSessionContext';
 import {
   getLastPhone,
+  getStoreProfile,
+  hasShopWxSession,
   request,
   saveRememberedSession,
   type ShopSessionPayload,
 } from '../lib/api';
 import { routeAfterShopLogin } from './SelectStorePage';
+import {
+  bindShopWechatAfterSmsLogin,
+  consumeShopWechatLoginHint,
+  fetchClientConfig,
+  formatShopWechatError,
+  handleShopWechatCallbackOnce,
+  handleShopWechatLoginResult,
+  loginShopWithWechat,
+} from '../lib/wechat-auth';
+import { isWechatEnv } from '../lib/weixin';
+
+function maskPhone(phone: string) {
+  if (phone.length < 7) return phone;
+  return `${phone.slice(0, 3)} **** ${phone.slice(-4)}`;
+}
 
 function ShopAgreementCheckbox({
   agreed,
@@ -43,14 +62,49 @@ function ShopAgreementCheckbox({
 export default function LoginPage() {
   const navigate = useNavigate();
   const { applySession } = useStoreSession();
+  const [params, setSearchParams] = useSearchParams();
+  const quick = params.get('quick') === '1';
+  const savedProfile = getStoreProfile();
   const [phone, setPhone] = useState(getLastPhone());
   const [code, setCode] = useState('');
   const [agreed, setAgreed] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [msg, setMsg] = useState('');
+  const [wxLoading, setWxLoading] = useState(false);
+  const [msg, setMsg] = useState(() => consumeShopWechatLoginHint() ?? '');
   const [codeCooldown, setCodeCooldown] = useState(0);
+  const [wxAuthorize, setWxAuthorize] = useState(false);
   const agreementRef = useRef<HTMLLabelElement>(null);
 
+  useEffect(() => {
+    fetchClientConfig()
+      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
+      .catch(() => setWxAuthorize(false));
+  }, []);
+
+  useEffect(() => {
+    const hint = consumeShopWechatLoginHint();
+    if (hint) setMsg(hint);
+  }, []);
+
+  useEffect(() => {
+    if (!isWechatEnv() || !wxAuthorize || !params.get('code')) return;
+    void handleShopWechatCallbackOnce()
+      .then((result) => {
+        if (!result) return;
+        const session = handleShopWechatLoginResult(result);
+        if (session) {
+          applySession(session);
+          stripOAuthParamsFromLocation();
+          setSearchParams({}, { replace: true });
+          routeAfterShopLogin(session, navigate);
+        }
+      })
+      .catch((e) => setMsg(formatShopWechatError(e)));
+  }, [applySession, navigate, params, setSearchParams, wxAuthorize]);
+
+  const quickStoreName = savedProfile?.storeName ?? '门店管理中心';
+  const quickPhone = savedProfile?.phone || phone;
+
   function ensureAgreed() {
     if (!agreed) {
       setMsg('请先阅读并同意用户协议');
@@ -86,15 +140,30 @@ export default function LoginPage() {
 
   async function login() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    const trimmedCode = code.trim();
+    if (!trimmedPhone) {
+      setMsg('phone should not be empty');
+      return;
+    }
+    if (!trimmedCode) {
+      setMsg('code should not be empty');
+      return;
+    }
     setLoading(true);
     setMsg('');
     try {
       const data = await request<ShopSessionPayload>('SHOP_H5', '/shop/auth/login/sms', {
         method: 'POST',
-        body: JSON.stringify({ phone, code }),
+        body: JSON.stringify({ phone: trimmedPhone, code: trimmedCode }),
       });
       saveRememberedSession(data);
       applySession(data);
+      if (isWechatEnv() && wxAuthorize) {
+        setMsg('登录成功，正在关联微信…');
+        await bindShopWechatAfterSmsLogin();
+        return;
+      }
       routeAfterShopLogin(data, navigate);
     } catch (e) {
       setMsg(e instanceof Error ? e.message : '登录失败');
@@ -103,6 +172,103 @@ export default function LoginPage() {
     }
   }
 
+  async function wechatLogin() {
+    if (!ensureAgreed()) return;
+    setMsg('');
+    if (!isWechatEnv()) {
+      setMsg('请在微信内打开以使用微信一键登录');
+      return;
+    }
+    setWxLoading(true);
+    try {
+      const session = await loginShopWithWechat();
+      if (session) {
+        applySession(session);
+        routeAfterShopLogin(session, navigate);
+      }
+    } catch (e) {
+      setMsg(formatShopWechatError(e));
+    } finally {
+      setWxLoading(false);
+    }
+  }
+
+  if (quick) {
+    const canWechatQuick = wxAuthorize && isWechatEnv() && hasShopWxSession() && !!savedProfile;
+
+    return (
+      <div className="shop-quick-login-page">
+        <header className="shop-quick-header">
+          <AppImage src="/logo.png" alt="杜康好客" wrapperClassName="shop-quick-logo" fit="contain" />
+          <h1 className="shop-quick-welcome">欢迎回来</h1>
+          <div className="shop-quick-welcome-line" />
+        </header>
+
+        <section className="shop-quick-store-card">
+          <div className="shop-quick-store-inner">
+            <div className="shop-quick-store-icon">
+              <span className="material-symbols-outlined shop-fill-icon">storefront</span>
+            </div>
+            <div>
+              <h2 className="shop-quick-store-name">{quickStoreName}</h2>
+              <p className="shop-quick-store-phone">{maskPhone(quickPhone)}</p>
+            </div>
+            <span className="shop-quick-verified">
+              <span className="material-symbols-outlined shop-fill-icon" style={{ fontSize: 14 }}>verified_user</span>
+              认证门店
+            </span>
+            <div className="shop-quick-switch">
+              <Link to="/login">
+                <span className="material-symbols-outlined" style={{ fontSize: 18 }}>sync</span>
+                切换账号
+              </Link>
+            </div>
+          </div>
+        </section>
+
+        <div className="shop-quick-actions">
+          {msg && <p className="shop-login-msg">{msg}</p>}
+          <ShopAgreementCheckbox
+            agreed={agreed}
+            onChange={setAgreed}
+            labelRef={agreementRef}
+          />
+          {canWechatQuick ? (
+            <button
+              type="button"
+              className="shop-quick-login-btn shop-quick-login-btn--wechat"
+              disabled={wxLoading}
+              onClick={() => void wechatLogin()}
+            >
+              <span className="material-symbols-outlined">chat</span>
+              <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
+            </button>
+          ) : (
+            <p className="shop-login-msg" style={{ textAlign: 'center' }}>
+              {wxAuthorize && !isWechatEnv()
+                ? '请在微信内打开以使用一键登录'
+                : '请使用验证码登录并绑定微信后，即可 7 天内免登录'}
+            </p>
+          )}
+          {!canWechatQuick && (
+            <Link to="/login" className="shop-quick-login-btn" style={{ textAlign: 'center', textDecoration: 'none' }}>
+              验证码登录
+            </Link>
+          )}
+          <div className="shop-quick-secure">
+            <span className="material-symbols-outlined" style={{ fontSize: 16 }}>lock</span>
+            <span>{canWechatQuick ? '微信验证 · 7 天内免登录' : '加密环境安全登录中'}</span>
+          </div>
+        </div>
+
+        <footer className="shop-quick-footer">
+          <p className="shop-login-footer-brand">SECURED BY DUKANG HERITAGE</p>
+          <p style={{ fontSize: 10, fontFamily: 'var(--font-label)' }}>© 2024 杜康酒业门店管理系统</p>
+        </footer>
+      </div>
+    );
+  }
+
   return (
     <div className="shop-login-page">
       <header className="shop-login-hero">
@@ -172,8 +338,29 @@ export default function LoginPage() {
             <span>{loading ? '登录中...' : '登录'}</span>
             {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
           </button>
+
+          {wxAuthorize && (
+            <>
+              <div className="shop-login-divider">
+                <span className="shop-login-divider-line" />
+                <span className="shop-login-divider-text">或者</span>
+                <span className="shop-login-divider-line" />
+              </div>
+
+              <button
+                type="button"
+                className="shop-login-wechat"
+                disabled={wxLoading}
+                onClick={() => void wechatLogin()}
+              >
+                <span className="material-symbols-outlined">chat</span>
+                <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
+              </button>
+            </>
+          )}
+
           <p className="shop-login-msg" style={{ textAlign: 'center', marginTop: 12 }}>
-            手机号验证成功后，7 天内无需再次输入验证码
+            手机号验证成功后，7 天内无需再次输入验证码；微信内登录将自动关联微信
           </p>
         </div>
       </main>
@@ -183,6 +370,11 @@ export default function LoginPage() {
         <span className="material-symbols-outlined shop-fill-icon" style={{ opacity: 0.3, fontSize: 20, color: 'var(--color-outline)' }}>
           security
         </span>
+        {hasShopWxSession() && savedProfile && (
+          <p style={{ marginTop: 16, textAlign: 'center' }}>
+            <Link to="/login?quick=1" className="text-primary body-md">微信快捷登录</Link>
+          </p>
+        )}
       </footer>
     </div>
   );

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

@@ -9,12 +9,14 @@ import {
   authorizeShopWechat,
   fetchClientConfig,
   fetchShopAccount,
-  handleShopWechatCallback,
+  handleShopWechatCallbackOnce,
   handleShopWechatLoginResult,
 } from '../lib/wechat-auth';
 import { isWechatEnv } from '../lib/weixin';
+import { useStorePageView } from '../lib/usePageView';
 
 export default function MinePage() {
+  useStorePageView('store_mine_view');
   const navigate = useNavigate();
   const [searchParams, setSearchParams] = useSearchParams();
   const { resetSession, store: sessionStore, applySession } = useStoreSession();
@@ -43,7 +45,7 @@ export default function MinePage() {
 
   useEffect(() => {
     if (!isWechatEnv() || !wxAuthorize || !searchParams.get('code')) return;
-    void handleShopWechatCallback()
+    void handleShopWechatCallbackOnce()
       .then((result) => {
         if (!result) return;
         const session = handleShopWechatLoginResult(result);
@@ -141,6 +143,16 @@ export default function MinePage() {
               切换门店
             </button>
           ) : null}
+          <button type="button" className="shop-mine-action" onClick={() => navigate('/withdraw')}>
+            <span className="material-symbols-outlined" style={{ fontSize: 20 }}>account_balance_wallet</span>
+            结算提现
+          </button>
+          {profile?.isPrimary ? (
+            <button type="button" className="shop-mine-action" onClick={() => navigate('/packages')}>
+              <span className="material-symbols-outlined" style={{ fontSize: 20 }}>restaurant_menu</span>
+              门店套餐
+            </button>
+          ) : null}
           {profile?.isPrimary ? (
             <button type="button" className="shop-mine-action" onClick={() => navigate('/staff')}>
               <span className="material-symbols-outlined" style={{ fontSize: 20 }}>group</span>

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

@@ -0,0 +1,143 @@
+import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import type { StorePackagesResponse } from '@dukang/shared-types';
+import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
+import ShopPackagesForm from '../components/ShopPackagesForm';
+import { request } from '../lib/api';
+import { useStorePageView } from '../lib/usePageView';
+import {
+  emptyPackage,
+  normalizePackageFormItems,
+  validatePackageFormItems,
+  type PackageFormItem,
+} from '../lib/storePackages';
+
+export default function PackagesPage() {
+  useStorePageView('store_packages_view');
+  const navigate = useNavigate();
+  const [items, setItems] = useState<PackageFormItem[]>([emptyPackage()]);
+  const [pending, setPending] = useState<StorePackagesResponse['pendingRequest']>(null);
+  const [loading, setLoading] = useState(true);
+  const [submitting, setSubmitting] = useState(false);
+  const [msg, setMsg] = useState('');
+
+  async function load() {
+    setLoading(true);
+    try {
+      const data = await request<StorePackagesResponse>('SHOP_H5', '/shop/store/packages');
+      const base = data.pendingRequest?.packages?.length
+        ? data.pendingRequest.packages
+        : data.live?.length
+          ? data.live
+          : [emptyPackage()];
+      setItems(base.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i })));
+      setPending(data.pendingRequest ?? null);
+      setMsg('');
+    } catch (e) {
+      setMsg(e instanceof Error ? e.message : '加载失败');
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    void load();
+  }, []);
+
+  async function submitAudit() {
+    const validationMsg = validatePackageFormItems(items);
+    if (validationMsg) {
+      setMsg(validationMsg);
+      return;
+    }
+    if (pending?.status === 'PENDING') {
+      setMsg('已有套餐变更审核中，请等待总部处理');
+      return;
+    }
+    setSubmitting(true);
+    setMsg('');
+    try {
+      const packages = normalizePackageFormItems(items).map((p) => ({
+        ...p,
+        price: Number(p.price).toFixed(2),
+      }));
+      await request('SHOP_H5', '/shop/store/packages', {
+        method: 'PUT',
+        body: JSON.stringify({ packages }),
+      });
+      setMsg('已提交审核，请等待总部处理');
+      await load();
+    } catch (e) {
+      setMsg(e instanceof Error ? e.message : '提交失败');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  const disabled = pending?.status === 'PENDING' || submitting;
+
+  return (
+    <PullToRefresh onRefresh={load} className="shop-records-page shop-packages-page">
+      <header className="shop-records-header" style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+        <button
+          type="button"
+          className="shop-withdraw-back"
+          onClick={() => navigate('/mine')}
+          aria-label="返回"
+        >
+          <span className="material-symbols-outlined" style={{ fontSize: 22 }}>
+            arrow_back
+          </span>
+        </button>
+        <h1 className="app-page-title" style={{ margin: 0 }}>
+          门店套餐
+        </h1>
+      </header>
+
+      <div className="shop-records-main">
+        {loading ? <p className="shop-records-empty">加载中…</p> : null}
+
+        {!loading && pending?.status === 'PENDING' ? (
+          <section className="shop-packages-notice">
+            <span className="material-symbols-outlined shop-fill-icon" style={{ fontSize: 18 }}>
+              hourglass_top
+            </span>
+            <p>套餐变更审核中，用户端仍展示上一版生效套餐。</p>
+          </section>
+        ) : null}
+
+        {!loading && pending?.status === 'REJECTED' && pending.rejectReason ? (
+          <section className="shop-packages-notice shop-packages-notice--warn">
+            <span className="material-symbols-outlined shop-fill-icon" style={{ fontSize: 18 }}>
+              error
+            </span>
+            <p>上次驳回：{pending.rejectReason}</p>
+          </section>
+        ) : null}
+
+        {!loading ? (
+          <>
+            <p className="shop-packages-intro">
+              维护门店可核销套餐信息，提交后由总部审核通过后在用户端展示。
+            </p>
+            <ShopPackagesForm items={items} onChange={setItems} disabled={disabled} />
+          </>
+        ) : null}
+
+        {msg ? <p className="shop-withdraw-msg">{msg}</p> : null}
+
+        {!loading ? (
+          <button
+            type="button"
+            className="shop-withdraw-btn"
+            style={{ marginTop: 16 }}
+            disabled={disabled}
+            onClick={() => void submitAudit()}
+          >
+            {submitting ? '提交中…' : '提交审核'}
+          </button>
+        ) : null}
+      </div>
+    </PullToRefresh>
+  );
+}