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

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

.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 直存；套餐变更审核通过/驳回 |

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`。
 

apps/admin-web/src/App.tsx

@@ -5,6 +5,7 @@ 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';
@@ -37,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';
@@ -45,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 />;
@@ -73,12 +80,19 @@ 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 />} />
@@ -118,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/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,7 @@ 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: '门店账户' },
@@ -109,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 资源库' },
   {
@@ -121,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: '权限分配' },
@@ -132,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',
@@ -141,11 +166,14 @@ 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',
@@ -172,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',

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/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,355 @@
+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,
+  type DevPlanTaskDto,
+  type DevPlanTaskStatusDto,
+  type DevPlanTaskTypeDto,
+  type DevPlanVersionDto,
+} 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 [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]);
+
+  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' });
+    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 }),
+        });
+        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>
+          ) : null}
+        </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/ProductsPage.tsx

@@ -168,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="故事标题">

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

@@ -1,5 +1,4 @@
 import { useState } from 'react';
-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';

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

@@ -41,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: '基本信息' },
@@ -1214,6 +1215,11 @@ export default function StoresPage() {
                   label: '审核材料',
                   children: <StoreAuditMediaSection detail={detail} />,
                 },
+                {
+                  key: 'packages',
+                  label: '套餐',
+                  children: <AdminStorePackagesSection storeId={String(detail.id)} />,
+                },
               ]}
             />
           </Form>
@@ -1398,14 +1404,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/SystemSettingsPage.tsx

@@ -61,34 +61,6 @@ function MockSmsCodePanel({ codes, loading }: { codes: MockSmsCodeItem[]; loadin
   );
 }
 
-function WecomAlertTestButton() {
-  const [testing, setTesting] = useState(false);
-  async function onTest() {
-    setTesting(true);
-    try {
-      const res = await request<{ ok: boolean; message: string }>(
-        '/admin/system-config/wecom-alert/test',
-        { method: 'POST', body: '{}' },
-      );
-      message.success(res.message || '已发送测试告警');
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '发送失败');
-    } finally {
-      setTesting(false);
-    }
-  }
-  return (
-    <div style={{ marginTop: -8, marginBottom: 16 }}>
-      <Button size="small" loading={testing} onClick={() => void onTest()}>
-        发送测试告警
-      </Button>
-      <Typography.Text type="secondary" style={{ marginLeft: 8, fontSize: 12 }}>
-        需已配置 WECOM_ALERT_WEBHOOK_URL 并开启上方开关
-      </Typography.Text>
-    </div>
-  );
-}
-
 function renderField(
   field: SystemConfigFieldMeta,
   configuredSecrets: string[],
@@ -291,8 +263,6 @@ export default function SystemSettingsPage() {
                 meta.configuredSecrets,
                 f.key === 'MOCK_SMS' && mockSmsEnabled ? (
                   <MockSmsCodePanel codes={meta.mockSmsCodes ?? []} loading={loading} />
-                ) : f.key === 'WECOM_ALERT_ENABLED' ? (
-                  <WecomAlertTestButton />
                 ) : undefined,
               ),
             )}

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

@@ -159,6 +159,7 @@ export default function TicketsPage() {
               { value: 'RESHIPMENT', label: '破损补发' },
               { value: 'DAMAGE_RETURN', label: '破损退货' },
               { value: 'RETURN_REFUND', label: '退货退款' },
+              { value: 'PACKAGE_DISPUTE', label: '套餐异议' },
               { value: 'ALERT', label: '异常' },
             ]}
           />

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/h5-partner/package.json

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

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';
@@ -31,6 +32,7 @@ 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 />} />
@@ -68,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/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/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';
 
@@ -159,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/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/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/main.tsx

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

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

@@ -59,6 +59,7 @@ export default function ProxyOrderDetailPage() {
   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() {
@@ -77,7 +78,12 @@ export default function ProxyOrderDetailPage() {
   useEffect(() => {
     if (!id) return;
     void request<PartnerProxyOrderListItem>('PARTNER_H5', `/partner/proxy-orders/${id}`)
-      .then(setOrder)
+      .then((data) => {
+        setOrder(data);
+        if (data.proxyPayMethod) {
+          setPayMethod(data.proxyPayMethod);
+        }
+      })
       .catch((e) => setError(e instanceof Error ? e.message : '加载失败'));
   }, [id]);
 
@@ -129,6 +135,15 @@ export default function ProxyOrderDetailPage() {
 
   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);
@@ -166,12 +181,14 @@ export default function ProxyOrderDetailPage() {
 
       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',
@@ -191,14 +208,27 @@ export default function ProxyOrderDetailPage() {
     }
   }
 
-  const autoPayStartedRef = useRef(false);
-  useEffect(() => {
-    if (!id || !unpaid || autoPayStartedRef.current) return;
-    autoPayStartedRef.current = true;
-    void startPay('NATIVE');
-    // 仅首次进入未支付详情时自动拉收款码
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [id, unpaid]);
+  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';
@@ -285,6 +315,7 @@ export default function ProxyOrderDetailPage() {
                 <button
                   type="button"
                   className={`partner-proxy-mode-tab${payMethod === 'NATIVE' ? ' is-active' : ''}`}
+                  disabled={!!lockedPayMethod && lockedPayMethod !== 'NATIVE'}
                   onClick={() => void startPay('NATIVE')}
                 >
                   收款码
@@ -292,11 +323,21 @@ export default function ProxyOrderDetailPage() {
                 <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 }}>
@@ -338,6 +379,16 @@ export default function ProxyOrderDetailPage() {
                   {payMsg}
                 </p>
               ) : null}
+
+              <button
+                type="button"
+                className="btn btn-block"
+                style={{ marginTop: 16 }}
+                disabled={cancelling || paying}
+                onClick={() => void cancelPay()}
+              >
+                {cancelling ? '取消中…' : '取消支付'}
+              </button>
             </section>
           ) : null}
 

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

@@ -24,6 +24,7 @@ import type {
   ProxyOrderPayResponse,
   ProxyPayMethod,
 } from '@dukang/shared-types';
+import { usePartnerPageView } from '../lib/usePageView';
 
 function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
@@ -46,6 +47,7 @@ function initialDraft(): ProxyOrderDraft {
 }
 
 export default function ProxyOrderPage() {
+  usePartnerPageView('partner_proxy_order_view');
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const draft0 = useMemo(() => initialDraft(), []);
@@ -70,6 +72,8 @@ export default function ProxyOrderPage() {
   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]);
@@ -234,8 +238,17 @@ export default function ProxyOrderPage() {
   }
 
   async function startPay(orderId: string, method: ProxyPayMethod) {
+    if (lockedPayMethod && lockedPayMethod !== method) {
+      setMsg(
+        lockedPayMethod === 'JSAPI'
+          ? '该订单已发起微信代付，请先取消支付后重新下单'
+          : '该订单已生成收款码，请先取消支付后重新下单',
+      );
+      return;
+    }
     setPaying(true);
     setMsg('');
+    setPayMethod(method);
     try {
       if (method === 'JSAPI') {
         if (!isWechatEnv()) {
@@ -266,11 +279,14 @@ export default function ProxyOrderPage() {
 
       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',
@@ -289,6 +305,40 @@ export default function ProxyOrderPage() {
     }
   }
 
+  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() {
     setMsg('');
     const err = validateForm();
@@ -322,6 +372,7 @@ export default function ProxyOrderPage() {
       setCreated(order);
       setStep('pay');
       setCodeUrl(null);
+      setLockedPayMethod(null);
       await startPay(order.id, payMethod);
     } catch (e) {
       setMsg(e instanceof Error ? e.message : '下单失败');
@@ -359,24 +410,25 @@ export default function ProxyOrderPage() {
                 <button
                   type="button"
                   className={`partner-proxy-mode-tab${payMethod === 'NATIVE' ? ' is-active' : ''}`}
-                  onClick={() => {
-                    setPayMethod('NATIVE');
-                    void startPay(created.id, 'NATIVE');
-                  }}
+                  disabled={!!lockedPayMethod && lockedPayMethod !== 'NATIVE'}
+                  onClick={() => switchPayMethod('NATIVE')}
                 >
                   收款码
                 </button>
                 <button
                   type="button"
                   className={`partner-proxy-mode-tab${payMethod === 'JSAPI' ? ' is-active' : ''}`}
-                  onClick={() => {
-                    setPayMethod('JSAPI');
-                    void startPay(created.id, 'JSAPI');
-                  }}
+                  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' ? (
@@ -419,6 +471,16 @@ export default function ProxyOrderPage() {
                 {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>

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

@@ -20,6 +20,7 @@ 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();
@@ -102,6 +106,7 @@ export default function StoreCreatePage() {
   const [categoryTree, setCategoryTree] = useState<StoreCategoryNode[]>([]);
 
   const [mapPickerOpen, setMapPickerOpen] = useState(false);
+  const [stepErrorModal, setStepErrorModal] = useState<string | null>(null);
 
   const draftSaveDisabledRef = useRef(false);
 
@@ -109,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);
 
 
 
@@ -301,7 +311,7 @@ export default function StoreCreatePage() {
       const msg = validateStoreStep1(form);
 
       if (msg) {
-        reportFormError(msg);
+        reportStepError(msg);
         return;
       }
 
@@ -312,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);
 
@@ -337,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) {
@@ -472,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('');
@@ -496,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;
 
@@ -919,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">
 
@@ -945,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>
 
 
@@ -1096,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">
@@ -1110,7 +1182,7 @@ export default function StoreCreatePage() {
 
         )}
 
-        {step < 3 ? (
+        {step < 4 ? (
 
           <button type="button" className="partner-btn-primary" onClick={() => void handleNext()} disabled={nextDisabled}>
 
@@ -1122,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)}

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

@@ -5,7 +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 { MIN_ENV_PHOTO_COUNT, normalizeStringArray, patchEnvPhotoAt, addEnvPhotoSlot } from '../lib/storeDraft';
 import OssUploadField from '../components/OssUploadField';
 import TencentLocPickerOverlay from '../components/TencentLocPickerOverlay';
 import {
@@ -16,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>();
@@ -34,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);
@@ -81,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(() => {
@@ -196,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);
@@ -277,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 }}>
@@ -388,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} 张`
                   : '暂无照片'}
