merge(dev): fix XFX callback build types

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

.cursor/rules/frontend-h5.mdc

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

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

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

AGENTS.md

@@ -11,7 +11,7 @@
 | **V3.0 唯一需求源** | [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) | 产品需求与三波交付（**只看这个**） |
 | **现状对照** | [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md) | 已完成 / 冲突 / 缺口审计 |
 | **V3 实现验收** | [`杜康好客-v3编码手册.md`](./杜康好客-v3编码手册.md) | 核销规则、分工、闭环 |
-| ~~V2 / preV1~~ | 历史参考 | **不再作为需求依据** |
+| ~~V2 / preV1~~ | 历史参考（**已压缩**；V2 全文见 git 2026-08-06 前） | **不再作为需求依据** |
 
 **禁止**：臆造 PRD 未定义规则；依赖 `doc/` 下过时文档；跨 OWNER 直写他人 Prisma 表。
 
@@ -137,6 +137,9 @@ C 端门店仅 status=OPEN
 订单 Tab：待付款 | 已付款 | 已完成
 ```
 
+**iOS 微信 H5 JSSDK**：登录/OAuth 后禁止仅 SPA 跳转再调扫码；见 `packages/weixin-sdk/GOTCHAS.md`、知识库「门店端 · 踩坑」。
+**微信小程序 open-type**：`chooseAvatar` 等 Button 的祖先禁止 `stopPropagation`（会编成 catchtap）；见知识库「C 端 · 踩坑」、`.cursor/rules/mini-user-weapp-opentype.mdc`。
+
 ## 环境与发版
 
 | 环境 | 分支 | 目录 | 端口 | 域名 |

apps/AGENTS.md

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

apps/admin-web/package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.5.1",
     "@dukang/shared-types": "workspace:*",
+    "@dukang/shared-ui": "workspace:*",
     "antd": "^5.22.0",
     "dayjs": "^1.11.13",
     "echarts": "^6.1.0",

apps/admin-web/src/App.tsx

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

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

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

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

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

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

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

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

@@ -146,6 +146,7 @@ const MENU_ITEMS: MenuProps['items'] = [
     ],
   },
   { key: '/hq-permissions', icon: <LockOutlined />, label: '权限分配' },
+  { key: '/test-whitelist', icon: <SafetyOutlined />, label: '白名单管理' },
   { key: '/system-settings', icon: <SettingOutlined />, label: '系统设置' },
   { key: '/hq-accounts', icon: <SafetyOutlined />, label: 'HQ账户' },
 ];
@@ -215,6 +216,7 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
     '/logs/third-party': 'logs',
     '/logs/domain-events': 'logs',
     '/hq-permissions': 'hq_permissions',
+    '/test-whitelist': 'test_whitelist',
     '/system-settings': 'system_settings_any',
     '/hq-accounts': 'hq_accounts',
   };

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

@@ -167,6 +167,7 @@ export type AdminUserRow = {
   sourceLabel: string | null;
   createdAt: string;
   orderCount: number;
+  isTest?: boolean;
 };
 
 export type AdminOrderItem = {
@@ -199,6 +200,7 @@ export type AdminOrderRow = {
   isProxyOrder?: boolean;
   proxyPartnerName?: string | null;
   proxyPartnerPhone?: string | null;
+  isTest?: boolean;
   user?: { id: string; userNo: string; phone: string | null; nickname: string | null };
   delivery?: {
     provider: string;

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

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

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

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

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

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

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

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

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

@@ -16,10 +16,12 @@ import type { ColumnsType } from 'antd/es/table';
 import {
   DEV_PLAN_TASK_STATUS_LABELS,
   DEV_PLAN_TASK_TYPE_LABELS,
+  SUPPORT_TICKET_STATUS_LABELS,
   type DevPlanTaskDto,
   type DevPlanTaskStatusDto,
   type DevPlanTaskTypeDto,
   type DevPlanVersionDto,
+  type SupportTicketDto,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
@@ -50,6 +52,7 @@ export default function DevPlanTasksPage() {
   const [batchEditOpen, setBatchEditOpen] = useState(false);
   const [batchSaving, setBatchSaving] = useState(false);
   const [versions, setVersions] = useState<DevPlanVersionDto[]>([]);
+  const [supportTickets, setSupportTickets] = useState<SupportTicketDto[]>([]);
   const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
   const [saving, setSaving] = useState(false);
   const [dispatching, setDispatching] = useState(false);
@@ -64,6 +67,13 @@ export default function DevPlanTasksPage() {
       .catch(() => setVersions([]));
   }, [batchEditOpen]);
 
+  useEffect(() => {
+    if (!modalOpen || editing) return;
+    request<{ items: SupportTicketDto[] }>('/admin/support-tickets?pageSize=100')
+      .then((res) => setSupportTickets(res.items ?? []))
+      .catch(() => setSupportTickets([]));
+  }, [modalOpen, editing]);
+
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<DevPlanTaskDto>(
     '/admin/dev-plan/tasks',
     () => {
@@ -78,7 +88,7 @@ export default function DevPlanTasksPage() {
 
   function openCreate() {
     setEditing(null);
-    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO' });
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
     setModalOpen(true);
   }
 
@@ -101,7 +111,11 @@ export default function DevPlanTasksPage() {
       } else {
         await request('/admin/dev-plan/tasks', {
           method: 'POST',
-          body: JSON.stringify({ content: values.content, type: values.type }),
+          body: JSON.stringify({
+            content: values.content,
+            type: values.type,
+            supportTicketId: values.supportTicketId || undefined,
+          }),
         });
         message.success('已创建');
       }
@@ -305,7 +319,20 @@ export default function DevPlanTasksPage() {
             <Form.Item name="status" label="状态" rules={[{ required: true }]}>
               <Select options={STATUS_OPTIONS} />
             </Form.Item>
-          ) : null}
+          ) : (
+            <Form.Item name="supportTicketId" label="绑定技术支持工单">
+              <Select
+                allowClear
+                showSearch
+                optionFilterProp="label"
+                placeholder="可选：关联工单"
+                options={supportTickets.map((t) => ({
+                  value: t.id,
+                  label: `${t.ticketNo} · ${SUPPORT_TICKET_STATUS_LABELS[t.status]} · ${t.title}`,
+                }))}
+              />
+            </Form.Item>
+          )}
         </Form>
       </Modal>
 

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

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

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

@@ -1,4 +1,4 @@
-import { useMemo, useRef, useState } from 'react';
+import { useMemo, useState } from 'react';
 import {
   Button, Descriptions, Divider, Drawer, Form, Input, InputNumber, Modal, Popconfirm, Select, Space,
   Switch, Table, Tabs, Tag, Typography, message,
@@ -67,13 +67,6 @@ type ProductFormValues = {
   features?: Array<{ icon?: string; title?: string; desc?: string }>;
 };
 
-type UserPickRow = {
-  id: string;
-  phone?: string | null;
-  nickname?: string | null;
-  userNo?: string;
-};
-
 function mapDetailToForm(d: Record<string, unknown>) {
   const detail = (d.detailContent ?? {}) as ProductDetailContentDto;
   const row = d as Row;
@@ -112,10 +105,6 @@ function buildProductPayload(v: ProductFormValues) {
     features: features.length ? features : undefined,
   };
 
-  const visibilityPhones = (v.visibilityPhones ?? [])
-    .map((p) => String(p || '').replace(/\D/g, '').trim())
-    .filter(Boolean);
-
   return {
     barcode69: v.barcode69,
     name: v.name,
@@ -131,7 +120,6 @@ function buildProductPayload(v: ProductFormValues) {
     allowCrossCityDelivery:
       v.allowOnlinePurchase === false ? false : v.allowCrossCityDelivery !== false,
     visibilityWhitelistEnabled: !!v.visibilityWhitelistEnabled,
-    visibilityPhones,
     coverUrl: v.coverUrl,
     carouselUrls,
     detailImageUrls,
@@ -213,33 +201,6 @@ function ProductDetailFields({ form, aromaType }: { form: FormInstance; aromaTyp
 }
 
 function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
-  const [userOptions, setUserOptions] = useState<UserPickRow[]>([]);
-  const [userSearching, setUserSearching] = useState(false);
-  const searchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  async function searchUsers(keyword: string) {
-    const q = keyword.trim();
-    if (searchTimer.current) clearTimeout(searchTimer.current);
-    if (!q) {
-      setUserOptions([]);
-      return;
-    }
-    searchTimer.current = setTimeout(() => {
-      void (async () => {
-        setUserSearching(true);
-        try {
-          const qs = new URLSearchParams({ page: '1', pageSize: '20', phone: q });
-          const res = await request<{ items: UserPickRow[] }>(`/admin/users?${qs}`);
-          setUserOptions((res.items ?? []).filter((u) => !!u.phone));
-        } catch {
-          setUserOptions([]);
-        } finally {
-          setUserSearching(false);
-        }
-      })();
-    }, 300);
-  }
-
   const enabled = Form.useWatch('visibilityWhitelistEnabled', form);
 
   return (
@@ -248,46 +209,14 @@ function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
         name="visibilityWhitelistEnabled"
         label="可见白名单"
         valuePropName="checked"
-        extra="开启后仅名单内手机号在 C 端可见/可购，用于在线测试"
+        extra="开启后仅全局测试白名单内手机号在 C 端可见/可购，用于在线测试"
       >
         <Switch checkedChildren="开" unCheckedChildren="关" />
       </Form.Item>
       {enabled ? (
-        <>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 16 }}>
-          <Form.Item
+          可见手机号见白名单管理
-            name="visibilityPhones"
+        </Typography.Text>
-            label="白名单手机号"
-            rules={[{ required: true, message: '请至少添加一个手机号' }]}
-            extra="可直接输入多个手机号回车添加，或从下方用户库选择"
-          >
-            <Select
-              mode="tags"
-              tokenSeparators={[',', ' ', '，', ';', '；']}
-              placeholder="输入手机号后回车"
-              style={{ width: '100%' }}
-            />
-          </Form.Item>
-          <Form.Item label="从用户库添加">
-            <Select
-              showSearch
-              filterOption={false}
-              placeholder="按手机号搜索用户"
-              loading={userSearching}
-              options={userOptions.map((u) => ({
-                value: u.phone!,
-                label: `${u.phone}${u.nickname ? ` · ${u.nickname}` : ''}${u.userNo ? `（${u.userNo}）` : ''}`,
-              }))}
-              onSearch={searchUsers}
-              onSelect={(phone: string) => {
-                const cur = (form.getFieldValue('visibilityPhones') as string[] | undefined) ?? [];
-                if (!cur.includes(phone)) {
-                  form.setFieldsValue({ visibilityPhones: [...cur, phone] });
-                }
-              }}
-              notFoundContent={userSearching ? '搜索中…' : '输入手机号搜索'}
-            />
-          </Form.Item>
-        </>
       ) : null}
     </>
   );
@@ -419,8 +348,8 @@ export default function ProductsPage() {
       title: '白名单',
       dataIndex: 'visibilityWhitelistEnabled',
       width: 90,
-      render: (v: boolean, row) =>
+      render: (v: boolean) =>
-        v ? <Tag color="orange">限{row.visibilityPhones?.length ?? 0}人</Tag> : <Tag>公开</Tag>,
+        v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
     {
       title: '履约',

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

@@ -1,7 +1,8 @@
 import { useState } from 'react';
-import { Button, Descriptions, Drawer, Form, Input, Select, Table, Tag, Typography } from 'antd';
+import { Button, Checkbox, Drawer, Form, Input, Select, Table, Tag, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { REDEEM_CHANNEL_LABELS, type RedeemChannel } from '@dukang/shared-types';
+import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
@@ -13,30 +14,62 @@ type Row = {
   settleAmount: number;
   channel?: RedeemChannel;
   createdAt: string;
-  user?: { userNo: string; phone: string | null };
+  isTest?: boolean;
+  user?: { userNo: string; phone: string | null; nickname?: string | null };
   store?: { name: string; cityName: string };
   coupon?: { couponNo: string };
 };
 
+function maskPhone(phone: string | null | undefined) {
+  if (!phone || phone.length < 7) return phone ?? '—';
+  return `${phone.slice(0, 3)}****${phone.slice(-4)}`;
+}
+
 export default function RedeemRecordsPage() {
   const [form] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
   const { data, loading, page, pageSize, setPage, setPageSize } = useAdminList<Row>(
     '/admin/redeem-records',
     () => {
       const qs = new URLSearchParams();
-      if (filters.redeemNo) qs.set('redeemNo', filters.redeemNo);
+      if (filters.redeemNo) qs.set('redeemNo', String(filters.redeemNo));
-      if (filters.storeId) qs.set('storeId', filters.storeId);
+      if (filters.storeId) qs.set('storeId', String(filters.storeId));
-      if (filters.channel) qs.set('channel', filters.channel);
+      if (filters.channel) qs.set('channel', String(filters.channel));
+      if (filters.excludeTest) qs.set('excludeTest', 'true');
       return qs;
     },
     [filters],
   );
   const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
+  const [detailLoading, setDetailLoading] = useState(false);
+
+  async function openDetail(id: string) {
+    setDetailLoading(true);
+    setDrawerOpen(true);
+    try {
+      setDetail(await request(`/admin/redeem-records/${id}`));
+    } finally {
+      setDetailLoading(false);
+    }
+  }
 
   const columns: ColumnsType<Row> = [
-    { title: '核销号', dataIndex: 'redeemNo', width: 180 },
+    {
+      title: '核销号',
+      dataIndex: 'redeemNo',
+      width: 200,
+      render: (v, row) => (
+        <span>
+          {v}
+          {row.isTest ? (
+            <Tag color="orange" style={{ marginLeft: 6 }}>
+              测试
+            </Tag>
+          ) : null}
+        </span>
+      ),
+    },
     {
       title: '方式',
       dataIndex: 'channel',
@@ -50,7 +83,19 @@ export default function RedeemRecordsPage() {
         );
       },
     },
-    { title: '用户', dataIndex: ['user', 'userNo'], width: 110 },
+    { title: '用户编号', dataIndex: ['user', 'userNo'], width: 110 },
+    {
+      title: '用户昵称',
+      dataIndex: ['user', 'nickname'],
+      width: 100,
+      render: (v: string | null | undefined) => v || '—',
+    },
+    {
+      title: '用户手机',
+      dataIndex: ['user', 'phone'],
+      width: 120,
+      render: (v: string | null | undefined) => maskPhone(v),
+    },
     { title: '门店', dataIndex: ['store', 'name'] },
     { title: '核销额', dataIndex: 'amount', width: 90, render: (v) => `¥${v}` },
     { title: '结算额', dataIndex: 'settleAmount', width: 90, render: (v) => `¥${v}` },
@@ -60,14 +105,7 @@ export default function RedeemRecordsPage() {
       title: '操作',
       width: 80,
       render: (_, row) => (
-        <Button
+        <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
-          type="link"
-          size="small"
-          onClick={async () => {
-            setDetail(await request(`/admin/redeem-records/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
           详情
         </Button>
       ),
@@ -102,6 +140,9 @@ export default function RedeemRecordsPage() {
             ]}
           />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item>
           <Button type="primary" htmlType="submit">
             查询
@@ -113,7 +154,7 @@ export default function RedeemRecordsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 1300 }}
         pagination={{
           current: page,
           pageSize,
@@ -125,22 +166,21 @@ export default function RedeemRecordsPage() {
           },
         }}
       />
-      <Drawer title="核销详情" width={520} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
+      <Drawer
-        {detail && (
+        title="核销详情"
-          <Descriptions column={1} bordered size="small">
+        width={640}
-            <Descriptions.Item label="核销号">{String(detail.redeemNo)}</Descriptions.Item>
+        open={drawerOpen}
-            <Descriptions.Item label="方式">
+        onClose={() => {
-              {
+          setDrawerOpen(false);
-                REDEEM_CHANNEL_LABELS[
+          setDetail(null);
-                  (detail.channel === 'PHONE' ? 'PHONE' : 'SCAN') as RedeemChannel
+        }}
-                ]
+        destroyOnClose
-              }
+      >
-            </Descriptions.Item>
+        {detailLoading ? (
-            <Descriptions.Item label="核销额">¥{String(detail.amount)}</Descriptions.Item>
+          <Typography.Text type="secondary">加载中…</Typography.Text>
-            <Descriptions.Item label="结算额">¥{String(detail.settleAmount)}</Descriptions.Item>
+        ) : detail ? (
-            <Descriptions.Item label="时间">{fmtTime(String(detail.createdAt))}</Descriptions.Item>
+          <RedeemRecordDetailDescriptions detail={detail} />
-          </Descriptions>
+        ) : null}
-        )}
       </Drawer>
     </div>
   );

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

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

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

@@ -1,8 +1,9 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Alert,
   Button,
+  Checkbox,
   Descriptions,
   Drawer,
   Form,
@@ -277,36 +278,7 @@ function StoreAuditMediaSection({ detail }: { detail: Record<string, unknown> })
   );
 }
 
-type UserPickRow = { id: string; phone?: string | null; nickname?: string | null; userNo?: string | null };
-
 function StoreVisibilityWhitelistFields({ form }: { form: FormInstance }) {
-  const [userOptions, setUserOptions] = useState<UserPickRow[]>([]);
-  const [userSearching, setUserSearching] = useState(false);
-  const searchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  async function searchUsers(keyword: string) {
-    const q = keyword.trim();
-    if (searchTimer.current) clearTimeout(searchTimer.current);
-    if (!q) {
-      setUserOptions([]);
-      return;
-    }
-    searchTimer.current = setTimeout(() => {
-      void (async () => {
-        setUserSearching(true);
-        try {
-          const qs = new URLSearchParams({ page: '1', pageSize: '20', phone: q });
-          const res = await request<{ items: UserPickRow[] }>(`/admin/users?${qs}`);
-          setUserOptions((res.items ?? []).filter((u) => !!u.phone));
-        } catch {
-          setUserOptions([]);
-        } finally {
-          setUserSearching(false);
-        }
-      })();
-    }, 300);
-  }
-
   const enabled = Form.useWatch('visibilityWhitelistEnabled', form);
 
   return (
@@ -315,46 +287,14 @@ function StoreVisibilityWhitelistFields({ form }: { form: FormInstance }) {
         name="visibilityWhitelistEnabled"
         label="可见白名单"
         valuePropName="checked"
-        extra="开启后仅名单内手机号在 C 端可见，用于在线测试"
+        extra="开启后仅全局测试白名单内手机号在 C 端可见，用于在线测试"
       >
         <Switch checkedChildren="开" unCheckedChildren="关" />
       </Form.Item>
       {enabled ? (
-        <>
+        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 16 }}>
-          <Form.Item
+          可见手机号见白名单管理
-            name="visibilityPhones"
+        </Typography.Text>
-            label="白名单手机号"
-            rules={[{ required: true, message: '请至少添加一个手机号' }]}
-            extra="可直接输入多个手机号回车添加，或从下方用户库选择"
-          >
-            <Select
-              mode="tags"
-              tokenSeparators={[',', ' ', '，', ';', '；']}
-              placeholder="输入手机号后回车"
-              style={{ width: '100%' }}
-            />
-          </Form.Item>
-          <Form.Item label="从用户库添加">
-            <Select
-              showSearch
-              filterOption={false}
-              placeholder="按手机号搜索用户"
-              loading={userSearching}
-              options={userOptions.map((u) => ({
-                value: u.phone!,
-                label: `${u.phone}${u.nickname ? ` · ${u.nickname}` : ''}${u.userNo ? `（${u.userNo}）` : ''}`,
-              }))}
-              onSearch={searchUsers}
-              onSelect={(phone: string) => {
-                const cur = (form.getFieldValue('visibilityPhones') as string[] | undefined) ?? [];
-                if (!cur.includes(phone)) {
-                  form.setFieldsValue({ visibilityPhones: [...cur, phone] });
-                }
-              }}
-              notFoundContent={userSearching ? '搜索中…' : '输入手机号搜索'}
-            />
-          </Form.Item>
-        </>
       ) : null}
     </>
   );