@@ -408,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"

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

@@ -3634,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/src/App.tsx

@@ -13,6 +13,7 @@ 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 (
@@ -24,6 +25,7 @@ export default function App() {
         <Route path="/select-store" element={<SelectStorePage />} />
         <Route path="/staff" element={<StaffPage />} />
         <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 />} />

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

@@ -15,7 +15,7 @@ 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 formData = new FormData();
   formData.append('file', file);
   formData.append('bizType', bizType);

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/main.tsx

@@ -3,12 +3,17 @@ 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 './lib/client-error';
+import { installClientErrorReporting } from '@dukang/client-logging';
 import App from './App';
+import { apiBase } from './lib/api';
 import './styles.css';
 import './styles/legal.css';
 
-installClientErrorReporting();
+installClientErrorReporting({
+  apiBase,
+  clientApp: 'SHOP_H5',
+  getToken: () => localStorage.getItem('shopAccessToken'),
+});
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>

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

@@ -14,6 +14,8 @@ import {
 import { isWechatEnv, weixinSdk } from '../lib/weixin';
 import { stripOAuthParamsFromLocation } from '@dukang/weixin-sdk';
 import WechatScanAuthModal from '../components/WechatScanAuthModal';
+import { useStorePageView } from '../lib/usePageView';
+import { trackStore } from '../lib/analytics';
 
 const PENDING_SCAN_KEY = 'shop_pending_scan';
 
@@ -33,6 +35,7 @@ function formatScanError(e: unknown): string {
 }
 
 export default function HomePage() {
+  useStorePageView('store_home_view');
   const navigate = useNavigate();
   const { applySession } = useStoreSession();
   const [searchParams, setSearchParams] = useSearchParams();
@@ -74,6 +77,7 @@ export default function HomePage() {
   }, [loadDashboard]);
 
   async function runScan(opts?: { postAuthWarmup?: boolean }) {
+    trackStore('store_redeem_scan_start');
     if (!isWechatEnv()) {
       setScanMsg('请在微信内打开门店端进行扫码核销');
       return;

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

@@ -13,8 +13,10 @@ import {
   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();
@@ -145,6 +147,12 @@ export default function MinePage() {
             <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>
+  );
+}

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

@@ -2,12 +2,14 @@ import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import type { RedeemPhoneDirectPrepareResult } from '@dukang/shared-types';
 import { request } from '../lib/api';
+import { useStorePageView } from '../lib/usePageView';
 
 function formatAmount(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
 
 export default function PhoneRedeemPage() {
+  useStorePageView('store_phone_redeem_view');
   const navigate = useNavigate();
   const [phone, setPhone] = useState('');
   const [amount, setAmount] = useState('');

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

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { REDEEM_CHANNEL_LABELS, type RedeemChannel, type RedeemStatsDto } from '@dukang/shared-types';
 import { request } from '../lib/api';
+import { useStorePageView } from '../lib/usePageView';
 
 type RangeKey = 'today' | '7d' | '30d';
 type StatusFilter = 'all' | 'pending' | 'paid';
@@ -30,6 +31,7 @@ function channelLabel(channel: unknown): string {
 }
 
 export default function RecordsPage() {
+  useStorePageView('store_records_view');
   const [records, setRecords] = useState<Array<Record<string, unknown>>>([]);
   const [range, setRange] = useState<RangeKey>('today');
   const [statusFilter, setStatusFilter] = useState<StatusFilter>('all');

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

@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import WeakNetFallbackPanel from '../components/WeakNetFallbackPanel';
 import { request } from '../lib/api';
 import { reportRedeemFailure } from '../lib/redeem-failure';
+import { useStorePageView } from '../lib/usePageView';
 
 function formatAmount(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
@@ -17,6 +18,7 @@ type Preview = {
 };
 
 export default function RedeemConfirmPage() {
+  useStorePageView('store_redeem_confirm_view');
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const [token, setToken] = useState('');

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

@@ -4,6 +4,7 @@ import { STORE_STAFF_ROLE_LABELS, type StoreStaffRole } from '@dukang/shared-typ
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { useStoreSession } from '../contexts/StoreSessionContext';
 import { getStoreProfile, request } from '../lib/api';
+import { useStorePageView } from '../lib/usePageView';
 
 type StaffItem = {
   id: string;
@@ -23,6 +24,7 @@ function maskPhone(phone: string) {
 }
 
 export default function StaffPage() {
+  useStorePageView('store_staff_view');
   const navigate = useNavigate();
   const { store } = useStoreSession();
   const profile = store ?? getStoreProfile();

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

@@ -8,6 +8,7 @@ import {
 } from '@dukang/shared-types';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { request } from '../lib/api';
+import { useStorePageView } from '../lib/usePageView';
 
 type StatusFilter = 'all' | StoreWithdrawStatus;
 
@@ -16,6 +17,7 @@ function formatMoney(n: number) {
 }
 
 export default function WithdrawPage() {
+  useStorePageView('store_withdraw_view');
   const navigate = useNavigate();
   const [summary, setSummary] = useState<StoreWithdrawSummaryDto | null>(null);
   const [items, setItems] = useState<StoreWithdrawRequestDto[]>([]);
@@ -78,7 +80,6 @@ export default function WithdrawPage() {
   const canApply =
     !!summary?.isPrimary &&
     summary.availableAmount > 0 &&
-    !summary.hasPendingRequest &&
     summary.hasBankAccount &&
     !submitting;
 
@@ -124,7 +125,6 @@ export default function WithdrawPage() {
               info
             </span>
             单日上限 ¥{formatMoney(summary?.dailyLimit ?? 5000)}
-            {summary?.hasPendingRequest ? ' · 已有待审核申请' : ''}
             {!summary?.hasBankAccount ? ' · 请先完善收款账户' : ''}
           </p>
         </section>

apps/h5-shop/src/styles.css

@@ -1920,6 +1920,165 @@
   text-align: center;
 }
 
+/* ─── 门店套餐 ─── */
+.shop-packages-page .shop-records-main {
+  padding-bottom: 24px;
+}
+
+.shop-packages-intro {
+  margin: 0 0 12px;
+  font-size: 13px;
+  line-height: 1.5;
+  color: var(--color-subtle-gray);
+}
+
+.shop-packages-notice {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  margin-bottom: 12px;
+  padding: 12px 14px;
+  border-radius: var(--radius-md);
+  background: rgba(46, 125, 50, 0.08);
+  border: 1px solid rgba(46, 125, 50, 0.15);
+  font-size: 13px;
+  line-height: 1.5;
+  color: var(--color-on-surface);
+}
+
+.shop-packages-notice--warn {
+  background: rgba(180, 35, 24, 0.06);
+  border-color: rgba(180, 35, 24, 0.12);
+}
+
+.shop-packages-notice p {
+  margin: 0;
+}
+
+.shop-packages-form {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.shop-packages-card {
+  background: var(--color-card);
+  border-radius: var(--radius-md);
+  padding: 16px;
+  box-shadow: var(--shadow-card);
+  border: 1px solid rgba(0, 0, 0, 0.04);
+}
+
+.shop-packages-card-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+
+.shop-packages-card--collapsed .shop-packages-card-head {
+  margin-bottom: 0;
+}
+
+.shop-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;
+}
+
+.shop-packages-toggle .material-symbols-outlined {
+  font-size: 20px;
+  color: var(--color-on-surface-variant, #666);
+  flex-shrink: 0;
+}
+
+.shop-packages-card-title {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 700;
+  color: var(--color-on-surface);
+}
+
+.shop-packages-remove {
+  border: none;
+  background: transparent;
+  color: var(--color-heritage-red);
+  font-size: 13px;
+  padding: 0;
+}
+
+.shop-packages-field {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin-bottom: 12px;
+}
+
+.shop-packages-field:last-child {
+  margin-bottom: 0;
+}
+
+.shop-packages-label {
+  font-size: 12px;
+  color: var(--color-subtle-gray);
+}
+
+.shop-packages-input,
+.shop-packages-textarea {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 12px;
+  border: 1px solid rgba(0, 0, 0, 0.08);
+  border-radius: var(--radius-sm);
+  background: var(--color-surface-container-low, #fafafa);
+  font-size: 14px;
+  color: var(--color-on-surface);
+}
+
+.shop-packages-textarea {
+  resize: vertical;
+  min-height: 72px;
+}
+
+.shop-packages-input:focus,
+.shop-packages-textarea:focus {
+  outline: none;
+  border-color: var(--color-heritage-red);
+  box-shadow: 0 0 0 1px rgba(166, 29, 36, 0.12);
+}
+
+.shop-packages-input:disabled,
+.shop-packages-textarea:disabled {
+  opacity: 0.6;
+}
+
+.shop-packages-add {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  width: 100%;
+  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;
+}
+
+.shop-packages-add .material-symbols-outlined {
+  font-size: 20px;
+}
+
 .shop-record-amounts {
   display: grid;
   grid-template-columns: 1fr 1fr;

apps/h5-user/package.json

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

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

@@ -1,16 +1,21 @@
+import { createUserTracker, getSessionId } from '@dukang/client-logging';
 import { apiBase } from './api';
 
-export function track(eventName: string, params?: Record<string, unknown>) {
-  const token = localStorage.getItem('accessToken');
-  if (!token) return;
+const tracker = createUserTracker({
+  apiBase,
+  clientApp: 'USER_H5',
+});
 
-  void fetch(`${apiBase}/analytics/events`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${token}`,
-      'X-Client-App': 'USER_H5',
-    },
-    body: JSON.stringify({ events: [{ eventName, params }] }),
-  }).catch(() => {});
+export { getSessionId };
+
+export function track(eventName: string, params?: Record<string, unknown>) {
+  tracker.track(eventName, params);
+}
+
+export function trackPageView(eventName: string, params?: Record<string, unknown>) {
+  tracker.trackPageView(eventName, params);
+}
+
+export function initUserAnalytics() {
+  tracker.trackSessionStart();
 }

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

@@ -1,3 +1,5 @@
+import { reportApiError } from '@dukang/client-logging';
+
 export const BRAND = {
   red: '#A02D30',
   yellow: '#FFC107',
@@ -83,6 +85,12 @@ async function rawRequest<T>(
   if (json.code !== 0) {
     const err = new Error(json.message || '请求失败') as Error & { status?: number };
     err.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-user/src/lib/usePageView.ts

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

apps/h5-user/src/main.tsx

@@ -2,10 +2,16 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { getRouterBasename } from '@dukang/weixin-sdk';
+import { installClientErrorReporting } from '@dukang/client-logging';
 import App from './App';
+import { initUserAnalytics } from './lib/analytics';
+import { apiBase } from './lib/api';
 import './styles.css';
 import './styles/legal.css';
 
+installClientErrorReporting({ apiBase, clientApp: 'USER_H5' });
+initUserAnalytics();
+
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <BrowserRouter basename={getRouterBasename()}>

apps/h5-user/src/pages/AddressEditPage.tsx

@@ -6,6 +6,7 @@ import { request } from '../lib/api';
 import { buildAddressListUrl, readCheckoutContext } from '../lib/navigation';
 import { DEFAULT_REGION, formatRegion } from '../lib/region-data';
 import { normalizePhoneInput, validateMobilePhone } from '../lib/phone';
+import { usePageView } from '../lib/usePageView';
 
 type AddressForm = {
   receiverName: string;
@@ -21,6 +22,7 @@ export default function AddressEditPage() {
   const { id } = useParams();
   const [params] = useSearchParams();
   const isEdit = Boolean(id);
+  usePageView('address_edit', { mode: isEdit ? 'edit' : 'create' });
   const navigate = useNavigate();
   const [pickerOpen, setPickerOpen] = useState(false);
   const [saving, setSaving] = useState(false);

apps/h5-user/src/pages/AddressListPage.tsx

@@ -4,6 +4,7 @@ import SubPageHeader from '../components/SubPageHeader';
 import { request } from '../lib/api';
 import { useUserSession } from '../contexts/UserSessionContext';
 import { buildAddressEditUrl, buildAddressListUrl, buildOrderConfirmUrl, hasCheckoutContext, readCheckoutContext } from '../lib/navigation';
+import { usePageView } from '../lib/usePageView';
 
 type Address = {
   id: string;
@@ -25,6 +26,7 @@ function formatAddress(a: Address) {
 }
 
 export default function AddressListPage() {
+  usePageView('address_list_view');
   const { profile } = useUserSession();
   const [list, setList] = useState<Address[]>([]);
   const [pendingAddress, setPendingAddress] = useState<Address | null>(null);

apps/h5-user/src/pages/AfterSaleListPage.tsx

@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import { TICKET_TYPE_LABELS, type TicketTypeDto } from '@dukang/shared-types';
 import SubPageHeader from '../components/SubPageHeader';
 import { request } from '../lib/api';
+import { usePageView } from '../lib/usePageView';
 
 type TicketRow = {
   id: string;
@@ -23,6 +24,7 @@ const STATUS_LABEL: Record<string, string> = {
 };
 
 export default function AfterSaleListPage() {
+  usePageView('after_sale_list_view');
   const navigate = useNavigate();
   const [items, setItems] = useState<TicketRow[]>([]);
   const [loading, setLoading] = useState(true);

apps/h5-user/src/pages/AfterSalePage.tsx

@@ -8,6 +8,8 @@ import {
 import SubPageHeader from '../components/SubPageHeader';
 import { request } from '../lib/api';
 import { uploadFileToOss } from '../lib/upload';
+import { usePageView } from '../lib/usePageView';
+import { track } from '../lib/analytics';
 
 type OrderRow = {
   id: string;
@@ -21,6 +23,7 @@ type OrderRow = {
 const STEPS = ['类型', '订单', '凭证', '完成'] as const;
 
 export default function AfterSalePage() {
+  usePageView('after_sale_apply');
   const navigate = useNavigate();
   const [params] = useSearchParams();
   const presetOrderId = params.get('orderId') || '';

apps/h5-user/src/pages/BenefitDetailPage.tsx

@@ -2,9 +2,11 @@ import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import { request } from '../lib/api';
+import { usePageView } from '../lib/usePageView';
 
 export default function BenefitDetailPage() {
   const { id } = useParams();
+  usePageView('benefit_detail_view', { couponId: id });
   const navigate = useNavigate();
   const [data, setData] = useState<{ coupon: Record<string, unknown>; ledgers: Array<Record<string, unknown>> } | null>(null);
   useEffect(() => {

apps/h5-user/src/pages/BenefitPage.tsx

@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import BrandLogo from '@dukang/shared-ui/BrandLogo';
 import { request } from '../lib/api';
+import { usePageView } from '../lib/usePageView';
 
 type BenefitSummary = {
   totalBalance: number;
@@ -44,6 +45,7 @@ function buildRedeemUrl(coupon?: CouponItem) {
 }
 
 export default function BenefitPage() {
+  usePageView('benefit_page_view');
   const navigate = useNavigate();
   const listRef = useRef<HTMLElement>(null);
   const [summary, setSummary] = useState<BenefitSummary | null>(null);

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

@@ -7,6 +7,7 @@ import { buildOrderAddressSelectUrl } from '../lib/navigation';
 import { STITCH_ORDER_PRODUCT_IMAGE } from '../lib/order-images';
 import { handleShareButtonClick } from '../lib/wechat-share';
 import ContactCustomerSheet from '../components/ContactCustomerSheet';
+import { usePageView } from '../lib/usePageView';
 
 type OrderItem = {
   productName: string;
@@ -131,6 +132,7 @@ function fullReceiverAddress(order: Order) {
 
 export default function OrderDetailPage() {
   const { id } = useParams();
+  usePageView('order_detail_view', { orderId: id });
   const navigate = useNavigate();
   const [order, setOrder] = useState<Order | null>(null);
   const [showCs, setShowCs] = useState(false);

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

@@ -4,6 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader';
 import AppImage from '@dukang/shared-ui/AppImage';
 import OrderStatusTabs from '@dukang/shared-ui/OrderStatusTabs';
 import { request } from '../lib/api';
+import { usePageView } from '../lib/usePageView';
 
 const TABS = [
   { key: 'all', label: '全部' },
@@ -36,6 +37,7 @@ function orderStatusLabel(order: Record<string, unknown>) {
 export default function OrderListPage() {
   const [params, setParams] = useSearchParams();
   const tab = params.get('tab') || 'all';
+  usePageView('order_list_view', { tab });
   const [data, setData] = useState<{ list: Array<Record<string, unknown>> }>({ list: [] });
   const navigate = useNavigate();
 

apps/h5-user/src/pages/PayPage.tsx

@@ -15,6 +15,8 @@ import {
 } from '../lib/pay-wechat';
 import { applyWechatLoginResult, handleWechatAuthCallback } from '../lib/wechat-auth';
 import { isWechatEnv } from '../lib/weixin';
+import { usePageView } from '../lib/usePageView';
+import { track } from '../lib/analytics';
 
 function sleep(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -32,6 +34,7 @@ async function waitOrderPaid(orderId: string, maxAttempts = 15) {
 export default function PayPage() {
   const [params] = useSearchParams();
   const orderId = params.get('orderId') || '';
+  usePageView('pay_page_view', { orderId });
   const navigate = useNavigate();
   const [loading, setLoading] = useState(false);
   const [authLoading, setAuthLoading] = useState(false);
@@ -161,6 +164,11 @@ export default function PayPage() {
         return;
       }
       setMsg(e instanceof Error ? e.message : '支付失败');
+      track('pay_fail', {
+        orderId,
+        failReason: e instanceof Error ? e.message : '支付失败',
+        pagePath: '/pay',
+      });
     } finally {
       setLoading(false);
     }

apps/h5-user/src/pages/ProductDetailPage.tsx

@@ -155,7 +155,10 @@ export default function ProductDetailPage() {
         <button
           type="button"
           className="product-detail-buy-btn"
-          onClick={() => navigate(`/order/confirm?productId=${id}&qty=2`)}
+          onClick={() => {
+            track('product_click', { refType: 'PRODUCT', refId: id, productId: id });
+            navigate(`/order/confirm?productId=${id}&qty=2`);
+          }}
         >
           立即购买
         </button>

apps/h5-user/src/pages/RedeemCodePage.tsx

@@ -2,8 +2,10 @@ import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { REDEEM_TOKEN_TTL_SECONDS } from '@dukang/shared-types';
 import PageHeader from '@dukang/shared-ui/PageHeader';
+import { usePageView } from '../lib/usePageView';
 
 export default function RedeemCodePage() {
+  usePageView('redeem_code_view');
   const navigate = useNavigate();
   const token = sessionStorage.getItem('redeemToken') || '';
   const amount = sessionStorage.getItem('redeemAmount') || '0';

apps/h5-user/src/pages/RedeemPage.tsx

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { REDEEM_TOKEN_TTL_SECONDS } from '@dukang/shared-types';
 import { request } from '../lib/api';
+import { usePageView } from '../lib/usePageView';
 
 const POLL_INTERVAL_MS = 2500;
 
@@ -37,6 +38,7 @@ function formatTimer(seconds: number) {
 }
 
 export default function RedeemPage() {
+  usePageView('benefit_redeem_start');
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const couponId = searchParams.get('couponId') ?? undefined;

apps/h5-user/src/pages/RedeemSuccessPage.tsx

@@ -2,6 +2,7 @@ import { useMemo, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import { request } from '../lib/api';
+import { usePageView } from '../lib/usePageView';
 
 type RedeemRecord = {
   id: string;
@@ -46,6 +47,7 @@ function StarRating({
 }
 
 export default function RedeemSuccessPage() {
+  usePageView('redeem_success_view');
   const navigate = useNavigate();
   const location = useLocation();
   const [serviceScore, setServiceScore] = useState(5);

apps/mini-hq/src/pages/login/index.tsx

@@ -9,6 +9,7 @@ import {
   loginHqWithWechat,
 } from '../../lib/wechat';
 import { isWechatEnv } from '../../lib/weixin';
+import { MOCK_SMS_FIXED_CODE } from '@dukang/shared-types';
 import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
 import { clearHqAccountCache } from '../../lib/session';
 import './index.css';
@@ -41,7 +42,7 @@ function WechatIcon() {
 export default function LoginPage() {
   const remembered = loadRememberedPhone();
   const [phone, setPhone] = useState(remembered.phone || DEMO_PHONE);
-  const [code, setCode] = useState('123456');
+  const [code, setCode] = useState(MOCK_SMS_FIXED_CODE);
   const [rememberAccount, setRememberAccount] = useState(remembered.remember);
   const [agreed, setAgreed] = useState(false);
   const [cooldown, setCooldown] = useState(0);
@@ -103,7 +104,7 @@ export default function LoginPage() {
         method: 'POST',
         data: { phone, scene: 'HQ_LOGIN' },
       });
-      toast('验证码已发送（Mock:123456）', 'success');
+      toast(`验证码已发送（Mock:${MOCK_SMS_FIXED_CODE}）`, 'success');
       setCooldown(60);
       const t = setInterval(() => {
         setCooldown((s) => {

apps/mini-user/config/index.ts

@@ -104,8 +104,7 @@ export default defineConfig(async () => ({
     },
   },
   h5: {
-    // 生产发版由 remote-release 注入 TARO_H5_PUBLIC_PATH=/user/、TARO_H5_ROUTER_BASENAME=/user
-    // 本地预览勿强制 basename，否则静态托管下易白屏
+    // staging：user-test.dukanghaoke.com 根路径；生产：remote-release 注入 /user/
     publicPath: process.env.TARO_H5_PUBLIC_PATH || '/',
     ...(process.env.TARO_H5_ROUTER_BASENAME
       ? {

apps/mini-user/package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.24.4",
+    "@dukang/client-logging": "workspace:*",
     "@dukang/shared-types": "workspace:*",
     "@dukang/shared-ui": "workspace:*",
     "@dukang/weixin-sdk": "workspace:*",

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

@@ -1,19 +1,33 @@
 import { useState } from 'react';
 import { View, Image, Swiper, SwiperItem } from '@tarojs/components';
+import Taro from '@tarojs/taro';
 
 type ProductCarouselProps = {
   images: string[];
   alt: string;
   variant?: 'home' | 'detail' | 'store';
+  previewable?: boolean;
 };
 
 /** 商品/门店轮播（对齐 h5 ProductCarousel 三变体） */
-export default function ProductCarousel({ images, alt, variant = 'detail' }: ProductCarouselProps) {
+export default function ProductCarousel({
+  images,
+  alt,
+  variant = 'detail',
+  previewable = false,
+}: ProductCarouselProps) {
   const slides = images.length > 0 ? images : [''];
   const [activeIndex, setActiveIndex] = useState(0);
   const prefix =
     variant === 'store' ? 'store-detail-carousel' : variant === 'home' ? 'home-carousel' : 'detail-carousel';
 
+  function previewAt(index: number) {
+    const urls = slides.filter(Boolean);
+    if (!urls.length) return;
+    const current = slides[index] || urls[0];
+    Taro.previewImage({ current, urls }).catch(() => undefined);
+  }
+
   return (
     <View className={`${prefix}-wrap`}>
       <Swiper
@@ -24,7 +38,13 @@ export default function ProductCarousel({ images, alt, variant = 'detail' }: Pro
         {slides.map((src, index) => (
           <SwiperItem key={`${src}-${index}`} className={`${prefix}-item`}>
             {src ? (
-              <Image className={`${prefix}-image`} src={src} mode="aspectFill" alt={alt} />
+              <Image
+                className={`${prefix}-image`}
+                src={src}
+                mode="aspectFill"
+                alt={alt}
+                onClick={previewable ? () => previewAt(index) : undefined}
+              />
             ) : (
               <View className={`${prefix}-placeholder`} />
             )}

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

@@ -0,0 +1,37 @@
+import Taro from '@tarojs/taro';
+import { createUserTracker, getSessionId } from '@dukang/client-logging';
+import { API_BASE, CLIENT_APP, getToken } from './api';
+
+function currentPagePath(): string | undefined {
+  try {
+    const pages = Taro.getCurrentPages();
+    const cur = pages[pages.length - 1] as { route?: string; $taroPath?: string } | undefined;
+    return cur?.$taroPath || cur?.route || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+const tracker = createUserTracker({
+  apiBase: API_BASE,
+  clientApp: CLIENT_APP,
+  getToken,
+  getPagePath: currentPagePath,
+  postJson: ({ url, headers, body }) => {
+    void Taro.request({ url, method: 'POST', header: headers, data: body }).catch(() => {});
+  },
+});
+
+export { getSessionId };
+
+export function track(eventName: string, params?: Record<string, unknown>) {
+  tracker.track(eventName, params);
+}
+
+export function trackPageView(eventName: string, params?: Record<string, unknown>) {
+  tracker.trackPageView(eventName, params);
+}
+
+export function initUserAnalytics() {
+  tracker.trackSessionStart();
+}

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

@@ -3,6 +3,7 @@ import { ClientApp } from '@dukang/shared-types';
 import { forceReloadAfterAccountMerge } from './auth-nav';
 import { resetStoresSessionBootstrap } from './stores-session';
 import { resetHomeCatalogBootstrap } from './home-catalog-session';
+import { reportClientValidationError } from './client-error';
 
 function resolveApiBase(): string {
   const origin =
@@ -113,6 +114,12 @@ export async function request<T = unknown>(path: string, options: ReqOptions = {
     throw new Error('接口不可达，请确认 API 服务已启动');
   }
   if (status >= 400 || body.code !== 0) {
+    if (status === 400 || body?.code === 400) {
+      reportClientValidationError({
+        message: body?.message || `请求失败(${status})`,
+        apiPath: path,
+      });
+    }
     throw new Error(body?.message || `请求失败(${status})`);
   }
   return (res.data as { data: T }).data;

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

@@ -6,6 +6,7 @@ export type ClientErrorCategory =
   | 'js_error'
   | 'unhandled_rejection'
   | 'api_error'
+  | 'validation_error'
   | 'network'
   | 'render'
   | 'bridge'
@@ -57,6 +58,17 @@ export function reportClientError(payload: ClientErrorPayload): void {
   }).catch(() => {});
 }
 
+/** 上报 API 400 验证错误（失败静默） */
+export function reportClientValidationError(input: { message: string; apiPath?: string }): void {
+  if (input.apiPath?.includes('/common/client-errors')) return;
+  reportClientError({
+    level: 'warn',
+    category: 'validation_error',
+    message: input.message,
+    extra: { status: 400, url: input.apiPath },
+  });
+}
+
 let installed = false;
 
 /** 安装小程序/H5 全局未捕获错误钩子（幂等） */

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

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

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

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { View, Text, Image, Swiper, SwiperItem } from '@tarojs/components';
 import Taro, {
   useDidShow,
@@ -24,7 +24,6 @@ import { capturePromoSceneAndTouchScan } from '../../lib/promo';
 import { getProductMainImage } from '../../lib/product-images';
 import {
   canBuyOnline,
-  canCrossCity,
   canPickupOnSite,
   normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
@@ -34,6 +33,7 @@ import {
   DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
 } from '../../lib/wechat-share';
+import { trackPageView } from '../../lib/analytics';
 type Product = {
   id: string;
   name: string;
@@ -49,22 +49,6 @@ type Product = {
   allowCrossCityDelivery?: boolean;
 };
 
-type FulfillmentFilter = 'ALL' | 'ONLINE' | 'CROSS_CITY' | 'ON_SITE';
-
-const FULFILLMENT_FILTERS: Array<{ key: FulfillmentFilter; label: string }> = [
-  { key: 'ALL', label: '全部' },
-  { key: 'ONLINE', label: '线上' },
-  { key: 'CROSS_CITY', label: '跨城' },
-  { key: 'ON_SITE', label: '现场' },
-];
-
-function matchFulfillmentFilter(p: Product, filter: FulfillmentFilter): boolean {
-  if (filter === 'ALL') return true;
-  if (filter === 'ONLINE') return canBuyOnline(p);
-  if (filter === 'CROSS_CITY') return canCrossCity(p);
-  return canPickupOnSite(p);
-}
-
 type MiniHomeConfig = {
   banners: string[];
   footerUrl: string | null;
@@ -87,7 +71,6 @@ function aromaSectionId(key: AromaKey) {
 
 export default function HomePage() {
   const [activeAroma, setActiveAroma] = useState<AromaKey>('QINGXIANG');
-  const [fulfillmentFilter, setFulfillmentFilter] = useState<FulfillmentFilter>('ALL');
   const [products, setProducts] = useState<Product[]>([]);
   const [loading, setLoading] = useState(true);
   const [displayCity, setDisplayCity] = useState('郑州市');
@@ -97,6 +80,10 @@ export default function HomePage() {
   const scrollLockTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const lastScrollSyncAtRef = useRef(0);
 
+  useEffect(() => {
+    trackPageView('home_view', { pagePath: '/pages/home/index', cityCode });
+  }, [cityCode]);
+
   const loadMiniHome = useCallback(() => {
     return request<{ miniHome?: MiniHomeConfig }>('/common/client-config')
       .then((cfg) => {
@@ -205,23 +192,30 @@ export default function HomePage() {
     Taro.navigateTo({ url: returnPath });
   }
 
-  const filteredProducts = useMemo(
-    () => products.filter((p) => matchFulfillmentFilter(p, fulfillmentFilter)),
-    [products, fulfillmentFilter],
-  );
-
   const productsByAroma = useMemo(() => {
     const map: Record<AromaKey, Product[]> = {
       QINGXIANG: [],
       JIANGXIANG: [],
       NONGXIANG: [],
     };
-    for (const p of filteredProducts) {
+    for (const p of products) {
       const key = p.aromaType as AromaKey;
       if (key in map) map[key].push(p);
     }
     return map;
-  }, [filteredProducts]);
+  }, [products]);
+
+  const visibleAromaTabs = useMemo(
+    () => AROMA_TABS.filter((t) => productsByAroma[t.key].length > 0),
+    [productsByAroma],
+  );
+
+  useEffect(() => {
+    if (loading || visibleAromaTabs.length === 0) return;
+    if (!visibleAromaTabs.some((t) => t.key === activeAroma)) {
+      setActiveAroma(visibleAromaTabs[0].key);
+    }
+  }, [loading, visibleAromaTabs, activeAroma]);
 
   const banners = miniHome.banners;
   const footerUrl = miniHome.footerUrl;
@@ -269,18 +263,18 @@ export default function HomePage() {
     if (now - lastScrollSyncAtRef.current < 80) return;
     lastScrollSyncAtRef.current = now;
     const query = Taro.createSelectorQuery();
-    AROMA_TABS.forEach((t) => {
+    visibleAromaTabs.forEach((t) => {
       query.select(`#${aromaSectionId(t.key)}`).boundingClientRect();
     });
     query.exec((rects) => {
       if (!Array.isArray(rects) || rects.length === 0) return;
-      let next: AromaKey = AROMA_TABS[0].key;
-      for (let i = 0; i < AROMA_TABS.length; i++) {
+      let next: AromaKey = visibleAromaTabs[0]?.key ?? AROMA_TABS[0].key;
+      for (let i = 0; i < visibleAromaTabs.length; i++) {
         const rect = rects[i] as { top?: number } | null;
         if (!rect || rect.top == null) continue;
         // 区块顶进入导航下方一带时视为当前香型
         if (rect.top <= AROMA_NAV_OFFSET_PX + 24) {
-          next = AROMA_TABS[i].key;
+          next = visibleAromaTabs[i].key;
         }
       }
       setActiveAroma((prev) => (prev === next ? prev : next));
@@ -364,7 +358,7 @@ export default function HomePage() {
 
       <View className="home-aroma-nav">
         <View className="home-aroma-tabs">
-          {AROMA_TABS.map((t) => (
+          {visibleAromaTabs.map((t) => (
             <Text
               key={t.key}
               className={`home-aroma-tab${activeAroma === t.key ? ' home-aroma-tab--active' : ''}`}
@@ -377,38 +371,19 @@ export default function HomePage() {
         <Text className="home-aroma-city">{displayCity}</Text>
       </View>
 
-      <View className="home-fulfillment-filters">
-        {FULFILLMENT_FILTERS.map((f) => (
-          <Text
-            key={f.key}
-            className={`home-fulfillment-chip${fulfillmentFilter === f.key ? ' home-fulfillment-chip--active' : ''}`}
-            onClick={() => setFulfillmentFilter(f.key)}
-          >
-            {f.label}
-          </Text>
-        ))}
-      </View>
-
       <View className="home-product-list">
         {loading ? <View className="home-empty">加载中…</View> : null}
         {!loading && products.length === 0 ? (
           <View className="home-empty">当前城市暂无在售商品</View>
         ) : null}
-        {!loading && products.length > 0 && filteredProducts.length === 0 ? (
-          <View className="home-empty">暂无符合履约方式的商品</View>
-        ) : null}
         {!loading &&
-          filteredProducts.length > 0 &&
-          AROMA_TABS.map((t) => {
+          products.length > 0 &&
+          visibleAromaTabs.map((t) => {
             const list = productsByAroma[t.key];
             return (
               <View key={t.key} id={aromaSectionId(t.key)} className="home-aroma-section">
                 <Text className="home-aroma-section-title">{t.label}</Text>
-                {list.length === 0 ? (
-                  <View className="home-empty home-empty--section">该香型暂未上线</View>
-                ) : (
-                  list.map((p) => renderProductCard(p))
-                )}
+                {list.map((p) => renderProductCard(p))}
               </View>
             );
           })}

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

@@ -15,6 +15,7 @@ import {
   DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
 } from '../../lib/wechat-share';
+import { usePageView } from '../../lib/usePageView';
 
 const isWeapp = process.env.TARO_ENV === 'weapp';
 
@@ -74,6 +75,7 @@ function fullReceiverAddress(order: OrderDetail) {
 export default function OrderDetailPage() {
   const router = useRouter();
   const orderId = router.params.id ?? '';
+  usePageView('order_detail_view', orderId ? { orderId } : undefined);
   const [order, setOrder] = useState<OrderDetail | null>(null);
   const [confirming, setConfirming] = useState(false);
 

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

@@ -5,6 +5,7 @@ import PageShell from '../../components/PageShell';
 import SubPageHeader from '../../components/SubPageHeader';
 import { request, toast } from '../../lib/api';
 import { buildPayUrl } from '../../lib/checkout-nav';
+import { usePageView } from '../../lib/usePageView';
 
 import { ORDER_STATUS_LABELS } from '@dukang/shared-types';
 
@@ -54,6 +55,7 @@ type OrderRow = {
 export default function OrdersPage() {
   const router = useRouter();
   const [tab, setTab] = useState(() => normalizeOrdersTab(router.params.tab as string));
+  usePageView('order_list_view', { tab });
   const [orders, setOrders] = useState<OrderRow[]>([]);
   const [loading, setLoading] = useState(true);
 

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

@@ -33,6 +33,7 @@ import {
   toWeappShareMessage,
 } from '../../lib/wechat-share';
 import iconHome from '../../assets/tabbar/home.png';
+import { usePageView } from '../../lib/usePageView';
 
 type Product = ProductImageSource & {
   id: string;
@@ -50,6 +51,10 @@ type Product = ProductImageSource & {
 export default function ProductDetailPage() {
   const router = useRouter();
   const productId = router.params.id ?? '';
+  usePageView(
+    'product_detail_view',
+    productId ? { refType: 'PRODUCT', refId: productId, productId } : undefined,
+  );
   const [product, setProduct] = useState<Product | null>(null);
   const [headerSolid, setHeaderSolid] = useState(false);
 

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

@@ -28,6 +28,16 @@ type StoreMedia = {
   mediaType?: string | null;
 };
 
+type StorePackage = {
+  name: string;
+  price: string | number;
+  dishes: string;
+  usableTime?: string | null;
+  otherNotes?: string | null;
+  imageUrl?: string | null;
+  sortOrder?: number;
+};
+
 type Store = {
   id: string;
   name: string;
@@ -42,6 +52,7 @@ type Store = {
   coverUrl?: string | null;
   carouselUrls?: string[] | null;
   media?: StoreMedia[] | null;
+  packages?: StorePackage[] | null;
   openTime?: string | null;
   closeTime?: string | null;
   openTime2?: string | null;
@@ -305,11 +316,7 @@ export default function StoreDetailPage() {
   }
 
   const envPhotos = envPhotoUrls(store);
-  const images = uniqueUrls([
-    store.coverUrl,
-    ...(store.carouselUrls || []),
-    ...envPhotos,
-  ]);
+  const heroImages = uniqueUrls([store.coverUrl, ...(store.carouselUrls || [])]);
 
   const intro = store.intro?.trim() || '';
   const benefitRuleRaw = store.benefitUsageRule?.trim() || '';
@@ -336,7 +343,7 @@ export default function StoreDetailPage() {
       />
 
       <View className="store-detail-hero full-bleed">
-        <ProductCarousel images={images} alt={store.name} variant="store" />
+        <ProductCarousel images={heroImages} alt={store.name} variant="store" previewable />
       </View>
 
       <View className="store-detail-info-card">
@@ -389,6 +396,29 @@ export default function StoreDetailPage() {
         </View>
       ) : null}
 
+      {store.packages && store.packages.length > 0 ? (
+        <View className="store-detail-section">
+          <Text className="store-detail-section-title">门店套餐</Text>
+          {store.packages.map((pkg, index) => (
+            <View key={`${pkg.name}-${index}`} className="store-detail-package-card">
+              {pkg.imageUrl ? (
+                <Image className="store-detail-package-img" src={pkg.imageUrl} mode="aspectFill" />
+              ) : null}
+              <Text className="store-detail-package-name">{pkg.name}</Text>
+              <Text className="store-detail-package-body">
+                {formatRedeemAmountYuan(pkg.price)} 元 · {pkg.dishes}
+              </Text>
+              {pkg.usableTime ? (
+                <Text className="store-detail-package-meta">使用时间：{pkg.usableTime}</Text>
+              ) : null}
+              {pkg.otherNotes ? (
+                <Text className="store-detail-package-meta">说明：{pkg.otherNotes}</Text>
+              ) : null}
+            </View>
+          ))}
+        </View>
+      ) : null}
+
       {intro ? (
         <View className="store-detail-section">
           <Text className="store-detail-section-title">门店详情</Text>
@@ -413,7 +443,7 @@ export default function StoreDetailPage() {
                 className="store-detail-env-item"
                 onClick={() => previewEnv(index)}
               >
-                <Image className="store-detail-env-img" src={url} mode="aspectFill" />
+                <Image className="store-detail-env-img" src={url} mode="widthFix" />
               </View>
             ))}
           </View>

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

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { View, Text, Image, Input } from '@tarojs/components';
 import Taro, { useDidShow, usePullDownRefresh, useShareAppMessage, useShareTimeline } from '@tarojs/taro';
+import { StoreStatus, STORE_STATUS_LABELS } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import TabMainHeader from '../../components/TabMainHeader';
 import WechatShareReady from '../../components/WechatShareReady';
@@ -342,10 +343,17 @@ export default function StoresPage() {
   }
 
   function formatHours(store: Store) {
-    const parts: string[] = [];
-    if (store.openTime && store.closeTime) parts.push(`${store.openTime}-${store.closeTime}`);
-    if (store.openTime2 && store.closeTime2) parts.push(`${store.openTime2}-${store.closeTime2}`);
-    return parts.length ? `营业时间: ${parts.join('，')}` : '营业时间: 10:00-22:00';
+    // 列表只展示第一段营业时间，避免挤占一行
+    if (store.openTime && store.closeTime) {
+      return `营业时间: ${store.openTime}-${store.closeTime}`;
+    }
+    return '营业时间: 10:00-22:00';
+  }
+
+  function formatStatus(store: Store) {
+    const status = store.status as StoreStatus | undefined;
+    if (status && STORE_STATUS_LABELS[status]) return STORE_STATUS_LABELS[status];
+    return STORE_STATUS_LABELS[StoreStatus.OPEN];
   }
 
   const sharePayload = useMemo(
@@ -427,31 +435,39 @@ export default function StoresPage() {
               {s.coverUrl ? (
                 <Image className="store-card-cover" src={s.coverUrl} mode="aspectFill" />
               ) : (
-                <View className="store-card-cover--empty" />
+                <View className="store-card-cover store-card-cover--empty" />
               )}
               <View className="store-card-body">
-                <Text className="store-card-name">{s.name}</Text>
-                <Text className="store-card-meta">
-                  {s.district ? `${s.district} · ` : ''}
-                  {s.address || '地址待完善'}
-                </Text>
-                <Text className="store-card-meta">{formatHours(s)}</Text>
-                {s.avgPrice != null && Number(s.avgPrice) > 0 ? (
-                  <Text className="store-card-meta">人均¥{Number(s.avgPrice).toFixed(0)}</Text>
-                ) : null}
-                <View className="store-card-footer">
+                {/* 第1行：标题 + 距离 */}
+                <View className="store-card-row store-card-row--head">
+                  <Text className="store-card-name" numberOfLines={1}>
+                    {s.name}
+                  </Text>
                   <Text className="store-card-distance">
                     {formatDistanceMeters(s.distanceMeters)}
                   </Text>
-                  <Text
+                </View>
+                {/* 第2行：状态 + 营业时间（仅第一段） */}
+                <View className="store-card-row store-card-row--meta">
+                  <Text className="store-card-status">{formatStatus(s)}</Text>
+                  <Text className="store-card-hours" numberOfLines={1}>
+                    {formatHours(s)}
+                  </Text>
+                </View>
+                {/* 第3行：地址 + 去核销 */}
+                <View className="store-card-row store-card-row--foot">
+                  <Text className="store-card-address" numberOfLines={1}>
+                    {s.address || (s.district ? `${s.district}` : '地址待完善')}
+                  </Text>
+                  <View
                     className="store-card-cta"
                     onClick={(e) => {
                       e.stopPropagation();
                       Taro.navigateTo({ url: '/pages/redeem/index' });
                     }}
                   >
-                    去核销
-                  </Text>
+                    <Text className="store-card-cta-text">去核销</Text>
+                  </View>
                 </View>
               </View>
             </View>

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

@@ -175,24 +175,25 @@
 }
 
 .store-detail-env-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
 }
 
 .store-detail-env-item {
   position: relative;
   width: 100%;
-  aspect-ratio: 1;
   border-radius: var(--radius-md, 8px);
   overflow: hidden;
   background: var(--color-surface-container);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
 }
 
 .store-detail-env-img {
   width: 100%;
-  height: 100%;
+  height: auto;
   display: block;
+  vertical-align: top;
 }
 
 .store-detail-bar {
@@ -234,3 +235,93 @@
   flex: 1;
   margin-right: 0;
 }
+
+.store-detail-package-card {
+  padding: 12px 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+}
+
+.store-detail-package-img {
+  width: 100%;
+  height: 160px;
+  border-radius: var(--radius-md, 8px);
+  margin-bottom: 8px;
+  display: block;
+}
+
+.store-detail-package-card:last-of-type {
+  border-bottom: none;
+}
+
+.store-detail-package-name {
+  display: block;
+  font-size: 16px;
+  font-weight: 700;
+  color: var(--color-text-primary, #1a1a1a);
+  margin-bottom: 6px;
+}
+
+.store-detail-package-body {
+  display: block;
+  font-size: 14px;
+  color: var(--color-text-secondary, #666);
+  line-height: 1.5;
+}
+
+.store-detail-package-meta {
+  display: block;
+  font-size: 13px;
+  color: var(--color-text-tertiary, #999);
+  margin-top: 4px;
+}
+
+.store-detail-package-dispute {
+  display: block;
+  margin-top: 12px;
+  font-size: 13px;
+  color: var(--color-heritage-red);
+}
+
+.store-detail-dispute-mask {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.45);
+  z-index: 1000;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+
+.store-detail-dispute-panel {
+  width: 100%;
+  max-width: 480px;
+  background: #fff;
+  border-radius: 16px 16px 0 0;
+  padding: 20px 16px calc(20px + env(safe-area-inset-bottom));
+  box-sizing: border-box;
+}
+
+.store-detail-dispute-input {
+  width: 100%;
+  min-height: 96px;
+  margin: 12px 0 16px;
+  padding: 12px;
+  border: 1px solid rgba(0, 0, 0, 0.08);
+  border-radius: 8px;
+  box-sizing: border-box;
+  font-size: 14px;
+}
+
+.store-detail-dispute-actions {
+  display: flex;
+  gap: 12px;
+}
+
+.store-detail-dispute-actions .u-btn {
+  flex: 1;
+}
+
+.store-detail-dispute-actions .u-btn--ghost {
+  background: rgba(166, 29, 36, 0.08);
+  color: var(--color-heritage-red);
+}

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

@@ -144,63 +144,144 @@
   padding: 4px var(--space-page) 16px;
 }
 
+/* 左图右文，卡片等高 */
 .store-card {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  gap: 12px;
+  padding: 12px;
+  box-sizing: border-box;
   background: var(--color-card);
   border-radius: var(--radius-lg);
-  overflow: hidden;
   box-shadow: var(--shadow-card);
-  margin-bottom: 16px;
+  margin-bottom: 12px;
 }
 
 .store-card-cover {
-  width: 100%;
-  height: 160px;
+  flex-shrink: 0;
+  width: 96px;
+  height: 96px;
+  border-radius: 8px;
   background: var(--color-surface-container);
   display: block;
 }
 
 .store-card-cover--empty {
-  height: 160px;
   background: var(--color-surface-container);
 }
 
 .store-card-body {
-  padding: 14px 16px 16px;
+  flex: 1;
+  min-width: 0;
+  height: 96px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+
+.store-card-row {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  overflow: hidden;
+}
+
+/* 第1行：加粗标题（单行截断）+ 右对齐距离 */
+.store-card-row--head {
+  gap: 8px;
+  height: 22px;
 }
 
 .store-card-name {
-  display: block;
+  flex: 1;
+  min-width: 0;
   font-family: var(--font-headline);
-  font-size: 16px;
+  font-size: 15px;
   font-weight: 700;
-  color: var(--color-on-surface);
-  margin-bottom: 6px;
-}
-
-.store-card-meta {
-  display: block;
-  font-size: 12px;
-  color: var(--color-subtle-gray);
-  margin-bottom: 4px;
-}
-
-.store-card-footer {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 12px;
+  line-height: 22px;
+  color: #1a1a1a;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .store-card-distance {
+  flex-shrink: 0;
+  max-width: 40%;
   font-size: 12px;
-  color: var(--color-on-surface-variant);
+  font-weight: 400;
+  line-height: 22px;
+  color: #999;
+  text-align: right;
+  white-space: nowrap;
+}
+
+/* 第2行：营业状态 + 营业时间（单行） */
+.store-card-row--meta {
+  gap: 6px;
+  height: 20px;
+}
+
+.store-card-status {
+  flex-shrink: 0;
+  padding: 0 6px;
+  border-radius: 4px;
+  background: rgba(45, 106, 79, 0.12);
+  color: #2d6a4f;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 18px;
+  white-space: nowrap;
+}
+
+.store-card-hours {
+  flex: 1;
+  min-width: 0;
+  font-size: 11px;
+  font-weight: 400;
+  line-height: 20px;
+  color: #999;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* 第3行：地址（单行截断）+ 右对齐去核销 */
+.store-card-row--foot {
+  gap: 8px;
+  height: 28px;
+}
+
+.store-card-address {
+  flex: 1;
+  min-width: 0;
+  font-size: 9px;
+  font-weight: 400;
+  line-height: 28px;
+  color: #999;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .store-card-cta {
-  padding: 6px 14px;
-  border-radius: var(--radius-full);
-  background: rgba(166, 29, 36, 0.08);
-  color: var(--color-heritage-red);
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 14px;
+  height: 26px;
+  border-radius: 999px;
+  background: var(--color-heritage-red, #a61d24);
+  box-sizing: border-box;
+}
+
+.store-card-cta-text {
   font-size: 12px;
   font-weight: 600;
+  line-height: 26px;
+  color: #fff;
+  white-space: nowrap;
 }

deploy/nginx-dukang-staging.conf

@@ -69,6 +69,14 @@ server {
         proxy_set_header Connection "";
     }
 
+    # 旧 /user 前缀书签 → 根路径（staging 独立域名，无 /user 子路径）
+    location = /user {
+        return 301 /;
+    }
+    location ^~ /user/ {
+        rewrite ^/user/(.*)$ /$1 permanent;
+    }
+
     location / {
         proxy_pass http://127.0.0.1:8191;
         proxy_http_version 1.1;