@@ -375,8 +315,9 @@ type StoreRow = {
   createdAt: string;
   visibilityWhitelistEnabled?: boolean;
   visibilityPhones?: string[];
+  isTest?: boolean;
   cityRef?: { name: string; code: string };
-  partner?: { companyName: string };
+  partner?: { id?: string; companyName?: string | null; name?: string | null; phone?: string | null };
   account?: {
     phone: string;
     name: string;
@@ -394,13 +335,14 @@ type StoreRow = {
   category?: { id: string; name: string; parentId?: string | null } | null;
 };
 
-type PartnerOption = { id: string; companyName: string; name?: string };
+type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string | null };
 
 function partnerOptionLabel(p: PartnerOption): string {
   const company = (p.companyName || '').trim();
   const person = (p.name || '').trim();
+  const phone = (p.phone || '').trim();
   if (company && person) return `${company}-${person}`;
-  return company || person || p.id;
+  return company || person || phone || p.id;
 }
 type CityOption = {
   id: string;
@@ -423,8 +365,8 @@ export default function StoresPage() {
   const [form] = Form.useForm();
   const [editForm] = Form.useForm();
   const [createForm] = Form.useForm<StoreCreateForm>();
-  const [filters, setFilters] = useState<Record<string, string>>(() => {
+  const [filters, setFilters] = useState<Record<string, string | boolean>>(() => {
-    const init: Record<string, string> = {};
+    const init: Record<string, string | boolean> = {};
     if (initialCityId) init.cityId = initialCityId;
     if (initialPartnerId) init.partnerId = initialPartnerId;
     return init;
@@ -433,12 +375,13 @@ export default function StoresPage() {
     '/admin/stores',
     () => {
       const qs = new URLSearchParams();
-      if (filters.name) qs.set('name', filters.name);
+      if (filters.name) qs.set('name', String(filters.name));
-      if (filters.status) qs.set('status', filters.status);
+      if (filters.status) qs.set('status', String(filters.status));
-      if (filters.auditStatus) qs.set('auditStatus', filters.auditStatus);
+      if (filters.auditStatus) qs.set('auditStatus', String(filters.auditStatus));
-      if (filters.phone) qs.set('phone', filters.phone);
+      if (filters.phone) qs.set('phone', String(filters.phone));
-      if (filters.cityId) qs.set('cityId', filters.cityId);
+      if (filters.cityId) qs.set('cityId', String(filters.cityId));
-      if (filters.partnerId) qs.set('partnerId', filters.partnerId);
+      if (filters.partnerId) qs.set('partnerId', String(filters.partnerId));
+      if (filters.excludeTest) qs.set('excludeTest', 'true');
       return qs;
     },
     [filters],
@@ -596,6 +539,7 @@ export default function StoresPage() {
       visibilityPhones: Array.isArray(d.visibilityPhones)
         ? (d.visibilityPhones as string[])
         : [],
+      isTest: !!d.isTest,
     });
     setDrawerOpen(true);
   }
@@ -636,9 +580,7 @@ export default function StoresPage() {
         bankAccountNo: v.bankAccountNo ?? null,
         bankBranch: v.bankBranch ?? null,
         visibilityWhitelistEnabled: !!v.visibilityWhitelistEnabled,
-        visibilityPhones: ((v.visibilityPhones as string[] | undefined) ?? [])
+        isTest: !!v.isTest,
-          .map((p) => String(p || '').replace(/\D/g, '').trim())
-          .filter(Boolean),
         ...(hasCoords
           ? { latitude: Number(v.latitude), longitude: Number(v.longitude) }
           : {}),
@@ -812,9 +754,6 @@ export default function StoresPage() {
           bankBranch: values.bankBranch.trim(),
           settlementRate: Number(values.settlementRate ?? 60) / 100,
           visibilityWhitelistEnabled: !!values.visibilityWhitelistEnabled,
-          visibilityPhones: (values.visibilityPhones ?? [])
-            .map((p: string) => String(p || '').replace(/\D/g, '').trim())
-            .filter(Boolean),
         }),
       });
       message.success('门店已创建');
@@ -838,7 +777,12 @@ export default function StoresPage() {
       title: '封面', dataIndex: 'coverUrl', width: 72,
       render: (url) => url ? <Image src={url} width={48} height={48} style={{ objectFit: 'cover', borderRadius: 4 }} /> : '—',
     },
-    { title: '门店名', dataIndex: 'name', width: 140 },
+    { title: '门店名', dataIndex: 'name', width: 160, render: (v, row) => (
+      <Space size={4}>
+        <span>{v}</span>
+        {row.isTest ? <Tag color="orange">测试</Tag> : null}
+      </Space>
+    ) },
     {
       title: '分类',
       width: 100,
@@ -867,13 +811,19 @@ export default function StoresPage() {
         );
       },
     },
-    { title: '开城合伙人', dataIndex: ['partner', 'companyName'], width: 120 },
+    {
+      title: '开城合伙人',
+      dataIndex: 'partner',
+      width: 140,
+      render: (partner: StoreRow['partner']) =>
+        partner ? partnerOptionLabel({ id: partner.id ?? '', ...partner }) : '—',
+    },
     {
       title: '可见',
       dataIndex: 'visibilityWhitelistEnabled',
       width: 90,
-      render: (v, row) =>
+      render: (v) =>
-        v ? <Tag color="orange">限{row.visibilityPhones?.length ?? 0}人</Tag> : <Tag>公开</Tag>,
+        v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
     { title: '介绍', dataIndex: 'intro', width: 160, ellipsis: true, render: (v) => v || '—' },
     { title: '店长', dataIndex: ['account', 'name'], width: 90, render: (v) => v || '—' },
@@ -932,6 +882,9 @@ export default function StoresPage() {
             options={Object.entries(STORE_AUDIT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
           />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
         <Form.Item>
           <Button
@@ -1169,6 +1122,14 @@ export default function StoresPage() {
                         </Form.Item>
                       </Space>
                       <StoreVisibilityWhitelistFields form={editForm} />
+                      <Form.Item
+                        name="isTest"
+                        label="测试门店"
+                        valuePropName="checked"
+                        extra="测试门店核销不计入结算账单；联系电话命中全局白名单时会自动标记"
+                      >
+                        <Switch checkedChildren="是" unCheckedChildren="否" />
+                      </Form.Item>
                     </>
                   ),
                 },

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

@@ -30,6 +30,7 @@ import {
   DEV_PLAN_TASK_TYPE_LABELS,
   SUPPORT_TICKET_STATUS_LABELS,
   SUPPORT_TICKET_TYPE_LABELS,
+  SUPPORT_TICKET_PRIORITY_LABELS,
   mapSupportTicketTypeToDevPlanTask,
   type BatchReviewPreviewItem,
   type BatchReviewPreviewResponse,
@@ -37,6 +38,7 @@ import {
   type DevPlanVersionDto,
   type SupportTicketDto,
   type SupportTicketLinkedTaskDto,
+  type SupportTicketPriorityDto,
   type SupportTicketStatusDto,
   type SupportTicketTypeDto,
 } from '@dukang/shared-types';
@@ -54,6 +56,7 @@ const STATUS_COLOR: Record<SupportTicketStatusDto, string> = {
   DEVELOPING: 'blue',
   TESTING: 'purple',
   PASSED: 'green',
+  PUBLISHED: 'cyan',
 };
 
 const TYPE_OPTIONS = (Object.keys(SUPPORT_TICKET_TYPE_LABELS) as SupportTicketTypeDto[]).map(
@@ -64,6 +67,17 @@ const STATUS_OPTIONS = (Object.keys(SUPPORT_TICKET_STATUS_LABELS) as SupportTick
   (value) => ({ value, label: SUPPORT_TICKET_STATUS_LABELS[value] }),
 );
 
+const PRIORITY_COLOR: Record<SupportTicketPriorityDto, string> = {
+  LOW: 'default',
+  NORMAL: 'blue',
+  HIGH: 'orange',
+  URGENT: 'red',
+};
+
+const PRIORITY_OPTIONS = (Object.keys(SUPPORT_TICKET_PRIORITY_LABELS) as SupportTicketPriorityDto[]).map(
+  (value) => ({ value, label: SUPPORT_TICKET_PRIORITY_LABELS[value] }),
+);
+
 const TASK_TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTaskTypeDto[]).map(
   (v) => ({ value: v, label: DEV_PLAN_TASK_TYPE_LABELS[v] }),
 );
@@ -80,6 +94,7 @@ export default function SupportTicketsPage() {
       const qs = new URLSearchParams();
       if (filters.ticketType) qs.set('ticketType', filters.ticketType);
       if (filters.status) qs.set('status', filters.status);
+      if (filters.priority) qs.set('priority', filters.priority);
       return qs;
     },
     [filters],
@@ -154,6 +169,7 @@ export default function SupportTicketsPage() {
           title: values.title.trim(),
           content: values.content?.trim() || undefined,
           remark: values.remark?.trim() || undefined,
+          priority: values.priority,
           attachmentUrls: (values.attachmentUrls ?? []).map((u: string) => u?.trim()).filter(Boolean),
         }),
       });
@@ -217,6 +233,7 @@ export default function SupportTicketsPage() {
       title: detail.title,
       content: detail.content || '',
       remark: detail.remark || '',
+      priority: detail.priority ?? 'NORMAL',
       attachmentUrls: detail.attachmentUrls?.length ? detail.attachmentUrls : [''],
     });
     setEditOpen(true);
@@ -233,6 +250,7 @@ export default function SupportTicketsPage() {
           title: values.title.trim(),
           content: values.content?.trim() || undefined,
           remark: values.remark?.trim() || undefined,
+          priority: values.priority,
           attachmentUrls: (values.attachmentUrls ?? []).map((u: string) => u?.trim()).filter(Boolean),
         }),
       });
@@ -451,12 +469,29 @@ export default function SupportTicketsPage() {
       width: 90,
       render: (t: SupportTicketTypeDto) => SUPPORT_TICKET_TYPE_LABELS[t] ?? t,
     },
+    {
+      title: '优先级',
+      dataIndex: 'priority',
+      width: 90,
+      render: (p: SupportTicketPriorityDto) => (
+        <Tag color={PRIORITY_COLOR[p] ?? 'default'}>
+          {SUPPORT_TICKET_PRIORITY_LABELS[p] ?? p ?? '普通'}
+        </Tag>
+      ),
+    },
     {
       title: '状态',
       dataIndex: 'status',
       width: 100,
-      render: (s: SupportTicketStatusDto) => (
+      render: (s: SupportTicketStatusDto, row) => (
-        <Tag color={STATUS_COLOR[s]}>{SUPPORT_TICKET_STATUS_LABELS[s] ?? s}</Tag>
+        <Space size={4} direction="vertical" style={{ lineHeight: 1.2 }}>
+          <Tag color={STATUS_COLOR[s]}>{SUPPORT_TICKET_STATUS_LABELS[s] ?? s}</Tag>
+          {row.releasedVersionNo ? (
+            <Typography.Text type="secondary" style={{ fontSize: 11 }}>
+              {row.releasedVersionNo}
+            </Typography.Text>
+          ) : null}
+        </Space>
       ),
     },
     { title: '标题', dataIndex: 'title', ellipsis: true },
@@ -562,6 +597,9 @@ export default function SupportTicketsPage() {
         <Form.Item name="status" label="状态">
           <Select allowClear style={{ width: 120 }} options={STATUS_OPTIONS} />
         </Form.Item>
+        <Form.Item name="priority" label="优先级">
+          <Select allowClear style={{ width: 120 }} options={PRIORITY_OPTIONS} />
+        </Form.Item>
         <Button type="primary" htmlType="submit">
           筛选
         </Button>
@@ -577,11 +615,7 @@ export default function SupportTicketsPage() {
           isSuperAdmin
             ? {
                 selectedRowKeys,
-                onChange: (keys, rows) => {
+                onChange: (keys) => setSelectedRowKeys(keys as string[]),
-                  const pending = rows.filter((r) => r.status === 'PENDING_REVIEW').map((r) => String(r.id));
-                  setSelectedRowKeys(pending.length === rows.length ? (keys as string[]) : pending);
-                },
-                getCheckboxProps: (row) => ({ disabled: row.status !== 'PENDING_REVIEW' }),
               }
             : undefined
         }
@@ -607,6 +641,9 @@ export default function SupportTicketsPage() {
                   {detail.ticketNo}
                 </Typography.Text>
                 <Tag>{SUPPORT_TICKET_TYPE_LABELS[detail.ticketType] ?? detail.ticketType}</Tag>
+                <Tag color={PRIORITY_COLOR[detail.priority ?? 'NORMAL']}>
+                  {SUPPORT_TICKET_PRIORITY_LABELS[detail.priority ?? 'NORMAL']}
+                </Tag>
               </>
             )}
           </Space>
@@ -637,6 +674,11 @@ export default function SupportTicketsPage() {
                   {detail.status === 'PASSED' && (
                     <Typography.Text type="success">此工单已测试通过</Typography.Text>
                   )}
+                  {detail.status === 'PUBLISHED' && (
+                    <Typography.Text type="success">
+                      已发布{detail.releasedVersionNo ? ` · ${detail.releasedVersionNo}` : ''}
+                    </Typography.Text>
+                  )}
                 </Space>
                 <Typography.Text type="secondary" style={{ fontSize: 12 }}>
                   创建于 {fmtTime(detail.createdAt)}
@@ -660,6 +702,7 @@ export default function SupportTicketsPage() {
                           { key: 'DEVELOPING' as SupportTicketStatusDto, label: '开发中', time: detail.reviewedAt },
                           { key: 'TESTING' as SupportTicketStatusDto, label: '测试中', time: null },
                           { key: 'PASSED' as SupportTicketStatusDto, label: '已通过', time: detail.completedAt },
+                          { key: 'PUBLISHED' as SupportTicketStatusDto, label: '已发布', time: detail.publishedAt },
                         ]
                       : [{ key: 'REJECTED' as SupportTicketStatusDto, label: '已驳回', time: detail.reviewedAt }]),
                   ];
@@ -865,10 +908,13 @@ export default function SupportTicketsPage() {
       </Drawer>
 
       <Modal title="创建技术支持工单" open={createOpen} onCancel={() => setCreateOpen(false)} onOk={() => void submitCreate()} confirmLoading={creating} destroyOnClose okText="提交">
-        <Form form={createForm} layout="vertical" initialValues={{ ticketType: 'BUG', attachmentUrls: [''] }}>
+        <Form form={createForm} layout="vertical" initialValues={{ ticketType: 'BUG', priority: 'NORMAL', attachmentUrls: [''] }}>
           <Form.Item name="ticketType" label="类型" rules={[{ required: true }]}>
             <Select options={TYPE_OPTIONS} />
           </Form.Item>
+          <Form.Item name="priority" label="优先级" rules={[{ required: true }]}>
+            <Select options={PRIORITY_OPTIONS} />
+          </Form.Item>
           <Form.Item name="title" label="标题" rules={[{ required: true }]}>
             <Input maxLength={128} showCount />
           </Form.Item>
@@ -972,6 +1018,9 @@ export default function SupportTicketsPage() {
           <Form.Item name="ticketType" label="类型" rules={[{ required: true }]}>
             <Select options={TYPE_OPTIONS} />
           </Form.Item>
+          <Form.Item name="priority" label="优先级" rules={[{ required: true }]}>
+            <Select options={PRIORITY_OPTIONS} />
+          </Form.Item>
           <Form.Item name="title" label="标题" rules={[{ required: true }]}>
             <Input maxLength={128} showCount />
           </Form.Item>

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

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

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

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

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

@@ -112,6 +112,7 @@ export default function UsersPage() {
       if (values.status !== undefined && values.status !== '') {
         qs.set('status', String(values.status));
       }
+      if (values.excludeTest) qs.set('excludeTest', 'true');
       const res = await request<Paginated<AdminUserRow>>(`/admin/users?${qs}`);
       setData(res);
     } finally {
@@ -237,7 +238,17 @@ export default function UsersPage() {
   ];
 
   const columns: ColumnsType<AdminUserRow> = [
-    { title: '用户编号', dataIndex: 'userNo', width: 120 },
+    {
+      title: '用户编号',
+      dataIndex: 'userNo',
+      width: 140,
+      render: (v, row) => (
+        <Space size={4}>
+          <span>{v}</span>
+          {row.isTest ? <Tag color="orange">测试</Tag> : null}
+        </Space>
+      ),
+    },
     { title: '昵称', dataIndex: 'nickname', width: 100 },
     {
       title: '手机',
@@ -362,6 +373,9 @@ export default function UsersPage() {
             { value: 0, label: '停用' },
           ]} />
         </Form.Item>
+        <Form.Item name="excludeTest" valuePropName="checked">
+          <Checkbox>过滤测试账号</Checkbox>
+        </Form.Item>
         <Form.Item>
           <Space>
             <Button type="primary" htmlType="submit">查询</Button>

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

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

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

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

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

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

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

@@ -19,8 +19,6 @@ type OssUploadFieldProps = {
   onWechatReadyChange?: (ready: boolean) => void;
 };
 
-const DEFAULT_MAX_MB = 10;
-
 function isCancelError(msg: string): boolean {
   return /cancel|取消/i.test(msg);
 }
@@ -79,10 +77,6 @@ export default function OssUploadField({
       showUploadError('图片读取失败，请重新选择');
       return;
     }
-    if (file.size > DEFAULT_MAX_MB * 1024 * 1024) {
-      showUploadError(`文件不能超过 ${DEFAULT_MAX_MB}MB`);
-      return;
-    }
     const result = await uploadFileToOss(file, { bizType, mediaType });
     onChange?.(result.url);
   }

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

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

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

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

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

@@ -12,8 +12,10 @@ import {
 } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';
+import type { PartnerPhoneCheckResponse } from '@dukang/shared-types';
 import {
   bindPartnerWechatAfterSmsLogin,
+  checkPartnerPhoneForLogin,
   fetchClientConfig,
   loginPartnerWithWechat,
 } from '../lib/wechat-auth';
@@ -69,14 +71,17 @@ function formatPartnerError(e: unknown): string {
   if (text.includes('合伙人账号不存在') || text.includes('未找到合伙人账号')) {
     return '未找到合伙人账号';
   }
-  if (text.includes('合伙人账号已停用')) {
+  if (text.includes('合伙人账号已停用') || text.includes('账号已停用')) {
-    return '合伙人账号已停用';
+    return '合伙人账号已暂停，无法登录';
   }
   return text;
 }
 
 function formatWechatError(e: unknown): string {
   const text = e instanceof Error ? e.message : '微信登录失败';
+  if (text.includes('合伙人账号已停用') || text.includes('账号已停用')) {
+    return '合伙人账号已暂停，无法登录';
+  }
   if (text.includes('首次登录') || text.includes('手机验证码')) {
     return '该微信尚未绑定合伙人账号，请先使用手机验证码登录，登录后将自动关联微信';
   }
@@ -138,11 +143,21 @@ export default function LoginPage() {
 
   async function sendCode() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    if (!trimmedPhone) {
+      setMsg('请输入手机号');
+      return;
+    }
+    if (!/^1\d{10}$/.test(trimmedPhone)) {
+      setMsg('请输入正确的手机号');
+      return;
+    }
     setMsg('');
     try {
+      await checkPartnerPhoneForLogin(trimmedPhone);
       await request('PARTNER_H5', '/partner/auth/sms/send', {
         method: 'POST',
-        body: JSON.stringify({ phone, scene: 'PARTNER_LOGIN' }),
+        body: JSON.stringify({ phone: trimmedPhone, scene: 'PARTNER_LOGIN' }),
         silent: true,
       });
       setMsg('验证码已发送');
@@ -168,12 +183,27 @@ export default function LoginPage() {
 
   async function login() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    const trimmedCode = code.trim();
+    if (!trimmedPhone) {
+      setMsg('请输入手机号');
+      return;
+    }
+    if (!/^1\d{10}$/.test(trimmedPhone)) {
+      setMsg('请输入正确的手机号');
+      return;
+    }
+    if (!trimmedCode) {
+      setMsg('请输入验证码');
+      return;
+    }
     setLoading(true);
     setMsg('');
     try {
+      await checkPartnerPhoneForLogin(trimmedPhone);
       const data = await request<PartnerSessionPayload>('PARTNER_H5', '/partner/auth/login/sms', {
         method: 'POST',
-        body: JSON.stringify({ phone, code }),
+        body: JSON.stringify({ phone: trimmedPhone, code: trimmedCode }),
         silent: true,
       });
       saveRememberedSession(data);

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

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

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

@@ -19,6 +19,7 @@ import {
 import {
   fetchClientConfig,
   handleShopWechatCallback,
+  handleShopWechatCallbackOnce,
   handleShopWechatLoginResult,
   isShopWechatUnboundError,
   SHOP_WX_NEED_PHONE_LOGIN_MSG,
@@ -79,7 +80,7 @@ export function StoreSessionProvider({ children }: { children: ReactNode }) {
           try {
             const config = await fetchClientConfig();
             if (isWxAuthorizeEnabled(config)) {
-              const result = await handleShopWechatCallback();
+              const result = await handleShopWechatCallbackOnce();
               if (result && !cancelled) {
                 const session = handleShopWechatLoginResult(result);
                 if (session) applySession(session);

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

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

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

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

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

@@ -2,6 +2,7 @@ import type { ClientRuntimeConfig, WechatLoginResult } from '@dukang/shared-type
 import { isWxAuthorizeEnabled } from '@dukang/shared-types';
 import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
 import { isWechatEnv, weixinSdk } from './weixin';
+import { markScanWarmupAfterAuth } from './shop-scan-auth';
 import { request, saveWechatSession, type ShopSessionPayload } from './api';
 
 export type ShopAccountProfile = {
@@ -138,6 +139,20 @@ export async function handleShopWechatCallback(): Promise<WechatLoginResult | nu
   return weixinSdk.handleOAuthCallback();
 }
 
+let oauthCallbackInflight: Promise<WechatLoginResult | null> | null = null;
+
+/** 全局单例：避免 Context 与页面 effect 重复消费 OAuth code */
+export async function handleShopWechatCallbackOnce(): Promise<WechatLoginResult | null> {
+  if (!isWechatEnv()) return null;
+  const params = new URLSearchParams(window.location.search);
+  if (!params.get('code')) return null;
+  if (oauthCallbackInflight) return oauthCallbackInflight;
+  oauthCallbackInflight = handleShopWechatCallback().finally(() => {
+    oauthCallbackInflight = null;
+  });
+  return oauthCallbackInflight;
+}
+
 /**
  * 微信一键登录（已绑定微信的门店账号免验证码）。
  * 返回 session = 已登录；void = 已跳转授权页等待回调。
@@ -148,15 +163,19 @@ export async function loginShopWithWechat(): Promise<ShopSessionPayload | null |
   if (!isWechatEnv()) {
     throw new Error(WECHAT_INAPP_REQUIRED_MSG);
   }
+  markScanWarmupAfterAuth();
   const result = await weixinSdk.login();
   if (result) return handleShopWechatLoginResult(result);
 }
 
 /** 短信登录成功后于微信内自动发起 OAuth，绑定 openId 便于后续免登 */
-export async function bindShopWechatAfterSmsLogin(): Promise<void> {
+export async function bindShopWechatAfterSmsLogin(session?: ShopSessionPayload): Promise<'skipped' | void> {
   const config = await fetchClientConfig();
-  if (!isWxAuthorizeEnabled(config)) return;
+  if (!isWxAuthorizeEnabled(config)) return 'skipped';
-  if (!isWechatEnv()) return;
+  if (!isWechatEnv()) return 'skipped';
+  // 已绑定则勿再 OAuth：每次 OAuth 回跳都会重置 iOS JSSDK 入场 URL，易导致扫码失败
+  if (session?.account?.hasWechat) return 'skipped';
+  markScanWarmupAfterAuth();
   await weixinSdk.login();
 }
 
@@ -166,5 +185,6 @@ export async function authorizeShopWechat(): Promise<WechatLoginResult | void> {
   if (!isWechatEnv()) {
     throw new Error(WECHAT_INAPP_REQUIRED_MSG);
   }
+  markScanWarmupAfterAuth();
   return weixinSdk.login();
 }

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

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

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

@@ -18,7 +18,7 @@ import {
   consumeShopWechatLoginHint,
   fetchClientConfig,
   formatShopWechatError,
-  handleShopWechatCallback,
+  handleShopWechatCallbackOnce,
   handleShopWechatLoginResult,
   loginShopWithWechat,
 } from '../lib/wechat-auth';
@@ -88,7 +88,7 @@ export default function LoginPage() {
 
   useEffect(() => {
     if (!isWechatEnv() || !wxAuthorize || !params.get('code')) return;
-    void handleShopWechatCallback()
+    void handleShopWechatCallbackOnce()
       .then((result) => {
         if (!result) return;
         const session = handleShopWechatLoginResult(result);
@@ -140,18 +140,28 @@ export default function LoginPage() {
 
   async function login() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    const trimmedCode = code.trim();
+    if (!trimmedPhone) {
+      setMsg('phone should not be empty');
+      return;
+    }
+    if (!trimmedCode) {
+      setMsg('code should not be empty');
+      return;
+    }
     setLoading(true);
     setMsg('');
     try {
       const data = await request<ShopSessionPayload>('SHOP_H5', '/shop/auth/login/sms', {
         method: 'POST',
-        body: JSON.stringify({ phone, code }),
+        body: JSON.stringify({ phone: trimmedPhone, code: trimmedCode }),
       });
       saveRememberedSession(data);
       applySession(data);
-      if (isWechatEnv() && wxAuthorize) {
+      if (isWechatEnv() && wxAuthorize && !data.account?.hasWechat) {
         setMsg('登录成功，正在关联微信…');
-        await bindShopWechatAfterSmsLogin();
+        await bindShopWechatAfterSmsLogin(data);
         return;
       }
       routeAfterShopLogin(data, navigate);

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

@@ -9,7 +9,7 @@ import {
   authorizeShopWechat,
   fetchClientConfig,
   fetchShopAccount,
-  handleShopWechatCallback,
+  handleShopWechatCallbackOnce,
   handleShopWechatLoginResult,
 } from '../lib/wechat-auth';
 import { isWechatEnv } from '../lib/weixin';
@@ -45,7 +45,7 @@ export default function MinePage() {
 
   useEffect(() => {
     if (!isWechatEnv() || !wxAuthorize || !searchParams.get('code')) return;
-    void handleShopWechatCallback()
+    void handleShopWechatCallbackOnce()
       .then((result) => {
         if (!result) return;
         const session = handleShopWechatLoginResult(result);

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

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

apps/h5-shop/src/styles.css

@@ -794,6 +794,7 @@
 
 .shop-scan-auth-actions {
   display: flex;
+  flex-wrap: wrap;
   gap: 12px;
 }
 

apps/h5-user/src/components/ContactCustomerSheet.tsx

@@ -1,6 +1,10 @@
-import { CUSTOMER_SERVICE_PHONE } from '@dukang/shared-types';
+import { useEffect, useState } from 'react';
 import { track } from '../lib/analytics';
-import { openWecomCustomerService } from '../lib/customer-service';
+import {
+  getCustomerServicePhone,
+  loadCustomerServicePhone,
+  openWecomCustomerService,
+} from '../lib/customer-service';
 
 type ContactCustomerSheetProps = {
   orderId?: string;
@@ -9,7 +13,13 @@ type ContactCustomerSheetProps = {
 };
 
 export default function ContactCustomerSheet({ orderId, onClose }: ContactCustomerSheetProps) {
-  const tel = CUSTOMER_SERVICE_PHONE.replace(/-/g, '');
+  const [phone, setPhone] = useState(getCustomerServicePhone);
+
+  useEffect(() => {
+    void loadCustomerServicePhone().then(setPhone);
+  }, []);
+
+  const tel = phone.replace(/-/g, '');
 
   function openPhone() {
     track('cs_contact', { type: 'phone', orderId });
@@ -41,7 +51,7 @@ export default function ContactCustomerSheet({ orderId, onClose }: ContactCustom
             </div>
             <div className="contact-customer-option-body">
               <p className="contact-customer-option-title">拨打总部客服电话</p>
-              <p className="contact-customer-option-sub">{CUSTOMER_SERVICE_PHONE}</p>
+              <p className="contact-customer-option-sub">{phone}</p>
             </div>
             <span className="material-symbols-outlined contact-customer-chevron">chevron_right</span>
           </button>

apps/h5-user/src/lib/customer-service.ts

@@ -1,12 +1,31 @@
 import { CUSTOMER_SERVICE_PHONE, CUSTOMER_SERVICE_WECOM_URL } from '@dukang/shared-types';
+import { fetchClientConfig } from './pay-wechat';
 import { isWechatEnv } from './weixin';
 
+let cachedPhone = CUSTOMER_SERVICE_PHONE;
+
 /** 企微客服链接：优先 Vite env，否则 shared-types 默认 */
 export function getCustomerServiceWecomUrl(): string {
   const fromEnv = import.meta.env.VITE_CS_WECOM_URL?.trim();
   return fromEnv || CUSTOMER_SERVICE_WECOM_URL;
 }
 
+export function getCustomerServicePhone(): string {
+  return cachedPhone;
+}
+
+/** 从系统设置拉取客服电话（失败则保持默认常量） */
+export async function loadCustomerServicePhone(): Promise<string> {
+  try {
+    const cfg = await fetchClientConfig();
+    const phone = cfg.customerServicePhone?.trim();
+    if (phone) cachedPhone = phone;
+  } catch {
+    /* keep fallback */
+  }
+  return cachedPhone;
+}
+
 /**
  * 打开企业微信客服会话（须在微信内；需用户点击手势）。
  * @returns true 已跳转；false 非微信环境已提示
@@ -20,4 +39,5 @@ export function openWecomCustomerService(): boolean {
   return true;
 }
 
+/** @deprecated 请用 getCustomerServicePhone()，保留兼容旧引用 */
 export { CUSTOMER_SERVICE_PHONE };

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

@@ -1,4 +1,9 @@
 import { apiBase } from './api';
+import {
+  compressImageFileIfNeeded,
+  DEFAULT_OSS_MAX_UPLOAD_BYTES,
+  formatOssMaxSizeMb,
+} from '@dukang/shared-ui/compressImage';
 
 export type OssMediaType = 'IMAGE' | 'VIDEO' | 'FILE';
 
@@ -15,8 +20,15 @@ export async function uploadFileToOss(
   options: { bizType: string; mediaType?: OssMediaType },
 ): Promise<UploadFileResult> {
   const mediaType = options.mediaType ?? (file.type.startsWith('video/') ? 'VIDEO' : 'IMAGE');
+  let prepared = file;
+  if (mediaType === 'IMAGE') {
+    prepared = await compressImageFileIfNeeded(file);
+    if (prepared.size > DEFAULT_OSS_MAX_UPLOAD_BYTES) {
+      throw new Error(`图片压缩后仍超过 ${formatOssMaxSizeMb()}MB，请换一张较小的图片`);
+    }
+  }
   const formData = new FormData();
-  formData.append('file', file);
+  formData.append('file', prepared);
   formData.append('bizType', options.bizType);
   formData.append('mediaType', mediaType);
 

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

@@ -1,11 +1,22 @@
+import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import SubPageHeader from '../components/SubPageHeader';
-import { CUSTOMER_SERVICE_PHONE, openWecomCustomerService } from '../lib/customer-service';
+import {
+  getCustomerServicePhone,
+  loadCustomerServicePhone,
+  openWecomCustomerService,
+} from '../lib/customer-service';
 import { track } from '../lib/analytics';
 
 export default function CustomerServicePage() {
   const navigate = useNavigate();
-  const tel = CUSTOMER_SERVICE_PHONE.replace(/-/g, '');
+  const [phone, setPhone] = useState(getCustomerServicePhone);
+
+  useEffect(() => {
+    void loadCustomerServicePhone().then(setPhone);
+  }, []);
+
+  const tel = phone.replace(/-/g, '');
 
   function openOnline() {
     track('cs_contact', { type: 'wecom_kf' });
@@ -27,7 +38,7 @@ export default function CustomerServicePage() {
 
         <a className="customer-service-phone-link" href={`tel:${tel}`}>
           <span className="material-symbols-outlined">call</span>
-          或拨打客服电话 {CUSTOMER_SERVICE_PHONE}
+          或拨打客服电话 {phone}
         </a>
       </div>
     </div>

apps/mini-user/package.json

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

apps/mini-user/src/app.config.ts

@@ -6,11 +6,13 @@ export default defineAppConfig({
     'pages/mine/index',
     'pages/product-detail/index',
     'pages/store-detail/index',
+    'pages/store-package-detail/index',
     'pages/order-confirm/index',
     'pages/order-confirm-pickup/index',
     'pages/pay/index',
     'pages/orders/index',
     'pages/order-detail/index',
+    'pages/order-logistics/index',
     'pages/pickup-receive/index',
     'pages/addresses/index',
     'pages/address-edit/index',

apps/mini-user/src/app.tsx

@@ -6,11 +6,13 @@ import WechatShareBootstrap from './components/WechatShareBootstrap';
 import { patchTaroH5Hooks } from './lib/patch-taro-h5-hooks';
 import { handleWechatOrderConfirmShow } from './lib/wechat-order-confirm';
 import { installClientErrorReporting } from './lib/client-error';
+import { prefetchShareBrandAssets } from './lib/wechat-share';
 import './app.css';
 
 // H5：在首屏 page hooks 执行前，把 Taro.useDidShow 等绑到与 createReactApp 同一份 runtime
 patchTaroH5Hooks();
 installClientErrorReporting();
+prefetchShareBrandAssets();
 
 function App({ children }: PropsWithChildren) {
   const handlingRef = useRef(false);

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

@@ -0,0 +1,44 @@
+import { Text } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import { splitLogisticsText } from '../lib/order-logistics-utils';
+import { toast } from '../lib/api';
+
+type LogisticsRichTextProps = {
+  text: string;
+  className?: string;
+  phoneClassName?: string;
+};
+
+export default function LogisticsRichText({
+  text,
+  className = '',
+  phoneClassName = 'order-logistics-phone-link',
+}: LogisticsRichTextProps) {
+  const segments = splitLogisticsText(text);
+
+  function dial(phone: string) {
+    const normalized = phone.replace(/-/g, '');
+    Taro.makePhoneCall({ phoneNumber: normalized }).catch(() => toast('无法拨打电话'));
+  }
+
+  return (
+    <Text className={className}>
+      {segments.map((segment, index) =>
+        segment.type === 'phone' ? (
+          <Text
+            key={`${segment.value}-${index}`}
+            className={phoneClassName}
+            onClick={(e) => {
+              e.stopPropagation();
+              dial(segment.value);
+            }}
+          >
+            {segment.value}
+          </Text>
+        ) : (
+          <Text key={`${index}-text`}>{segment.value}</Text>
+        ),
+      )}
+    </Text>
+  );
+}

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

@@ -7,6 +7,8 @@ type ProductCarouselProps = {
   alt: string;
   variant?: 'home' | 'detail' | 'store';
   previewable?: boolean;
+  /** cover=aspectFill 裁剪铺满；contain=aspectFit 缩放完整显示（门店门头固定区） */
+  imageFit?: 'cover' | 'contain';
 };
 
 /** 商品/门店轮播（对齐 h5 ProductCarousel 三变体） */
@@ -15,11 +17,14 @@ export default function ProductCarousel({
   alt,
   variant = 'detail',
   previewable = false,
+  imageFit = 'cover',
 }: 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';
+  const isContain = imageFit === 'contain';
+  const wrapClass = `${prefix}-wrap${isContain ? ` ${prefix}-wrap--contain` : ''}`;
 
   function previewAt(index: number) {
     const urls = slides.filter(Boolean);
@@ -29,7 +34,7 @@ export default function ProductCarousel({
   }
 
   return (
-    <View className={`${prefix}-wrap`}>
+    <View className={wrapClass}>
       <Swiper
         className={prefix}
         circular={slides.length > 1}
@@ -41,7 +46,7 @@ export default function ProductCarousel({
               <Image
                 className={`${prefix}-image`}
                 src={src}
-                mode="aspectFill"
+                mode={isContain ? 'aspectFit' : 'aspectFill'}
                 alt={alt}
                 onClick={previewable ? () => previewAt(index) : undefined}
               />

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

@@ -4,6 +4,7 @@ import { useEffect, useRef } from 'react';
 import { finishLoginNavigate, forceReloadAfterAccountMerge, goLogin } from '../lib/auth-nav';
 import { toast } from '../lib/api';
 import { capturePromoSceneAndTouchScan } from '../lib/promo';
+import { initClientVersionChecks } from '../lib/client-version';
 import { saveWechatLoginResult } from '../lib/pay-wechat';
 import { applyWechatShare } from '../lib/wechat-share';
 import { handleWechatAuthCallback } from '../lib/wechat-auth';
@@ -38,6 +39,7 @@ export default function WechatShareBootstrap() {
 
   useEffect(() => {
     void capturePromoSceneAndTouchScan();
+    initClientVersionChecks();
   }, []);
 
   useEffect(() => {

apps/mini-user/src/lib/brand-assets.ts

@@ -0,0 +1,68 @@
+import {
+  BRAND_LOGO_MARK_URL,
+  BRAND_LOGO_URL,
+  BRAND_LOGO_WIDE_URL,
+  CUSTOMER_SERVICE_PHONE,
+  QUALIFICATION_DISCLOSURE_URL,
+  type ClientRuntimeConfig,
+} from '@dukang/shared-types';
+import { fetchClientConfig } from './pay-wechat';
+
+export type BrandAssets = {
+  brandLogoUrl: string;
+  brandLogoWideUrl: string;
+  brandLogoMarkUrl: string;
+  qualificationDisclosureUrl: string;
+  customerServicePhone: string;
+};
+
+const FALLBACK: BrandAssets = {
+  brandLogoUrl: BRAND_LOGO_URL,
+  brandLogoWideUrl: BRAND_LOGO_WIDE_URL,
+  brandLogoMarkUrl: BRAND_LOGO_MARK_URL,
+  qualificationDisclosureUrl: QUALIFICATION_DISCLOSURE_URL,
+  customerServicePhone: CUSTOMER_SERVICE_PHONE,
+};
+
+let cached: BrandAssets | null = null;
+let inflight: Promise<BrandAssets> | null = null;
+
+function fromConfig(config: ClientRuntimeConfig | null | undefined): BrandAssets {
+  return {
+    brandLogoUrl: config?.brandLogoUrl?.trim() || FALLBACK.brandLogoUrl,
+    brandLogoWideUrl: config?.brandLogoWideUrl?.trim() || FALLBACK.brandLogoWideUrl,
+    brandLogoMarkUrl: config?.brandLogoMarkUrl?.trim() || FALLBACK.brandLogoMarkUrl,
+    qualificationDisclosureUrl:
+      config?.qualificationDisclosureUrl?.trim() || FALLBACK.qualificationDisclosureUrl,
+    customerServicePhone: config?.customerServicePhone?.trim() || FALLBACK.customerServicePhone,
+  };
+}
+
+/** 同步读取最近一次缓存（未拉取前返回代码默认常量） */
+export function getBrandAssetsSync(): BrandAssets {
+  return cached ?? FALLBACK;
+}
+
+/** 拉取 /common/client-config 中的品牌与客服配置并缓存 */
+export async function loadBrandAssets(force = false): Promise<BrandAssets> {
+  if (!force && cached) return cached;
+  if (!force && inflight) return inflight;
+  inflight = fetchClientConfig()
+    .then((cfg) => {
+      cached = fromConfig(cfg);
+      return cached;
+    })
+    .catch(() => {
+      cached = FALLBACK;
+      return cached;
+    })
+    .finally(() => {
+      inflight = null;
+    });
+  return inflight;
+}
+
+export function applyBrandFromClientConfig(config: ClientRuntimeConfig | null | undefined) {
+  cached = fromConfig(config);
+  return cached;
+}

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

@@ -0,0 +1,131 @@
+import Taro from '@tarojs/taro';
+import { fetchClientConfig } from './pay-wechat';
+
+/** 与 package.json version 同步，供服务端 minClientVersion 比对 */
+export const APP_VERSION = '3.4.15';
+
+export const APP_VERSION_LABEL = `v${APP_VERSION}`;
+
+function parseSemver(v: string): number[] {
+  return v.split('.').map((n) => parseInt(n, 10) || 0);
+}
+
+export function compareSemver(a: string, b: string): number {
+  const pa = parseSemver(a);
+  const pb = parseSemver(b);
+  const len = Math.max(pa.length, pb.length);
+  for (let i = 0; i < len; i += 1) {
+    const da = pa[i] ?? 0;
+    const db = pb[i] ?? 0;
+    if (da !== db) return da - db;
+  }
+  return 0;
+}
+
+function exitMiniProgramIfSupported() {
+  if (process.env.TARO_ENV !== 'weapp') return;
+  if (typeof Taro.exitMiniProgram !== 'function') return;
+  void Taro.exitMiniProgram({});
+}
+
+/** 微信 CDN 有新包时引导 applyUpdate；返回是否已触发更新流程 */
+function tryWeappForceUpdate(min: string): Promise<boolean> {
+  if (process.env.TARO_ENV !== 'weapp' || typeof Taro.getUpdateManager !== 'function') {
+    return Promise.resolve(false);
+  }
+
+  return new Promise((resolve) => {
+    const manager = Taro.getUpdateManager();
+    let settled = false;
+    const finish = (updated: boolean) => {
+      if (settled) return;
+      settled = true;
+      resolve(updated);
+    };
+
+    manager.onCheckForUpdate((res) => {
+      if (!res.hasUpdate) {
+        finish(false);
+        return;
+      }
+      manager.onUpdateReady(() => {
+        void Taro.showModal({
+          title: '版本过低',
+          content: `当前 ${APP_VERSION_LABEL} 低于要求版本 v${min}，已检测到新版本，请立即更新后继续使用。`,
+          showCancel: false,
+          confirmText: '立即更新',
+          success: (r) => {
+            if (r.confirm) {
+              manager.applyUpdate();
+              finish(true);
+            } else {
+              finish(false);
+            }
+          },
+          fail: () => finish(false),
+        });
+      });
+      manager.onUpdateFailed(() => finish(false));
+    });
+
+    setTimeout(() => finish(false), 4000);
+  });
+}
+
+async function enforceMinClientVersion(min: string) {
+  const updated = await tryWeappForceUpdate(min);
+  if (updated) return;
+
+  await Taro.showModal({
+    title: '版本过低',
+    content: `当前 ${APP_VERSION_LABEL} 低于要求版本 v${min}，请更新至最新版本后继续使用。`,
+    showCancel: false,
+    confirmText: '我知道了',
+  });
+
+  exitMiniProgramIfSupported();
+}
+
+export async function checkClientVersionGate() {
+  try {
+    const config = await fetchClientConfig();
+    const min = config.minClientVersion?.trim();
+    if (min && compareSemver(APP_VERSION, min) < 0) {
+      await enforceMinClientVersion(min);
+    }
+  } catch {
+    /* 配置拉取失败不阻塞启动 */
+  }
+}
+
+export function setupWeappUpdateManager() {
+  if (process.env.TARO_ENV !== 'weapp') return;
+  if (typeof Taro.getUpdateManager !== 'function') return;
+
+  const manager = Taro.getUpdateManager();
+  manager.onCheckForUpdate((res) => {
+    if (!res.hasUpdate) return;
+    manager.onUpdateReady(() => {
+      void Taro.showModal({
+        title: '更新提示',
+        content: '新版本已准备好，是否重启应用？',
+        confirmText: '立即更新',
+        success: (r) => {
+          if (r.confirm) manager.applyUpdate();
+        },
+      });
+    });
+    manager.onUpdateFailed(() => {
+      void Taro.showModal({
+        title: '更新失败',
+        content: '新版本下载失败，请删除小程序后重新搜索打开。',
+        showCancel: false,
+      });
+    });
+  });
+}
+
+export function initClientVersionChecks() {
+  setupWeappUpdateManager();
+  void checkClientVersionGate();
+}

apps/mini-user/src/lib/compress-image.ts

@@ -0,0 +1,34 @@
+import Taro from '@tarojs/taro';
+
+const MAX_BYTES = 10 * 1024 * 1024;
+
+/** 小程序临时文件超过 10MB 时用 compressImage 压缩后再上传 */
+export async function compressWeappImageIfNeeded(tempFilePath: string): Promise<string> {
+  if (process.env.TARO_ENV !== 'weapp') return tempFilePath;
+
+  let path = tempFilePath;
+  let size = await getFileSize(path);
+  if (size <= MAX_BYTES) return path;
+
+  const qualities = [80, 65, 50, 40];
+  for (const quality of qualities) {
+    const res = await Taro.compressImage({ src: path, quality });
+    path = res.tempFilePath;
+    size = await getFileSize(path);
+    if (size <= MAX_BYTES) return path;
+  }
+
+  if (size > MAX_BYTES) {
+    throw new Error('图片压缩后仍超过 10MB，请换一张较小的图片');
+  }
+  return path;
+}
+
+async function getFileSize(filePath: string): Promise<number> {
+  try {
+    const info = await Taro.getFileInfo({ filePath });
+    return typeof info.size === 'number' ? info.size : 0;
+  } catch {
+    return 0;
+  }
+}

apps/mini-user/src/lib/mini-wechat-profile.ts

@@ -69,12 +69,15 @@ export function mergeWxDisplayProfile(profile: UserProfile): UserProfile {
 /** 上传 chooseAvatar 临时文件到 OSS，并返回已登记到当前用户的真实资源。 */
 export async function uploadAvatarTempFile(tempFilePath: string): Promise<UploadedAvatarResource> {
   const { API_BASE, CLIENT_APP, getToken } = await import('./api');
+  const { compressWeappImageIfNeeded } = await import('./compress-image');
   const token = getToken();
   if (!token) throw new Error('请先登录');
 
+  const filePath = await compressWeappImageIfNeeded(tempFilePath);
+
   const res = await Taro.uploadFile({
     url: `${API_BASE}/common/resources/upload`,
-    filePath: tempFilePath,
+    filePath,
     name: 'file',
     formData: {
       bizType: 'AVATAR',

apps/mini-user/src/lib/order-logistics-utils.ts

@@ -0,0 +1,114 @@
+import type { OrderTrackDto } from '@dukang/shared-types';
+import { isXfxProviderCode } from '@dukang/shared-types';
+import { formatShanghaiDateTime } from './datetime';
+
+export type OrderDelivery = {
+  provider?: string;
+  trackingNo?: string;
+  logisticsCompany?: string;
+  manualQueryUrl?: string;
+};
+
+export type OrderTrackNode = {
+  trackInfo?: string;
+  createTime?: string;
+  createdAt?: string;
+  statusName?: string;
+};
+
+export type OrderTrackEstimatedArrival = {
+  arriveTime: string;
+  siteName?: string;
+};
+
+export type OrderTrackResponse = OrderTrackDto;
+
+/** 订单详情页展示物流摘要的状态（配送中） */
+export const ORDER_LOGISTICS_PREVIEW_STATUSES = ['SHIPPING', 'SHIPPED'] as const;
+
+const PHONE_PATTERN = /(1[3-9]\d{9}|\d{3,4}-\d{7,8})/g;
+
+function compareTrackNodeTime(a: OrderTrackNode, b: OrderTrackNode) {
+  const ta = new Date(a.createTime || a.createdAt || 0).getTime();
+  const tb = new Date(b.createTime || b.createdAt || 0).getTime();
+  if (Number.isNaN(ta) && Number.isNaN(tb)) return 0;
+  if (Number.isNaN(ta)) return 1;
+  if (Number.isNaN(tb)) return -1;
+  return ta - tb;
+}
+
+export function deliveryProviderLabel(provider?: string, company?: string) {
+  if (company) return company;
+  if (!provider || provider === 'MOCK' || isXfxProviderCode(provider)) {
+    return '小飞侠配送';
+  }
+  if (provider === 'LOGISTICS') return '快递配送';
+  return provider;
+}
+
+export function shouldLoadOrderTrack(delivery?: OrderDelivery | null) {
+  if (!delivery) return false;
+  if (delivery.trackingNo) return true;
+  return isXfxProviderCode(delivery.provider || '');
+}
+
+export function formatTrackNodeTime(node: OrderTrackNode) {
+  return formatShanghaiDateTime(node.createTime || node.createdAt);
+}
+
+export function sortTrackNodesNewestFirst(nodes: OrderTrackNode[]): OrderTrackNode[] {
+  return [...nodes].sort((a, b) => -compareTrackNodeTime(a, b));
+}
+
+export function sortTrackNodesOldestFirst(nodes: OrderTrackNode[]): OrderTrackNode[] {
+  return [...nodes].sort(compareTrackNodeTime);
+}
+
+export function latestTrackNode(nodes: OrderTrackNode[]) {
+  if (!nodes.length) return null;
+  let latest = nodes[0];
+  for (let i = 1; i < nodes.length; i += 1) {
+    if (compareTrackNodeTime(nodes[i], latest) > 0) {
+      latest = nodes[i];
+    }
+  }
+  return latest;
+}
+
+export function isLogisticsNotArrived(nodes: OrderTrackNode[], orderStatus?: string) {
+  if (['PENDING_RECEIVE', 'DELIVERED', 'COMPLETED'].includes(orderStatus || '')) {
+    return false;
+  }
+  if (nodes.length === 0) return true;
+  return !nodes.some(
+    (node) => node.statusName?.includes('签收') || node.trackInfo?.includes('签收'),
+  );
+}
+
+export function formatEstimatedArrival(eta?: OrderTrackEstimatedArrival | null) {
+  if (!eta?.arriveTime) return '';
+  const time = formatShanghaiDateTime(eta.arriveTime);
+  if (eta.siteName) return `预计送达：${time}（${eta.siteName}）`;
+  return `预计送达：${time}`;
+}
+
+export type LogisticsTextSegment = { type: 'text' | 'phone'; value: string };
+
+export function splitLogisticsText(text: string): LogisticsTextSegment[] {
+  if (!text) return [];
+  const segments: LogisticsTextSegment[] = [];
+  let lastIndex = 0;
+  const regex = new RegExp(PHONE_PATTERN.source, 'g');
+  let match: RegExpExecArray | null;
+  while ((match = regex.exec(text)) !== null) {
+    if (match.index > lastIndex) {
+      segments.push({ type: 'text', value: text.slice(lastIndex, match.index) });
+    }
+    segments.push({ type: 'phone', value: match[0] });
+    lastIndex = match.index + match[0].length;
+  }
+  if (lastIndex < text.length) {
+    segments.push({ type: 'text', value: text.slice(lastIndex) });
+  }
+  return segments.length ? segments : [{ type: 'text', value: text }];
+}

apps/mini-user/src/lib/order-logistics.ts

@@ -0,0 +1,7 @@
+export * from './order-logistics-utils';
+import type { OrderTrackResponse } from './order-logistics-utils';
+import { request } from './api';
+
+export async function fetchOrderTrack(orderId: string) {
+  return request<OrderTrackResponse>(`/trade/orders/${orderId}/track`);
+}

apps/mini-user/src/lib/wechat-share.ts

@@ -1,16 +1,126 @@
 import Taro from '@tarojs/taro';
-import { BRAND_LOGO_URL } from '@dukang/shared-types';
 import type { WechatShareData } from '@dukang/weixin-sdk';
 import { getWechatShareLink, isWechatBrowser, isMiniProgram } from '@dukang/weixin-sdk';
+import {
+  applyShareTitleTemplate,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_HINT,
+  DEFAULT_SHARE_TITLE,
+  resolveMiniShareRuntime,
+  type ClientRuntimeConfig,
+  type MiniShareRuntime,
+  type MiniShareSceneConfig,
+} from '@dukang/shared-types';
 import { toast } from './api';
+import { getBrandAssetsSync, loadBrandAssets } from './brand-assets';
+import { fetchClientConfig } from './pay-wechat';
 import { isWechatEnv, weixinSdk } from './weixin';
 
-export const DEFAULT_SHARE_TITLE = '你吃饭，杜康买单';
+export type ShareScene =
-export const DEFAULT_SHARE_DESC = '杜康好客 · 买美酒，享好礼，全城门店可用';
+  | 'home'
-export const WECHAT_SHARE_HINT = '请点击右上角 ··· 分享给好友';
+  | 'stores'
+  | 'storeDetail'
+  | 'benefit'
+  | 'mine'
+  | 'productDetail'
+  | 'orderDetail';
+
+export { DEFAULT_SHARE_TITLE, DEFAULT_SHARE_DESC };
+
+export const WECHAT_SHARE_HINT = DEFAULT_SHARE_HINT;
+
+const FALLBACK_SHARE: MiniShareRuntime = resolveMiniShareRuntime({});
+
+let shareCached: MiniShareRuntime | null = null;
+
+export function getShareRuntimeSync(): MiniShareRuntime {
+  return shareCached ?? FALLBACK_SHARE;
+}
+
+export function applyShareFromClientConfig(config?: ClientRuntimeConfig | null) {
+  if (config?.share) {
+    shareCached = config.share;
+    return shareCached;
+  }
+  return getShareRuntimeSync();
+}
+
+export async function loadShareConfig(force = false): Promise<MiniShareRuntime> {
+  if (!force && shareCached) return shareCached;
+  try {
+    const cfg = await fetchClientConfig();
+    if (cfg?.share) {
+      shareCached = cfg.share;
+      return shareCached;
+    }
+  } catch {
+    /* ignore */
+  }
+  shareCached = FALLBACK_SHARE;
+  return shareCached;
+}
 
 export function getDefaultShareImageUrl(): string {
-  return BRAND_LOGO_URL;
+  const share = getShareRuntimeSync();
+  return share.default.imageUrl || getBrandAssetsSync().brandLogoUrl;
+}
+
+export function getShareHint(): string {
+  return getShareRuntimeSync().hint || DEFAULT_SHARE_HINT;
+}
+
+/** 预热分享配置与品牌图 */
+export function prefetchShareBrandAssets() {
+  void loadBrandAssets();
+  void loadShareConfig();
+}
+
+function sceneConfig(scene?: ShareScene): MiniShareSceneConfig {
+  const runtime = getShareRuntimeSync();
+  if (!scene) return runtime.default;
+  return runtime[scene] ?? runtime.default;
+}
+
+/**
+ * 组装页面分享：场景配置优先；空字段用 dynamic → 默认分享。
+ * orderDetail 标题支持 {productName}。
+ */
+export function buildSceneSharePayload(
+  scene: ShareScene,
+  options?: {
+    path?: string;
+    /** 业务动态标题（场景配置为空时使用） */
+    dynamicTitle?: string | null;
+    dynamicDesc?: string | null;
+    dynamicImageUrl?: string | null;
+    titleVars?: Record<string, string | undefined | null>;
+  },
+): PageSharePayload {
+  const def = getShareRuntimeSync().default;
+  const sc = sceneConfig(scene);
+  let title = (sc.title || '').trim();
+  if (title && options?.titleVars) {
+    const vars = options.titleVars;
+    const missingRequired = Object.entries(vars).some(
+      ([key, value]) => title.includes(`{${key}}`) && !(value != null && String(value).trim()),
+    );
+    title = missingRequired ? '' : applyShareTitleTemplate(title, vars);
+  }
+  if (!title) {
+    title = (options?.dynamicTitle || '').trim() || def.title;
+  }
+  const desc = (sc.desc || '').trim() || (options?.dynamicDesc || '').trim() || def.desc;
+  const imgUrl =
+    (sc.imageUrl || '').trim() ||
+    (options?.dynamicImageUrl || '').trim() ||
+    def.imageUrl ||
+    getDefaultShareImageUrl();
+  return {
+    title,
+    desc,
+    path: options?.path,
+    imgUrl,
+  };
 }
 
 export function buildDefaultShareData(
@@ -24,9 +134,10 @@ export function buildDefaultShareData(
       link = '';
     }
   }
+  const def = getShareRuntimeSync().default;
   return {
-    title: overrides?.title ?? DEFAULT_SHARE_TITLE,
+    title: overrides?.title ?? def.title,
-    desc: overrides?.desc ?? DEFAULT_SHARE_DESC,
+    desc: overrides?.desc ?? def.desc,
     link,
     imgUrl: overrides?.imgUrl ?? getDefaultShareImageUrl(),
   };
@@ -68,7 +179,7 @@ export async function handleShareButtonClick(
         /* ignore */
       }
     }
-    toast(WECHAT_SHARE_HINT);
+    toast(getShareHint());
     return { showGuide: false };
   }
 
@@ -89,7 +200,7 @@ export async function handleShareButtonClick(
     if (result.invoked) {
       return { showGuide: false };
     }
-    toast(WECHAT_SHARE_HINT);
+    toast(getShareHint());
     return { showGuide: true };
   } catch (e) {
     toast(e instanceof Error ? e.message : '分享配置失败，请刷新后重试');
@@ -99,9 +210,20 @@ export async function handleShareButtonClick(
 
 /** 供 useShareAppMessage 使用的标题/路径/图 */
 export function toWeappShareMessage(payload?: PageSharePayload) {
+  const def = getShareRuntimeSync().default;
   return {
-    title: payload?.title || DEFAULT_SHARE_TITLE,
+    title: payload?.title || def.title,
     path: payload?.path || '/pages/home/index',
     imageUrl: payload?.imgUrl || getDefaultShareImageUrl(),
   };
 }
+
+/** 供 useShareTimeline */
+export function toWeappShareTimeline(payload?: PageSharePayload, query = '') {
+  const def = getShareRuntimeSync().default;
+  return {
+    title: payload?.title || def.title,
+    query,
+    imageUrl: payload?.imgUrl || getDefaultShareImageUrl(),
+  };
+}

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

@@ -8,9 +8,9 @@ import { goLogin } from '../../lib/auth-nav';
 import { isLoggedIn, request, toast } from '../../lib/api';
 import { navBarStyle, tabNavContentStyle, useNavBarMetrics } from '../../lib/nav-bar';
 import {
-  DEFAULT_SHARE_DESC,
+  buildSceneSharePayload,
-  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import { formatMoney } from '../../lib/money';
 import iconBenefit from '../../assets/tabbar/benefit-active.png';
@@ -104,20 +104,15 @@ export default function BenefitPage() {
   const available = coupons.filter((c) => c.status === 'ACTIVE' && c.balance > 0);
 
   const sharePayload = useMemo(
-    () => ({
+    () =>
-      title: '好客权益 · 杜康好客',
+      buildSceneSharePayload('benefit', {
-      desc: DEFAULT_SHARE_DESC,
+        path: '/pages/benefit/index',
-      path: '/pages/benefit/index',
+      }),
-    }),
     [],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() => toWeappShareTimeline(sharePayload));
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
-    query: '',
-    imageUrl: sharePayload.imgUrl,
-  }));
 
   return (
     <PageShell variant="tab" className="benefit-page">

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

@@ -1,19 +1,26 @@
+import { useEffect, useState } from 'react';
 import { View, Text } from '@tarojs/components';
 import Taro from '@tarojs/taro';
-import { CUSTOMER_SERVICE_PHONE } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import SubPageHeader from '../../components/SubPageHeader';
 import ContactCsButton from '../../components/ContactCsButton';
 import { toast } from '../../lib/api';
+import { getBrandAssetsSync, loadBrandAssets } from '../../lib/brand-assets';
 
 const isWeapp = process.env.TARO_ENV === 'weapp';
-const DIAL_PHONE = CUSTOMER_SERVICE_PHONE.replace(/-/g, '');
 
-function dialPhone() {
+function dialPhone(phone: string) {
-  Taro.makePhoneCall({ phoneNumber: DIAL_PHONE }).catch(() => toast('无法拨打电话'));
+  const tel = phone.replace(/-/g, '');
+  Taro.makePhoneCall({ phoneNumber: tel }).catch(() => toast('无法拨打电话'));
 }
 
 export default function CustomerServicePage() {
+  const [phone, setPhone] = useState(() => getBrandAssetsSync().customerServicePhone);
+
+  useEffect(() => {
+    void loadBrandAssets().then((b) => setPhone(b.customerServicePhone));
+  }, []);
+
   return (
     <PageShell variant="sub" className="cs-page">
       <SubPageHeader title="联系客服" />
@@ -30,14 +37,14 @@ export default function CustomerServicePage() {
           <ContactCsButton className="cs-online-btn" session={{ from: 'customer-service' }} />
         ) : null}
 
-        <View className={isWeapp ? 'cs-phone-link' : 'cs-call-btn'} onClick={dialPhone}>
+        <View className={isWeapp ? 'cs-phone-link' : 'cs-call-btn'} onClick={() => dialPhone(phone)}>
           <Text>
-            {isWeapp ? `或拨打客服电话 ${CUSTOMER_SERVICE_PHONE}` : '拨打客服电话'}
+            {isWeapp ? `或拨打客服电话 ${phone}` : '拨打客服电话'}
           </Text>
         </View>
 
         {!isWeapp ? (
-          <Text className="cs-phone-display">{CUSTOMER_SERVICE_PHONE}</Text>
+          <Text className="cs-phone-display">{phone}</Text>
         ) : null}
       </View>
     </PageShell>

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

@@ -28,10 +28,12 @@ import {
   normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
 import { getCityCodeForCatalog, resolveUserCity } from '../../lib/user-location';
+import type { ClientRuntimeConfig } from '@dukang/shared-types';
 import {
-  DEFAULT_SHARE_DESC,
+  applyShareFromClientConfig,
-  DEFAULT_SHARE_TITLE,
+  buildSceneSharePayload,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import { trackPageView } from '../../lib/analytics';
 type Product = {
@@ -85,8 +87,9 @@ export default function HomePage() {
   }, [cityCode]);
 
   const loadMiniHome = useCallback(() => {
-    return request<{ miniHome?: MiniHomeConfig }>('/common/client-config')
+    return request<ClientRuntimeConfig>('/common/client-config')
       .then((cfg) => {
+        applyShareFromClientConfig(cfg);
         const banners = Array.isArray(cfg.miniHome?.banners)
           ? cfg.miniHome!.banners.filter((u) => typeof u === 'string' && !!u.trim())
           : [];
@@ -221,21 +224,16 @@ export default function HomePage() {
   const footerUrl = miniHome.footerUrl;
 
   const sharePayload = useMemo(
-    () => ({
+    () =>
-      title: DEFAULT_SHARE_TITLE,
+      buildSceneSharePayload('home', {
-      desc: DEFAULT_SHARE_DESC,
+        path: '/pages/home/index',
-      path: '/pages/home/index',
+        dynamicImageUrl: banners[0] || undefined,
-      imgUrl: banners[0] || undefined,
+      }),
-    }),
     [banners],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() => toWeappShareTimeline(sharePayload));
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
-    query: '',
-    imageUrl: sharePayload.imgUrl,
-  }));
 
   function scrollToAroma(key: AromaKey) {
     setActiveAroma(key);

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

@@ -10,7 +10,11 @@ import {
 import PageShell from '../../components/PageShell';
 import WechatLoginButton from '../../components/WechatLoginButton';
 import PhoneQuickLoginButton from '../../components/PhoneQuickLoginButton';
-import { BRAND_LOGO_WIDE_URL } from '@dukang/shared-types';
+import {
+  applyBrandFromClientConfig,
+  getBrandAssetsSync,
+  loadBrandAssets,
+} from '../../lib/brand-assets';
 import { finishLoginNavigate, forceReloadAfterAccountMerge } from '../../lib/auth-nav';
 import {
   bindWechatForUser,
@@ -98,11 +102,18 @@ export default function LoginPage() {
   const [wxAuthorize, setWxAuthorize] = useState(true);
   const [completeMode, setCompleteMode] = useState<'phone' | 'wechat' | null>(null);
   const [showSmsForm, setShowSmsForm] = useState(!IS_WEAPP);
+  const [logoWideUrl, setLogoWideUrl] = useState(() => getBrandAssetsSync().brandLogoWideUrl);
 
   useEffect(() => {
     request<ClientRuntimeConfig>('/common/client-config')
-      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
+      .then((config) => {
-      .catch(() => setWxAuthorize(true));
+        setWxAuthorize(isWxAuthorizeEnabled(config));
+        setLogoWideUrl(applyBrandFromClientConfig(config).brandLogoWideUrl);
+      })
+      .catch(() => {
+        setWxAuthorize(true);
+        void loadBrandAssets().then((b) => setLogoWideUrl(b.brandLogoWideUrl));
+      });
   }, []);
 
   useEffect(() => {
@@ -394,7 +405,7 @@ export default function LoginPage() {
       <View className="login-header">
         <View className="login-logo-wrap">
           <View className="login-logo">
-            <Image className="login-logo-img" src={BRAND_LOGO_WIDE_URL} mode="aspectFit" />
+            <Image className="login-logo-img" src={logoWideUrl} mode="aspectFit" />
           </View>
           <Text className="login-logo-badge">官方</Text>
         </View>

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

@@ -2,8 +2,6 @@ import { useEffect, useMemo, useState } from 'react';
 import { View, Text, Image, Button, Input, ScrollView } from '@tarojs/components';
 import Taro, { useDidShow, usePullDownRefresh, useShareAppMessage, useShareTimeline } from '@tarojs/taro';
 import {
-  BRAND_LOGO_MARK_URL,
-  QUALIFICATION_DISCLOSURE_URL,
   isWxAuthorizeEnabled,
   type ClientRuntimeConfig,
 } from '@dukang/shared-types';
@@ -13,6 +11,11 @@ import WechatShareReady from '../../components/WechatShareReady';
 import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar';
 import { goLogin } from '../../lib/auth-nav';
 import { bindWechatForUser } from '../../lib/wechat-auth';
+import {
+  applyBrandFromClientConfig,
+  getBrandAssetsSync,
+  loadBrandAssets,
+} from '../../lib/brand-assets';
 import {
   fetchMiniWechatUserInfo,
   isDefaultMiniNickname,
@@ -23,11 +26,13 @@ import {
 } from '../../lib/mini-wechat-profile';
 import { isLoggedIn, logout, request, toast, type UserProfile } from '../../lib/api';
 import { isWechatEnv } from '../../lib/weixin';
+import { APP_VERSION_LABEL } from '../../lib/client-version';
 import { maskPhone } from '../../lib/phone';
 import {
-  DEFAULT_SHARE_DESC,
+  applyShareFromClientConfig,
-  DEFAULT_SHARE_TITLE,
+  buildSceneSharePayload,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import iconPendingPay from '../../assets/icons/待付款.png';
 import iconPaid from '../../assets/icons/已付款.png';
@@ -69,7 +74,11 @@ export default function MinePage() {
   const [savingProfile, setSavingProfile] = useState(false);
   const [profileLoadError, setProfileLoadError] = useState('');
   const [qualificationOpen, setQualificationOpen] = useState(false);
-
+  const [brandMarkUrl, setBrandMarkUrl] = useState(() => getBrandAssetsSync().brandLogoMarkUrl);
+  const [qualificationUrl, setQualificationUrl] = useState(
+    () => getBrandAssetsSync().qualificationDisclosureUrl,
+  );
+  const [shareTick, setShareTick] = useState(0);
   function resetGuestState() {
     setProfile(null);
     setBenefitBalance(0);
@@ -140,24 +149,30 @@ export default function MinePage() {
 
   useEffect(() => {
     request<ClientRuntimeConfig>('/common/client-config')
-      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
+      .then((config) => {
-      .catch(() => setWxAuthorize(true));
+        setWxAuthorize(isWxAuthorizeEnabled(config));
+        const brand = applyBrandFromClientConfig(config);
+        applyShareFromClientConfig(config);
+        setBrandMarkUrl(brand.brandLogoMarkUrl);
+        setQualificationUrl(brand.qualificationDisclosureUrl);
+        setShareTick((n) => n + 1);
+      })
+      .catch(() => {
+        setWxAuthorize(true);
+        void loadBrandAssets();
+      });
   }, []);
 
   const sharePayload = useMemo(
-    () => ({
+    () =>
-      title: '杜康好客 · 我的',
+      buildSceneSharePayload('mine', {
-      desc: DEFAULT_SHARE_DESC,
+        path: '/pages/mine/index',
-      path: '/pages/mine/index',
+      }),
-    }),
+    [shareTick],
-    [],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() => toWeappShareTimeline(sharePayload));
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
-    query: '',
-  }));
 
   async function ensureWechatBound(): Promise<boolean> {
     if (profile?.hasWechat) return true;
@@ -303,7 +318,7 @@ export default function MinePage() {
     if (displayAvatarUrl) {
       return <Image className="mine-avatar-img" src={displayAvatarUrl} mode="aspectFill" />;
     }
-    return <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />;
+    return <Image className="mine-avatar-img" src={brandMarkUrl} mode="aspectFit" />;
   }
 
   if (!authed) {
@@ -316,7 +331,7 @@ export default function MinePage() {
           <View className="mine-profile">
             <View className="mine-avatar-wrap mine-avatar-wrap--action" onClick={() => goLogin('/pages/mine/index')}>
               <View className="mine-avatar mine-avatar--wx-pending">
-                <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />
+                <Image className="mine-avatar-img" src={brandMarkUrl} mode="aspectFit" />
               </View>
             </View>
             <View>
@@ -499,7 +514,7 @@ export default function MinePage() {
         </View>
 
         <View className="mine-footer">
-          <Text className="mine-version">杜康好客</Text>
+          <Text className="mine-version">杜康好客 {APP_VERSION_LABEL}</Text>
           <Text className="mine-logout" onClick={() => logout()}>
             退出登录
           </Text>
@@ -509,8 +524,13 @@ export default function MinePage() {
       {shouldRenderPageTabBar() ? <UserTabBar selected={3} /> : null}
 
       {profileSheetOpen ? (
-        <View className="mine-profile-sheet-mask" onClick={() => !savingProfile && setProfileSheetOpen(false)}>
+        <View className="mine-profile-sheet-mask">
-          <View className="mine-profile-sheet" onClick={(e) => e.stopPropagation()}>
+          {/* 遮罩单独绑 tap，勿在含 chooseAvatar 的祖先上用 stopPropagation（会编译成 catchtap 导致选头像无反应） */}
+          <View
+            className="mine-profile-sheet-backdrop"
+            onClick={() => !savingProfile && setProfileSheetOpen(false)}
+          />
+          <View className="mine-profile-sheet">
             <Text className="mine-profile-sheet-title">完善头像与昵称</Text>
             <Text className="mine-profile-sheet-hint">
               点击头像选择，并填写昵称后保存（用于个人中心展示）
@@ -519,13 +539,14 @@ export default function MinePage() {
               className="mine-profile-avatar-btn"
               openType="chooseAvatar"
               hoverClass="none"
+              plain
               onChooseAvatar={onChooseAvatar}
             >
               <View className="mine-profile-avatar-preview">
                 {previewAvatar ? (
                   <Image className="mine-avatar-img" src={previewAvatar} mode="aspectFill" />
                 ) : (
-                  <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />
+                  <Image className="mine-avatar-img" src={brandMarkUrl} mode="aspectFit" />
                 )}
               </View>
               <Text className="mine-profile-avatar-tip">点击选择头像</Text>
@@ -578,7 +599,7 @@ export default function MinePage() {
             <View className="mine-qualification-body">
               <Image
                 className="mine-qualification-img"
-                src={QUALIFICATION_DISCLOSURE_URL}
+                src={qualificationUrl}
                 mode="widthFix"
               />
             </View>

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

@@ -141,6 +141,14 @@ export default function OrderConfirmPickupPage() {
     const ready = await ensurePayReady(returnPath);
     if (!ready) return;
 
+    const { confirm } = await Taro.showModal({
+      title: '确认提交订单',
+      content: `请确保您已拿到货品，货款将直接打给商家，如不是现场交易请选择立即购买方式下单，我们会为您安排配送到家。`,
+      confirmText: '确认提交',
+      cancelText: '再想想',
+    });
+    if (!confirm) return;
+
     setLoading(true);
     setMsg('');
     try {

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

@@ -6,14 +6,25 @@ import SubPageHeader from '../../components/SubPageHeader';
 import ShareNavButton from '../../components/ShareNavButton';
 import WechatShareReady from '../../components/WechatShareReady';
 import ContactCsButton from '../../components/ContactCsButton';
+import LogisticsRichText from '../../components/LogisticsRichText';
 import { request, toast } from '../../lib/api';
 import { buildPayUrl } from '../../lib/checkout-nav';
+import {
+  formatEstimatedArrival,
+  isLogisticsNotArrived,
+  latestTrackNode,
+  ORDER_LOGISTICS_PREVIEW_STATUSES,
+  shouldLoadOrderTrack,
+  type OrderTrackEstimatedArrival,
+  type OrderTrackNode,
+} from '../../lib/order-logistics-utils';
+import { fetchOrderTrack } from '../../lib/order-logistics';
 import { maskPhone } from '../../lib/phone';
 import { confirmOrderReceive, type WechatConfirmPayload } from '../../lib/wechat-order-confirm';
 import {
-  DEFAULT_SHARE_DESC,
+  buildSceneSharePayload,
-  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import { usePageView } from '../../lib/usePageView';
 
@@ -44,8 +55,15 @@ type OrderDetail = {
   orderType?: string;
   isProxyOrder?: boolean;
   proxyPartnerName?: string | null;
+  deliveryType?: string;
   items?: OrderItem[];
   wechatConfirm?: WechatConfirmPayload | null;
+  delivery?: {
+    provider?: string;
+    trackingNo?: string;
+    logisticsCompany?: string;
+    manualQueryUrl?: string;
+  } | null;
 };
 
 const STATUS_LABELS: Record<string, string> = {
@@ -78,11 +96,41 @@ export default function OrderDetailPage() {
   usePageView('order_detail_view', orderId ? { orderId } : undefined);
   const [order, setOrder] = useState<OrderDetail | null>(null);
   const [confirming, setConfirming] = useState(false);
+  const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
+  const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
+  const [trackLoading, setTrackLoading] = useState(false);
+
+  async function loadOrderTrack(delivery: OrderDetail['delivery'], orderStatus?: string) {
+    if (!orderId || !shouldLoadOrderTrack(delivery)) {
+      setLatestTrack(null);
+      setEstimatedArrival(null);
+      return;
+    }
+    setTrackLoading(true);
+    try {
+      const track = await fetchOrderTrack(orderId);
+      const nodes = track.nodes ?? [];
+      setLatestTrack(latestTrackNode(nodes));
+      setEstimatedArrival(
+        isLogisticsNotArrived(nodes, orderStatus) && track.estimatedArrival
+          ? track.estimatedArrival
+          : null,
+      );
+    } catch {
+      setLatestTrack(null);
+      setEstimatedArrival(null);
+    } finally {
+      setTrackLoading(false);
+    }
+  }
 
   useEffect(() => {
     if (!orderId) return;
     request<OrderDetail>(`/trade/orders/${orderId}`)
-      .then(setOrder)
+      .then((data) => {
+        setOrder(data);
+        void loadOrderTrack(data.delivery, data.status);
+      })
       .catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
   }, [orderId]);
 
@@ -90,7 +138,10 @@ export default function OrderDetailPage() {
     if (!orderId) return;
     // 从微信确认收货组件返回后刷新
     request<OrderDetail>(`/trade/orders/${orderId}`)
-      .then(setOrder)
+      .then((data) => {
+        setOrder(data);
+        void loadOrderTrack(data.delivery, data.status);
+      })
       .catch(() => {});
   });
 
@@ -99,6 +150,18 @@ export default function OrderDetailPage() {
   const canPay = !!order && order.status === 'PENDING_PAY' && !isReship;
   const canConfirmReceive =
     !!order && !isReship && !isProxy && ['PENDING_RECEIVE', 'DELIVERED'].includes(order.status || '');
+  const canViewLogistics =
+    !!order &&
+    order.deliveryType !== 'ON_SITE_PICKUP' &&
+    !isReship &&
+    ['PENDING_SHIP', 'OUT_WAREHOUSE', 'SHIPPING', 'SHIPPED', 'PENDING_RECEIVE', 'DELIVERED', 'COMPLETED'].includes(
+      order.status || '',
+    );
+  const showLogisticsPreview =
+    canViewLogistics &&
+    ORDER_LOGISTICS_PREVIEW_STATUSES.includes(
+      (order?.status || '') as (typeof ORDER_LOGISTICS_PREVIEW_STATUSES)[number],
+    );
 
   const item = order?.items?.[0];
   const productName = item?.productName || order?.productName || '杜康商品';
@@ -111,19 +174,20 @@ export default function OrderDetailPage() {
     : '';
 
   const sharePayload = useMemo(
-    () => ({
+    () =>
-      title: productName !== '杜康商品' ? `我买了${productName} · 杜康好客` : DEFAULT_SHARE_TITLE,
+      buildSceneSharePayload('orderDetail', {
-      desc: DEFAULT_SHARE_DESC,
+        path: orderId ? `/pages/order-detail/index?id=${orderId}` : '/pages/home/index',
-      path: orderId ? `/pages/order-detail/index?id=${orderId}` : '/pages/home/index',
+        titleVars: {
-    }),
+          productName: productName && productName !== '杜康商品' ? productName : '',
+        },
+      }),
     [productName, orderId],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() =>
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    toWeappShareTimeline(sharePayload, orderId ? `id=${orderId}` : ''),
-    query: orderId ? `id=${orderId}` : '',
+  );
-  }));
 
   function goPay() {
     if (!order) return;
@@ -134,6 +198,11 @@ export default function OrderDetailPage() {
     Taro.navigateTo({ url: '/pages/customer-service/index' });
   }
 
+  function goLogistics() {
+    if (!order) return;
+    Taro.navigateTo({ url: `/pages/order-logistics/index?id=${order.id}` });
+  }
+
   async function confirmReceive() {
     if (!order || !canConfirmReceive || confirming) return;
 
@@ -211,6 +280,34 @@ export default function OrderDetailPage() {
               {isProxy && order.proxyPartnerName ? (
                 <Text className="order-proxy-hint">由合伙人 {order.proxyPartnerName} 代下</Text>
               ) : null}
+              {showLogisticsPreview ? (
+                <View className="order-logistics-preview-block">
+                  <View className="order-logistics-preview" onClick={goLogistics}>
+                    <View className="order-logistics-preview-main">
+                      {trackLoading ? (
+                        <Text className="order-logistics-preview-info u-muted">物流信息加载中…</Text>
+                      ) : latestTrack?.trackInfo ? (
+                        <LogisticsRichText
+                          text={latestTrack.trackInfo}
+                          className="order-logistics-preview-info"
+                        />
+                      ) : order.delivery?.manualQueryUrl ? (
+                        <Text className="order-logistics-preview-info u-muted">物流已更新，点击查看详情</Text>
+                      ) : (
+                        <Text className="order-logistics-preview-info u-muted">物流信息待更新，请稍后查看</Text>
+                      )}
+                    </View>
+                    <Text className="order-logistics-preview-link">物流详情</Text>
+                  </View>
+                  {estimatedArrival ? (
+                    <Text className="order-logistics-eta">{formatEstimatedArrival(estimatedArrival)}</Text>
+                  ) : null}
+                </View>
+              ) : canViewLogistics ? (
+                <Text className="order-logistics-link" onClick={goLogistics}>
+                  查看物流追踪
+                </Text>
+              ) : null}
             </View>
             <View className="order-card">
               <Text className="order-card-title">商品信息</Text>

apps/mini-user/src/pages/order-logistics/index.config.ts

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationStyle: 'custom',
+  navigationBarTitleText: '物流详情',
+});

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

@@ -0,0 +1,209 @@
+import { useEffect, useMemo, useState } from 'react';
+import { View, Text, Image } from '@tarojs/components';
+import Taro, { useRouter } from '@tarojs/taro';
+import PageShell from '../../components/PageShell';
+import SubPageHeader from '../../components/SubPageHeader';
+import LogisticsRichText from '../../components/LogisticsRichText';
+import { request, toast } from '../../lib/api';
+import {
+  deliveryProviderLabel,
+  formatTrackNodeTime,
+  shouldLoadOrderTrack,
+  sortTrackNodesOldestFirst,
+  type OrderDelivery,
+  type OrderTrackNode,
+} from '../../lib/order-logistics-utils';
+import { fetchOrderTrack } from '../../lib/order-logistics';
+import { usePageView } from '../../lib/usePageView';
+
+type OrderDetail = {
+  id: string;
+  orderNo?: string;
+  status?: string;
+  delivery?: OrderDelivery | null;
+};
+
+export default function OrderLogisticsPage() {
+  const router = useRouter();
+  const orderId = router.params.id ?? '';
+  usePageView('order_logistics_view', orderId ? { orderId } : undefined);
+  const [order, setOrder] = useState<OrderDetail | null>(null);
+  const [trackNodes, setTrackNodes] = useState<OrderTrackNode[]>([]);
+  const [signPhotoUrls, setSignPhotoUrls] = useState<string[]>([]);
+  const [trackLoading, setTrackLoading] = useState(false);
+
+  const sortedTrackNodes = useMemo(
+    () => (Array.isArray(trackNodes) ? sortTrackNodesOldestFirst(trackNodes) : []),
+    [trackNodes],
+  );
+  const timelineComplete = ['PENDING_RECEIVE', 'DELIVERED', 'COMPLETED'].includes(
+    order?.status || '',
+  );
+
+  useEffect(() => {
+    if (!orderId) return;
+    let cancelled = false;
+    (async () => {
+      try {
+        const data = await request<OrderDetail>(`/trade/orders/${orderId}`);
+        if (cancelled) return;
+        setOrder(data);
+        if (!shouldLoadOrderTrack(data.delivery)) {
+          setTrackNodes([]);
+          setSignPhotoUrls([]);
+          return;
+        }
+        setTrackLoading(true);
+        try {
+          const track = await fetchOrderTrack(orderId);
+          if (!cancelled) {
+            setTrackNodes(track.nodes ?? []);
+            setSignPhotoUrls(track.signPhotoUrls ?? []);
+          }
+        } catch {
+          if (!cancelled) {
+            setTrackNodes([]);
+            setSignPhotoUrls([]);
+          }
+        } finally {
+          if (!cancelled) setTrackLoading(false);
+        }
+      } catch (e) {
+        if (!cancelled) toast(e instanceof Error ? e.message : '加载失败');
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [orderId]);
+
+  function openManualQuery() {
+    const url = order?.delivery?.manualQueryUrl?.trim();
+    if (!url) {
+      toast('暂无物流查询链接');
+      return;
+    }
+    if (process.env.TARO_ENV === 'h5' && typeof window !== 'undefined') {
+      window.open(url, '_blank');
+      return;
+    }
+    Taro.setClipboardData({ data: url })
+      .then(() => toast('查询链接已复制，请在浏览器中打开'))
+      .catch(() => toast('无法打开物流查询'));
+  }
+
+  function previewSignPhotos(index: number) {
+    if (signPhotoUrls.length === 0) return;
+    Taro.previewImage({ current: signPhotoUrls[index], urls: signPhotoUrls }).catch(() =>
+      toast('无法预览图片'),
+    );
+  }
+
+  const delivery = order?.delivery;
+
+  return (
+    <PageShell variant="sub" className="order-logistics-page">
+      <SubPageHeader title="物流详情" />
+      <View className="sub-page-body order-logistics-body">
+        {!order ? (
+          <View className="u-empty">加载中…</View>
+        ) : (
+          <>
+            <View className="order-card order-logistics-info-card">
+              <Text className="order-card-title">物流信息</Text>
+              <View className="order-row">
+                <Text className="order-row-label">配送方式</Text>
+                <Text className="order-row-value">
+                  {deliveryProviderLabel(delivery?.provider, delivery?.logisticsCompany)}
+                </Text>
+              </View>
+              {delivery?.trackingNo ? (
+                <View className="order-row">
+                  <Text className="order-row-label">运单号</Text>
+                  <Text className="order-row-value">{delivery.trackingNo}</Text>
+                </View>
+              ) : null}
+              {delivery?.manualQueryUrl ? (
+                <View className="order-row">
+                  <Text className="order-row-label">物流查询</Text>
+                  <Text className="order-row-value order-row-value--link" onClick={openManualQuery}>
+                    查看物流
+                  </Text>
+                </View>
+              ) : null}
+              {!delivery?.trackingNo && !delivery?.manualQueryUrl ? (
+                <Text className="u-muted">物流信息待更新，请稍后查看</Text>
+              ) : null}
+            </View>
+
+            {signPhotoUrls.length > 0 ? (
+              <View className="order-card">
+                <Text className="order-card-title">签收照片</Text>
+                <View className="order-logistics-sign-photos">
+                  {signPhotoUrls.map((url, index) => (
+                    <Image
+                      key={url}
+                      className="order-logistics-sign-photo"
+                      src={url}
+                      mode="aspectFill"
+                      onClick={() => previewSignPhotos(index)}
+                    />
+                  ))}
+                </View>
+              </View>
+            ) : null}
+
+            {trackLoading ? (
+              <View className="order-card">
+                <Text className="order-card-title">物流动态</Text>
+                <Text className="u-muted">加载中…</Text>
+              </View>
+            ) : sortedTrackNodes.length > 0 ? (
+              <View className="order-card">
+                <Text className="order-card-title">物流动态</Text>
+                <View
+                  className={`order-logistics-timeline${
+                    timelineComplete ? ' order-logistics-timeline--complete' : ''
+                  }`}
+                >
+                  {sortedTrackNodes.map((node, index) => {
+                    const isLatest = index === sortedTrackNodes.length - 1;
+                    return (
+                      <View
+                        key={`${node.trackInfo}-${node.createTime}-${index}`}
+                        className={[
+                          'order-logistics-timeline-item',
+                          'order-logistics-timeline-item--done',
+                          isLatest ? 'order-logistics-timeline-item--latest' : '',
+                        ]
+                          .filter(Boolean)
+                          .join(' ')}
+                      >
+                        <View className="order-logistics-timeline-dot" />
+                        <View className="order-logistics-timeline-body">
+                          {node.statusName ? (
+                            <Text className="order-logistics-timeline-status">{node.statusName}</Text>
+                          ) : null}
+                          <LogisticsRichText
+                            text={node.trackInfo || '—'}
+                            className="order-logistics-node-info"
+                          />
+                          <Text className="order-logistics-node-time">{formatTrackNodeTime(node)}</Text>
+                        </View>
+                      </View>
+                    );
+                  })}
+                </View>
+              </View>
+            ) : shouldLoadOrderTrack(delivery) ? (
+              <View className="order-card">
+                <Text className="order-card-title">物流动态</Text>
+                <Text className="u-muted">暂无路由信息，请稍后刷新</Text>
+              </View>
+            ) : null}
+          </>
+        )}
+      </View>
+    </PageShell>
+  );
+}

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

@@ -11,7 +11,6 @@ import type { ProductDetailContentDto } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
-import ShareNavButton from '../../components/ShareNavButton';
 import WechatShareReady from '../../components/WechatShareReady';
 import { goLogin } from '../../lib/auth-nav';
 import { ensurePayReady } from '../../lib/pay-ready';
@@ -28,9 +27,9 @@ import {
   normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
 import {
-  DEFAULT_SHARE_DESC,
+  buildSceneSharePayload,
-  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import iconHome from '../../assets/tabbar/home.png';
 import { usePageView } from '../../lib/usePageView';
@@ -89,21 +88,20 @@ export default function ProductDetailPage() {
   });
 
   const sharePayload = useMemo(
-    () => ({
+    () =>
-      title: product?.name || DEFAULT_SHARE_TITLE,
+      buildSceneSharePayload('productDetail', {
-      desc: product?.subtitle || DEFAULT_SHARE_DESC,
+        path: `/pages/product-detail/index?id=${productId}`,
-      path: `/pages/product-detail/index?id=${productId}`,
+        dynamicTitle: product?.name,
-      imgUrl: (product ? getProductMainImage(product) : '') || undefined,
+        dynamicDesc: product?.subtitle,
-    }),
+        dynamicImageUrl: product ? getProductMainImage(product) : undefined,
+      }),
     [product, productId],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() =>
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    toWeappShareTimeline(sharePayload, productId ? `id=${productId}` : ''),
-    query: productId ? `id=${productId}` : '',
+  );
-    imageUrl: sharePayload.imgUrl,
-  }));
 
   function goBack() {
     const pages = Taro.getCurrentPages();
@@ -167,12 +165,11 @@ export default function ProductDetailPage() {
         solid={headerSolid}
         titleVisible={headerSolid}
         onBack={goBack}
-        right={<ShareNavButton payload={sharePayload} />}
       />
 
       <View className="product-detail-main">
         <View className="product-detail-hero full-bleed">
-          <ProductCarousel images={carouselImages} alt={product.name} variant="detail" />
+          <ProductCarousel images={carouselImages} alt={product.name} variant="detail" previewable />
         </View>
 
         <View className="product-detail-info">

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

@@ -15,11 +15,13 @@ import ShareNavButton from '../../components/ShareNavButton';
 import StoreRedeemMarquee from '../../components/StoreRedeemMarquee';
 import WechatShareReady from '../../components/WechatShareReady';
 import { request, toast } from '../../lib/api';
+import { maskPhone } from '../../lib/phone';
+import { track } from '../../lib/analytics';
 import { formatShanghaiDateTime } from '../../lib/datetime';
 import {
-  DEFAULT_SHARE_DESC,
+  buildSceneSharePayload,
-  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 
 type StoreMedia = {
@@ -235,18 +237,15 @@ export default function StoreDetailPage() {
     void loadRecentRedeems(id);
   });
 
-  const sharePayload = useMemo(
+  const sharePayload = useMemo(() => {
-    () => {
+    const envFirst = store ? envPhotoUrls(store)[0] : undefined;
-      const envFirst = store ? envPhotoUrls(store)[0] : undefined;
+    return buildSceneSharePayload('storeDetail', {
-      return {
+      path: `/pages/store-detail/index?id=${storeId}`,
-        title: store?.name || DEFAULT_SHARE_TITLE,
+      dynamicTitle: store?.name,
-        desc: store?.intro?.trim() || store?.address || DEFAULT_SHARE_DESC,
+      dynamicDesc: store?.intro?.trim() || store?.address,
-        path: `/pages/store-detail/index?id=${storeId}`,
+      dynamicImageUrl: store?.coverUrl || envFirst || store?.carouselUrls?.[0],
-        imgUrl: store?.coverUrl || envFirst || store?.carouselUrls?.[0] || undefined,
+    });
-      };
+  }, [store, storeId]);
-    },
-    [store, storeId],
-  );
 
   const marqueeLines = useMemo(
     () => recentRedeems.map(formatRecentRedeemLine).filter(Boolean),
@@ -254,11 +253,9 @@ export default function StoreDetailPage() {
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() =>
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    toWeappShareTimeline(sharePayload, storeId ? `id=${storeId}` : ''),
-    query: storeId ? `id=${storeId}` : '',
+  );
-    imageUrl: sharePayload.imgUrl,
-  }));
 
   function goBack() {
     const pages = Taro.getCurrentPages();
@@ -271,6 +268,7 @@ export default function StoreDetailPage() {
       toast('暂无门店电话');
       return;
     }
+    track('store_phone_call', { storeId: store.id });
     Taro.makePhoneCall({ phoneNumber: store.phone }).catch(() => toast('无法拨打电话'));
   }
 
@@ -317,12 +315,19 @@ export default function StoreDetailPage() {
 
   const envPhotos = envPhotoUrls(store);
   const heroImages = uniqueUrls([store.coverUrl, ...(store.carouselUrls || [])]);
+  const packages = store.packages ?? [];
 
   const intro = store.intro?.trim() || '';
   const benefitRuleRaw = store.benefitUsageRule?.trim() || '';
   const benefitRule =
     benefitRuleRaw && !/^null$/i.test(benefitRuleRaw) ? benefitRuleRaw : '';
 
+  function openPackageDetail(index: number) {
+    Taro.navigateTo({
+      url: `/pages/store-package-detail/index?storeId=${storeId}&index=${index}`,
+    });
+  }
+
   function previewEnv(index: number) {
     if (!envPhotos.length) return;
     Taro.previewImage({
@@ -343,7 +348,13 @@ export default function StoreDetailPage() {
       />
 
       <View className="store-detail-hero full-bleed">
-        <ProductCarousel images={heroImages} alt={store.name} variant="store" previewable />
+        <ProductCarousel
+          images={heroImages}
+          alt={store.name}
+          variant="store"
+          previewable
+          imageFit="contain"
+        />
       </View>
 
       <View className="store-detail-info-card">
@@ -374,7 +385,9 @@ export default function StoreDetailPage() {
 
         {store.phone ? (
           <View className="store-detail-row">
-            <Text className="store-detail-meta store-detail-meta--flex">电话: {store.phone}</Text>
+            <Text className="store-detail-meta store-detail-meta--flex">
+              电话: {maskPhone(store.phone)}
+            </Text>
             <Text className="store-detail-action" onClick={callStore}>
               拨打
             </Text>
@@ -396,26 +409,20 @@ export default function StoreDetailPage() {
         </View>
       ) : null}
 
-      {store.packages && store.packages.length > 0 ? (
+      {packages.length > 0 ? (
-        <View className="store-detail-section">
+        <View className="store-detail-section store-detail-section--packages">
           <Text className="store-detail-section-title">门店套餐</Text>
-          {store.packages.map((pkg, index) => (
+          <View className="store-detail-package-list">
-            <View key={`${pkg.name}-${index}`} className="store-detail-package-card">
+            {packages.map((pkg, index) => (
-              {pkg.imageUrl ? (
+              <View
-                <Image className="store-detail-package-img" src={pkg.imageUrl} mode="aspectFill" />
+                key={`${pkg.name}-${index}`}
-              ) : null}
+                className="store-detail-package-list-item"
-              <Text className="store-detail-package-name">{pkg.name}</Text>
+                onClick={() => openPackageDetail(index)}
-              <Text className="store-detail-package-body">
+              >
-                {formatRedeemAmountYuan(pkg.price)} 元 · {pkg.dishes}
+                <Text className="store-detail-package-list-title">{pkg.name}</Text>
-              </Text>
+              </View>
-              {pkg.usableTime ? (
+            ))}
-                <Text className="store-detail-package-meta">使用时间：{pkg.usableTime}</Text>
+          </View>
-              ) : null}
-              {pkg.otherNotes ? (
-                <Text className="store-detail-package-meta">说明：{pkg.otherNotes}</Text>
-              ) : null}
-            </View>
-          ))}
         </View>
       ) : null}
 

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

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationStyle: 'custom',
+  navigationBarTitleText: '套餐详情',
+});

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

@@ -0,0 +1,175 @@
+import { useCallback, useState } from 'react';
+import { View, Text, Image } from '@tarojs/components';
+import Taro, { useLoad, useRouter } from '@tarojs/taro';
+import PageShell from '../../components/PageShell';
+import PageNavBar from '../../components/PageNavBar';
+import { request, toast } from '../../lib/api';
+
+type StorePackage = {
+  name: string;
+  price: string | number;
+  dishes: string;
+  usableTime?: string | null;
+  otherNotes?: string | null;
+  imageUrl?: string | null;
+};
+
+type Store = {
+  id: string;
+  name: string;
+  packages?: StorePackage[] | null;
+};
+
+function pickStoreId(raw?: string | null) {
+  return String(raw || '')
+    .trim()
+    .replace(/[^\d]/g, '');
+}
+
+function parsePackageIndex(raw?: string | null) {
+  const n = Number.parseInt(String(raw ?? ''), 10);
+  return Number.isFinite(n) && n >= 0 ? n : -1;
+}
+
+function formatPriceYuan(price: string | number) {
+  const n = typeof price === 'number' ? price : Number(price);
+  if (!Number.isFinite(n)) return '0';
+  if (Math.abs(n - Math.round(n)) < 1e-9) return String(Math.round(n));
+  return n.toFixed(2).replace(/\.?0+$/, '');
+}
+
+export default function StorePackageDetailPage() {
+  const router = useRouter();
+  const [storeId, setStoreId] = useState(() => pickStoreId(router.params.storeId));
+  const [storeName, setStoreName] = useState('');
+  const [pkg, setPkg] = useState<StorePackage | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [loadError, setLoadError] = useState('');
+
+  const loadPackage = useCallback(async (sid: string, index: number) => {
+    if (!sid) {
+      setLoading(false);
+      setLoadError('缺少门店参数');
+      return;
+    }
+    if (index < 0) {
+      setLoading(false);
+      setLoadError('套餐不存在');
+      return;
+    }
+    setLoadError('');
+    setLoading(true);
+    try {
+      const data = await request<Store>(`/stores/${sid}`);
+      const packages = data?.packages ?? [];
+      const item = packages[index];
+      if (!data?.id || !item) {
+        setPkg(null);
+        setLoadError('套餐不存在或已下架');
+        toast('套餐不存在或已下架');
+        return;
+      }
+      setStoreName(data.name);
+      setPkg(item);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : '加载失败';
+      setLoadError(msg);
+      toast(msg);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useLoad((options) => {
+    const sid = pickStoreId(options?.storeId || router.params.storeId);
+    const index = parsePackageIndex(options?.index ?? router.params.index);
+    setStoreId(sid);
+    void loadPackage(sid, index);
+  });
+
+  function goBack() {
+    const pages = Taro.getCurrentPages();
+    if (pages.length > 1) Taro.navigateBack();
+    else if (storeId) {
+      Taro.redirectTo({ url: `/pages/store-detail/index?id=${storeId}` });
+    } else {
+      Taro.switchTab({ url: '/pages/stores/index' });
+    }
+  }
+
+  function previewImage(url: string) {
+    Taro.previewImage({ urls: [url], current: url }).catch(() => toast('无法预览图片'));
+  }
+
+  if (loading) {
+    return (
+      <PageShell variant="scroll" className="store-package-detail-page">
+        <PageNavBar title="套餐详情" solid onBack={goBack} />
+        <View className="page-with-nav-bar u-empty">加载中…</View>
+      </PageShell>
+    );
+  }
+
+  if (!pkg) {
+    return (
+      <PageShell variant="scroll" className="store-package-detail-page">
+        <PageNavBar title="套餐详情" solid onBack={goBack} />
+        <View className="page-with-nav-bar u-empty">{loadError || '套餐不存在'}</View>
+      </PageShell>
+    );
+  }
+
+  const imageUrl = (pkg.imageUrl || '').trim();
+
+  return (
+    <PageShell variant="scroll" className="store-package-detail-page">
+      <PageNavBar title={pkg.name} solid titleVisible onBack={goBack} />
+
+      <View className="store-package-detail-body">
+        <View className="store-package-detail-inner">
+          <View className="store-package-detail-header">
+            <View className="store-package-detail-title-row">
+              <Text className="store-package-detail-title">{pkg.name}</Text>
+              <Text className="store-package-detail-price">¥{formatPriceYuan(pkg.price)}</Text>
+            </View>
+            {storeName ? (
+              <Text className="store-package-detail-store">{storeName}</Text>
+            ) : null}
+          </View>
+
+          {imageUrl ? (
+            <View
+              className="store-package-detail-photo"
+              onClick={() => previewImage(imageUrl)}
+            >
+              <Image
+                className="store-package-detail-photo-image"
+                src={imageUrl}
+                mode="widthFix"
+              />
+            </View>
+          ) : null}
+
+          <View className="store-package-detail-content">
+            <View className="store-detail-package-field">
+              <Text className="store-detail-package-field-label">菜品</Text>
+              <Text className="store-detail-package-field-value">{pkg.dishes || '—'}</Text>
+            </View>
+            {pkg.usableTime ? (
+              <View className="store-detail-package-field">
+                <Text className="store-detail-package-field-label">使用时间</Text>
+                <Text className="store-detail-package-field-value">{pkg.usableTime}</Text>
+              </View>
+            ) : null}
+            {pkg.otherNotes ? (
+              <View className="store-detail-package-field">
+                <Text className="store-detail-package-field-label">其他说明</Text>
+                <Text className="store-detail-package-field-value">{pkg.otherNotes}</Text>
+              </View>
+            ) : null}
+          </View>
+        </View>
+      </View>
+    </PageShell>
+  );
+}

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

@@ -1,7 +1,6 @@
 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';
@@ -37,10 +36,11 @@ import {
   setStoresListCache,
 } from '../../lib/stores-session';
 import {
-  DEFAULT_SHARE_DESC,
+  buildSceneSharePayload,
-  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
+  toWeappShareTimeline,
 } from '../../lib/wechat-share';
+import openBadgeImg from '../../assets/icons/store-open-badge.png';
 
 type Store = {
   id: string;
@@ -342,33 +342,24 @@ export default function StoresPage() {
     }
   }
 
-  function formatHours(store: Store) {
+  function hoursText(store: Store): string {
     const parts: string[] = [];
     if (store.openTime && store.closeTime) parts.push(`${store.openTime}-${store.closeTime}`);
     if (store.openTime2 && store.closeTime2) parts.push(`${store.openTime2}-${store.closeTime2}`);
-    return parts.length ? `营业时间: ${parts.join('，')}` : '营业时间: 10:00-22:00';
+    if (!parts.length) parts.push('10:00-22:00');
-  }
+    return `营业时间: ${parts.join(' ')}`;
-
-  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(
-    () => ({
+    () =>
-      title: '杜康好客门店',
+      buildSceneSharePayload('stores', {
-      desc: DEFAULT_SHARE_DESC,
+        path: '/pages/stores/index',
-      path: '/pages/stores/index',
+      }),
-    }),
     [],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => ({
+  useShareTimeline(() => toWeappShareTimeline(sharePayload));
-    title: sharePayload.title || DEFAULT_SHARE_TITLE,
-    query: '',
-  }));
 
   return (
     <PageShell variant="tab" className="store-page no-tab-header">
@@ -431,38 +422,38 @@ export default function StoresPage() {
               className="store-card"
               onClick={() => Taro.navigateTo({ url: `/pages/store-detail/index?id=${s.id}` })}
             >
-              {s.coverUrl ? (
+              <View className="store-card-cover-wrap">
-                <Image className="store-card-cover" src={s.coverUrl} mode="aspectFill" />
+                {s.coverUrl ? (
-              ) : (
+                  <Image className="store-card-cover" src={s.coverUrl} mode="aspectFill" />
-                <View className="store-card-cover store-card-cover--empty" />
+                ) : (
-              )}
+                  <View className="store-card-cover store-card-cover--empty" />
+                )}
+                <Image
+                  className="store-card-open-badge"
+                  src={openBadgeImg}
+                  mode="aspectFit"
+                />
+              </View>
               <View className="store-card-body">
-                <View className="store-card-head">
+                {/* 第1行：标题（截断无省略号，顶到最右） */}
+                <View className="store-card-row store-card-row--head">
                   <Text className="store-card-name">{s.name}</Text>
+                </View>
+                {/* 第2行：地址（最多两行）+ 距离 */}
+                <View className="store-card-row store-card-row--mid">
+                  <Text className="store-card-address" numberOfLines={2}>
+                    {s.address || (s.district ? `${s.district}` : '地址待完善')}
+                  </Text>
                   <Text className="store-card-distance">
                     {formatDistanceMeters(s.distanceMeters)}
                   </Text>
                 </View>
-                <View className="store-card-status-row">
+                {/* 第3行：营业时间（同行） */}
-                  <Text className="store-card-status">{formatStatus(s)}</Text>
+                <View className="store-card-row store-card-row--hours">
-                  <Text className="store-card-hours">{formatHours(s)}</Text>
+                  <Text className="store-card-hours">{hoursText(s)}</Text>
-                </View>
-                <Text className="store-card-address">
-                  {s.address || (s.district ? `${s.district}` : '地址待完善')}
-                </Text>
-                <View className="store-card-footer">
-                  <View className="store-card-footer-spacer" />
-                  <Text
-                    className="store-card-cta"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      Taro.navigateTo({ url: '/pages/redeem/index' });
-                    }}
-                  >
-                    去核销
-                  </Text>
                 </View>
               </View>
+              <Text className="store-card-arrow">›</Text>
             </View>
           ))}
       </View>

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

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

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

@@ -488,3 +488,188 @@
   line-height: 1.5;
   text-align: center;
 }
+
+.order-logistics-page {
+  background: var(--color-background);
+  min-height: 100vh;
+}
+
+.order-logistics-body {
+  padding-top: 0;
+}
+
+.order-logistics-info-card {
+  margin-top: 0;
+}
+
+.order-logistics-link {
+  display: inline-block;
+  margin-top: 8px;
+  font-size: 14px;
+  color: var(--color-heritage-red);
+}
+
+.order-logistics-preview {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-top: 12px;
+  padding: 12px;
+  border-radius: 10px;
+  background: rgba(166, 29, 36, 0.04);
+}
+
+.order-logistics-preview-main {
+  flex: 1;
+  min-width: 0;
+}
+
+.order-logistics-preview-info {
+  font-size: 13px;
+  color: var(--color-on-surface);
+  line-height: 1.5;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+.order-logistics-preview-link {
+  flex-shrink: 0;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--color-heritage-red);
+}
+
+.order-logistics-preview-block {
+  margin-top: 12px;
+}
+
+.order-logistics-eta {
+  display: block;
+  margin-top: 8px;
+  font-size: 12px;
+  color: var(--color-on-surface-variant);
+  line-height: 1.5;
+}
+
+.order-logistics-phone-link {
+  color: var(--color-heritage-red);
+}
+
+.order-logistics-sign-photos {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.order-logistics-sign-photo {
+  width: 96px;
+  height: 96px;
+  border-radius: 8px;
+  background: var(--color-surface-container);
+}
+
+.order-row-value--link {
+  color: var(--color-heritage-red);
+}
+
+.order-logistics-timeline {
+  padding-top: 4px;
+}
+
+.order-logistics-timeline--complete .order-logistics-timeline-item:not(:last-child)::before {
+  background: rgba(166, 29, 36, 0.35);
+}
+
+.order-logistics-timeline-item {
+  display: flex;
+  gap: 12px;
+  position: relative;
+  padding-bottom: 16px;
+}
+
+.order-logistics-timeline-item:last-child {
+  padding-bottom: 0;
+}
+
+.order-logistics-timeline-item:not(:last-child)::before {
+  content: '';
+  position: absolute;
+  left: 5px;
+  top: 14px;
+  bottom: 0;
+  width: 1px;
+  background: rgba(0, 0, 0, 0.08);
+}
+
+.order-logistics-timeline-item--done .order-logistics-timeline-dot {
+  background: var(--color-heritage-red);
+  box-shadow: 0 0 0 1px var(--color-heritage-red);
+}
+
+.order-logistics-timeline-item--done:not(:last-child)::before {
+  background: rgba(166, 29, 36, 0.35);
+}
+
+.order-logistics-timeline-dot {
+  flex-shrink: 0;
+  width: 11px;
+  height: 11px;
+  margin-top: 4px;
+  border-radius: 50%;
+  background: var(--color-surface-container-high, #e8e4df);
+  border: 2px solid #fff;
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.08);
+}
+
+.order-logistics-timeline-item--latest .order-logistics-timeline-dot {
+  background: var(--color-heritage-red);
+  box-shadow: 0 0 0 2px rgba(166, 29, 36, 0.25);
+}
+
+.order-logistics-timeline-body {
+  flex: 1;
+  min-width: 0;
+}
+
+.order-logistics-timeline-status {
+  display: block;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--color-on-surface);
+  margin-bottom: 4px;
+}
+
+.order-logistics-timeline-item--done .order-logistics-timeline-status {
+  color: var(--color-heritage-red);
+}
+
+.order-logistics-timeline-item--latest .order-logistics-timeline-status {
+  color: var(--color-heritage-red);
+  font-weight: 700;
+}
+
+.order-logistics-node {
+  padding: 10px 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+}
+
+.order-logistics-node:last-child {
+  border-bottom: none;
+}
+
+.order-logistics-node-time {
+  display: block;
+  font-size: 12px;
+  color: var(--color-on-surface-variant);
+  margin-bottom: 4px;
+}
+
+.order-logistics-node-info {
+  display: block;
+  font-size: 14px;
+  color: var(--color-on-surface);
+  line-height: 1.5;
+}

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

@@ -10,8 +10,24 @@
 .store-detail-carousel-wrap {
   position: relative;
   width: 100%;
-  height: 280px;
+  aspect-ratio: 4 / 3;
   overflow: hidden;
+  /* background: var(--color-surface-container); */
+  background-color: #000;
+}
+
+/* 门店门头：固定 4:3 区域，图片 aspectFit 缩放完整显示（不裁剪） */
+.store-detail-carousel-wrap--contain .store-detail-carousel-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.store-detail-carousel-wrap--contain .store-detail-carousel-image {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  object-position: center center;
 }
 
 .store-detail-carousel {
@@ -26,6 +42,12 @@
   height: 100%;
 }
 
+.store-detail-carousel-image {
+  object-fit: cover;
+  object-position: center center;
+  display: block;
+}
+
 .store-detail-carousel-placeholder {
   background: var(--color-surface-container);
 }
@@ -53,7 +75,7 @@
 }
 
 .store-detail-info-card {
-  margin: -40px var(--space-page) 16px;
+  margin: 0 var(--space-page) 16px;
   position: relative;
   z-index: 2;
   background: var(--color-card);
@@ -236,43 +258,146 @@
   margin-right: 0;
 }
 
-.store-detail-package-card {
+.store-detail-section--packages {
-  padding: 12px 0;
+  overflow: hidden;
+}
+
+.store-detail-package-list {
+  display: flex;
+  flex-direction: column;
+}
+
+.store-detail-package-list-item {
+  padding: 14px 0;
   border-bottom: 1px solid rgba(0, 0, 0, 0.06);
 }
 
-.store-detail-package-img {
+.store-detail-package-list-item:first-child {
-  width: 100%;
+  padding-top: 4px;
-  height: 160px;
-  border-radius: var(--radius-md, 8px);
-  margin-bottom: 8px;
-  display: block;
 }
 
-.store-detail-package-card:last-of-type {
+.store-detail-package-list-item:last-child {
   border-bottom: none;
+  padding-bottom: 0;
 }
 
-.store-detail-package-name {
+.store-detail-package-list-title {
   display: block;
-  font-size: 16px;
+  font-size: 15px;
+  line-height: 1.5;
+  font-weight: 500;
+  color: var(--color-on-surface);
+  word-break: break-word;
+}
+
+.store-detail-package-list-item:active {
+  opacity: 0.72;
+}
+
+/* ── 套餐详情页（独立于门店详情） ── */
+.store-package-detail-page {
+  background: var(--color-background);
+}
+
+.store-package-detail-body {
+  /* 避开状态栏+胶囊导航，并额外 12px 顶白 */
+  padding: calc(var(--nav-bar-height, 56px) + 12px) 0 24px;
+  box-sizing: border-box;
+}
+
+.store-package-detail-inner {
+  /* 左右留白，内容不贴边 */
+  padding: 8px 16px 0;
+  box-sizing: border-box;
+}
+
+.store-package-detail-header {
+  padding: 8px 16px 4px 16px;
+}
+
+.store-package-detail-title-row {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+}
+
+.store-package-detail-title {
+  flex: 1;
+  min-width: 0;
+  font-family: var(--font-headline);
+  font-size: 20px;
   font-weight: 700;
-  color: var(--color-text-primary, #1a1a1a);
+  line-height: 1.4;
+  color: var(--color-ink-black);
+  word-break: break-word;
+}
+
+.store-package-detail-price {
+  flex-shrink: 0;
+  font-size: 24px;
+  font-weight: 700;
+  line-height: 1.35;
+  color: #a61d24;
+  color: var(--color-heritage-red, #a61d24);
+  text-align: right;
+}
+
+.store-package-detail-store {
+  display: block;
+  margin-top: 10px;
+  font-size: 13px;
+  line-height: 1.5;
+  color: var(--color-on-surface-variant);
+  padding-left: 4px;
+}
+
+.store-package-detail-photo {
+  margin: 14px 0 0;
+  border-radius: var(--radius-lg);
+  overflow: hidden;
+  background: var(--color-card);
+  box-shadow: var(--shadow-card);
+}
+
+.store-package-detail-photo-image {
+  width: 100%;
+  display: block;
+  vertical-align: top;
+}
+
+.store-package-detail-content {
+  margin-top: 16px;
+  background: var(--color-card);
+  border-radius: var(--radius-lg);
+  padding: 16px;
+  box-shadow: var(--shadow-card);
+  box-sizing: border-box;
+}
+
+.store-detail-package-field-label {
+  display: block;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--color-on-surface-variant);
   margin-bottom: 6px;
 }
 
-.store-detail-package-body {
+.store-detail-package-field-value {
   display: block;
   font-size: 14px;
-  color: var(--color-text-secondary, #666);
+  color: var(--color-on-surface);
-  line-height: 1.5;
+  line-height: 1.7;
+  white-space: pre-wrap;
+  word-break: break-word;
 }
 
-.store-detail-package-meta {
+.store-detail-package-field {
-  display: block;
+  margin-bottom: 16px;
-  font-size: 13px;
+}
-  color: var(--color-text-tertiary, #999);
+
-  margin-top: 4px;
+.store-detail-package-field:last-child {
+  margin-bottom: 0;
 }
 
 .store-detail-package-dispute {

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

@@ -144,24 +144,33 @@
   padding: 4px var(--space-page) 16px;
 }
 
+/* 左图 + 中间文案 + 右侧箭头 */
 .store-card {
   display: flex;
   flex-direction: row;
-  align-items: stretch;
+  align-items: center;
-  gap: 12px;
+  gap: 10px;
   padding: 12px;
+  box-sizing: border-box;
   background: var(--color-card);
   border-radius: var(--radius-lg);
   box-shadow: var(--shadow-card);
   margin-bottom: 12px;
-  box-sizing: border-box;
 }
 
-.store-card-cover {
+.store-card-cover-wrap {
+  position: relative;
   flex-shrink: 0;
   width: 96px;
   height: 96px;
-  border-radius: var(--radius-md);
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.store-card-cover {
+  width: 100%;
+  height: 100%;
+  border-radius: 8px;
   background: var(--color-surface-container);
   display: block;
 }
@@ -170,99 +179,113 @@
   background: var(--color-surface-container);
 }
 
+.store-card-open-badge {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 44px;
+  height: 44px;
+  pointer-events: none;
+  z-index: 1;
+}
+
 .store-card-body {
   flex: 1;
   min-width: 0;
+  min-height: 96px;
   display: flex;
   flex-direction: column;
+  justify-content: space-between;
+  gap: 4px;
+  box-sizing: border-box;
 }
 
-.store-card-head {
+.store-card-row {
   display: flex;
   align-items: flex-start;
-  justify-content: space-between;
+  min-width: 0;
-  gap: 8px;
+  overflow: hidden;
-  margin-bottom: 6px;
+}
+
+/* 第1行：加粗标题（单行截断，不显示 …，宽度顶到最右） */
+.store-card-row--head {
+  height: 22px;
+  align-items: center;
 }
 
 .store-card-name {
-  flex: 1;
+  width: 100%;
   min-width: 0;
   font-family: var(--font-headline);
   font-size: 15px;
   font-weight: 700;
-  line-height: 1.35;
+  line-height: 22px;
-  color: var(--color-on-surface);
+  color: #1a1a1a;
+  overflow: hidden;
+  text-overflow: clip;
+  white-space: nowrap;
+}
+
+/* 第2行：地址最多两行 + 右对齐距离 */
+.store-card-row--mid {
+  gap: 8px;
+  align-items: flex-start;
+}
+
+.store-card-address {
+  flex: 1;
+  min-width: 0;
+  font-size: 11px;
+  font-weight: 400;
+  line-height: 16px;
+  max-height: 32px;
+  color: #999;
+  text-align: left;
+  white-space: normal;
+  word-break: break-word;
   overflow: hidden;
-  text-overflow: ellipsis;
   display: -webkit-box;
-  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
 }
 
 .store-card-distance {
   flex-shrink: 0;
+  max-width: 40%;
+  padding-top: 1px;
   font-size: 12px;
-  line-height: 1.35;
+  font-weight: 400;
-  color: var(--color-subtle-gray);
+  line-height: 16px;
+  color: #999;
+  text-align: right;
+  white-space: nowrap;
 }
 
-.store-card-status-row {
+/* 第3行：营业时间同行 */
-  display: flex;
+.store-card-row--hours {
   align-items: center;
-  flex-wrap: wrap;
-  gap: 6px;
-  margin-bottom: 4px;
-}
-
-.store-card-status {
-  flex-shrink: 0;
-  padding: 2px 8px;
-  border-radius: var(--radius-sm);
-  background: rgba(45, 106, 79, 0.12);
-  color: var(--color-success-green);
-  font-size: 11px;
-  font-weight: 600;
-  line-height: 1.4;
 }
 
 .store-card-hours {
-  flex: 1;
+  width: 100%;
   min-width: 0;
   font-size: 11px;
-  line-height: 1.4;
+  font-weight: 400;
-  color: var(--color-subtle-gray);
+  line-height: 16px;
-}
+  color: #999;
-
-.store-card-address {
-  font-size: 12px;
-  line-height: 1.45;
-  color: var(--color-subtle-gray);
   overflow: hidden;
-  text-overflow: ellipsis;
+  text-overflow: clip;
-  display: -webkit-box;
+  white-space: nowrap;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
 }
 
-.store-card-footer {
+.store-card-arrow {
-  display: flex;
-  align-items: center;
-  margin-top: auto;
-  padding-top: 8px;
-}
-
-.store-card-footer-spacer {
-  flex: 1;
-}
-
-.store-card-cta {
   flex-shrink: 0;
-  padding: 6px 16px;
+  align-self: center;
-  border-radius: var(--radius-full);
+  width: 16px;
-  background: var(--color-heritage-red);
+  font-size: 20px;
-  color: #fff;
+  font-weight: 300;
-  font-size: 12px;
+  line-height: 1;
-  font-weight: 600;
+  color: #ccc;
-  line-height: 1.4;
+  text-align: center;
 }

packages/domain/src/support-ticket.test.ts

@@ -29,6 +29,15 @@ describe('validateSupportTicketStatusTransition', () => {
     ).toBe(false);
   });
 
+  it('allows PASSED -> PUBLISHED', () => {
+    expect(
+      validateSupportTicketStatusTransition('PASSED', 'PUBLISHED', {
+        linkedTaskCount: 1,
+        isSuperAdmin: true,
+      }).ok,
+    ).toBe(true);
+  });
+
   it('requires super admin and reason for REJECTED', () => {
     expect(
       validateSupportTicketStatusTransition('DEVELOPING', 'REJECTED', {

packages/domain/src/support-ticket.ts

@@ -3,7 +3,8 @@ export type SupportTicketStatus =
   | 'REJECTED'
   | 'DEVELOPING'
   | 'TESTING'
-  | 'PASSED';
+  | 'PASSED'
+  | 'PUBLISHED';
 
 export type SupportTicketStatusTransitionContext = {
   linkedTaskCount: number;
@@ -16,7 +17,8 @@ const FORWARD_TRANSITIONS: Record<SupportTicketStatus, SupportTicketStatus[]> =
   DEVELOPING: ['TESTING', 'REJECTED'],
   TESTING: ['PASSED', 'REJECTED'],
   REJECTED: [],
-  PASSED: [],
+  PASSED: ['PUBLISHED'],
+  PUBLISHED: [],
 };
 
 /** 技术支持工单批量/人工改状态校验（禁止回退） */

packages/shared-types/src/config.ts

@@ -32,29 +32,29 @@ export interface AppConfig {
   userH5Url: string;
 }
 
-/** 推广码 / C 端 H5 默认落地页（未配置 USER_H5_URL 时使用） */
+/** 推广码 / C 端 H5 默认落地页（系统设置 USER_H5_URL 未配时回退；HQ 可改） */
 export const DEFAULT_USER_H5_URL = 'https://user.runxian.top/user';
 
-/** 品牌 Logo OSS 根路径（改环境时只改此处） */
+/** 品牌 Logo OSS 根路径（默认；系统设置 BRAND_LOGO_OSS_BASE 可覆盖） */
 export const BRAND_LOGO_OSS_BASE = 'https://dukang-dev.oss-cn-beijing.aliyuncs.com/logo/';
 
-/** 方形 Logo（首页等品牌展示；商品列表顶栏仍用文字标题） */
+/** 方形 Logo（默认；系统设置 BRAND_LOGO_URL 可覆盖） */
 export const BRAND_LOGO_URL = `${BRAND_LOGO_OSS_BASE}logo.png`;
 
-/** 长方形 Logo（含文字，登录等场景） */
+/** 长方形 Logo（默认；系统设置 BRAND_LOGO_WIDE_URL 可覆盖） */
 export const BRAND_LOGO_WIDE_URL = `${BRAND_LOGO_OSS_BASE}logo1.png`;
 
-/** 仅图标 Logo（默认头像：未微信授权时） */
+/** 仅图标 Logo（默认；系统设置 BRAND_LOGO_MARK_URL 可覆盖） */
 export const BRAND_LOGO_MARK_URL = `${BRAND_LOGO_OSS_BASE}logo2.png`;
 
-/** 小程序静态资源（资质公示等） */
+/** 小程序静态资源根路径（默认；系统设置 MINI_USER_STATIC_OSS_BASE 可覆盖） */
 export const MINI_USER_STATIC_OSS_BASE =
   'https://dukang-dev.oss-cn-beijing.aliyuncs.com/static/mini-user/';
 
-/** 「我的」页资质公示长图 */
+/** 「我的」页资质公示长图（默认；系统设置 QUALIFICATION_DISCLOSURE_URL 可覆盖） */
 export const QUALIFICATION_DISCLOSURE_URL = `${MINI_USER_STATIC_OSS_BASE}qualification-disclosure.png`;
 
-/** 总部客服电话（C 端联系客服） */
+/** 总部客服电话（默认；系统设置 CUSTOMER_SERVICE_PHONE 可覆盖） */
 export const CUSTOMER_SERVICE_PHONE = '13203801799';
 
 /**
@@ -64,6 +64,137 @@ export const CUSTOMER_SERVICE_PHONE = '13203801799';
 export const CUSTOMER_SERVICE_WECOM_URL =
   'https://work.weixin.qq.com/kfid/kfc8b88659a1dffa8cd';
 
+/** 从 env / 系统设置解析的 C 端品牌与客服展示配置（缺省回退常量） */
+export type ClientBrandRuntime = {
+  userH5Url: string;
+  brandLogoOssBase: string;
+  brandLogoUrl: string;
+  brandLogoWideUrl: string;
+  brandLogoMarkUrl: string;
+  miniUserStaticOssBase: string;
+  qualificationDisclosureUrl: string;
+  customerServicePhone: string;
+};
+
+export function resolveClientBrandRuntime(
+  env?: Record<string, string | undefined>,
+): ClientBrandRuntime {
+  const e = readEnv(env);
+  const brandBase = (e.BRAND_LOGO_OSS_BASE || BRAND_LOGO_OSS_BASE).trim().replace(/\/*$/, '/');
+  const staticBase = (e.MINI_USER_STATIC_OSS_BASE || MINI_USER_STATIC_OSS_BASE)
+    .trim()
+    .replace(/\/*$/, '/');
+  return {
+    userH5Url: (e.USER_H5_URL || DEFAULT_USER_H5_URL).replace(/\/$/, ''),
+    brandLogoOssBase: brandBase,
+    brandLogoUrl: (e.BRAND_LOGO_URL || '').trim() || `${brandBase}logo.png`,
+    brandLogoWideUrl: (e.BRAND_LOGO_WIDE_URL || '').trim() || `${brandBase}logo1.png`,
+    brandLogoMarkUrl: (e.BRAND_LOGO_MARK_URL || '').trim() || `${brandBase}logo2.png`,
+    miniUserStaticOssBase: staticBase,
+    qualificationDisclosureUrl:
+      (e.QUALIFICATION_DISCLOSURE_URL || '').trim() ||
+      `${staticBase}qualification-disclosure.png`,
+    customerServicePhone: (e.CUSTOMER_SERVICE_PHONE || CUSTOMER_SERVICE_PHONE).trim(),
+  };
+}
+
+/** Mock 短信固定验证码（系统设置 MOCK_SMS_FIXED_CODE 可覆盖） */
+export function resolveMockSmsFixedCode(env?: Record<string, string | undefined>): string {
+  const code = (readEnv(env).MOCK_SMS_FIXED_CODE || '').trim();
+  return code || MOCK_SMS_FIXED_CODE;
+}
+
+/** 小程序 / H5 默认分享文案与引导（系统设置「小程序分享配置」可覆盖） */
+export const DEFAULT_SHARE_TITLE = '你吃饭，我买单';
+export const DEFAULT_SHARE_DESC = '杜康好客 · 买美酒，享好礼，全城门店可用';
+export const DEFAULT_SHARE_HINT = '请点击右上角 ··· 分享给好友';
+export const DEFAULT_SHARE_STORES_TITLE = '杜康好客门店';
+export const DEFAULT_SHARE_BENEFIT_TITLE = '好客权益 · 杜康好客';
+export const DEFAULT_SHARE_MINE_TITLE = '杜康好客 · 我的';
+/** 订单详情分享标题模板，可用 {productName} */
+export const DEFAULT_SHARE_ORDER_TITLE = '我买了{productName} · 杜康好客';
+
+export type MiniShareSceneConfig = {
+  title: string;
+  desc: string;
+  imageUrl: string;
+};
+
+/** 各场景分享文案/图（空字符串表示该字段走动态内容或默认分享） */
+export type MiniShareRuntime = {
+  hint: string;
+  default: MiniShareSceneConfig;
+  home: MiniShareSceneConfig;
+  stores: MiniShareSceneConfig;
+  storeDetail: MiniShareSceneConfig;
+  benefit: MiniShareSceneConfig;
+  mine: MiniShareSceneConfig;
+  productDetail: MiniShareSceneConfig;
+  orderDetail: MiniShareSceneConfig;
+};
+
+function pickShareScene(
+  e: Record<string, string | undefined>,
+  prefix: string,
+  fallback: Partial<MiniShareSceneConfig> = {},
+): MiniShareSceneConfig {
+  return {
+    title: (e[`${prefix}_TITLE`] || '').trim() || fallback.title || '',
+    desc: (e[`${prefix}_DESC`] || '').trim() || fallback.desc || '',
+    imageUrl: (e[`${prefix}_IMAGE_URL`] || '').trim() || fallback.imageUrl || '',
+  };
+}
+
+/** 从 env / 系统设置解析小程序分享配置 */
+export function resolveMiniShareRuntime(
+  env?: Record<string, string | undefined>,
+): MiniShareRuntime {
+  const e = readEnv(env);
+  const brand = resolveClientBrandRuntime(e);
+  const defaults: MiniShareSceneConfig = {
+    title: (e.SHARE_DEFAULT_TITLE || '').trim() || DEFAULT_SHARE_TITLE,
+    desc: (e.SHARE_DEFAULT_DESC || '').trim() || DEFAULT_SHARE_DESC,
+    imageUrl: (e.SHARE_DEFAULT_IMAGE_URL || '').trim() || brand.brandLogoUrl,
+  };
+  return {
+    hint: (e.SHARE_HINT || '').trim() || DEFAULT_SHARE_HINT,
+    default: defaults,
+    home: pickShareScene(e, 'SHARE_HOME', {
+      title: defaults.title,
+      desc: defaults.desc,
+    }),
+    stores: pickShareScene(e, 'SHARE_STORES', {
+      title: DEFAULT_SHARE_STORES_TITLE,
+      desc: defaults.desc,
+    }),
+    storeDetail: pickShareScene(e, 'SHARE_STORE_DETAIL'),
+    benefit: pickShareScene(e, 'SHARE_BENEFIT', {
+      title: DEFAULT_SHARE_BENEFIT_TITLE,
+      desc: defaults.desc,
+    }),
+    mine: pickShareScene(e, 'SHARE_MINE', {
+      title: DEFAULT_SHARE_MINE_TITLE,
+      desc: defaults.desc,
+    }),
+    productDetail: pickShareScene(e, 'SHARE_PRODUCT_DETAIL'),
+    orderDetail: pickShareScene(e, 'SHARE_ORDER_DETAIL', {
+      title: DEFAULT_SHARE_ORDER_TITLE,
+      desc: defaults.desc,
+    }),
+  };
+}
+
+/** 订单等标题模板：替换 {productName} 等占位符 */
+export function applyShareTitleTemplate(
+  template: string,
+  vars: Record<string, string | undefined | null>,
+): string {
+  return template.replace(/\{(\w+)\}/g, (_, key: string) => {
+    const v = vars[key];
+    return v != null && String(v).trim() ? String(v).trim() : '';
+  }).replace(/\s{2,}/g, ' ').trim();
+}
+
 function readEnv(env?: Record<string, string | undefined>) {
   return (
     env ??
@@ -142,5 +273,5 @@ export function loadAppConfig(env?: Record<string, string | undefined>): AppConf
   };
 }
 
-/** Mock 短信环境固定验证码 */
+/** Mock 短信环境固定验证码（默认；系统设置 MOCK_SMS_FIXED_CODE 可覆盖） */
 export const MOCK_SMS_FIXED_CODE = '999888';

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

@@ -18,6 +18,7 @@ export const HQ_PERMISSION_CATALOG = [
   { key: 'llm_configs', label: '语言模型配置', group: '业务' },
   { key: 'knowledge_bases', label: '知识库', group: '业务' },
   { key: 'dev_plan', label: '开发计划', group: '业务' },
+  { key: 'test_whitelist', label: '白名单管理', group: '业务' },
   { key: 'resources', label: 'OSS 资源库', group: '业务' },
   { key: 'logs', label: '日志', group: '业务' },
   { key: 'users_delete', label: '删除用户', group: '危险操作' },
@@ -116,6 +117,7 @@ export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<string, HqPermissionKey[]> = {
     'llm_configs',
     'knowledge_bases',
     'dev_plan',
+    'test_whitelist',
     'resources',
     'logs',
     'system_settings_wechat_mini',

packages/shared-types/src/promo.ts

@@ -85,6 +85,50 @@ export function promoConversion(scan: number, orders: number): string {
   return `${Math.round((orders / scan) * 1000) / 10}%`;
 }
 
+export type PromoMetricEventType = 'SCAN' | 'ATTRIBUTION' | 'REGISTER' | 'ORDER';
+
+export const PROMO_METRIC_EVENT_LABELS: Record<PromoMetricEventType, string> = {
+  SCAN: '扫码进入',
+  ATTRIBUTION: '归因用户',
+  REGISTER: '扫码注册',
+  ORDER: '订单',
+};
+
+export type PromoMetricEventItem = {
+  id: string;
+  eventType: PromoMetricEventType;
+  userId: string | null;
+  orderId: string | null;
+  sessionId: string | null;
+  clientIp: string | null;
+  ipProvince: string | null;
+  ipCity: string | null;
+  createdAt: string;
+};
+
+export type PromoMetricTimelineBucket = {
+  key: string;
+  scan: number;
+  attribution: number;
+  register: number;
+  order: number;
+};
+
+export type PromoMetricTimelinePeak = {
+  scan: { key: string; count: number } | null;
+  attribution: { key: string; count: number } | null;
+  register: { key: string; count: number } | null;
+  order: { key: string; count: number } | null;
+};
+
+export type PromoMetricTimelineDto = {
+  granularity: 'day' | 'hour';
+  dateFrom: string;
+  dateTo: string;
+  buckets: PromoMetricTimelineBucket[];
+  peak: PromoMetricTimelinePeak;
+};
+
 export function buildPromoLandingUrl(baseUrl: string, code: string, qrcodeId: string): string {
   const base = baseUrl.replace(/\/$/, '');
   return `${base}/?promo=${encodeURIComponent(code)}&pid=${encodeURIComponent(qrcodeId)}`;

packages/shared-types/src/settlement.ts

@@ -183,7 +183,7 @@ export const STORE_SETTLEMENT_DEFAULT_RATE = 0.6;
 /** 酒厂账单结算比例（酒单实付 × 比例），暂定 30% */
 export const WINERY_SETTLEMENT_RATE = 0.3;
 
-/** 酒厂账单出账滞后自然日（T+3：支付日 + 3 天后纳入账单） */
+/** 酒厂账单出账滞后自然日（T+3：订单完成日 + 3 天后纳入账单） */
 export const WINERY_SETTLEMENT_LAG_DAYS = 3;
 
 export type { LogisticsSettlementMethod } from './enums';

packages/shared-types/src/support-ticket.ts

@@ -15,7 +15,8 @@ export type SupportTicketStatusDto =
   | 'REJECTED'
   | 'DEVELOPING'
   | 'TESTING'
-  | 'PASSED';
+  | 'PASSED'
+  | 'PUBLISHED';
 
 export const SUPPORT_TICKET_STATUSES = [
   'PENDING_REVIEW',
@@ -23,6 +24,7 @@ export const SUPPORT_TICKET_STATUSES = [
   'DEVELOPING',
   'TESTING',
   'PASSED',
+  'PUBLISHED',
 ] as const;
 
 export const SUPPORT_TICKET_STATUS_LABELS: Record<SupportTicketStatusDto, string> = {
@@ -31,6 +33,19 @@ export const SUPPORT_TICKET_STATUS_LABELS: Record<SupportTicketStatusDto, string
   DEVELOPING: '开发',
   TESTING: '测试',
   PASSED: '通过',
+  PUBLISHED: '已发布',
+};
+
+/** 技术支持工单优先级 */
+export type SupportTicketPriorityDto = 'LOW' | 'NORMAL' | 'HIGH' | 'URGENT';
+
+export const SUPPORT_TICKET_PRIORITIES = ['LOW', 'NORMAL', 'HIGH', 'URGENT'] as const;
+
+export const SUPPORT_TICKET_PRIORITY_LABELS: Record<SupportTicketPriorityDto, string> = {
+  LOW: '低',
+  NORMAL: '普通',
+  HIGH: '高',
+  URGENT: '紧急',
 };
 
 export interface SupportTicketDto {
@@ -38,6 +53,7 @@ export interface SupportTicketDto {
   ticketNo: string;
   ticketType: SupportTicketTypeDto;
   status: SupportTicketStatusDto;
+  priority: SupportTicketPriorityDto;
   title: string;
   content?: string | null;
   rejectReason?: string | null;
@@ -51,6 +67,8 @@ export interface SupportTicketDto {
   createdAt: string;
   updatedAt: string;
   completedAt?: string | null;
+  releasedVersionNo?: string | null;
+  publishedAt?: string | null;
 }
 
 export interface CreateSupportTicketRequest {
@@ -59,6 +77,7 @@ export interface CreateSupportTicketRequest {
   content?: string;
   remark?: string;
   attachmentUrls?: string[];
+  priority?: SupportTicketPriorityDto;
 }
 
 export interface UpdateSupportTicketRequest {
@@ -67,6 +86,7 @@ export interface UpdateSupportTicketRequest {
   content?: string;
   remark?: string;
   attachmentUrls?: string[];
+  priority?: SupportTicketPriorityDto;
 }
 
 export interface RejectSupportTicketRequest {

packages/shared-types/src/ticket.ts

@@ -27,6 +27,30 @@ export const TICKET_TYPE_LABELS: Record<TicketTypeDto, string> = {
   PACKAGE_DISPUTE: '套餐异议',
 };
 
+/** 售后工单状态（common_ticket.status） */
+export type TicketStatusDto =
+  | 'PENDING'
+  | 'OPEN'
+  | 'COLLABORATING'
+  | 'RESOLVED'
+  | 'REJECTED'
+  | 'COMPLETED'
+  | 'CLOSED';
+
+export const TICKET_STATUS_LABELS: Record<TicketStatusDto, string> = {
+  PENDING: '待处理',
+  OPEN: '处理中',
+  COLLABORATING: '协同中',
+  RESOLVED: '已解决',
+  REJECTED: '已驳回',
+  COMPLETED: '已完成',
+  CLOSED: '已关闭',
+};
+
+export function ticketStatusLabel(status: string): string {
+  return TICKET_STATUS_LABELS[status as TicketStatusDto] ?? status;
+}
+
 export interface TicketDto {
   id: string;
   ticketNo: string;

packages/shared-types/src/trade.ts

@@ -70,6 +70,30 @@ export interface DeliveryDto {
   deliveredAt?: string;
 }
 
+/** 物流路由节点（C 端 track API） */
+export interface OrderTrackNodeDto {
+  trackInfo: string;
+  createTime: string;
+  statusName?: string;
+}
+
+/** 小飞侠 cmd=100301 预估送达 */
+export interface OrderTrackEstimatedArrivalDto {
+  arriveTime: string;
+  siteName?: string;
+}
+
+/** GET /trade/orders/:id/track 响应 */
+export interface OrderTrackDto {
+  nodes: OrderTrackNodeDto[];
+  signPhotoUrls: string[];
+  estimatedArrival?: OrderTrackEstimatedArrivalDto | null;
+  manualQueryUrl?: string | null;
+  provider?: string;
+  trackingNo?: string | null;
+  logisticsCompany?: string | null;
+}
+
 /** 大单拦截原因：≥10 箱不自动推小飞侠 */
 export const FULFILLMENT_HOLD_REASON_LABELS: Record<string, string> = {
   LARGE_ORDER_GE_10_BOXES: '大单≥10箱，待总部确认推单/自配送',

packages/shared-types/src/wechat.ts

@@ -1,3 +1,5 @@
+import type { MiniShareRuntime } from './config';
+
 /** 微信 JSSDK 初始化参数（后端签名下发） */
 export interface WechatJssdkConfig {
   appId: string;
@@ -48,6 +50,22 @@ export type ClientRuntimeConfig = {
     banners: string[];
     footerUrl: string | null;
   };
+  /** 小程序最低兼容版本（semver，如 3.4.13）；客户端低于此值时提示更新 */
+  minClientVersion?: string | null;
+  /** C 端 H5 落地页（推广码等） */
+  userH5Url?: string;
+  /** 方形品牌 Logo */
+  brandLogoUrl?: string;
+  /** 长方形品牌 Logo（登录） */
+  brandLogoWideUrl?: string;
+  /** 图标 Logo（默认头像） */
+  brandLogoMarkUrl?: string;
+  /** 「我的」资质公示长图 */
+  qualificationDisclosureUrl?: string;
+  /** 总部客服电话 */
+  customerServicePhone?: string;
+  /** 小程序各场景分享文案/图 */
+  share?: MiniShareRuntime;
 };
 
 /** 是否展示微信授权入口 */

packages/shared-ui/package.json

@@ -11,7 +11,8 @@
     "./CouponBadge": "./src/CouponBadge.tsx",
     "./OrderStatusTabs": "./src/OrderStatusTabs.tsx",
     "./AppImage": "./src/AppImage.tsx",
-    "./PullToRefresh": "./src/PullToRefresh.tsx"
+    "./PullToRefresh": "./src/PullToRefresh.tsx",
+    "./compressImage": "./src/compressImage.ts"
   },
   "peerDependencies": {
     "react": "^18.3.1"

packages/shared-ui/src/compressImage.ts

@@ -0,0 +1,90 @@
+/** OSS 单文件上限（与后端 OSS_MAX_UPLOAD_BYTES 默认一致） */
+export const DEFAULT_OSS_MAX_UPLOAD_BYTES = 10 * 1024 * 1024;
+
+function isCompressibleImage(file: File): boolean {
+  if (!file.type.startsWith('image/')) return false;
+  if (file.type === 'image/svg+xml' || file.type === 'image/gif') return false;
+  return true;
+}
+
+function loadImage(file: File): Promise<HTMLImageElement> {
+  return new Promise((resolve, reject) => {
+    const url = URL.createObjectURL(file);
+    const img = new Image();
+    img.onload = () => {
+      URL.revokeObjectURL(url);
+      resolve(img);
+    };
+    img.onerror = () => {
+      URL.revokeObjectURL(url);
+      reject(new Error('图片读取失败'));
+    };
+    img.src = url;
+  });
+}
+
+function canvasToBlob(canvas: HTMLCanvasElement, type: string, quality: number): Promise<Blob> {
+  return new Promise((resolve, reject) => {
+    canvas.toBlob(
+      (blob) => (blob ? resolve(blob) : reject(new Error('图片压缩失败'))),
+      type,
+      quality,
+    );
+  });
+}
+
+async function renderScaled(
+  img: HTMLImageElement,
+  maxEdge: number,
+  quality: number,
+  mime: string,
+): Promise<Blob> {
+  const w = img.naturalWidth;
+  const h = img.naturalHeight;
+  const scale = Math.min(1, maxEdge / Math.max(w, h));
+  const cw = Math.max(1, Math.round(w * scale));
+  const ch = Math.max(1, Math.round(h * scale));
+  const canvas = document.createElement('canvas');
+  canvas.width = cw;
+  canvas.height = ch;
+  const ctx = canvas.getContext('2d');
+  if (!ctx) throw new Error('图片压缩失败');
+  ctx.drawImage(img, 0, 0, cw, ch);
+  return canvasToBlob(canvas, mime, quality);
+}
+
+/**
+ * 超过 maxBytes 的图片用 canvas 压缩后再上传；不可压缩或非图片原样返回。
+ */
+export async function compressImageFileIfNeeded(
+  file: File,
+  maxBytes = DEFAULT_OSS_MAX_UPLOAD_BYTES,
+): Promise<File> {
+  if (!isCompressibleImage(file) || file.size <= maxBytes) return file;
+
+  const img = await loadImage(file);
+  const mime = file.type === 'image/png' || file.type === 'image/webp' ? 'image/jpeg' : file.type || 'image/jpeg';
+  const edges = [4096, 3072, 2048, 1536, 1280, 1024, 800];
+  let best: Blob | null = null;
+
+  outer: for (const edge of edges) {
+    for (let quality = 0.92; quality >= 0.5; quality -= 0.08) {
+      const blob = await renderScaled(img, edge, quality, mime);
+      if (!best || blob.size < best.size) best = blob;
+      if (blob.size <= maxBytes) {
+        best = blob;
+        break outer;
+      }
+    }
+  }
+
+  if (!best || best.size >= file.size) return file;
+
+  const ext = mime === 'image/png' ? '.png' : '.jpg';
+  const baseName = file.name.replace(/\.[^.]+$/, '') || 'image';
+  return new File([best], `${baseName}${ext}`, { type: mime, lastModified: Date.now() });
+}
+
+export function formatOssMaxSizeMb(maxBytes = DEFAULT_OSS_MAX_UPLOAD_BYTES): number {
+  return Math.floor(maxBytes / 1024 / 1024);
+}

packages/weixin-sdk/GOTCHAS.md

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

packages/weixin-sdk/src/index.ts

@@ -1,16 +1,19 @@
-export { isWechatBrowser, isMiniProgram, getRuntimePlatform } from './env';
+export { isWechatBrowser, isMiniProgram, getRuntimePlatform, isIosDevice, isWechatDevTools } from './env';
 export { getRouterBasename, toAppPath, isOnAppPath } from './app-path';
 export {
   initWechatJssdk,
   ensureJssdkReady,
   isJssdkReady,
   normalizeJssdkPageUrl,
+  jssdkUrlWithoutHash,
   getJssdkSignUrl,
   captureIosJssdkEntryUrl,
   resetJssdkConfig,
   stripOAuthParamsFromLocation,
+  hardNavigateInWechat,
+  shouldHardNavigateForJssdk,
 } from './jssdk';
-export { formatScanFailMessage } from './scan';
+export { formatScanFailMessage, isScanPermissionWarmupError } from './scan';
 export {
   getWechatLocation,
   getWechatLocationDetailed,

packages/weixin-sdk/src/jssdk.ts

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

packages/weixin-sdk/src/scan.ts

@@ -38,7 +38,7 @@ export function formatScanFailMessage(errMsg: string): string {
   return msg;
 }
 
-function isScanPermissionWarmupError(msg: string): boolean {
+export function isScanPermissionWarmupError(msg: string): boolean {
   return /offline verifying|permission value is offline|权限验证中|接口未就绪|invalid signature|config:fail|signature/i.test(
     msg,
   );
@@ -134,15 +134,13 @@ export async function scanQrCode(
       throw new Error('当前微信版本不支持扫码，请升级微信后重试');
     }
 
-    // wx.ready ≠ 权限离线校验完成；授权回跳后更明显
+    const ios = isIosDevice() && !isWechatDevTools();
-    const warmupMs = options.postAuthWarmup
+
-      ? 1200
+    // wx.ready ≠ 权限离线校验完成；OAuth 回跳后 iOS 更明显
-      : isIosDevice() && !isWechatDevTools()
+    const warmupMs = options.postAuthWarmup ? (ios ? 1600 : 1000) : ios ? 800 : 300;
-        ? 800
-        : 300;
     await delay(warmupMs);
 
-    const maxAttempts = options.postAuthWarmup ? 3 : 2;
+    const maxAttempts = options.postAuthWarmup ? (ios ? 4 : 3) : 2;
     let lastError: Error | null = null;
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       if (attempt > 0) {
@@ -151,7 +149,8 @@ export async function scanQrCode(
           await initWechatJssdk({ ...jssdkOptions, url: getJssdkSignUrl() });
           await checkJsApi('scanQRCode');
         }
-        await delay(700 + attempt * 500);
+        const retryDelay = options.postAuthWarmup && ios ? 900 + attempt * 700 : 700 + attempt * 500;
+        await delay(retryDelay);
       }
       try {
         return await invokeScanQrCode();

pnpm-lock.yaml

@@ -29,6 +29,9 @@ importers:
       '@dukang/shared-types':
         specifier: workspace:*
         version: link:../../packages/shared-types
+      '@dukang/shared-ui':
+        specifier: workspace:*
+        version: link:../../packages/shared-ui
       antd:
         specifier: ^5.22.0
         version: 5.29.3(luxon@3.7.2)(moment@2.30.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)

server/dukang-api/prisma/schema.prisma

@@ -107,6 +107,14 @@ enum SupportTicketStatus {
   DEVELOPING
   TESTING
   PASSED
+  PUBLISHED
+}
+
+enum SupportTicketPriority {
+  LOW
+  NORMAL
+  HIGH
+  URGENT
 }
 
 enum DevPlanTaskType {
@@ -174,6 +182,13 @@ enum PromoCodeScene {
   OTHER
 }
 
+enum PromoMetricEventType {
+  SCAN
+  ATTRIBUTION
+  REGISTER
+  ORDER
+}
+
 enum CityStatus {
   PENDING
   ACTIVE
@@ -646,6 +661,7 @@ model CommonSupportTicket {
   ticketNo     String               @unique @map("ticket_no") @db.VarChar(32)
   ticketType   SupportTicketType    @map("ticket_type")
   status       SupportTicketStatus  @default(PENDING_REVIEW)
+  priority     SupportTicketPriority @default(NORMAL) @map("priority")
   title        String               @db.VarChar(128)
   content      String?              @db.Text
   rejectReason String?              @map("reject_reason") @db.VarChar(512)
@@ -656,6 +672,8 @@ model CommonSupportTicket {
   reviewedAt   DateTime?            @map("reviewed_at") @db.DateTime(3)
   remark       String?              @db.VarChar(512)
   attachmentUrls Json?              @map("attachment_urls")
+  releasedVersionNo String?         @map("released_version_no") @db.VarChar(32)
+  publishedAt  DateTime?            @map("published_at") @db.DateTime(3)
   createdAt    DateTime             @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt    DateTime             @updatedAt @map("updated_at") @db.DateTime(3)
   completedAt  DateTime?            @map("completed_at") @db.DateTime(3)
@@ -663,6 +681,7 @@ model CommonSupportTicket {
   @@index([status, createdAt])
   @@index([ticketType, status])
   @@index([creatorId])
+  @@index([releasedVersionNo])
   @@map("common_support_ticket")
 
   devPlanTasks DevPlanTask[]
@@ -793,6 +812,21 @@ model CommonProductVisibilityPhone {
   @@map("common_product_visibility_phone")
 }
 
+/// 全局测试白名单手机号（测试账号 + 限测商品/门店可见）
+model CommonTestWhitelistPhone {
+  id              BigInt   @id @default(autoincrement()) @db.UnsignedBigInt
+  phone           String   @unique @db.VarChar(20)
+  note            String?  @db.VarChar(256)
+  createdByHqId   BigInt?  @map("created_by_hq_id") @db.UnsignedBigInt
+  createdAt       DateTime @default(now()) @map("created_at") @db.DateTime(3)
+  updatedAt       DateTime @updatedAt @map("updated_at") @db.DateTime(3)
+
+  createdBy HqAccount? @relation("TestWhitelistCreatedBy", fields: [createdByHqId], references: [id], onDelete: SetNull)
+
+  @@index([createdAt])
+  @@map("common_test_whitelist_phone")
+}
+
 model CommonProductDetailTemplate {
   id                        BigInt               @id @default(autoincrement()) @db.UnsignedBigInt
   code                      String               @unique @db.VarChar(32)
@@ -848,6 +882,7 @@ model CommonPromoCode {
   qrcodeResource CommonResource?        @relation("PromoQrcode", fields: [qrcodeResourceId], references: [id], onDelete: SetNull)
   attributions   UserPromoAttribution[]
   orders         Order[]
+  metricEvents   LogPromoEvent[]
 
   @@index([ownerUserId])
   @@index([scene, status])
@@ -1023,6 +1058,8 @@ model PartnerAccount {
   bankBranch           String?              @map("bank_branch") @db.VarChar(128)
   weeklyStoreTarget    Int?                 @default(20) @map("weekly_store_target")
   managedWarehouseId   BigInt?              @unique @map("managed_warehouse_id") @db.UnsignedBigInt
+  /// 测试合伙人账号
+  isTest               Boolean              @default(false) @map("is_test")
   createdAt            DateTime             @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt            DateTime             @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1039,6 +1076,7 @@ model PartnerAccount {
   @@index([parentAccountId])
   @@index([wxOpenId])
   @@index([contactPhone])
+  @@index([isTest])
   @@map("partner_account")
 }
 
@@ -1082,6 +1120,7 @@ model HqAccount {
   updatedAt   DateTime      @updatedAt @map("updated_at") @db.DateTime(3)
 
   permissions HqAccountPermission[]
+  testWhitelistPhones CommonTestWhitelistPhone[] @relation("TestWhitelistCreatedBy")
 
   @@map("hq_account")
 }
@@ -1120,6 +1159,8 @@ model User {
   nickname         String?        @db.VarChar(64)
   avatarResourceId BigInt?        @map("avatar_resource_id") @db.UnsignedBigInt
   status           Int            @default(1) @db.TinyInt
+  /// 测试账号：命中全局测试白名单手机号
+  isTest           Boolean        @default(false) @map("is_test")
   sourceType       UserSourceType @default(ORGANIC) @map("source_type")
   sourceRefId      BigInt?        @map("source_ref_id") @db.UnsignedBigInt
   sourceLabel      String?        @map("source_label") @db.VarChar(128)
@@ -1146,6 +1187,7 @@ model User {
   @@index([referrerUserId])
   @@index([mergedIntoUserId])
   @@index([wxOpenId])
+  @@index([isTest])
   @@map("user_user")
 }
 
@@ -1233,6 +1275,8 @@ model Store {
   visibilityWhitelistEnabled Boolean @default(false) @map("visibility_whitelist_enabled")
   /// FIN-001：允许未出账手动提现的白名单门店
   withdrawWhitelistEnabled Boolean @default(false) @map("withdraw_whitelist_enabled")
+  /// 测试门店：不计结算 / HQ 可手动标记
+  isTest          Boolean     @default(false) @map("is_test")
   createdAt       DateTime    @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt       DateTime    @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1254,6 +1298,7 @@ model Store {
   @@index([cityId, status])
   @@index([partnerAccountId])
   @@index([auditStatus, createdAt])
+  @@index([isTest])
   @@map("store_store")
 }
 
@@ -1324,6 +1369,8 @@ model StoreAccount {
   bankBranch      String?         @map("bank_branch") @db.VarChar(128)
   status          AccountStatus   @default(ACTIVE)
   lastLoginAt     DateTime?       @map("last_login_at") @db.DateTime(3)
+  /// 测试门店账号（商户）
+  isTest          Boolean         @default(false) @map("is_test")
   createdAt       DateTime        @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt       DateTime        @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1334,6 +1381,7 @@ model StoreAccount {
   withdrawRequests     StoreWithdrawRequest[]
 
   @@index([parentAccountId])
+  @@index([isTest])
   @@map("store_account")
 }
 
@@ -1412,6 +1460,8 @@ model Order {
   fulfillmentHold          Boolean   @default(false) @map("fulfillment_hold")
   fulfillmentHoldReason    String?   @map("fulfillment_hold_reason") @db.VarChar(64)
   remark                   String?   @db.VarChar(512)
+  /// 测试订单快照（下单时取自 User.isTest）
+  isTest                   Boolean   @default(false) @map("is_test")
   createdAt                DateTime  @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt                DateTime  @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1436,6 +1486,7 @@ model Order {
   @@index([gpsCity])
   @@index([fulfillmentWarehouseId])
   @@index([proxyPartnerAccountId])
+  @@index([isTest])
   @@map("user_order")
 }
 
@@ -1528,6 +1579,8 @@ model RedeemRecord {
   settleAmount Decimal       @map("settle_amount") @db.Decimal(10, 2)
   /// SCAN=qrcode, PHONE=phone
   channel      RedeemChannel @default(SCAN)
+  /// 测试核销快照（User.isTest || Store.isTest）
+  isTest       Boolean       @default(false) @map("is_test")
   createdAt    DateTime      @default(now()) @map("created_at") @db.DateTime(3)
 
   user         User                     @relation(fields: [userId], references: [id], onDelete: Restrict)
@@ -1540,6 +1593,7 @@ model RedeemRecord {
 
   @@index([storeId, createdAt])
   @@index([storeId, channel, createdAt])
+  @@index([isTest])
   @@map("user_redeem_record")
 }
 
@@ -1751,6 +1805,25 @@ model LogThirdParty {
   @@map("log_third_party")
 }
 
+model LogPromoEvent {
+  id          BigInt               @id @default(autoincrement()) @db.UnsignedBigInt
+  promoCodeId BigInt               @map("promo_code_id") @db.UnsignedBigInt
+  eventType   PromoMetricEventType @map("event_type")
+  userId      BigInt?              @map("user_id") @db.UnsignedBigInt
+  orderId     BigInt?              @map("order_id") @db.UnsignedBigInt
+  sessionId   String?              @map("session_id") @db.VarChar(64)
+  clientIp    String?              @map("client_ip") @db.VarChar(45)
+  ipProvince  String?              @map("ip_province") @db.VarChar(32)
+  ipCity      String?              @map("ip_city") @db.VarChar(32)
+  createdAt   DateTime             @default(now()) @map("created_at") @db.DateTime(3)
+
+  promoCode CommonPromoCode @relation(fields: [promoCodeId], references: [id], onDelete: Cascade)
+
+  @@index([promoCodeId, eventType, createdAt])
+  @@index([createdAt])
+  @@map("log_promo_event")
+}
+
 model LogUserAnalytics {
   id         BigInt     @id @default(autoincrement()) @db.UnsignedBigInt
   userId     BigInt?    @map("user_id") @db.UnsignedBigInt

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

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

server/dukang-api/src/app.module.ts

@@ -21,6 +21,7 @@ import { CityScopeModule } from './modules/city-scope/city-scope.module';
 import { CommonModule } from './modules/common/common.module';
 import { HqOperationModule } from './common/hq-operation/hq-operation.module';
 import { SystemConfigModule } from './common/system-config/system-config.module';
+import { TestWhitelistModule } from './common/test-whitelist/test-whitelist.module';
 import { DevPlanModule } from './modules/dev-plan/dev-plan.module';
 import { CallbacksModule } from './callbacks/callbacks.module';
 import { WecomModule } from './integrations/wecom/wecom.module';
@@ -37,6 +38,7 @@ import { RequestIdMiddleware } from './common/logging/request-id.middleware';
     }),
     PrismaModule,
     SystemConfigModule,
+    TestWhitelistModule,
     GeoModule,
     RedisModule,
     AlertModule,

server/dukang-api/src/callbacks/callbacks.module.ts

@@ -6,9 +6,12 @@ import { WechatPayCallbackController } from './wechat-pay.controller';
 import { WechatRefundCallbackController } from './wechat-refund.controller';
 import { WechatMessageCallbackController } from './wechat-message.controller';
 import { DeliveryCallbackController } from './delivery-track.controller';
+import { DeliveryCallbackService } from './delivery-callback.service';
+import { CourierModule } from '../integrations/courier/courier.module';
 
 @Module({
-  imports: [IntegrationsModule, TradeModule, PrismaModule],
+  imports: [IntegrationsModule, TradeModule, PrismaModule, CourierModule],
+  providers: [DeliveryCallbackService],
   controllers: [
     WechatPayCallbackController,
     WechatRefundCallbackController,

server/dukang-api/src/callbacks/delivery-callback.service.ts

@@ -0,0 +1,171 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaService } from '../common/prisma/prisma.module';
+import { CourierService } from '../integrations/courier/courier.service';
+import { XiaofeixiaProvider } from '../integrations/courier/xiaofeixia/xiaofeixia.provider';
+import { logCourierCall } from '../integrations/courier/courier-log.util';
+import { TradeService } from '../modules/trade/trade.service';
+
+const XFX_PROVIDER_ALIASES = new Set(['xfx', 'xiaofeixia']);
+const RAW_BODY_LOG_LIMIT = 4000;
+
+export type TrackCallbackRequestMeta = {
+  contentType?: string | null;
+  rawBody?: string | null;
+  query?: Record<string, unknown>;
+};
+
+@Injectable()
+export class DeliveryCallbackService {
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly courier: CourierService,
+    private readonly xiaofeixiaProvider: XiaofeixiaProvider,
+    private readonly tradeService: TradeService,
+  ) {}
+
+  async handleTrackCallback(
+    providerKey: string,
+    body: unknown,
+    requestUrl: string,
+    meta?: TrackCallbackRequestMeta,
+  ) {
+    const normalized = providerKey.trim().toLowerCase();
+    const baseLog = {
+      scene: 'TRACK_CALLBACK',
+      requestUrl,
+      requestBody: this.buildRequestBodyForLog(body, meta),
+    };
+
+    if (!XFX_PROVIDER_ALIASES.has(normalized) && normalized !== 'logistics') {
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        status: 'FAILED',
+        errorMessage: `不支持的承运商: ${providerKey}`,
+      });
+      return this.courier.buildTrackCallbackResponse(false);
+    }
+
+    if (normalized === 'logistics') {
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        status: 'SUCCESS',
+        errorMessage: '跨城物流回调暂未接入，已记录',
+      });
+      return this.courier.buildTrackCallbackResponse(true);
+    }
+
+    const payload = this.xiaofeixiaProvider.parseTrackCallback(body);
+    if (!payload) {
+      const response = this.courier.buildTrackCallbackResponse(false);
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        responseBody: response,
+        status: 'FAILED',
+        errorMessage: '回调体解析失败',
+      });
+      return response;
+    }
+
+    const order = payload.outNumber
+      ? await this.prisma.order.findUnique({ where: { orderNo: payload.outNumber } })
+      : payload.trackingNumber
+        ? await this.prisma.order.findFirst({
+            where: { delivery: { trackingNo: payload.trackingNumber } },
+          })
+        : null;
+
+    if (!order) {
+      const response = this.courier.buildTrackCallbackResponse(false);
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        responseBody: response,
+        status: 'FAILED',
+        errorMessage: '订单不存在',
+        externalNo: payload.outNumber || payload.trackingNumber,
+      });
+      return response;
+    }
+
+    const targetStatus = this.xiaofeixiaProvider.mapTrackStatus(
+      payload.status,
+      payload.statusName,
+    );
+    let applied = false;
+    if (targetStatus && targetStatus !== order.status) {
+      await this.tradeService.applyStatusTransition(
+        order.id,
+        order.status,
+        targetStatus,
+        'COURIER_TRACK_CALLBACK',
+        payload.trackInfo || payload.statusName,
+      );
+      applied = true;
+    }
+
+    const response = this.courier.buildTrackCallbackResponse(true);
+    await logCourierCall(this.prisma, {
+      ...baseLog,
+      responseBody: response,
+      status: 'SUCCESS',
+      externalNo: order.orderNo,
+      ref: { refType: 'ORDER', refId: order.id },
+      errorMessage: applied ? undefined : '状态未变更',
+    });
+
+    return response;
+  }
+
+  /** 第三方日志：保留解析后字段，并附带 Content-Type / rawBody / query 便于排查空 body */
+  private buildRequestBodyForLog(
+    body: unknown,
+    meta?: TrackCallbackRequestMeta,
+  ): Record<string, unknown> {
+    const parsed =
+      body && typeof body === 'object'
+        ? ({ ...(body as Record<string, unknown>) } as Record<string, unknown>)
+        : body === undefined || body === null
+          ? {}
+          : { value: body };
+
+    const rawBody = meta?.rawBody != null ? this.redactSecrets(String(meta.rawBody)) : null;
+    const query =
+      meta?.query && Object.keys(meta.query).length > 0
+        ? this.redactSecretFields({ ...meta.query })
+        : undefined;
+
+    return {
+      ...this.redactSecretFields(parsed),
+      _meta: {
+        contentType: meta?.contentType ?? null,
+        rawBody:
+          rawBody && rawBody.length > RAW_BODY_LOG_LIMIT
+            ? `${rawBody.slice(0, RAW_BODY_LOG_LIMIT)}…(truncated)`
+            : rawBody,
+        rawBodyLength: meta?.rawBody != null ? Buffer.byteLength(meta.rawBody, 'utf8') : 0,
+        query,
+      },
+    };
+  }
+
+  private redactSecretFields(input: Record<string, unknown>): Record<string, unknown> {
+    const out: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(input)) {
+      if (/^sign$/i.test(key) || /api[_-]?key/i.test(key)) {
+        out[key] = '[REDACTED]';
+      } else if (key === 'mchId' && value != null) {
+        const s = String(value);
+        out[key] = s.length <= 4 ? '****' : `${s.slice(0, 4)}****`;
+      } else {
+        out[key] = value;
+      }
+    }
+    return out;
+  }
+
+  private redactSecrets(raw: string): string {
+    return raw
+      .replace(/(sign=)[^&\s]*/gi, '$1[REDACTED]')
+      .replace(/("sign"\s*:\s*")[^"]*/gi, '$1[REDACTED]')
+      .replace(/(api[_-]?key=)[^&\s]*/gi, '$1[REDACTED]');
+  }
+}