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

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

.cursor/rules/frontend-h5.mdc

@@ -39,9 +39,6 @@ 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

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

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

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

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 全文见 git 2026-08-06 前） | **不再作为需求依据** |
+| ~~V2 / preV1~~ | 历史参考 | **不再作为需求依据** |
 
 **禁止**：臆造 PRD 未定义规则；依赖 `doc/` 下过时文档；跨 OWNER 直写他人 Prisma 表。
 
@@ -28,7 +28,7 @@ pnpm db:generate && pnpm db:validate
 cd server/dukang-api && npx prisma db push && pnpm prisma:seed
 
 # 开发（分终端）
-pnpm dev:api      # http://localhost:3010/api/v1
+pnpm dev:api      # http://localhost:3000/api/v1
 pnpm dev:user     # :5173
 pnpm dev:shop     # :5174
 pnpm dev:partner  # :5175
@@ -137,14 +137,11 @@ C 端门店仅 status=OPEN
 订单 Tab：待付款 | 已付款 | 已完成
 ```
 
-**iOS 微信 H5 JSSDK**：登录/OAuth 后禁止仅 SPA 跳转再调扫码；见 `packages/weixin-sdk/GOTCHAS.md`、知识库「门店端 · 踩坑」。
-**微信小程序 open-type**：`chooseAvatar` 等 Button 的祖先禁止 `stopPropagation`（会编成 catchtap）；见知识库「C 端 · 踩坑」、`.cursor/rules/mini-user-weapp-opentype.mdc`。
-
 ## 环境与发版
 
 | 环境 | 分支 | 目录 | 端口 | 域名 |
 |------|------|------|------|------|
-| local | `dev_jacy` | 本机 Docker 6016/6017 | API `:3010` | — |
+| local | `dev_jacy` | 本机 Docker 6016/6017 | API `:3000` | — |
 | **staging 测试** | `dev` | `/opt/dukang-staging` | 8190–8194 | `*-test.dukanghaoke.com` |
 | **production 生产** | `main` | `/opt/dukang` | 8090–8094 | `*.dukanghaoke.com` |
 

apps/AGENTS.md

@@ -22,7 +22,6 @@ 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/src/App.tsx

@@ -46,7 +46,6 @@ 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';
@@ -137,7 +136,6 @@ 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/AdminStorePackagesSection.tsx

@@ -1,47 +1,21 @@
-import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Alert, Button, Form, Input, InputNumber, Modal, Space, Typography, message } from 'antd';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import type { StorePackageItemDto } from '@dukang/shared-types';
-import { STORE_PACKAGE_IMAGE_MAX_COUNT, STORE_PACKAGE_MAX_COUNT, normalizeStorePackageImageUrls } from '@dukang/shared-types';
+import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
 import { request } from '../lib/api';
-import PackageImagesUpload from './PackageImagesUpload';
-
+import OssUpload from './OssUpload';
 type PackageRow = StorePackageItemDto;
 
-export type AdminStorePackagesHandle = {
-  /** 套餐已加载时写入；加载中则跳过，避免空数据覆盖线上套餐 */
-  saveIfLoaded: (opts?: { quiet?: boolean }) => Promise<{ skipped: boolean }>;
-};
-
 function emptyRow(index = 0): PackageRow {
-  return {
-    name: '',
-    price: '0',
-    dishes: '',
-    usableTime: '',
-    otherNotes: '',
-    imageUrl: '',
-    imageUrls: [],
-    sortOrder: index,
-  };
+  return { name: '', price: '0', dishes: '', usableTime: '', otherNotes: '', imageUrl: '', sortOrder: index };
 }
 
-const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId: string }>(
-  function AdminStorePackagesSection({ storeId }, ref) {
+export default function AdminStorePackagesSection({ storeId }: { storeId: string }) {
   const [items, setItems] = useState<PackageRow[]>([emptyRow()]);
   const [collapsed, setCollapsed] = useState<Record<number, boolean>>({});
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
-    const itemsRef = useRef(items);
-    const loadingRef = useRef(loading);
-
-    useEffect(() => {
-      itemsRef.current = items;
-    }, [items]);
-
-    useEffect(() => {
-      loadingRef.current = loading;
-    }, [loading]);
 
   useEffect(() => {
     setLoading(true);
@@ -49,17 +23,8 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
       .then((data) => {
         setItems(
           data.live?.length
-              ? data.live.map((p, i) => {
-                  const imageUrls = normalizeStorePackageImageUrls(p);
-                  return {
-                    ...p,
-                    price: String(p.price),
-                    imageUrl: imageUrls[0] ?? '',
-                    imageUrls,
-                    sortOrder: i,
-                  };
-                })
-              : [],
+            ? data.live.map((p, i) => ({ ...p, price: String(p.price), sortOrder: i }))
+            : [emptyRow()],
         );
       })
       .catch((e) => message.error(e instanceof Error ? e.message : '加载套餐失败'))
@@ -103,95 +68,56 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
     }
     run();
   }
-
   function toggleCollapse(index: number) {
     setCollapsed((prev) => ({ ...prev, [index]: !prev[index] }));
   }
 
-    async function save(opts?: { quiet?: boolean }) {
-      const currentItems = itemsRef.current;
-      const filled = currentItems
-        .map((item, index) => {
-          const imageUrls = normalizeStorePackageImageUrls(item);
-          return {
+  async function save() {
+    const filled = items
+      .map((item, index) => ({
         name: item.name.trim(),
         price: item.price.trim(),
         dishes: item.dishes.trim(),
         usableTime: item.usableTime?.trim() || null,
         otherNotes: item.otherNotes?.trim() || null,
-            imageUrl: imageUrls[0] ?? null,
-            imageUrls,
+        imageUrl: item.imageUrl?.trim() || null,
         sortOrder: index,
-          };
-        })
-        // 允许整店无套餐：忽略空白占位行（默认 price=0 不算已填）
-        .filter((item) => {
-          const hasText = !!(item.name || item.dishes || item.usableTime || item.otherNotes);
-          const hasImages = item.imageUrls.length > 0;
-          const hasNonZeroPrice = item.price !== '' && Number(item.price) !== 0;
-          return hasText || hasImages || hasNonZeroPrice;
-        });
+      }))
+      .filter((item) => item.name || item.dishes || item.price);
 
     for (let i = 0; i < filled.length; i++) {
       const item = filled[i];
       if (!item.name) {
         message.warning(`第 ${i + 1} 条套餐名称不能为空`);
-          throw new Error('套餐校验失败');
+        return;
       }
       if (!item.dishes) {
         message.warning(`第 ${i + 1} 条套餐菜品不能为空`);
-          throw new Error('套餐校验失败');
+        return;
       }
       const price = Number(item.price);
       if (!Number.isFinite(price) || price < 0) {
         message.warning(`第 ${i + 1} 条套餐价格须为非负数字`);
-          throw new Error('套餐校验失败');
-        }
-        if ((item.imageUrls?.length ?? 0) > STORE_PACKAGE_IMAGE_MAX_COUNT) {
-          message.warning(`第 ${i + 1} 条套餐图片最多 ${STORE_PACKAGE_IMAGE_MAX_COUNT} 张`);
-          throw new Error('套餐校验失败');
+        return;
       }
     }
 
     setSaving(true);
     try {
-        const data = await request<{ live: PackageRow[] }>(`/admin/stores/${storeId}/packages`, {
+      await request(`/admin/stores/${storeId}/packages`, {
         method: 'PUT',
         body: JSON.stringify({
           packages: filled.map((p) => ({ ...p, price: Number(p.price).toFixed(2) })),
         }),
       });
-        if (!opts?.quiet) message.success('套餐已保存并生效');
-        setItems(
-          data.live?.length
-            ? data.live.map((p, i) => {
-                const imageUrls = normalizeStorePackageImageUrls(p);
-                return {
-                  ...p,
-                  price: String(p.price),
-                  imageUrl: imageUrls[0] ?? '',
-                  imageUrls,
-                  sortOrder: i,
-                };
-              })
-            : [],
-        );
+      message.success('套餐已保存并生效');
     } catch (e) {
-        if (!opts?.quiet) message.error(e instanceof Error ? e.message : '保存失败');
-        throw e;
+      message.error(e instanceof Error ? e.message : '保存失败');
     } finally {
       setSaving(false);
     }
   }
 
-    useImperativeHandle(ref, () => ({
-      saveIfLoaded: async (opts) => {
-        if (loadingRef.current) return { skipped: true };
-        await save(opts);
-        return { skipped: false };
-      },
-    }));
-
   if (loading) {
     return <Typography.Text type="secondary">加载套餐中…</Typography.Text>;
   }
@@ -203,15 +129,14 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
         <Button onClick={addRow} style={{ marginBottom: 16 }}>
           添加套餐
         </Button>
-          <Button type="primary" loading={saving} onClick={() => void save().catch(() => undefined)}>
+        <Button type="primary" loading={saving} onClick={() => void save()}>
           保存套餐
         </Button>
       </Form>
     );
   }
 
-    return (
-      <Form layout="vertical" requiredMark={false}>
+  return (    <Form layout="vertical" requiredMark={false}>
       <Alert
         type="info"
         showIcon
@@ -248,8 +173,7 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
                 <Button type="link" danger onClick={() => removeAt(index)}>
                   删除
                 </Button>
-                ) : null}
-              </Space>
+              ) : null}            </Space>
 
             {!isCollapsed ? (
               <>
@@ -291,19 +215,15 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
                 </Form.Item>
 
                 <Form.Item label="套餐图片" style={{ marginBottom: 12 }}>
-                    <PackageImagesUpload
-                      value={normalizeStorePackageImageUrls(item)}
-                      onChange={(imageUrls) =>
-                        updateAt(index, {
-                          imageUrls,
-                          imageUrl: imageUrls[0] ?? '',
-                        })
-                      }
+                  <OssUpload
+                    bizType="STORE_PACKAGE"
+                    mediaType="IMAGE"
+                    value={item.imageUrl || undefined}
+                    onChange={(url) => updateAt(index, { imageUrl: url })}
                   />
                 </Form.Item>
 
-                  <Form.Item label="其他说明" style={{ marginBottom: 0 }}>
-                    <Input
+                <Form.Item label="其他说明" style={{ marginBottom: 0 }}>                  <Input
                     placeholder="不可叠加"
                     value={item.otherNotes || ''}
                     onChange={(e) => updateAt(index, { otherNotes: e.target.value })}
@@ -322,15 +242,12 @@ const AdminStorePackagesSection = forwardRef<AdminStorePackagesHandle, { storeId
       ) : null}
 
       <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
-          上传套餐图后请点右上角「保存修改」（会连同套餐一起保存），或点下方「保存套餐」。仅上传不保存，刷新会丢失。
+        修改后点击下方按钮保存，C 端将立即展示生效套餐。
       </Typography.Paragraph>
 
-        <Button type="primary" loading={saving} onClick={() => void save().catch(() => undefined)}>
+      <Button type="primary" loading={saving} onClick={() => void save()}>
         保存套餐
       </Button>
     </Form>
   );
-  },
-);
-
-export default AdminStorePackagesSection;
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -146,7 +146,6 @@ 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账户' },
 ];
@@ -216,7 +215,6 @@ 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,7 +167,6 @@ export type AdminUserRow = {
   sourceLabel: string | null;
   createdAt: string;
   orderCount: number;
-  isTest?: boolean;
 };
 
 export type AdminOrderItem = {
@@ -200,7 +199,6 @@ 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/storeCreate.ts

@@ -27,7 +27,6 @@ export type StoreCreateForm = {
   bankAccountNo: string;
   bankBranch: string;
   settlementRate?: number;
-  sortOrder?: number;
   visibilityWhitelistEnabled?: boolean;
   visibilityPhones?: string[];
 };

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

@@ -59,7 +59,6 @@ type Row = {
   accountCount: number;
   subAccounts?: SubRow[];
   createdAt: string;
-  isTest?: boolean;
 };
 
 type PartnerDetail = Row & {
@@ -125,15 +124,14 @@ export default function CityPartnersPage() {
   const [createForm] = Form.useForm();
   const [subForm] = Form.useForm();
   const [subEditForm] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
+  const [filters, setFilters] = useState<Record<string, string>>({});
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
     '/admin/partners',
     () => {
       const qs = new URLSearchParams();
-      if (filters.companyName) qs.set('companyName', String(filters.companyName));
-      if (filters.phone) qs.set('phone', String(filters.phone));
-      if (filters.cityId) qs.set('cityId', String(filters.cityId));
-      if (filters.excludeTest) qs.set('excludeTest', 'true');
+      if (filters.companyName) qs.set('companyName', filters.companyName);
+      if (filters.phone) qs.set('phone', filters.phone);
+      if (filters.cityId) qs.set('cityId', filters.cityId);
       return qs;
     },
     [filters],
@@ -272,18 +270,7 @@ export default function CityPartnersPage() {
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
     { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
-    {
-      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: 'name', width: 100, ellipsis: true },
     { title: '登录手机', dataIndex: 'phone', width: 120 },
     {
       title: '管辖',
@@ -400,9 +387,6 @@ 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,26 +3,13 @@ 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;
-  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;
-  };
+  id: string; provider: string; trackingNo: string | null; providerOrderNo: string | null; updatedAt: string;
+  order?: { orderNo: string; status: string; receiverName: string; receiverPhone: string; deliveryType: string };
 };
 
 export default function DeliveriesPage() {
@@ -42,22 +29,6 @@ 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 },
@@ -68,17 +39,14 @@ export default function DeliveriesPage() {
     { title: '收货人', dataIndex: ['order', 'receiverName'], width: 90 },
     { title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
     {
-      title: '操作', width: 140,
+      title: '操作', width: 80,
       render: (_, row) => (
-        <Space size={0}>
-          <Button type="link" size="small" onClick={() => openTrack(row)}>路由</Button>
         <Button type="link" size="small" onClick={async () => {
           const d = await request<Row>(`/admin/deliveries/${row.id}`);
           setDetail(d);
           editForm.setFieldsValue({ provider: d.provider, trackingNo: d.trackingNo, providerOrderNo: d.providerOrderNo });
           setDrawerOpen(true);
         }}>编辑</Button>
-        </Space>
       ),
     },
   ];
@@ -119,22 +87,9 @@ export default function DeliveriesPage() {
               <Form.Item name="providerOrderNo" label="第三方单号"><Input /></Form.Item>
               <Form.Item name="trackingNo" label="运单号"><Input /></Form.Item>
             </Form>
-            <Button
-              style={{ marginTop: 8 }}
-              onClick={() => openTrack(detail)}
-            >
-              查看路由
-            </Button>
           </>
         )}
       </Drawer>
-      <OrderTrackDrawer
-        open={trackOpen}
-        orderId={trackOrderId}
-        orderNo={trackOrderNo}
-        orderStatus={trackOrderStatus}
-        onClose={() => setTrackOpen(false)}
-      />
     </div>
   );
 }

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

@@ -3,7 +3,6 @@ import { Link } from 'react-router-dom';
 import {
   Alert,
   Button,
-  Checkbox,
   Collapse,
   Descriptions,
   Drawer,
@@ -31,7 +30,6 @@ 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;
@@ -188,7 +186,6 @@ 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');
 
@@ -226,7 +223,6 @@ 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 {
@@ -434,17 +430,7 @@ export default function OrdersPage() {
   }
 
   const columns: ColumnsType<AdminOrderRow> = [
-    {
-      title: '订单号',
-      dataIndex: 'orderNo',
-      width: 200,
-      render: (v, row) => (
-        <Space size={4}>
-          <span>{v}</span>
-          {row.isTest ? <Tag color="orange">测试</Tag> : null}
-        </Space>
-      ),
-    },
+    { title: '订单号', dataIndex: 'orderNo', width: 180 },
     {
       title: '城市',
       width: 90,
@@ -612,9 +598,6 @@ 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>
@@ -876,20 +859,7 @@ export default function OrdersPage() {
             </Descriptions>
 
             {detail.delivery && (
-              <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 column={1} bordered size="small" title="配送" style={{ marginTop: 16 }}>
                 <Descriptions.Item label="快递公司">
                   {detail.delivery.logisticsCompany ||
                     DELIVERY_PROVIDER_LABELS[detail.delivery.provider] ||
@@ -1262,14 +1232,6 @@ export default function OrdersPage() {
           void openDetail(order.id);
         }}
       />
-
-      <OrderTrackDrawer
-        open={trackOpen}
-        orderId={detail?.id ?? null}
-        orderNo={detail?.orderNo}
-        orderStatus={detail?.status}
-        onClose={() => setTrackOpen(false)}
-      />
     </div>
   );
 }

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
 import {
   Button,
   Drawer,
-  Image,
   Input,
   Modal,
   Space,
@@ -18,10 +17,7 @@ import type {
   StorePackageItemDto,
   StorePackageViewDto,
 } from '@dukang/shared-types';
-import {
-  STORE_PACKAGE_CHANGE_STATUS_LABELS,
-  normalizeStorePackageImageUrls,
-} from '@dukang/shared-types';
+import { STORE_PACKAGE_CHANGE_STATUS_LABELS } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 
@@ -30,10 +26,6 @@ function packageKey(pkg: StorePackageItemDto | StorePackageViewDto, index: numbe
   return name ? `name:${name}` : `idx:${index}`;
 }
 
-function imageSignature(pkg: StorePackageItemDto | StorePackageViewDto) {
-  return normalizeStorePackageImageUrls(pkg).join('|');
-}
-
 function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto[]) {
   const liveMap = new Map(live.map((p, i) => [packageKey(p, i), p]));
   const proposedMap = new Map(proposed.map((p, i) => [packageKey(p, i), p]));
@@ -57,8 +49,7 @@ function diffPackages(live: StorePackageViewDto[], proposed: StorePackageItemDto
         l.price !== p.price ||
         l.dishes !== p.dishes ||
         (l.usableTime ?? '') !== (p.usableTime ?? '') ||
-        (l.otherNotes ?? '') !== (p.otherNotes ?? '') ||
-        imageSignature(l) !== imageSignature(p);
+        (l.otherNotes ?? '') !== (p.otherNotes ?? '');
       rows.push({ key, change: changed ? 'changed' : 'unchanged', live: l, proposed: p });
     }
   }
@@ -72,108 +63,6 @@ const CHANGE_LABELS = {
   unchanged: { text: '未变', color: 'default' },
 } as const;
 
-function PackageDetailCard({
-  title,
-  pkg,
-}: {
-  title?: string;
-  pkg: StorePackageItemDto | StorePackageViewDto;
-}) {
-  const images = normalizeStorePackageImageUrls(pkg);
-  return (
-    <div
-      style={{
-        marginBottom: 12,
-        padding: 12,
-        border: '1px solid #f0f0f0',
-        borderRadius: 8,
-        background: '#fafafa',
-      }}
-    >
-      {title ? (
-        <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
-          {title}
-        </Typography.Text>
-      ) : null}
-      <div style={{ marginBottom: 8 }}>
-        <strong>{pkg.name}</strong>
-        <span style={{ marginLeft: 8 }}>¥{pkg.price}</span>
-      </div>
-      <Typography.Paragraph style={{ marginBottom: 8, whiteSpace: 'pre-wrap' }}>
-        {pkg.dishes || '—'}
-      </Typography.Paragraph>
-      {pkg.usableTime ? (
-        <div style={{ marginBottom: 4 }}>
-          <Typography.Text type="secondary">可用时间：{pkg.usableTime}</Typography.Text>
-        </div>
-      ) : null}
-      {pkg.otherNotes ? (
-        <div style={{ marginBottom: 8 }}>
-          <Typography.Text type="secondary">其他说明：{pkg.otherNotes}</Typography.Text>
-        </div>
-      ) : null}
-      {images.length ? (
-        <Image.PreviewGroup>
-          <Space wrap size={8}>
-            {images.map((url) => (
-              <Image
-                key={url}
-                src={url}
-                width={72}
-                height={72}
-                style={{ objectFit: 'cover', borderRadius: 4 }}
-              />
-            ))}
-          </Space>
-        </Image.PreviewGroup>
-      ) : (
-        <Typography.Text type="secondary">无套餐图片</Typography.Text>
-      )}
-    </div>
-  );
-}
-
-function PackageSummaryCell({ pkg }: { pkg?: StorePackageItemDto | StorePackageViewDto }) {
-  if (!pkg) return <>—</>;
-  const images = normalizeStorePackageImageUrls(pkg);
-  return (
-    <div>
-      <div>
-        <strong>{pkg.name}</strong> · ¥{pkg.price}
-      </div>
-      <Typography.Text type="secondary">{pkg.dishes}</Typography.Text>
-      {pkg.usableTime ? (
-        <div>
-          <Typography.Text type="secondary">可用：{pkg.usableTime}</Typography.Text>
-        </div>
-      ) : null}
-      {pkg.otherNotes ? (
-        <div>
-          <Typography.Text type="secondary">备注：{pkg.otherNotes}</Typography.Text>
-        </div>
-      ) : null}
-      {images.length ? (
-        <Image.PreviewGroup>
-          <Space wrap size={4} style={{ marginTop: 8 }}>
-            {images.slice(0, 4).map((url) => (
-              <Image
-                key={url}
-                src={url}
-                width={48}
-                height={48}
-                style={{ objectFit: 'cover', borderRadius: 4 }}
-              />
-            ))}
-            {images.length > 4 ? (
-              <Typography.Text type="secondary">+{images.length - 4}</Typography.Text>
-            ) : null}
-          </Space>
-        </Image.PreviewGroup>
-      ) : null}
-    </div>
-  );
-}
-
 export default function StorePackageAuditsPage() {
   const [loading, setLoading] = useState(false);
   const [items, setItems] = useState<StorePackageChangeRequestDto[]>([]);
@@ -186,11 +75,6 @@ export default function StorePackageAuditsPage() {
   const [detailOpen, setDetailOpen] = useState(false);
   const [detailLoading, setDetailLoading] = useState(false);
   const [detail, setDetail] = useState<StorePackageAuditDetailDto | null>(null);
-  const [pkgDetailOpen, setPkgDetailOpen] = useState(false);
-  const [pkgDetailTitle, setPkgDetailTitle] = useState('');
-  const [pkgDetailList, setPkgDetailList] = useState<Array<StorePackageItemDto | StorePackageViewDto>>(
-    [],
-  );
 
   async function reload(nextPage = page, nextStatus = status) {
     setLoading(true);
@@ -232,15 +116,6 @@ export default function StorePackageAuditsPage() {
     }
   }
 
-  function openPackageDetails(
-    title: string,
-    list: Array<StorePackageItemDto | StorePackageViewDto>,
-  ) {
-    setPkgDetailTitle(title);
-    setPkgDetailList(list);
-    setPkgDetailOpen(true);
-  }
-
   async function audit(id: string, action: 'APPROVE' | 'REJECT', reason?: string) {
     try {
       await request(`/admin/store-package-audits/${id}/audit`, {
@@ -271,11 +146,39 @@ export default function StorePackageAuditsPage() {
     },
     {
       title: '当前线上',
-      render: (_, row) => <PackageSummaryCell pkg={row.live} />,
+      render: (_, row) =>
+        row.live ? (
+          <div>
+            <div><strong>{row.live.name}</strong> · ¥{row.live.price}</div>
+            <Typography.Text type="secondary">{row.live.dishes}</Typography.Text>
+            {row.live.usableTime ? (
+              <div><Typography.Text type="secondary">可用：{row.live.usableTime}</Typography.Text></div>
+            ) : null}
+            {row.live.otherNotes ? (
+              <div><Typography.Text type="secondary">备注：{row.live.otherNotes}</Typography.Text></div>
+            ) : null}
+          </div>
+        ) : (
+          '—'
+        ),
     },
     {
       title: '申请变更',
-      render: (_, row) => <PackageSummaryCell pkg={row.proposed} />,
+      render: (_, row) =>
+        row.proposed ? (
+          <div>
+            <div><strong>{row.proposed.name}</strong> · ¥{row.proposed.price}</div>
+            <Typography.Text type="secondary">{row.proposed.dishes}</Typography.Text>
+            {row.proposed.usableTime ? (
+              <div><Typography.Text type="secondary">可用：{row.proposed.usableTime}</Typography.Text></div>
+            ) : null}
+            {row.proposed.otherNotes ? (
+              <div><Typography.Text type="secondary">备注：{row.proposed.otherNotes}</Typography.Text></div>
+            ) : null}
+          </div>
+        ) : (
+          '—'
+        ),
     },
   ];
 
@@ -354,7 +257,7 @@ export default function StorePackageAuditsPage() {
 
       <Drawer
         title={detail ? `${detail.storeName || detail.storeId} · 套餐变更` : '套餐变更详情'}
-        width={880}
+        width={720}
         open={detailOpen}
         onClose={() => setDetailOpen(false)}
         extra={
@@ -379,7 +282,7 @@ export default function StorePackageAuditsPage() {
           <Typography.Text type="secondary">加载中…</Typography.Text>
         ) : detail ? (
           <>
-            <Space style={{ marginBottom: 16 }} wrap>
+            <Space style={{ marginBottom: 16 }}>
               <Tag>{STORE_PACKAGE_CHANGE_STATUS_LABELS[detail.status]}</Tag>
               <Typography.Text type="secondary">
                 提交方：{detail.submitterType === 'PARTNER' ? '合伙人' : '门店'} · {fmtTime(detail.createdAt)}
@@ -388,27 +291,9 @@ export default function StorePackageAuditsPage() {
             {detail.rejectReason ? (
               <Typography.Paragraph type="danger">驳回原因：{detail.rejectReason}</Typography.Paragraph>
             ) : null}
-            <Space style={{ marginBottom: 12 }} wrap>
-              <Typography.Text type="secondary">
+            <Typography.Paragraph type="secondary">
               线上 {detail.livePackages?.length ?? 0} 条 → 申请 {detail.packages?.length ?? 0} 条
-              </Typography.Text>
-              <Button
-                size="small"
-                onClick={() =>
-                  openPackageDetails('申请套餐详情', detail.packages ?? [])
-                }
-              >
-                查看申请套餐详情
-              </Button>
-              <Button
-                size="small"
-                onClick={() =>
-                  openPackageDetails('线上套餐详情', detail.livePackages ?? [])
-                }
-              >
-                查看线上套餐详情
-              </Button>
-            </Space>
+            </Typography.Paragraph>
             <Table
               size="small"
               rowKey="key"
@@ -420,23 +305,6 @@ export default function StorePackageAuditsPage() {
         ) : null}
       </Drawer>
 
-      <Modal
-        title={pkgDetailTitle || '套餐详情'}
-        open={pkgDetailOpen}
-        onCancel={() => setPkgDetailOpen(false)}
-        footer={null}
-        width={720}
-        destroyOnClose
-      >
-        {pkgDetailList.length ? (
-          pkgDetailList.map((pkg, index) => (
-            <PackageDetailCard key={`${pkg.name}-${index}`} title={`套餐 ${index + 1}`} pkg={pkg} />
-          ))
-        ) : (
-          <Typography.Text type="secondary">暂无套餐</Typography.Text>
-        )}
-      </Modal>
-
       <Modal
         title="驳回套餐变更"
         open={rejectOpen}

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

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

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

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

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

@@ -112,7 +112,6 @@ 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 {
@@ -238,17 +237,7 @@ export default function UsersPage() {
   ];
 
   const columns: ColumnsType<AdminUserRow> = [
-    {
-      title: '用户编号',
-      dataIndex: 'userNo',
-      width: 140,
-      render: (v, row) => (
-        <Space size={4}>
-          <span>{v}</span>
-          {row.isTest ? <Tag color="orange">测试</Tag> : null}
-        </Space>
-      ),
-    },
+    { title: '用户编号', dataIndex: 'userNo', width: 120 },
     { title: '昵称', dataIndex: 'nickname', width: 100 },
     {
       title: '手机',
@@ -373,9 +362,6 @@ 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

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

apps/admin-web/vite.config.ts

@@ -1,13 +1,10 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 
-const apiTarget = process.env.VITE_API_TARGET ?? 'http://localhost:3010';
-
 export default defineConfig({
   plugins: [react()],
   server: {
-    host: true,
     port: 5175,
-    proxy: { '/api': apiTarget },
+    proxy: { '/api': 'http://localhost:3000' },
   },
 });

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

@@ -1,200 +0,0 @@
-import { useEffect, useRef, useState } from 'react';
-import { uploadFileToOss, type OssMediaType } from '../lib/upload';
-import { enqueueUpload } from '../lib/upload-lock';
-import { formatChooseImageFailMessage } from '@dukang/weixin-sdk';
-import { isWechatEnv, weixinSdk } from '../lib/weixin';
-import { toastError, toastSuccess } from '../lib/toast';
-
-type Props = {
-  value?: string[];
-  onChange?: (urls: string[]) => void;
-  bizType: string;
-  mediaType?: OssMediaType;
-  maxCount?: number;
-  disabled?: boolean;
-  label?: string;
-};
-
-function isCancelError(msg: string): boolean {
-  return /cancel|取消/i.test(msg);
-}
-
-function normalizeUrls(value?: string[]) {
-  return (value ?? []).map((u) => String(u || '').trim()).filter(Boolean);
-}
-
-/** 合伙人端多图批量上传（微信相册可多选） */
-export default function MultiOssUploadField({
-  value,
-  onChange,
-  bizType,
-  mediaType = 'IMAGE',
-  maxCount = 20,
-  disabled,
-  label,
-}: Props) {
-  const inputRef = useRef<HTMLInputElement>(null);
-  const pickingRef = useRef(false);
-  const [uploading, setUploading] = useState(false);
-  const [error, setError] = useState('');
-
-  const urls = normalizeUrls(value);
-  const urlsRef = useRef(urls);
-  const onChangeRef = useRef(onChange);
-  const remaining = Math.max(0, maxCount - urls.length);
-  const inWechat = isWechatEnv();
-
-  useEffect(() => {
-    urlsRef.current = urls;
-  }, [urls]);
-
-  useEffect(() => {
-    onChangeRef.current = onChange;
-  }, [onChange]);
-
-  useEffect(() => {
-    if (!inWechat) return;
-    void weixinSdk.init().catch(() => {});
-  }, [inWechat]);
-
-  function showUploadError(text: string) {
-    setError(text);
-    toastError(text);
-  }
-
-  async function uploadFiles(files: File[]) {
-    const current = urlsRef.current;
-    const room = Math.max(0, maxCount - current.length);
-    const picked = files.slice(0, room);
-    if (!picked.length) {
-      showUploadError(`最多 ${maxCount} 张`);
-      return;
-    }
-    setUploading(true);
-    setError('');
-    const appended: string[] = [];
-    try {
-      for (const file of picked) {
-        if (!file.size) continue;
-        const result = await enqueueUpload(() => uploadFileToOss(file, { bizType, mediaType }));
-        appended.push(result.url);
-      }
-      if (appended.length) {
-        const next = [...urlsRef.current, ...appended];
-        urlsRef.current = next;
-        onChangeRef.current?.(next);
-        toastSuccess(`已上传 ${appended.length} 张`);
-      }
-    } catch (e) {
-      showUploadError(e instanceof Error ? e.message : '上传失败');
-    } finally {
-      setUploading(false);
-      if (inputRef.current) inputRef.current.value = '';
-    }
-  }
-
-  async function pickWechat() {
-    if (pickingRef.current || uploading || disabled || remaining <= 0) return;
-    pickingRef.current = true;
-    setError('');
-    try {
-      await weixinSdk.init();
-      const files = await weixinSdk.chooseImages({
-        count: Math.min(remaining, 9),
-        sourceType: ['album', 'camera'],
-      });
-      if (!files?.length) return;
-      await uploadFiles(files);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : '无法打开相册';
-      if (isCancelError(msg)) return;
-      const formatted = formatChooseImageFailMessage(msg) || msg;
-      showUploadError(formatted);
-      inputRef.current?.click();
-    } finally {
-      pickingRef.current = false;
-    }
-  }
-
-  function removeAt(index: number) {
-    if (disabled) return;
-    onChange?.(urls.filter((_, i) => i !== index));
-  }
-
-  return (
-    <div className="partner-oss-upload">
-      <input
-        ref={inputRef}
-        type="file"
-        accept="image/*"
-        multiple
-        className="partner-oss-upload-input"
-        disabled={disabled || uploading || remaining <= 0}
-        onChange={(e) => {
-          const list = Array.from(e.target.files ?? []);
-          if (list.length) void uploadFiles(list);
-        }}
-      />
-
-      {urls.length > 0 ? (
-        <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginBottom: 8 }}>
-          {urls.map((url, index) => (
-            <div key={`${url}-${index}`} style={{ position: 'relative', width: 88, height: 88 }}>
-              <img
-                src={url}
-                alt=""
-                style={{ width: 88, height: 88, objectFit: 'cover', borderRadius: 8 }}
-              />
-              {!disabled ? (
-                <button
-                  type="button"
-                  className="partner-packages-remove"
-                  style={{
-                    position: 'absolute',
-                    top: 2,
-                    right: 2,
-                    margin: 0,
-                    padding: '2px 6px',
-                    fontSize: 12,
-                    background: 'rgba(0,0,0,0.55)',
-                    color: '#fff',
-                    borderRadius: 4,
-                  }}
-                  onClick={() => removeAt(index)}
-                >
-                  删
-                </button>
-              ) : null}
-            </div>
-          ))}
-        </div>
-      ) : null}
-
-      <button
-        type="button"
-        className="partner-upload-dashed partner-upload-dashed--compact"
-        disabled={disabled || uploading || remaining <= 0}
-        onClick={() => {
-          if (inWechat) void pickWechat();
-          else inputRef.current?.click();
-        }}
-      >
-        <span className="material-symbols-outlined text-primary" style={{ fontSize: 28 }}>
-          {uploading ? 'hourglass_top' : 'add_a_photo'}
-        </span>
-        <span className="text-primary" style={{ fontWeight: 500 }}>
-          {uploading
-            ? '上传中…'
-            : remaining <= 0
-              ? `已达上限 ${maxCount}`
-              : label ?? `批量上传（${urls.length}/${maxCount}）`}
-        </span>
-      </button>
-      {error ? (
-        <p className="partner-form-error" role="alert">
-          {error}
-        </p>
-      ) : null}
-    </div>
-  );
-}

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

@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import type { PackageFormItem } from '../lib/storePackages';
-import { STORE_PACKAGE_IMAGE_MAX_COUNT, STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
+import { STORE_PACKAGE_MAX_COUNT } from '@dukang/shared-types';
 import { emptyPackage } from '../lib/storePackages';
-import MultiOssUploadField from './MultiOssUploadField';
+import OssUploadField from './OssUploadField';
 
 type Props = {
   items: PackageFormItem[];
@@ -131,24 +131,12 @@ export default function StorePackagesForm({ items, onChange, disabled, embedded
                 </div>
 
                 <div className="partner-field">
-                  <label>套餐图片（最多 {STORE_PACKAGE_IMAGE_MAX_COUNT} 张，支持批量）</label>
-                  <MultiOssUploadField
+                  <label>套餐图片</label>
+                  <OssUploadField
                     bizType="STORE_PACKAGE"
-                    maxCount={STORE_PACKAGE_IMAGE_MAX_COUNT}
+                    value={item.imageUrl || ''}
                     disabled={disabled}
-                    value={
-                      Array.isArray(item.imageUrls) && item.imageUrls.length > 0
-                        ? item.imageUrls.map((u) => String(u ?? '')).filter((u) => u.trim())
-                        : item.imageUrl
-                          ? [String(item.imageUrl)]
-                          : []
-                    }
-                    onChange={(imageUrls) =>
-                      updateAt(index, {
-                        imageUrls,
-                        imageUrl: imageUrls[0] ?? '',
-                      })
-                    }
+                    onChange={(url) => updateAt(index, { imageUrl: url })}
                   />
                 </div>
 

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

@@ -5,10 +5,7 @@ export type StoreDraftForm = {
   city: string;
   district: string;
   name: string;
-  /** 门店登录手机号（老板主账号） */
   phone: string;
-  /** 对外联系电话（店长）；可与登录号不同 */
-  contactPhone: string;
   address: string;
   /** 门店坐标（定位或地理编码） */
   latitude: string;
@@ -54,7 +51,6 @@ export const defaultStoreForm = (): StoreDraftForm => ({
   cityId: '',
   name: '',
   phone: '',
-  contactPhone: '',
   address: '',
   latitude: '',
   longitude: '',
@@ -106,9 +102,6 @@ export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | un
     ...raw,
     regionCodes: Array.isArray(raw.regionCodes) ? raw.regionCodes.map(String) : base.regionCodes,
     cityId: String(raw.cityId ?? base.cityId),
-    phone: String(raw.phone ?? base.phone),
-    contactPhone:
-      String(raw.contactPhone ?? '').trim() || String(raw.phone ?? '').trim() || base.contactPhone,
     latitude: raw.latitude != null && raw.latitude !== '' ? String(raw.latitude) : base.latitude,
     longitude: raw.longitude != null && raw.longitude !== '' ? String(raw.longitude) : base.longitude,
     openTime: String(raw.openTime ?? base.openTime),
@@ -243,16 +236,14 @@ export function patchEnvPhotoAt(urls: string[], index: number, url: string): str
 export function validateStoreStep3(
   form: Pick<
     StoreDraftForm,
-    'bankAccountName' | 'bankAccountNo' | 'bankBranch' | 'phone' | 'contactPhone'
+    'bankAccountName' | 'bankAccountNo' | 'bankBranch' | 'phone'
   >,
 ): string | null {
   if (!form.bankAccountName.trim()) return '请填写户主姓名';
   if (!form.bankAccountNo.trim()) return '请填写银行卡号';
   if (!BANK_RE.test(form.bankAccountNo.replace(/\s/g, ''))) return '银行卡号须为 16~19 位数字';
   if (!form.bankBranch.trim()) return '请填写开户支行';
-  if (!form.phone.trim()) return '请填写门店登录手机号';
-  if (!PHONE_RE.test(form.phone.trim())) return '门店登录手机号须为11位手机号';
-  if (!form.contactPhone.trim()) return '请填写联系电话';
-  if (!PHONE_RE.test(form.contactPhone.trim())) return '联系电话须为11位手机号';
+  if (!form.phone.trim()) return '请填写联系电话';
+  if (!PHONE_RE.test(form.phone.trim())) return '联系电话须为11位手机号';
   return null;
 }

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

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

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

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

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

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

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

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

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

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

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

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

apps/h5-partner/src/styles.css

@@ -1960,134 +1960,6 @@ nav.app-tabbar .app-tabbar-label {
   color: #fff;
 }
 
-.partner-store-filter-row {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.partner-store-filter-label {
-  flex-shrink: 0;
-  font-family: var(--font-label);
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--color-on-surface-variant);
-}
-
-.partner-store-filter-select {
-  flex: 1;
-  height: 40px;
-  padding: 0 12px;
-  border: 1px solid var(--color-outline-variant);
-  border-radius: var(--radius-md);
-  background: var(--color-surface-container-low);
-  font-size: 14px;
-  color: var(--color-ink-black);
-}
-
-.partner-store-filter-select:focus {
-  outline: none;
-  box-shadow: 0 0 0 2px rgba(166, 29, 36, 0.2);
-}
-
-.partner-store-card-main {
-  flex: 1;
-  min-width: 0;
-  padding-right: 8px;
-}
-
-.partner-store-card-badge {
-  flex-shrink: 0;
-  white-space: nowrap;
-}
-
-.partner-store-card-actions--v3416 {
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-.partner-store-card-actions--v3416 > .partner-store-switch {
-  flex: 1 1 auto;
-  min-width: 140px;
-}
-
-.partner-store-card-actions--v3416 > .partner-store-close-btn {
-  flex: 0 0 auto;
-}
-
-.partner-store-card-actions--v3416 > .partner-menu-icon {
-  flex: 0 0 auto;
-  margin-left: auto;
-}
-
-.partner-store-switch {
-  display: inline-flex;
-  align-items: center;
-  gap: 10px;
-  cursor: pointer;
-  font-family: var(--font-label);
-  font-size: 12px;
-  color: var(--color-on-surface-variant);
-  user-select: none;
-}
-
-.partner-store-switch input {
-  position: absolute;
-  opacity: 0;
-  width: 0;
-  height: 0;
-}
-
-.partner-store-switch-track {
-  position: relative;
-  width: 44px;
-  height: 24px;
-  border-radius: 999px;
-  background: var(--color-surface-container-highest);
-  transition: background 0.2s ease;
-  flex-shrink: 0;
-}
-
-.partner-store-switch-track::after {
-  content: '';
-  position: absolute;
-  top: 2px;
-  left: 2px;
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  background: #fff;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
-  transition: transform 0.2s ease;
-}
-
-.partner-store-switch input:checked + .partner-store-switch-track {
-  background: var(--color-success-green);
-}
-
-.partner-store-switch input:checked + .partner-store-switch-track::after {
-  transform: translateX(20px);
-}
-
-.partner-store-switch--disabled {
-  opacity: 0.45;
-  cursor: not-allowed;
-}
-
-.partner-store-close-btn {
-  flex: 0 0 auto !important;
-  padding: 8px 12px !important;
-  border: 1px solid rgba(166, 29, 36, 0.35);
-  background: transparent;
-  color: var(--color-heritage-red);
-  font-weight: 500;
-}
-
-.partner-store-close-btn:disabled {
-  opacity: 0.45;
-  cursor: not-allowed;
-}
-
 .partner-store-card {
   background: var(--color-card);
   border-radius: var(--radius-md);
@@ -2189,39 +2061,6 @@ nav.app-tabbar .app-tabbar-label {
   margin: 0 var(--space-page) var(--space-md);
 }
 
-.partner-onboard-cs-card {
-  text-align: center;
-}
-
-.partner-onboard-cs-qr {
-  display: block;
-  width: min(220px, 70vw);
-  height: auto;
-  margin: 0 auto 16px;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid var(--color-surface-container);
-}
-
-.partner-onboard-cs-check {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  margin-top: 8px;
-  font-family: var(--font-label);
-  font-size: 14px;
-  color: var(--color-ink-black);
-  cursor: pointer;
-  text-align: left;
-}
-
-.partner-onboard-cs-check input {
-  width: 18px;
-  height: 18px;
-  flex-shrink: 0;
-}
-
 /* ── Store detail ── */
 .partner-detail-page {
   padding-bottom: 96px;

apps/h5-partner/vite.config.ts

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

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

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

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

@@ -2,10 +2,7 @@ type WechatScanAuthModalProps = {
   open: boolean;
   loading?: boolean;
   error?: string;
-  /** bind=首次绑定；recover=扫码 JSSDK 失败后的恢复引导 */
-  mode?: 'bind' | 'recover';
   onAuthorize: () => void;
-  onRefresh?: () => void;
   onCancel: () => void;
 };
 
@@ -13,43 +10,28 @@ 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">
-            {isRecover ? 'sync_problem' : 'qr_code_scanner'}
-          </span>
+          <span className="material-symbols-outlined shop-fill-icon">qr_code_scanner</span>
         </div>
-        <h2 id="shop-scan-auth-title" className="shop-scan-auth-title">
-          {isRecover ? '扫码能力未就绪' : '微信授权'}
-        </h2>
+        <h2 id="shop-scan-auth-title" className="shop-scan-auth-title">微信授权</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 ? '跳转授权中…' : isRecover ? '重新授权微信' : '微信授权'}
+            {loading ? '跳转授权中…' : '微信授权'}
           </button>
         </div>
       </div>

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

@@ -3,9 +3,6 @@ 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');
@@ -30,25 +27,6 @@ export function clearPendingScanAfterAuth(): void {
   }
 }
 
-/** OAuth（含短信登录后绑微信）回跳后，标记下一次扫码需要加长预热 */
-export function markScanWarmupAfterAuth(): void {
-  try {
-    sessionStorage.setItem(SHOP_SCAN_WARMUP_KEY, '1');
-  } catch {
-    /* ignore */
-  }
-}
-
-export function consumeScanWarmupAfterAuth(): boolean {
-  try {
-    if (sessionStorage.getItem(SHOP_SCAN_WARMUP_KEY) !== '1') return false;
-    sessionStorage.removeItem(SHOP_SCAN_WARMUP_KEY);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 /** OAuth 回跳后延迟再调 scanQRCode（iOS JSSDK 离线校验更慢） */
 export function getPostAuthScanDelayMs(): number {
   return isIosDevice() ? 1200 : 600;

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

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

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

@@ -2,7 +2,6 @@ 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 = {
@@ -163,19 +162,15 @@ 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(session?: ShopSessionPayload): Promise<'skipped' | void> {
+export async function bindShopWechatAfterSmsLogin(): Promise<void> {
   const config = await fetchClientConfig();
-  if (!isWxAuthorizeEnabled(config)) return 'skipped';
-  if (!isWechatEnv()) return 'skipped';
-  // 已绑定则勿再 OAuth：每次 OAuth 回跳都会重置 iOS JSSDK 入场 URL，易导致扫码失败
-  if (session?.account?.hasWechat) return 'skipped';
-  markScanWarmupAfterAuth();
+  if (!isWxAuthorizeEnabled(config)) return;
+  if (!isWechatEnv()) return;
   await weixinSdk.login();
 }
 
@@ -185,6 +180,5 @@ 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,624 +1,293 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-
 
-
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
-
-import { isIosDevice, isScanPermissionWarmupError } from '@dukang/weixin-sdk';
-
+
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
-
 
-
 import { isScanPermissionWarmupError } from '@dukang/weixin-sdk';
-
 
-
 import { useStoreSession } from '../contexts/StoreSessionContext';
-
 
-
 import { request } from '../lib/api';
-
 
-
 import { parseRedeemTokenFromScan } from '../lib/redeem-scan';
-
 
-
 import {
-
-  consumeScanWarmupAfterAuth,
-
 
-
   authorizeShopWechat,
-
 
-
   checkNeedsWechatAuth,
-
 
-
   fetchShopAccount,
-
 
 } from '../lib/wechat-auth';
-
-
 
-
 import { isWechatEnv, weixinSdk } from '../lib/weixin';
-
 
 import {
-
-
 
-
   clearPendingScanAfterAuth,
-
-  if (/invalid signature|config:fail|signature/i.test(msg)) {
-
-    return '微信扫码签名校验失败，请刷新页面或重新授权微信后重试';
-
+
+  getPostAuthScanDelayMs,
 
-
   markPendingScanAfterAuth,
-
 
-
-      return '微信授权后扫码仍未就绪，请刷新页面或重新授权微信';
-
+  peekPendingScanAfterAuth,
 
-
-    return '微信扫码能力未就绪，请刷新页面或重新授权微信';
-
+} from '../lib/shop-scan-auth';
 
-
 import WechatScanAuthModal from '../components/WechatScanAuthModal';
-
 
 import { useStorePageView } from '../lib/usePageView';
-function isScanRecoverableError(msg: string): boolean {
-
-  return isScanPermissionWarmupError(msg) || /签名校验失败|扫码能力未就绪|请刷新页面/i.test(msg);
-
-}
-
-
-
 
-
 import { trackStore } from '../lib/analytics';
-
 
-
 
-
 
-
 function formatMoney(n: number) {
-
 
-
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
-
 
-
-  const [authModalMode, setAuthModalMode] = useState<'bind' | 'recover'>('bind');
-
 }
-
 
-
 
 
-
-
 function formatScanError(e: unknown, opts?: { afterAuth?: boolean }): string {
-
 
-
   const msg = e instanceof Error ? e.message : '扫码失败，请重试';
-
 
-
   if (/invalid signature/i.test(msg)) {
-
 
-
     return '微信 JSSDK 签名校验失败：请确认公众号已配置 JS 接口安全域名，并刷新页面后重试';
 
-
-
   }
-
 
-
   if (isScanPermissionWarmupError(msg)) {
 
-
-
     if (opts?.afterAuth) {
-
 
-
       return '微信授权已完成，扫码权限仍在准备中，请再点一次「扫码核销」';
-
 
-
     }
-
 
-
     return '微信权限校验尚未完成，请等待 1～2 秒后再次点击扫码（首次绑定微信时较常见）';
-
 
-
   }
-
 
-
   return msg;
-
 
-
 }
-
 
-
 
-
 
-
 export default function HomePage() {
 
-
-
   useStorePageView('store_home_view');
-
 
-
   const navigate = useNavigate();
-
 
-
   const { ready, authenticated } = useStoreSession();
-
 
-
   const [searchParams] = useSearchParams();
-
 
-
   const [dash, setDash] = useState<Record<string, unknown> | null>(null);
-
 
-
   const [scanMsg, setScanMsg] = useState('');
-
 
-
-        // iOS / OAuth 回跳后须重新 wx.config（签名用入场 URL）
-        if (opts?.postAuthWarmup || isIosDevice()) {
-
+  const [scanning, setScanning] = useState(false);
 
-
   const [authModalOpen, setAuthModalOpen] = useState(false);
-
 
-
   const [authLoading, setAuthLoading] = useState(false);
-
 
-
   const [authError, setAuthError] = useState('');
-
 
-
   const pendingScanStartedRef = useRef(false);
-
 
-
 
-
 
-
   const loadDashboard = useCallback(() => {
-
 
-
     return request<Record<string, unknown>>('SHOP_H5', '/shop/dashboard')
-
 
-
       .then((d) => {
-
 
-
-        const tip = formatScanError(e, { afterAuth: opts?.postAuthWarmup });
-
-        setScanMsg(tip);
-
-        if (isScanRecoverableError(tip)) {
-
-          setAuthModalMode('recover');
-
-          setAuthError(tip);
-
-          setAuthModalOpen(true);
-
-        }
-
+        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);
-
 
-
-        setAuthModalMode('bind');
-
-        setAuthError('');
-
     window.addEventListener('focus', onResume);
-
 
-
     return () => {
-
-      const needWarmup = consumeScanWarmupAfterAuth();
-
-      await runScan(needWarmup ? { postAuthWarmup: true } : undefined);
-
+
       document.removeEventListener('visibilitychange', onVisibility);
-
 
-
       window.removeEventListener('pageshow', onResume);
-
 
       window.removeEventListener('focus', onResume);
-
-
 
-
     };
-
 
-
   }, [loadDashboard]);
-
 
-
 
-
 
-
   const runScan = useCallback(
-
 
-
     async (opts?: { postAuthWarmup?: boolean }) => {
-
 
-
       trackStore('store_redeem_scan_start');
-
 
       if (!isWechatEnv()) {
-
-
 
-
         setScanMsg('请在微信内打开门店端进行扫码核销');
-
 
-
         return;
-
 
-
       }
-
 
-
       setScanning(true);
-
 
-
       if (!opts?.postAuthWarmup) {
 
-
-
         setScanMsg('');
-
 
-
       }
-
 
-
       try {
 
-
-
         if (opts?.postAuthWarmup) {
-
 
-
           weixinSdk.reset();
-
 
-
         }
-
 
-
         await weixinSdk.init();
-
 
-
         const raw = await weixinSdk.scanQrCode(
-
 
-
           opts?.postAuthWarmup ? { postAuthWarmup: true } : undefined,
-
 
-
         );
-
 
-
         if (!raw) {
-
 
-
           void loadDashboard();
-
 
-
           return;
-
 
-
         }
-
 
-
         const token = parseRedeemTokenFromScan(raw);
 
-
-
         if (!token) {
-
 
-
           setScanMsg('无法识别核销码，请扫描用户出示的核销二维码');
-
 
-
           return;
-
 
-
         }
-
 
-
         navigate(`/redeem?token=${encodeURIComponent(token)}`);
-
 
-
       } catch (e) {
-
 
-
         setScanMsg(formatScanError(e, { afterAuth: opts?.postAuthWarmup }));
-
 
-
       } finally {
-
 
         setScanning(false);
-
-
 
-
       }
-
 
-
     },
-
 
-
     [loadDashboard, navigate],
-
 
-
   );
-
 
-
 
-
 
-
   // OAuth 由 StoreSessionContext 单例处理；此处仅在授权完成后续扫
-
 
-
   useEffect(() => {
-
 
-
     if (!ready || !authenticated || !isWechatEnv()) return;
 
-
-
     if (searchParams.get('code')) return;
-
 
-
     if (!peekPendingScanAfterAuth() || pendingScanStartedRef.current) return;
-
 
-
 
-
 
-
     pendingScanStartedRef.current = true;
-
 
-
     clearPendingScanAfterAuth();
-
 
-
     setAuthModalOpen(false);
-
 
-
     setAuthLoading(false);
-
 
-
     setAuthError('');
-
 
-
     setScanMsg('微信授权成功，正在准备扫码…');
-
 
-
 
-
 
-
     const timer = window.setTimeout(() => {
-
 
-
       void runScan({ postAuthWarmup: true });
-
 
-
     }, getPostAuthScanDelayMs());
-
 
 
-
-
 
-
     return () => window.clearTimeout(timer);
-
-        mode={authModalMode}
-
 
-
   }, [ready, authenticated, searchParams, runScan]);
-
 
-
-        onRefresh={() => {
-
-          window.location.reload();
-
-        }}
-
 
-
 
-
-          setAuthModalMode('bind');
-
   async function handleScan() {
-
 
-
     setScanMsg('');
-
 
-
     if (!isWechatEnv()) {
-
 
-
       setScanMsg('请在微信内打开门店端进行扫码核销');
-
 
       return;
-

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

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

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

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

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

@@ -1,7 +1,6 @@
 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,
@@ -11,14 +10,6 @@ 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();
@@ -46,7 +37,7 @@ export default function SelectStorePage() {
   async function onSelect(storeId: string) {
     if (loadingId) return;
     if (storeId === currentStoreId) {
-      goShopHome(navigate);
+      navigate('/', { replace: true });
       return;
     }
     setLoadingId(storeId);
@@ -54,7 +45,7 @@ export default function SelectStorePage() {
     try {
       const session = await selectStore(storeId);
       applySession(session);
-      goShopHome(navigate);
+      navigate('/', { replace: true });
     } catch (e) {
       setMsg(e instanceof Error ? e.message : '选店失败');
     } finally {
@@ -175,11 +166,9 @@ export function routeAfterShopLogin(
   session: ShopSessionPayload,
   navigate: (path: string, opts?: { replace?: boolean }) => void,
 ) {
-  const path = needsStoreSelection(session) ? '/select-store' : '/';
-  // iOS 微信：必须整页跳转，让业务页成为 JSSDK 新入场 URL，否则扫码验签必挂
-  if (shouldHardNavigateForJssdk()) {
-    hardNavigateInWechat(path);
+  if (needsStoreSelection(session)) {
+    navigate('/select-store', { replace: true });
     return;
   }
-  navigate(path, { replace: true });
+  navigate('/', { replace: true });
 }

apps/h5-shop/src/styles.css

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

apps/h5-shop/vite.config.ts

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

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

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

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

@@ -1,31 +1,12 @@
 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 非微信环境已提示
@@ -39,5 +20,4 @@ export function openWecomCustomerService(): boolean {
   return true;
 }
 
-/** @deprecated 请用 getCustomerServicePhone()，保留兼容旧引用 */
 export { CUSTOMER_SERVICE_PHONE };

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

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

apps/h5-user/vite.config.ts

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

apps/mini-hq/config/index.ts

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

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

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

apps/mini-user/README.md

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

apps/mini-user/config/index.ts

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

apps/mini-user/package.json

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

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

@@ -6,7 +6,6 @@ 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',

apps/mini-user/src/app.tsx

@@ -6,13 +6,11 @@ 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/ProductCarousel.tsx

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

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

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

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

@@ -1,68 +0,0 @@
-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

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

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

@@ -1,126 +1,16 @@
 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 type ShareScene =
-  | 'home'
-  | '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 const DEFAULT_SHARE_TITLE = '你吃饭，杜康买单';
+export const DEFAULT_SHARE_DESC = '杜康好客 · 买美酒，享好礼，全城门店可用';
+export const WECHAT_SHARE_HINT = '请点击右上角 ··· 分享给好友';
 
 export function getDefaultShareImageUrl(): string {
-  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,
-  };
+  return BRAND_LOGO_URL;
 }
 
 export function buildDefaultShareData(
@@ -134,10 +24,9 @@ export function buildDefaultShareData(
       link = '';
     }
   }
-  const def = getShareRuntimeSync().default;
   return {
-    title: overrides?.title ?? def.title,
-    desc: overrides?.desc ?? def.desc,
+    title: overrides?.title ?? DEFAULT_SHARE_TITLE,
+    desc: overrides?.desc ?? DEFAULT_SHARE_DESC,
     link,
     imgUrl: overrides?.imgUrl ?? getDefaultShareImageUrl(),
   };
@@ -179,7 +68,7 @@ export async function handleShareButtonClick(
         /* ignore */
       }
     }
-    toast(getShareHint());
+    toast(WECHAT_SHARE_HINT);
     return { showGuide: false };
   }
 
@@ -200,7 +89,7 @@ export async function handleShareButtonClick(
     if (result.invoked) {
       return { showGuide: false };
     }
-    toast(getShareHint());
+    toast(WECHAT_SHARE_HINT);
     return { showGuide: true };
   } catch (e) {
     toast(e instanceof Error ? e.message : '分享配置失败，请刷新后重试');
@@ -210,20 +99,9 @@ export async function handleShareButtonClick(
 
 /** 供 useShareAppMessage 使用的标题/路径/图 */
 export function toWeappShareMessage(payload?: PageSharePayload) {
-  const def = getShareRuntimeSync().default;
   return {
-    title: payload?.title || def.title,
+    title: payload?.title || DEFAULT_SHARE_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 {
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import { formatMoney } from '../../lib/money';
 import iconBenefit from '../../assets/tabbar/benefit-active.png';
@@ -104,15 +104,20 @@ export default function BenefitPage() {
   const available = coupons.filter((c) => c.status === 'ACTIVE' && c.balance > 0);
 
   const sharePayload = useMemo(
-    () =>
-      buildSceneSharePayload('benefit', {
+    () => ({
+      title: '好客权益 · 杜康好客',
+      desc: DEFAULT_SHARE_DESC,
       path: '/pages/benefit/index',
     }),
     [],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => toWeappShareTimeline(sharePayload));
+  useShareTimeline(() => ({
+    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,26 +1,19 @@
-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(phone: string) {
-  const tel = phone.replace(/-/g, '');
-  Taro.makePhoneCall({ phoneNumber: tel }).catch(() => toast('无法拨打电话'));
+function dialPhone() {
+  Taro.makePhoneCall({ phoneNumber: DIAL_PHONE }).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="联系客服" />
@@ -37,14 +30,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(phone)}>
+        <View className={isWeapp ? 'cs-phone-link' : 'cs-call-btn'} onClick={dialPhone}>
           <Text>
-            {isWeapp ? `或拨打客服电话 ${phone}` : '拨打客服电话'}
+            {isWeapp ? `或拨打客服电话 ${CUSTOMER_SERVICE_PHONE}` : '拨打客服电话'}
           </Text>
         </View>
 
         {!isWeapp ? (
-          <Text className="cs-phone-display">{phone}</Text>
+          <Text className="cs-phone-display">{CUSTOMER_SERVICE_PHONE}</Text>
         ) : null}
       </View>
     </PageShell>

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

@@ -28,12 +28,10 @@ import {
   normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
 import { getCityCodeForCatalog, resolveUserCity } from '../../lib/user-location';
-import type { ClientRuntimeConfig } from '@dukang/shared-types';
 import {
-  applyShareFromClientConfig,
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import { trackPageView } from '../../lib/analytics';
 type Product = {
@@ -87,9 +85,8 @@ export default function HomePage() {
   }, [cityCode]);
 
   const loadMiniHome = useCallback(() => {
-    return request<ClientRuntimeConfig>('/common/client-config')
+    return request<{ miniHome?: MiniHomeConfig }>('/common/client-config')
       .then((cfg) => {
-        applyShareFromClientConfig(cfg);
         const banners = Array.isArray(cfg.miniHome?.banners)
           ? cfg.miniHome!.banners.filter((u) => typeof u === 'string' && !!u.trim())
           : [];
@@ -224,16 +221,21 @@ export default function HomePage() {
   const footerUrl = miniHome.footerUrl;
 
   const sharePayload = useMemo(
-    () =>
-      buildSceneSharePayload('home', {
+    () => ({
+      title: DEFAULT_SHARE_TITLE,
+      desc: DEFAULT_SHARE_DESC,
       path: '/pages/home/index',
-        dynamicImageUrl: banners[0] || undefined,
+      imgUrl: banners[0] || undefined,
     }),
     [banners],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => toWeappShareTimeline(sharePayload));
+  useShareTimeline(() => ({
+    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,11 +10,7 @@ import {
 import PageShell from '../../components/PageShell';
 import WechatLoginButton from '../../components/WechatLoginButton';
 import PhoneQuickLoginButton from '../../components/PhoneQuickLoginButton';
-import {
-  applyBrandFromClientConfig,
-  getBrandAssetsSync,
-  loadBrandAssets,
-} from '../../lib/brand-assets';
+import { BRAND_LOGO_WIDE_URL } from '@dukang/shared-types';
 import { finishLoginNavigate, forceReloadAfterAccountMerge } from '../../lib/auth-nav';
 import {
   bindWechatForUser,
@@ -102,18 +98,11 @@ 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));
-        setLogoWideUrl(applyBrandFromClientConfig(config).brandLogoWideUrl);
-      })
-      .catch(() => {
-        setWxAuthorize(true);
-        void loadBrandAssets().then((b) => setLogoWideUrl(b.brandLogoWideUrl));
-      });
+      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
+      .catch(() => setWxAuthorize(true));
   }, []);
 
   useEffect(() => {
@@ -405,7 +394,7 @@ export default function LoginPage() {
       <View className="login-header">
         <View className="login-logo-wrap">
           <View className="login-logo">
-            <Image className="login-logo-img" src={logoWideUrl} mode="aspectFit" />
+            <Image className="login-logo-img" src={BRAND_LOGO_WIDE_URL} mode="aspectFit" />
           </View>
           <Text className="login-logo-badge">官方</Text>
         </View>

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

@@ -2,6 +2,8 @@ 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';
@@ -11,11 +13,6 @@ 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,
@@ -29,10 +26,9 @@ import { isWechatEnv } from '../../lib/weixin';
 import { APP_VERSION_LABEL } from '../../lib/client-version';
 import { maskPhone } from '../../lib/phone';
 import {
-  applyShareFromClientConfig,
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import iconPendingPay from '../../assets/icons/待付款.png';
 import iconPaid from '../../assets/icons/已付款.png';
@@ -74,11 +70,7 @@ 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);
@@ -149,30 +141,24 @@ export default function MinePage() {
 
   useEffect(() => {
     request<ClientRuntimeConfig>('/common/client-config')
-      .then((config) => {
-        setWxAuthorize(isWxAuthorizeEnabled(config));
-        const brand = applyBrandFromClientConfig(config);
-        applyShareFromClientConfig(config);
-        setBrandMarkUrl(brand.brandLogoMarkUrl);
-        setQualificationUrl(brand.qualificationDisclosureUrl);
-        setShareTick((n) => n + 1);
-      })
-      .catch(() => {
-        setWxAuthorize(true);
-        void loadBrandAssets();
-      });
+      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
+      .catch(() => setWxAuthorize(true));
   }, []);
 
   const sharePayload = useMemo(
-    () =>
-      buildSceneSharePayload('mine', {
+    () => ({
+      title: '杜康好客 · 我的',
+      desc: DEFAULT_SHARE_DESC,
       path: '/pages/mine/index',
     }),
-    [shareTick],
+    [],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => toWeappShareTimeline(sharePayload));
+  useShareTimeline(() => ({
+    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    query: '',
+  }));
 
   async function ensureWechatBound(): Promise<boolean> {
     if (profile?.hasWechat) return true;
@@ -318,7 +304,7 @@ export default function MinePage() {
     if (displayAvatarUrl) {
       return <Image className="mine-avatar-img" src={displayAvatarUrl} mode="aspectFill" />;
     }
-    return <Image className="mine-avatar-img" src={brandMarkUrl} mode="aspectFit" />;
+    return <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />;
   }
 
   if (!authed) {
@@ -331,7 +317,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={brandMarkUrl} mode="aspectFit" />
+                <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />
               </View>
             </View>
             <View>
@@ -524,13 +510,8 @@ export default function MinePage() {
       {shouldRenderPageTabBar() ? <UserTabBar selected={3} /> : null}
 
       {profileSheetOpen ? (
-        <View className="mine-profile-sheet-mask">
-          {/* 遮罩单独绑 tap，勿在含 chooseAvatar 的祖先上用 stopPropagation（会编译成 catchtap 导致选头像无反应） */}
-          <View
-            className="mine-profile-sheet-backdrop"
-            onClick={() => !savingProfile && setProfileSheetOpen(false)}
-          />
-          <View className="mine-profile-sheet">
+        <View className="mine-profile-sheet-mask" onClick={() => !savingProfile && setProfileSheetOpen(false)}>
+          <View className="mine-profile-sheet" onClick={(e) => e.stopPropagation()}>
             <Text className="mine-profile-sheet-title">完善头像与昵称</Text>
             <Text className="mine-profile-sheet-hint">
               点击头像选择，并填写昵称后保存（用于个人中心展示）
@@ -539,14 +520,13 @@ 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={brandMarkUrl} mode="aspectFit" />
+                  <Image className="mine-avatar-img" src={BRAND_LOGO_MARK_URL} mode="aspectFit" />
                 )}
               </View>
               <Text className="mine-profile-avatar-tip">点击选择头像</Text>
@@ -599,7 +579,7 @@ export default function MinePage() {
             <View className="mine-qualification-body">
               <Image
                 className="mine-qualification-img"
-                src={qualificationUrl}
+                src={QUALIFICATION_DISCLOSURE_URL}
                 mode="widthFix"
               />
             </View>

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

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

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

@@ -22,9 +22,9 @@ import { fetchOrderTrack } from '../../lib/order-logistics';
 import { maskPhone } from '../../lib/phone';
 import { confirmOrderReceive, type WechatConfirmPayload } from '../../lib/wechat-order-confirm';
 import {
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import { usePageView } from '../../lib/usePageView';
 
@@ -174,20 +174,19 @@ export default function OrderDetailPage() {
     : '';
 
   const sharePayload = useMemo(
-    () =>
-      buildSceneSharePayload('orderDetail', {
+    () => ({
+      title: productName !== '杜康商品' ? `我买了${productName} · 杜康好客` : DEFAULT_SHARE_TITLE,
+      desc: DEFAULT_SHARE_DESC,
       path: orderId ? `/pages/order-detail/index?id=${orderId}` : '/pages/home/index',
-        titleVars: {
-          productName: productName && productName !== '杜康商品' ? productName : '',
-        },
     }),
     [productName, orderId],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() =>
-    toWeappShareTimeline(sharePayload, orderId ? `id=${orderId}` : ''),
-  );
+  useShareTimeline(() => ({
+    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    query: orderId ? `id=${orderId}` : '',
+  }));
 
   function goPay() {
     if (!order) return;

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

@@ -27,9 +27,9 @@ import {
   normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
 import {
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import iconHome from '../../assets/tabbar/home.png';
 import { usePageView } from '../../lib/usePageView';
@@ -88,20 +88,21 @@ export default function ProductDetailPage() {
   });
 
   const sharePayload = useMemo(
-    () =>
-      buildSceneSharePayload('productDetail', {
+    () => ({
+      title: product?.name || DEFAULT_SHARE_TITLE,
+      desc: product?.subtitle || DEFAULT_SHARE_DESC,
       path: `/pages/product-detail/index?id=${productId}`,
-        dynamicTitle: product?.name,
-        dynamicDesc: product?.subtitle,
-        dynamicImageUrl: product ? getProductMainImage(product) : undefined,
+      imgUrl: (product ? getProductMainImage(product) : '') || undefined,
     }),
     [product, productId],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() =>
-    toWeappShareTimeline(sharePayload, productId ? `id=${productId}` : ''),
-  );
+  useShareTimeline(() => ({
+    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    query: productId ? `id=${productId}` : '',
+    imageUrl: sharePayload.imgUrl,
+  }));
 
   function goBack() {
     const pages = Taro.getCurrentPages();

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

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text, Image, ScrollView } from '@tarojs/components';
 import Taro, {
   useDidShow,
   useLoad,
@@ -19,9 +19,9 @@ import { maskPhone } from '../../lib/phone';
 import { track } from '../../lib/analytics';
 import { formatShanghaiDateTime } from '../../lib/datetime';
 import {
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 
 type StoreMedia = {
@@ -108,13 +108,6 @@ function formatRedeemTime(input?: string | null) {
   return formatShanghaiDateTime(input);
 }
 
-function formatPackagePriceYuan(price: string | number) {
-  const n = typeof price === 'number' ? price : Number(price);
-  if (!Number.isFinite(n)) return '0';
-  if (Math.abs(n - Math.round(n)) < 1e-9) return String(Math.round(n));
-  return n.toFixed(2).replace(/\.?0+$/, '');
-}
-
 function formatRedeemAmountYuan(amount: number | string) {
   const n = typeof amount === 'number' ? amount : Number(amount);
   if (!Number.isFinite(n)) return '0';
@@ -163,9 +156,14 @@ export default function StoreDetailPage() {
   const [loading, setLoading] = useState(true);
   const [loadError, setLoadError] = useState('');
   const [headerSolid, setHeaderSolid] = useState(false);
+  const [activePackageIndex, setActivePackageIndex] = useState(0);
   const storeRef = useRef<Store | null>(null);
   storeRef.current = store;
 
+  useEffect(() => {
+    setActivePackageIndex(0);
+  }, [store?.id]);
+
   usePageScroll(({ scrollTop }) => {
     setHeaderSolid(scrollTop > 100);
   });
@@ -244,15 +242,18 @@ export default function StoreDetailPage() {
     void loadRecentRedeems(id);
   });
 
-  const sharePayload = useMemo(() => {
+  const sharePayload = useMemo(
+    () => {
       const envFirst = store ? envPhotoUrls(store)[0] : undefined;
-    return buildSceneSharePayload('storeDetail', {
+      return {
+        title: store?.name || DEFAULT_SHARE_TITLE,
+        desc: store?.intro?.trim() || store?.address || DEFAULT_SHARE_DESC,
         path: `/pages/store-detail/index?id=${storeId}`,
-      dynamicTitle: store?.name,
-      dynamicDesc: store?.intro?.trim() || store?.address,
-      dynamicImageUrl: store?.coverUrl || envFirst || store?.carouselUrls?.[0],
-    });
-  }, [store, storeId]);
+        imgUrl: store?.coverUrl || envFirst || store?.carouselUrls?.[0] || undefined,
+      };
+    },
+    [store, storeId],
+  );
 
   const marqueeLines = useMemo(
     () => recentRedeems.map(formatRecentRedeemLine).filter(Boolean),
@@ -260,9 +261,11 @@ export default function StoreDetailPage() {
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() =>
-    toWeappShareTimeline(sharePayload, storeId ? `id=${storeId}` : ''),
-  );
+  useShareTimeline(() => ({
+    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    query: storeId ? `id=${storeId}` : '',
+    imageUrl: sharePayload.imgUrl,
+  }));
 
   function goBack() {
     const pages = Taro.getCurrentPages();
@@ -323,18 +326,13 @@ export default function StoreDetailPage() {
   const envPhotos = envPhotoUrls(store);
   const heroImages = uniqueUrls([store.coverUrl, ...(store.carouselUrls || [])]);
   const packages = store.packages ?? [];
+  const activePackage = packages[activePackageIndex] ?? packages[0];
 
   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({
@@ -355,13 +353,7 @@ export default function StoreDetailPage() {
       />
 
       <View className="store-detail-hero full-bleed">
-        <ProductCarousel
-          images={heroImages}
-          alt={store.name}
-          variant="store"
-          previewable
-          imageFit="contain"
-        />
+        <ProductCarousel images={heroImages} alt={store.name} variant="store" previewable />
       </View>
 
       <View className="store-detail-info-card">
@@ -416,25 +408,49 @@ export default function StoreDetailPage() {
         </View>
       ) : null}
 
-      {packages.length > 0 ? (
+      {packages.length > 0 && activePackage ? (
         <View className="store-detail-section store-detail-section--packages">
           <Text className="store-detail-section-title">门店套餐</Text>
-          <View className="store-detail-package-list">
+          {packages.length > 1 ? (
+            <ScrollView className="store-detail-package-tabs" scrollX showScrollbar={false} enhanced>
+              <View className="store-detail-package-tabs-inner">
                 {packages.map((pkg, index) => (
                   <View
                     key={`${pkg.name}-${index}`}
-                className="store-detail-package-list-item"
-                onClick={() => openPackageDetail(index)}
+                    className={`store-detail-package-tab${
+                      index === activePackageIndex ? ' store-detail-package-tab--active' : ''
+                    }`}
+                    onClick={() => setActivePackageIndex(index)}
                   >
-                <View className="store-detail-package-list-row">
-                  <Text className="store-detail-package-list-title">{pkg.name}</Text>
-                  <Text className="store-detail-package-list-price">
-                    &nbsp;&nbsp;&nbsp;&nbsp;¥{formatPackagePriceYuan(pkg.price)}
-                  </Text>
-                </View>
+                    <Text className="store-detail-package-tab-text">{pkg.name}</Text>
                   </View>
                 ))}
               </View>
+            </ScrollView>
+          ) : null}
+          <View className="store-detail-package-panel">
+            {activePackage.imageUrl ? (
+              <Image
+                className="store-detail-package-thumb"
+                src={activePackage.imageUrl}
+                mode="aspectFill"
+              />
+            ) : null}
+            <View className="store-detail-package-panel-body">
+              {packages.length === 1 ? (
+                <Text className="store-detail-package-name">{activePackage.name}</Text>
+              ) : null}
+              <Text className="store-detail-package-body">
+                {formatRedeemAmountYuan(activePackage.price)} 元 · {activePackage.dishes}
+              </Text>
+              {activePackage.usableTime ? (
+                <Text className="store-detail-package-meta">使用时间：{activePackage.usableTime}</Text>
+              ) : null}
+              {activePackage.otherNotes ? (
+                <Text className="store-detail-package-meta">说明：{activePackage.otherNotes}</Text>
+              ) : null}
+            </View>
+          </View>
         </View>
       ) : null}
 

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

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

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

@@ -1,172 +0,0 @@
-import { useCallback, useState } from 'react';
-import { View, Text } from '@tarojs/components';
-import Taro, { useLoad, useRouter } from '@tarojs/taro';
-import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
-import PageShell from '../../components/PageShell';
-import PageNavBar from '../../components/PageNavBar';
-import ProductCarousel from '../../components/ProductCarousel';
-import { request, toast } from '../../lib/api';
-
-type StorePackage = {
-  name: string;
-  price: string | number;
-  dishes: string;
-  usableTime?: string | null;
-  otherNotes?: string | null;
-  imageUrl?: string | null;
-  imageUrls?: 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' });
-    }
-  }
-
-  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 imageUrls = normalizeStorePackageImageUrls(pkg);
-
-  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>
-
-          {imageUrls.length > 0 ? (
-            <View className="store-package-detail-gallery">
-              <ProductCarousel
-                images={imageUrls}
-                alt={pkg.name}
-                variant="detail"
-                previewable
-              />
-            </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,6 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { View, Text, Image, Input } from '@tarojs/components';
 import Taro, { useDidShow, usePullDownRefresh, useShareAppMessage, useShareTimeline } from '@tarojs/taro';
+import { StoreStatus, STORE_STATUS_LABELS } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import TabMainHeader from '../../components/TabMainHeader';
 import WechatShareReady from '../../components/WechatShareReady';
@@ -36,11 +37,10 @@ import {
   setStoresListCache,
 } from '../../lib/stores-session';
 import {
-  buildSceneSharePayload,
+  DEFAULT_SHARE_DESC,
+  DEFAULT_SHARE_TITLE,
   toWeappShareMessage,
-  toWeappShareTimeline,
 } from '../../lib/wechat-share';
-import openBadgeImg from '../../assets/icons/store-open-badge.png';
 
 type Store = {
   id: string;
@@ -342,24 +342,33 @@ export default function StoresPage() {
     }
   }
 
-  function hoursText(store: Store): string {
+  function formatHours(store: Store) {
     const parts: string[] = [];
     if (store.openTime && store.closeTime) parts.push(`${store.openTime}-${store.closeTime}`);
     if (store.openTime2 && store.closeTime2) parts.push(`${store.openTime2}-${store.closeTime2}`);
-    if (!parts.length) parts.push('10:00-22:00');
-    return `营业时间: ${parts.join(' ')}`;
+    return parts.length ? `营业时间: ${parts.join('，')}` : '营业时间: 10:00-22:00';
+  }
+
+  function formatStatus(store: Store) {
+    const status = store.status as StoreStatus | undefined;
+    if (status && STORE_STATUS_LABELS[status]) return STORE_STATUS_LABELS[status];
+    return STORE_STATUS_LABELS[StoreStatus.OPEN];
   }
 
   const sharePayload = useMemo(
-    () =>
-      buildSceneSharePayload('stores', {
+    () => ({
+      title: '杜康好客门店',
+      desc: DEFAULT_SHARE_DESC,
       path: '/pages/stores/index',
     }),
     [],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
-  useShareTimeline(() => toWeappShareTimeline(sharePayload));
+  useShareTimeline(() => ({
+    title: sharePayload.title || DEFAULT_SHARE_TITLE,
+    query: '',
+  }));
 
   return (
     <PageShell variant="tab" className="store-page no-tab-header">
@@ -422,38 +431,42 @@ export default function StoresPage() {
               className="store-card"
               onClick={() => Taro.navigateTo({ url: `/pages/store-detail/index?id=${s.id}` })}
             >
-              <View className="store-card-cover-wrap">
               {s.coverUrl ? (
                 <Image className="store-card-cover" src={s.coverUrl} mode="aspectFill" />
               ) : (
                 <View className="store-card-cover store-card-cover--empty" />
               )}
-                <Image
-                  className="store-card-open-badge"
-                  src={openBadgeImg}
-                  mode="aspectFit"
-                />
-              </View>
               <View className="store-card-body">
-                {/* 第1行：标题（截断无省略号，顶到最右） */}
+                {/* 第1行：标题 + 距离 */}
                 <View className="store-card-row store-card-row--head">
-                  <Text className="store-card-name">{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 className="store-card-name" numberOfLines={1}>
+                    {s.name}
                   </Text>
                   <Text className="store-card-distance">
                     {formatDistanceMeters(s.distanceMeters)}
                   </Text>
                 </View>
-                {/* 第3行：营业时间（同行） */}
-                <View className="store-card-row store-card-row--hours">
-                  <Text className="store-card-hours">{hoursText(s)}</Text>
+                {/* 第2行：状态 + 营业时间（含第二段） */}
+                <View className="store-card-row store-card-row--meta">
+                  <Text className="store-card-status">{formatStatus(s)}</Text>
+                  <Text className="store-card-hours">{formatHours(s)}</Text>
+                </View>
+                {/* 第3行：地址 + 去核销 */}
+                <View className="store-card-row store-card-row--foot">
+                  <Text className="store-card-address" numberOfLines={1}>
+                    {s.address || (s.district ? `${s.district}` : '地址待完善')}
+                  </Text>
+                  <View
+                    className="store-card-cta"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      Taro.navigateTo({ url: '/pages/redeem/index' });
+                    }}
+                  >
+                    <Text className="store-card-cta-text">去核销</Text>
+                  </View>
                 </View>
               </View>
-              <Text className="store-card-arrow">›</Text>
             </View>
           ))}
       </View>

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

@@ -386,20 +386,13 @@
   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;
@@ -429,9 +422,8 @@
   margin: 20px auto 0;
   padding: 0;
   width: auto;
-  height: auto;
-  background: transparent !important;
-  border: none !important;
+  background: transparent;
+  border: none;
   line-height: 1.2;
   display: flex;
   flex-direction: column;
@@ -442,11 +434,6 @@
   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/store-detail.css

@@ -12,22 +12,7 @@
   width: 100%;
   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;
+  background: var(--color-surface-container);
 }
 
 .store-detail-carousel {
@@ -44,7 +29,6 @@
 
 .store-detail-carousel-image {
   object-fit: cover;
-  object-position: center center;
   display: block;
 }
 
@@ -75,7 +59,7 @@
 }
 
 .store-detail-info-card {
-  margin: 0 var(--space-page) 16px;
+  margin: -40px var(--space-page) 16px;
   position: relative;
   z-index: 2;
   background: var(--color-card);
@@ -262,167 +246,100 @@
   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-list-item:first-child {
-  padding-top: 4px;
-}
-
-.store-detail-package-list-item:last-child {
-  border-bottom: none;
-  padding-bottom: 0;
-}
-
-/* 名称在左可换行；价格始终贴该行最右侧 */
-.store-detail-package-list-row {
-  /* display: flex;
-  flex-wrap: wrap;
-  align-items: flex-start;
-  column-gap: 12px;
-  row-gap: 4px; */
-  display: block;
+.store-detail-package-tabs {
   width: 100%;
-}
-
-.store-detail-package-list-title {
-  min-width: 0;
-  font-family: var(--font-headline);
-  font-size: 15px;
-  line-height: 1.5;
-  font-weight: 500;
-  color: var(--color-on-surface);
-  word-break: break-word;
-  display: inline;
-}
-
-.store-detail-package-list-price {
-  display: inline;
-  margin-left: auto;
-  font-size: 15px;
-  line-height: 1.5;
-  font-weight: 600;
-  color: var(--color-heritage-red, #a61d24);
-  text-align: right;
-}
-
-.store-detail-package-list-item:active {
-  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;
-  flex-wrap: wrap;
-  align-items: flex-end;
-  column-gap: 16px;
-  row-gap: 4px;
-  width: 100%;
-}
-
-.store-package-detail-title {
-  /* flex: 1 1 10em; */
-  min-width: 0;
-  font-family: var(--font-headline);
-  font-size: 20px;
-  font-weight: 700;
-  line-height: 1.4;
-  color: var(--color-ink-black);
-  word-break: break-word;
-}
-
-.store-package-detail-price {
-  /* flex: 0 0 auto; */
-  margin-left: auto;
-  font-size: 20px;
-  font-weight: 700;
-  line-height: 1.4;
-  color: var(--color-heritage-red, #a61d24);
-  text-align: right;
+  margin-bottom: 10px;
   white-space: nowrap;
 }
 
-.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-detail-package-tabs-inner {
+  display: inline-flex;
+  flex-wrap: nowrap;
+  gap: 8px;
+  padding: 2px 0;
 }
 
-.store-package-detail-gallery {
-  margin: 14px 0 0;
-  border-radius: var(--radius-lg);
-  overflow: hidden;
-  background: var(--color-card);
-  box-shadow: var(--shadow-card);
-}
-
-.store-package-detail-gallery .detail-carousel-wrap {
-  border-radius: 0;
-}
-
-.store-package-detail-content {
-  margin-top: 16px;
-  background: var(--color-card);
-  border-radius: var(--radius-lg);
-  padding: 16px;
-  box-shadow: var(--shadow-card);
+.store-detail-package-tab {
+  display: inline-flex;
+  align-items: center;
+  flex-shrink: 0;
+  max-width: 132px;
+  padding: 6px 12px;
+  border-radius: 999px;
+  background: rgba(0, 0, 0, 0.04);
   box-sizing: border-box;
 }
 
-.store-detail-package-field-label {
-  display: block;
-  font-size: 13px;
+.store-detail-package-tab--active {
+  background: rgba(166, 29, 36, 0.1);
+}
+
+.store-detail-package-tab-text {
+  font-size: 12px;
+  line-height: 18px;
+  color: var(--color-text-secondary, #666);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.store-detail-package-tab--active .store-detail-package-tab-text {
+  color: var(--color-heritage-red, #a61d24);
   font-weight: 600;
-  color: var(--color-on-surface-variant);
-  margin-bottom: 6px;
 }
 
-.store-detail-package-field-value {
+.store-detail-package-panel {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+  padding: 10px;
+  border-radius: var(--radius-md, 8px);
+  background: var(--color-surface-container, #f7f7f7);
+  box-sizing: border-box;
+}
+
+.store-detail-package-thumb {
+  width: 72px;
+  height: 72px;
+  border-radius: 6px;
+  flex-shrink: 0;
+  background: rgba(0, 0, 0, 0.04);
+}
+
+.store-detail-package-panel-body {
+  flex: 1;
+  min-width: 0;
+}
+
+.store-detail-package-body,
+.store-detail-package-meta {
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+.store-detail-package-name {
   display: block;
-  font-size: 14px;
-  color: var(--color-on-surface);
-  line-height: 1.7;
-  white-space: pre-wrap;
-  word-break: break-word;
+  font-size: 15px;
+  font-weight: 700;
+  color: var(--color-text-primary, #1a1a1a);
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.store-detail-package-field {
-  margin-bottom: 16px;
+.store-detail-package-body {
+  font-size: 13px;
+  color: var(--color-text-secondary, #666);
+  line-height: 1.45;
 }
 
-.store-detail-package-field:last-child {
-  margin-bottom: 0;
+.store-detail-package-meta {
+  font-size: 12px;
+  color: var(--color-text-tertiary, #999);
+  margin-top: 4px;
 }
 
 .store-detail-package-dispute {

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

@@ -144,12 +144,12 @@
   padding: 4px var(--space-page) 16px;
 }
 
-/* 左图 + 中间文案 + 右侧箭头 */
+/* 左图右文，卡片等高 */
 .store-card {
   display: flex;
   flex-direction: row;
-  align-items: center;
-  gap: 10px;
+  align-items: stretch;
+  gap: 12px;
   padding: 12px;
   box-sizing: border-box;
   background: var(--color-card);
@@ -158,19 +158,11 @@
   margin-bottom: 12px;
 }
 
-.store-card-cover-wrap {
-  position: relative;
+.store-card-cover {
   flex-shrink: 0;
   width: 96px;
   height: 96px;
   border-radius: 8px;
-  overflow: hidden;
-}
-
-.store-card-cover {
-  width: 100%;
-  height: 100%;
-  border-radius: 8px;
   background: var(--color-surface-container);
   display: block;
 }
@@ -179,42 +171,31 @@
   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;
+  height: 96px;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  gap: 4px;
   box-sizing: border-box;
 }
 
 .store-card-row {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   min-width: 0;
   overflow: hidden;
 }
 
-/* 第1行：加粗标题（单行截断，不显示 …，宽度顶到最右） */
+/* 第1行：加粗标题（单行截断）+ 右对齐距离 */
 .store-card-row--head {
+  gap: 8px;
   height: 22px;
-  align-items: center;
 }
 
 .store-card-name {
-  width: 100%;
+  flex: 1;
   min-width: 0;
   font-family: var(--font-headline);
   font-size: 15px;
@@ -222,70 +203,84 @@
   line-height: 22px;
   color: #1a1a1a;
   overflow: hidden;
-  text-overflow: clip;
+  text-overflow: ellipsis;
   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;
-  display: -webkit-box;
-  -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;
   font-weight: 400;
-  line-height: 16px;
+  line-height: 22px;
   color: #999;
   text-align: right;
   white-space: nowrap;
 }
 
-/* 第3行：营业时间同行 */
-.store-card-row--hours {
-  align-items: center;
+/* 第2行：营业状态 + 营业时间（可含两段） */
+.store-card-row--meta {
+  gap: 6px;
+  min-height: 20px;
+  align-items: flex-start;
+}
+
+.store-card-status {
+  flex-shrink: 0;
+  padding: 0 6px;
+  margin-top: 1px;
+  border-radius: 4px;
+  background: rgba(45, 106, 79, 0.12);
+  color: #2d6a4f;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 18px;
+  white-space: nowrap;
 }
 
 .store-card-hours {
-  width: 100%;
+  flex: 1;
   min-width: 0;
   font-size: 11px;
   font-weight: 400;
   line-height: 16px;
   color: #999;
+}
+
+/* 第3行：地址（单行截断）+ 右对齐去核销 */
+.store-card-row--foot {
+  gap: 8px;
+  height: 28px;
+}
+
+.store-card-address {
+  flex: 1;
+  min-width: 0;
+  font-size: 9px;
+  font-weight: 400;
+  line-height: 28px;
+  color: #999;
   overflow: hidden;
-  text-overflow: clip;
+  text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-.store-card-arrow {
+.store-card-cta {
   flex-shrink: 0;
-  align-self: center;
-  width: 16px;
-  font-size: 20px;
-  font-weight: 300;
-  line-height: 1;
-  color: #ccc;
-  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 14px;
+  height: 26px;
+  border-radius: 999px;
+  background: var(--color-heritage-red, #a61d24);
+  box-sizing: border-box;
+}
+
+.store-card-cta-text {
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 26px;
+  color: #fff;
+  white-space: nowrap;
 }

packages/shared-types/src/config.ts

@@ -32,29 +32,29 @@ export interface AppConfig {
   userH5Url: string;
 }
 
-/** 推广码 / C 端 H5 默认落地页（系统设置 USER_H5_URL 未配时回退；HQ 可改） */
+/** 推广码 / C 端 H5 默认落地页（未配置 USER_H5_URL 时使用） */
 export const DEFAULT_USER_H5_URL = 'https://user.runxian.top/user';
 
-/** 品牌 Logo OSS 根路径（默认；系统设置 BRAND_LOGO_OSS_BASE 可覆盖） */
+/** 品牌 Logo OSS 根路径（改环境时只改此处） */
 export const BRAND_LOGO_OSS_BASE = 'https://dukang-dev.oss-cn-beijing.aliyuncs.com/logo/';
 
-/** 方形 Logo（默认；系统设置 BRAND_LOGO_URL 可覆盖） */
+/** 方形 Logo（首页等品牌展示；商品列表顶栏仍用文字标题） */
 export const BRAND_LOGO_URL = `${BRAND_LOGO_OSS_BASE}logo.png`;
 
-/** 长方形 Logo（默认；系统设置 BRAND_LOGO_WIDE_URL 可覆盖） */
+/** 长方形 Logo（含文字，登录等场景） */
 export const BRAND_LOGO_WIDE_URL = `${BRAND_LOGO_OSS_BASE}logo1.png`;
 
-/** 仅图标 Logo（默认；系统设置 BRAND_LOGO_MARK_URL 可覆盖） */
+/** 仅图标 Logo（默认头像：未微信授权时） */
 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`;
 
-/** 总部客服电话（默认；系统设置 CUSTOMER_SERVICE_PHONE 可覆盖） */
+/** 总部客服电话（C 端联系客服） */
 export const CUSTOMER_SERVICE_PHONE = '13203801799';
 
 /**
@@ -64,137 +64,6 @@ 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 ??
@@ -273,5 +142,5 @@ export function loadAppConfig(env?: Record<string, string | undefined>): AppConf
   };
 }
 
-/** Mock 短信环境固定验证码（默认；系统设置 MOCK_SMS_FIXED_CODE 可覆盖） */
+/** Mock 短信环境固定验证码 */
 export const MOCK_SMS_FIXED_CODE = '999888';

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

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

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

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

packages/shared-types/src/wechat.ts

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

packages/weixin-sdk/GOTCHAS.md

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

packages/weixin-sdk/src/index.ts

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

packages/weixin-sdk/src/jssdk.ts

@@ -1,53 +1,31 @@
 import type { WechatJssdkConfig } from '@dukang/shared-types';
-import { isIosDevice, isWechatBrowser, isWechatDevTools } from './env';
+import { 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';
-/** 旧版错误地把 SPA 当前 URL 写入 session；清理以免干扰排查 */
-const LEGACY_SIGN_URL_CACHE_KEY = 'dukang_wx_sign_url_v2';
+const 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;
 }
 
-/** 仅去 hash，保留全部 query（含 OAuth code/state）— iOS 入场签名必须如此 */
-export function jssdkUrlWithoutHash(rawUrl: string): string {
-  return rawUrl.split('#')[0];
-}
-
-/**
- * 规范化签名 URL。
- * - 默认：去 hash；可保留 code/state（由 keepOAuthQuery 控制）
- * - Android / 当前页签名：通常已 stripOAuth 后再签，keepOAuthQuery=false
- */
-export function normalizeJssdkPageUrl(rawUrl: string, opts?: { keepOAuthQuery?: boolean }): string {
-  const keepOAuth = !!opts?.keepOAuthQuery;
+/** 参与 JSSDK 签名的页面 URL：与微信文档一致，取 location.href 去掉 # 后的部分；剔除 OAuth 回调参数 */
+export function normalizeJssdkPageUrl(rawUrl: string): string {
   try {
     const url = new URL(rawUrl);
     url.hash = '';
-    if (!keepOAuth) {
     url.searchParams.delete('code');
     url.searchParams.delete('state');
-    }
     const query = url.searchParams.toString();
     return `${url.origin}${url.pathname}${query ? `?${query}` : ''}`;
   } catch {
-    const noHash = jssdkUrlWithoutHash(rawUrl);
-    if (keepOAuth) return noHash;
+    const noHash = rawUrl.split('#')[0];
     try {
       const url = new URL(noHash, typeof window !== 'undefined' ? window.location.origin : 'https://localhost');
       url.searchParams.delete('code');
@@ -64,48 +42,25 @@ function signUrlChanged(prev: string | null, current: string): boolean {
   return prev !== current;
 }
 
-function clearLegacySignUrlCache(): void {
-  try {
-    sessionStorage.removeItem(LEGACY_SIGN_URL_CACHE_KEY);
-  } catch {
-    /* ignore */
-  }
-}
-
-/**
- * 捕获 iOS 微信入场 URL（每个 document 生命周期只记一次；保留 code/state）。
- * Android / 非微信环境为 no-op。
- */
+/** 记录最近一次签名 URL；SPA 路由或 ?step= 变化时须重新 wx.config */
 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 });
+  if (!isWechatBrowser() || isWechatDevTools()) return;
+  const current = normalizeJssdkPageUrl(window.location.href);
+  const existing = sessionStorage.getItem(SIGN_URL_CACHE_KEY);
+  if (!existing) {
+    sessionStorage.setItem(SIGN_URL_CACHE_KEY, current);
+    return;
+  }
+  if (signUrlChanged(existing, current)) {
+    sessionStorage.setItem(SIGN_URL_CACHE_KEY, current);
+    resetJssdkConfig();
+  }
 }
 
-/** 获取参与 JSSDK 签名的 URL；iOS 微信内固定为本次入场 URL（含 OAuth query） */
+/** 获取参与 JSSDK 签名的 URL（始终为当前页完整 URL，含 query） */
 export function getJssdkSignUrl(rawUrl?: string): string {
-  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();
+  return normalizeJssdkPageUrl(rawUrl ?? (typeof window !== 'undefined' ? window.location.href : ''));
 }
 
 function isJssdkDebugEnabled(): boolean {
@@ -121,8 +76,6 @@ 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();
@@ -173,7 +126,7 @@ export async function initWechatJssdk(options: {
 }): Promise<void> {
   captureIosJssdkEntryUrl();
   const { apiBase, clientApp, getAccessToken } = options;
-  const pageUrl = getJssdkSignUrl(options.url);
+  const pageUrl = options.url ?? getJssdkSignUrl();
   await loadScript();
   if (!window.wx) throw new Error('微信 JSSDK 不可用');
 
@@ -211,7 +164,7 @@ export async function ensureJssdkReady(options: {
   jsApiList?: string[];
 }): Promise<void> {
   captureIosJssdkEntryUrl();
-  const pageUrl = getJssdkSignUrl(options.url);
+  const pageUrl = options.url ?? getJssdkSignUrl();
   if (configuredUrl && signUrlChanged(configuredUrl, pageUrl)) {
     resetJssdkConfig();
   }

server/dukang-api/.env.example

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

server/dukang-api/prisma/schema.prisma

@@ -812,21 +812,6 @@ 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)
@@ -1058,8 +1043,6 @@ 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)
 
@@ -1076,7 +1059,6 @@ model PartnerAccount {
   @@index([parentAccountId])
   @@index([wxOpenId])
   @@index([contactPhone])
-  @@index([isTest])
   @@map("partner_account")
 }
 
@@ -1120,7 +1102,6 @@ model HqAccount {
   updatedAt   DateTime      @updatedAt @map("updated_at") @db.DateTime(3)
 
   permissions HqAccountPermission[]
-  testWhitelistPhones CommonTestWhitelistPhone[] @relation("TestWhitelistCreatedBy")
 
   @@map("hq_account")
 }
@@ -1159,8 +1140,6 @@ 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)
@@ -1187,7 +1166,6 @@ model User {
   @@index([referrerUserId])
   @@index([mergedIntoUserId])
   @@index([wxOpenId])
-  @@index([isTest])
   @@map("user_user")
 }
 
@@ -1248,10 +1226,7 @@ model Store {
   partnerAccountId BigInt     @map("partner_account_id") @db.UnsignedBigInt
   categoryId      BigInt?     @map("category_id") @db.UnsignedBigInt
   name            String      @db.VarChar(128)
-  /// 门店主账号登录手机号（老板）；与 StoreAccount.phone 对齐
   phone           String      @db.VarChar(20)
-  /// 对外联系电话（店长等）；C 端拨号展示用；空则回退 phone
-  contactPhone    String?     @map("contact_phone") @db.VarChar(20)
   province        String      @db.VarChar(32)
   cityName        String      @map("city_name") @db.VarChar(32)
   district        String      @db.VarChar(32)
@@ -1278,10 +1253,6 @@ model Store {
   visibilityWhitelistEnabled Boolean @default(false) @map("visibility_whitelist_enabled")
   /// FIN-001：允许未出账手动提现的白名单门店
   withdrawWhitelistEnabled Boolean @default(false) @map("withdraw_whitelist_enabled")
-  /// 测试门店：不计结算 / HQ 可手动标记
-  isTest          Boolean     @default(false) @map("is_test")
-  /// C 端 / 列表排序：数值越小越靠前
-  sortOrder       Int         @default(0) @map("sort_order")
   createdAt       DateTime    @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt       DateTime    @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1303,8 +1274,6 @@ model Store {
   @@index([cityId, status])
   @@index([partnerAccountId])
   @@index([auditStatus, createdAt])
-  @@index([isTest])
-  @@index([sortOrder])
   @@map("store_store")
 }
 
@@ -1331,8 +1300,6 @@ model StorePackage {
   usableTime String?  @map("usable_time") @db.VarChar(256)
   otherNotes String?  @map("other_notes") @db.VarChar(512)
   imageUrl   String?  @map("image_url") @db.VarChar(512)
-  /// 套餐多图 URL 列表（JSON string[]），最多 20 张；imageUrl 同步为首图
-  imageUrls  Json?    @map("image_urls")
   sortOrder  Int      @default(0) @map("sort_order")
   createdAt  DateTime @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt  DateTime @updatedAt @map("updated_at") @db.DateTime(3)
@@ -1377,8 +1344,6 @@ 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)
 
@@ -1389,7 +1354,6 @@ model StoreAccount {
   withdrawRequests     StoreWithdrawRequest[]
 
   @@index([parentAccountId])
-  @@index([isTest])
   @@map("store_account")
 }
 
@@ -1468,8 +1432,6 @@ 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)
 
@@ -1494,7 +1456,6 @@ model Order {
   @@index([gpsCity])
   @@index([fulfillmentWarehouseId])
   @@index([proxyPartnerAccountId])
-  @@index([isTest])
   @@map("user_order")
 }
 
@@ -1587,8 +1548,6 @@ 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)
@@ -1601,7 +1560,6 @@ model RedeemRecord {
 
   @@index([storeId, createdAt])
   @@index([storeId, channel, createdAt])
-  @@index([isTest])
   @@map("user_redeem_record")
 }
 

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

@@ -61,16 +61,6 @@ 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();
@@ -93,28 +83,16 @@ 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();
@@ -123,7 +101,6 @@ async function main() {
 
   await prisma.commonProductDetailTemplate.deleteMany();
 
-  await prisma.commonStoreCategory.updateMany({ data: { parentId: null } });
   await prisma.commonStoreCategory.deleteMany();
 
   await prisma.commonPromoCode.deleteMany();
@@ -937,25 +914,6 @@ 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,
@@ -970,8 +928,6 @@ async function main() {
 
     stores: createdStores.length,
 
-    testWhitelistPhones,
-
     testPhones: {
 
       user: '13800000001',

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

@@ -21,7 +21,6 @@ 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';
@@ -38,7 +37,6 @@ import { RequestIdMiddleware } from './common/logging/request-id.middleware';
     }),
     PrismaModule,
     SystemConfigModule,
-    TestWhitelistModule,
     GeoModule,
     RedisModule,
     AlertModule,

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

@@ -1,19 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaService } from '../common/prisma/prisma.module';
 import { CourierService } from '../integrations/courier/courier.service';
-import { parseCourierCallbackBody } from '../integrations/courier/xiaofeixia/xiaofeixia-callback-body';
 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 {
@@ -24,17 +16,15 @@ export class DeliveryCallbackService {
     private readonly tradeService: TradeService,
   ) {}
 
-  async handleTrackCallback(
-    providerKey: string,
-    body: unknown,
-    requestUrl: string,
-    meta?: TrackCallbackRequestMeta,
-  ) {
+  async handleTrackCallback(providerKey: string, body: unknown, requestUrl: string) {
     const normalized = providerKey.trim().toLowerCase();
     const baseLog = {
       scene: 'TRACK_CALLBACK',
       requestUrl,
-      requestBody: this.buildRequestBodyForLog(body, meta),
+      requestBody: (body && typeof body === 'object' ? body : { value: body }) as Record<
+        string,
+        unknown
+      >,
     };
 
     if (!XFX_PROVIDER_ALIASES.has(normalized) && normalized !== 'logistics') {
@@ -55,18 +45,14 @@ export class DeliveryCallbackService {
       return this.courier.buildTrackCallbackResponse(true);
     }
 
-    const payload =
-      this.xiaofeixiaProvider.parseTrackCallback(body) ??
-      this.parseFromRawMeta(meta);
+    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;
+      return this.courier.buildTrackCallbackResponse(false);
     }
 
     const order = payload.outNumber
@@ -78,15 +64,13 @@ export class DeliveryCallbackService {
         : 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;
+      return this.courier.buildTrackCallbackResponse(false);
     }
 
     const targetStatus = this.xiaofeixiaProvider.mapTrackStatus(
@@ -117,65 +101,4 @@ export class DeliveryCallbackService {
 
     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 parseFromRawMeta(meta?: TrackCallbackRequestMeta) {
-    if (!meta?.rawBody?.trim()) return null;
-    const parsed = parseCourierCallbackBody(meta.rawBody, meta.contentType || '');
-    return this.xiaofeixiaProvider.parseTrackCallback(parsed);
-  }
-
-  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]')
-      .replace(/(name="sign"[\s\S]*?\r?\n\r?\n)([^\r\n-]+)/gi, '$1[REDACTED]');
-  }
 }

server/dukang-api/src/callbacks/delivery-track.controller.ts

@@ -1,56 +1,27 @@
-import { Body, Controller, Param, Post, Req, Res } from '@nestjs/common';
-import type { Request, Response } from 'express';
+import { Body, Controller, Param, Post } from '@nestjs/common';
 import { DeliveryCallbackService } from './delivery-callback.service';
 
-type CourierCallbackRequest = Request & { rawBody?: Buffer };
-
 @Controller('callbacks')
 export class DeliveryCallbackController {
   constructor(private readonly deliveryCallbackService: DeliveryCallbackService) {}
 
   /** 小飞侠/物流路由变化回调（适配器入口） */
   @Post('courier/:provider/track')
-  async trackByProvider(
-    @Param('provider') provider: string,
-    @Body() body: unknown,
-    @Req() req: CourierCallbackRequest,
-    @Res() res: Response,
-  ) {
-    const result = await this.deliveryCallbackService.handleTrackCallback(
+  trackByProvider(@Param('provider') provider: string, @Body() body: unknown) {
+    return this.deliveryCallbackService.handleTrackCallback(
       provider,
       body,
       `/api/v1/callbacks/courier/${provider}/track`,
-      this.buildRequestMeta(req),
     );
-    // 直出承运商约定结构，避免被全局 { code:0, data } 包装
-    return res.status(200).json(result);
   }
 
   /** 兼容旧路径，默认按小飞侠解析 */
   @Post('delivery/track')
-  async trackLegacy(
-    @Body() body: unknown,
-    @Req() req: CourierCallbackRequest,
-    @Res() res: Response,
-  ) {
-    const result = await this.deliveryCallbackService.handleTrackCallback(
+  trackLegacy(@Body() body: unknown) {
+    return this.deliveryCallbackService.handleTrackCallback(
       'xfx',
       body,
       '/api/v1/callbacks/delivery/track',
-      this.buildRequestMeta(req),
     );
-    return res.status(200).json(result);
-  }
-
-  private buildRequestMeta(req: CourierCallbackRequest) {
-    const contentType = req.headers['content-type'];
-    return {
-      contentType: Array.isArray(contentType) ? contentType.join(', ') : contentType || null,
-      rawBody: req.rawBody?.toString('utf8') ?? null,
-      query:
-        req.query && typeof req.query === 'object'
-          ? (req.query as Record<string, unknown>)
-          : undefined,
-    };
   }
 }

server/dukang-api/src/common/compat/v31-compat.ts

@@ -44,36 +44,11 @@ export function mapOrderCompat<T extends OrderLike & {
   };
 }
 
-/** 对外联系电话；未单独配置时回退登录手机号 */
-export function resolveStoreContactPhone(store: {
-  phone?: string | null;
-  contactPhone?: string | null;
-}): string {
-  const contact = String(store.contactPhone ?? '').trim();
-  if (contact) return contact;
-  return String(store.phone ?? '').trim();
-}
-
-export function mapStoreCompat<
-  T extends {
-    coverResource?: { url?: string } | null;
-    phone?: string | null;
-    contactPhone?: string | null;
-  },
->(store: T, opts?: { /** C 端：phone 字段对外可拨打号码 */ publicDial?: boolean }) {
-  const contactPhone = resolveStoreContactPhone(store) || null;
-  const mapped = {
+export function mapStoreCompat<T extends { coverResource?: { url?: string } | null }>(store: T) {
+  return {
     ...store,
     coverUrl: store.coverResource?.url ?? null,
-    contactPhone,
   };
-  if (opts?.publicDial) {
-    return {
-      ...mapped,
-      phone: contactPhone || store.phone || null,
-    };
-  }
-  return mapped;
 }
 
 export function mapStatusLogCompat(events: CommonEvent[]) {

server/dukang-api/src/common/guards/hq-permission.guard.ts

@@ -7,10 +7,11 @@ import {
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import {
-  HQ_PERMISSION_CATALOG,
+  HQ_DANGEROUS_PERMISSION_KEYS,
   HQ_ROLE_DEFAULT_PERMISSIONS,
   expandHqPermissionKeys,
   hasAnySystemSettingsPermission,
+  hqBasePermissionKeys,
   type HqPermissionKey,
 } from '@dukang/shared-types';
 import { PrismaService } from '../prisma/prisma.module';
@@ -27,7 +28,7 @@ export const RequireAnySystemSettings = () =>
 export class HqPermissionsResolver {
   constructor(private readonly prisma: PrismaService) {}
 
-  private async loadActiveAccount(actorId: bigint) {
+  async resolveEffectiveKeys(actorId: bigint): Promise<HqPermissionKey[]> {
     const account = await this.prisma.hqAccount.findUnique({
       where: { id: actorId },
       select: { adminRole: true, status: true },
@@ -35,14 +36,6 @@ export class HqPermissionsResolver {
     if (!account || account.status !== 'ACTIVE') {
       throw new ForbiddenException('HQ 账号不可用');
     }
-    return account;
-  }
-
-  async resolveAccess(actorId: bigint): Promise<{
-    keys: HqPermissionKey[];
-    isSuperAdmin: boolean;
-  }> {
-    const account = await this.loadActiveAccount(actorId);
 
     const userRows = await this.prisma.hqAccountPermission.findMany({
       where: { hqAccountId: actorId },
@@ -51,14 +44,12 @@ export class HqPermissionsResolver {
     const userKeys = userRows.map((r) => r.permissionKey);
 
     if (account.adminRole === 'SUPER_ADMIN') {
-      // 超管拥有权限目录内全部项（含后续新增），另含危险操作与用户级附加项
-      return {
-        isSuperAdmin: true,
-        keys: expandHqPermissionKeys([
-          ...HQ_PERMISSION_CATALOG.map((p) => p.key),
+      // 超管含危险操作（删用户/订单/城市）；其他角色仍需在权限分配中显式勾选
+      return expandHqPermissionKeys([
+        ...hqBasePermissionKeys(),
+        ...HQ_DANGEROUS_PERMISSION_KEYS,
         ...userKeys,
-        ]),
-      };
+      ]);
     }
 
     const roleRows = await this.prisma.hqRolePermission.findMany({
@@ -71,15 +62,7 @@ export class HqPermissionsResolver {
         ? roleRows.map((r) => r.permissionKey)
         : [...(HQ_ROLE_DEFAULT_PERMISSIONS[account.adminRole] ?? [])];
 
-    return {
-      isSuperAdmin: false,
-      keys: expandHqPermissionKeys([...roleKeys, ...userKeys]),
-    };
-  }
-
-  async resolveEffectiveKeys(actorId: bigint): Promise<HqPermissionKey[]> {
-    const { keys } = await this.resolveAccess(actorId);
-    return keys;
+    return expandHqPermissionKeys([...roleKeys, ...userKeys]);
   }
 }
 
@@ -96,7 +79,7 @@ export class HqPermissionGuard implements CanActivate {
     if (!user || user.actorType !== 'HQ') {
       throw new ForbiddenException('需要 HQ 权限');
     }
-    const { keys, isSuperAdmin } = await this.resolver.resolveAccess(user.actorId);
+    const keys = await this.resolver.resolveEffectiveKeys(user.actorId);
     req.hqPermissionKeys = keys;
 
     const required =
@@ -106,7 +89,6 @@ export class HqPermissionGuard implements CanActivate {
       ]) ?? [];
 
     if (!required.length) return true;
-    if (isSuperAdmin) return true;
     if (required.includes('__any_system_settings__')) {
       if (!hasAnySystemSettingsPermission(keys)) {
         throw new ForbiddenException('无系统设置权限');

server/dukang-api/src/common/system-config/system-config.registry.ts

@@ -1,22 +1,4 @@
 import type { SystemConfigFieldMeta, SystemConfigGroupMeta } from '@dukang/shared-types';
-import {
-  BRAND_LOGO_MARK_URL,
-  BRAND_LOGO_OSS_BASE,
-  BRAND_LOGO_URL,
-  BRAND_LOGO_WIDE_URL,
-  CUSTOMER_SERVICE_PHONE,
-  DEFAULT_SHARE_BENEFIT_TITLE,
-  DEFAULT_SHARE_DESC,
-  DEFAULT_SHARE_HINT,
-  DEFAULT_SHARE_MINE_TITLE,
-  DEFAULT_SHARE_ORDER_TITLE,
-  DEFAULT_SHARE_STORES_TITLE,
-  DEFAULT_SHARE_TITLE,
-  DEFAULT_USER_H5_URL,
-  MINI_USER_STATIC_OSS_BASE,
-  MOCK_SMS_FIXED_CODE,
-  QUALIFICATION_DISCLOSURE_URL,
-} from '@dukang/shared-types';
 
 /** 运行环境、安全与鉴权仅保留在 .env，不在 HQ 系统设置中维护 */
 export const SYSTEM_CONFIG_GROUPS: SystemConfigGroupMeta[] = [
@@ -24,7 +6,6 @@ export const SYSTEM_CONFIG_GROUPS: SystemConfigGroupMeta[] = [
   { key: 'sms', label: '短信' },
   { key: 'wechat', label: '微信' },
   { key: 'wechat_mini', label: '微信小程序配置' },
-  { key: 'wechat_mini_share', label: '小程序分享配置' },
   { key: 'oss', label: '对象存储 OSS' },
   { key: 'app', label: '应用链接' },
   { key: 'deploy', label: '发布部署' },
@@ -37,7 +18,6 @@ const G = {
   sms: 'sms',
   wechat: 'wechat',
   wechat_mini: 'wechat_mini',
-  wechat_mini_share: 'wechat_mini_share',
   oss: 'oss',
   app: 'app',
   deploy: 'deploy',
@@ -142,299 +122,9 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
     group: G.wechat_mini,
     type: 'string',
     requiresRestart: false,
-    placeholder: '3.4.15',
+    placeholder: '3.4.13',
     description: 'semver 格式；客户端低于此版本时提示更新',
   },
-  {
-    key: 'USER_H5_URL',
-    label: 'C 端 H5 落地页',
-    group: G.wechat_mini,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: 'https://user.example.com/user',
-    description: '推广码二维码 / 未配置时的默认落地页前缀（无末尾斜杠）',
-  },
-  {
-    key: 'BRAND_LOGO_OSS_BASE',
-    label: '品牌 Logo OSS 根路径',
-    group: G.wechat_mini,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: 'https://xxx.oss-cn-beijing.aliyuncs.com/logo/',
-    description: '仅作说明/备份；下方三张 Logo 请直接配置完整 URL',
-  },
-  {
-    key: 'BRAND_LOGO_URL',
-    label: '方形 Logo',
-    group: G.wechat_mini,
-    type: 'image',
-    requiresRestart: false,
-    description: '品牌方形 Logo；分享默认图未单独配置时回退此图',
-  },
-  {
-    key: 'BRAND_LOGO_WIDE_URL',
-    label: '长方形 Logo',
-    group: G.wechat_mini,
-    type: 'image',
-    requiresRestart: false,
-    description: '含文字，登录页等场景',
-  },
-  {
-    key: 'BRAND_LOGO_MARK_URL',
-    label: '图标 Logo',
-    group: G.wechat_mini,
-    type: 'image',
-    requiresRestart: false,
-    description: '默认头像（未微信授权时）',
-  },
-  {
-    key: 'MINI_USER_STATIC_OSS_BASE',
-    label: '小程序静态资源 OSS 根路径',
-    group: G.wechat_mini,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: 'https://xxx.oss-cn-beijing.aliyuncs.com/static/mini-user/',
-    description: '资质公示等静态资源根路径；完整 URL 优先用下方「资质公示图」',
-  },
-  {
-    key: 'QUALIFICATION_DISCLOSURE_URL',
-    label: '资质公示长图',
-    group: G.wechat_mini,
-    type: 'image',
-    requiresRestart: false,
-    description: '「我的」页资质公示大图',
-  },
-  {
-    key: 'CUSTOMER_SERVICE_PHONE',
-    label: '总部客服电话',
-    group: G.wechat_mini,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: '13203801799',
-    description: 'C 端联系客服拨号号码',
-  },
-  {
-    key: 'PARTNER_ONBOARD_CS_QR_URL',
-    label: '合伙人入驻 · 企微客服二维码',
-    group: G.wechat_mini,
-    type: 'image',
-    requiresRestart: false,
-    description: '合伙人 H5 录入门店提交前展示；未配置时禁止提交入驻',
-  },
-  {
-    key: 'PARTNER_ONBOARD_CS_HINT',
-    label: '合伙人入驻 · 客服提示文案',
-    group: G.wechat_mini,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: '使用问题、提现问题等随时可联系【杜康好客】客服',
-    description: '二维码下方说明；留空用默认文案',
-  },
-  {
-    key: 'MOCK_SMS_FIXED_CODE',
-    label: 'Mock 短信固定验证码',
-    group: G.wechat_mini,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: '999888',
-    description: '仅 MOCK_SMS 开启时生效；留空则用默认 999888',
-  },
-
-  // —— 小程序分享配置 ——
-  {
-    key: 'SHARE_HINT',
-    label: '分享引导文案',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_HINT,
-    description: '点击分享按钮后的 Toast 提示（小程序内）',
-  },
-  {
-    key: 'SHARE_DEFAULT_TITLE',
-    label: '默认分享标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_TITLE,
-    description: '各场景未单独配置标题时使用',
-  },
-  {
-    key: 'SHARE_DEFAULT_DESC',
-    label: '默认分享描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_DESC,
-    description: 'H5 分享卡片描述；小程序朋友圈/好友卡片副文案回退',
-  },
-  {
-    key: 'SHARE_DEFAULT_IMAGE_URL',
-    label: '默认分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-    description: '各场景未配置图且无业务图时使用；建议接近 5:4',
-  },
-  {
-    key: 'SHARE_HOME_TITLE',
-    label: '首页 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_HOME_DESC',
-    label: '首页 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_HOME_IMAGE_URL',
-    label: '首页 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-    description: '留空则优先用首页首张轮播图，再回退默认分享图',
-  },
-  {
-    key: 'SHARE_STORES_TITLE',
-    label: '门店列表 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_STORES_TITLE,
-  },
-  {
-    key: 'SHARE_STORES_DESC',
-    label: '门店列表 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_STORES_IMAGE_URL',
-    label: '门店列表 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_STORE_DETAIL_TITLE',
-    label: '门店详情 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    description: '留空则用门店名称',
-  },
-  {
-    key: 'SHARE_STORE_DETAIL_DESC',
-    label: '门店详情 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    description: '留空则用门店简介/地址',
-  },
-  {
-    key: 'SHARE_STORE_DETAIL_IMAGE_URL',
-    label: '门店详情 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-    description: '留空则用门头图/环境图',
-  },
-  {
-    key: 'SHARE_BENEFIT_TITLE',
-    label: '权益页 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_BENEFIT_TITLE,
-  },
-  {
-    key: 'SHARE_BENEFIT_DESC',
-    label: '权益页 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_BENEFIT_IMAGE_URL',
-    label: '权益页 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_MINE_TITLE',
-    label: '我的 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_MINE_TITLE,
-  },
-  {
-    key: 'SHARE_MINE_DESC',
-    label: '我的 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_MINE_IMAGE_URL',
-    label: '我的 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_PRODUCT_DETAIL_TITLE',
-    label: '商品详情 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    description: '留空则用商品名称',
-  },
-  {
-    key: 'SHARE_PRODUCT_DETAIL_DESC',
-    label: '商品详情 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    description: '留空则用商品副标题',
-  },
-  {
-    key: 'SHARE_PRODUCT_DETAIL_IMAGE_URL',
-    label: '商品详情 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-    description: '留空则用商品主图',
-  },
-  {
-    key: 'SHARE_ORDER_DETAIL_TITLE',
-    label: '订单详情 · 标题',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-    placeholder: DEFAULT_SHARE_ORDER_TITLE,
-    description: '支持 {productName} 占位符',
-  },
-  {
-    key: 'SHARE_ORDER_DETAIL_DESC',
-    label: '订单详情 · 描述',
-    group: G.wechat_mini_share,
-    type: 'string',
-    requiresRestart: false,
-  },
-  {
-    key: 'SHARE_ORDER_DETAIL_IMAGE_URL',
-    label: '订单详情 · 分享图',
-    group: G.wechat_mini_share,
-    type: 'image',
-    requiresRestart: false,
-  },
 
   { key: 'OSS_ACCESS_KEY_ID', label: 'OSS AccessKey ID', group: G.oss, type: 'password', secret: true, requiresRestart: true },
   { key: 'OSS_ACCESS_KEY_SECRET', label: 'OSS AccessKey Secret', group: G.oss, type: 'password', secret: true, requiresRestart: true },
@@ -447,6 +137,7 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
   { key: 'OSS_UPLOAD_EXPIRE_SECONDS', label: '直传凭证有效期(秒)', group: G.oss, type: 'number', requiresRestart: false },
   { key: 'OSS_MAX_UPLOAD_BYTES', label: '单文件上限(字节)', group: G.oss, type: 'number', requiresRestart: false },
 
+  { key: 'USER_H5_URL', label: 'C 端 H5 落地页', group: G.app, type: 'string', requiresRestart: false },
   {
     key: 'TENCENT_LBS_KEY',
     label: '腾讯位置服务 Key',
@@ -556,37 +247,6 @@ export const SYSTEM_CONFIG_RETIRED_KEYS = [
 
 export const SYSTEM_CONFIG_KEY_SET = new Set(SYSTEM_CONFIG_FIELDS.map((f) => f.key));
 
-/** 表单空值时展示 / 启动补种的默认值（与 shared-types 常量对齐） */
-export const SYSTEM_CONFIG_DEFAULTS: Record<string, string> = {
-  USER_H5_URL: DEFAULT_USER_H5_URL.replace(/\/$/, ''),
-  BRAND_LOGO_OSS_BASE: BRAND_LOGO_OSS_BASE,
-  BRAND_LOGO_URL: BRAND_LOGO_URL,
-  BRAND_LOGO_WIDE_URL: BRAND_LOGO_WIDE_URL,
-  BRAND_LOGO_MARK_URL: BRAND_LOGO_MARK_URL,
-  MINI_USER_STATIC_OSS_BASE: MINI_USER_STATIC_OSS_BASE,
-  QUALIFICATION_DISCLOSURE_URL: QUALIFICATION_DISCLOSURE_URL,
-  CUSTOMER_SERVICE_PHONE: CUSTOMER_SERVICE_PHONE,
-  MOCK_SMS_FIXED_CODE: MOCK_SMS_FIXED_CODE,
-  SHARE_HINT: DEFAULT_SHARE_HINT,
-  SHARE_DEFAULT_TITLE: DEFAULT_SHARE_TITLE,
-  SHARE_DEFAULT_DESC: DEFAULT_SHARE_DESC,
-  SHARE_DEFAULT_IMAGE_URL: BRAND_LOGO_URL,
-  SHARE_HOME_TITLE: DEFAULT_SHARE_TITLE,
-  SHARE_HOME_DESC: DEFAULT_SHARE_DESC,
-  SHARE_STORES_TITLE: DEFAULT_SHARE_STORES_TITLE,
-  SHARE_STORES_DESC: DEFAULT_SHARE_DESC,
-  SHARE_BENEFIT_TITLE: DEFAULT_SHARE_BENEFIT_TITLE,
-  SHARE_BENEFIT_DESC: DEFAULT_SHARE_DESC,
-  SHARE_MINE_TITLE: DEFAULT_SHARE_MINE_TITLE,
-  SHARE_MINE_DESC: DEFAULT_SHARE_DESC,
-  SHARE_ORDER_DETAIL_TITLE: DEFAULT_SHARE_ORDER_TITLE,
-  SHARE_ORDER_DETAIL_DESC: DEFAULT_SHARE_DESC,
-};
-
 export function getSystemConfigField(key: string): SystemConfigFieldMeta | undefined {
   return SYSTEM_CONFIG_FIELDS.find((f) => f.key === key);
 }
-
-export function getSystemConfigDefault(key: string): string {
-  return SYSTEM_CONFIG_DEFAULTS[key] ?? '';
-}

server/dukang-api/src/common/system-config/system-config.service.ts

@@ -8,7 +8,6 @@ import type {
 import { loadAppConfig, parseMiniHomeBanners, serializeMiniHomeBanners } from '@dukang/shared-types';
 import { PrismaService } from '../prisma/prisma.module';
 import {
-  SYSTEM_CONFIG_DEFAULTS,
   SYSTEM_CONFIG_FIELDS,
   SYSTEM_CONFIG_GROUPS,
   SYSTEM_CONFIG_KEY_SET,
@@ -43,7 +42,6 @@ export class SystemConfigService implements OnModuleInit {
     try {
       await this.purgeRetiredKeys();
       await this.seedMissingFromProcessEnv();
-      await this.seedMissingDefaults();
       const rows = await this.prisma.systemConfig.findMany();
       applyEnvOverlay(Object.fromEntries(rows.map((r) => [r.configKey, r.value])));
       this.lastUpdatedAt = rows.reduce<Date | null>(
@@ -84,7 +82,7 @@ export class SystemConfigService implements OnModuleInit {
     for (const field of fields) {
       const fromDb = dbMap.get(field.key);
       const fromEnv = process.env[field.key];
-      const raw = (fromDb ?? fromEnv ?? SYSTEM_CONFIG_DEFAULTS[field.key] ?? '').trim();
+      const raw = fromDb ?? fromEnv ?? '';
       if (field.secret) {
         if (raw) configuredSecrets.push(field.key);
         values[field.key] = '';
@@ -229,26 +227,6 @@ export class SystemConfigService implements OnModuleInit {
     }
   }
 
-  /** 将代码默认值写入空缺配置，便于 HQ 表单可见、可改 */
-  private async seedMissingDefaults() {
-    const overlay: Record<string, string> = {};
-    for (const field of SYSTEM_CONFIG_FIELDS) {
-      const defaultVal = SYSTEM_CONFIG_DEFAULTS[field.key];
-      if (!defaultVal?.trim()) continue;
-      const existing = await this.prisma.systemConfig.findUnique({ where: { configKey: field.key } });
-      if (existing?.value?.trim()) continue;
-      if (process.env[field.key]?.trim()) continue;
-      const value = this.normalizeByMeta(field, defaultVal);
-      await this.prisma.systemConfig.upsert({
-        where: { configKey: field.key },
-        create: { configKey: field.key, value },
-        update: { value },
-      });
-      overlay[field.key] = value;
-    }
-    if (Object.keys(overlay).length) applyEnvOverlay(overlay);
-  }
-
   private normalizeByMeta(meta: { key?: string; type: string }, raw: string): string {
     if (meta.type === 'boolean') {
       return raw === 'true' || raw === '1' ? 'true' : 'false';

server/dukang-api/src/common/test-whitelist/test-whitelist.module.ts

@@ -1,9 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { TestWhitelistService } from './test-whitelist.service';
-
-@Global()
-@Module({
-  providers: [TestWhitelistService],
-  exports: [TestWhitelistService],
-})
-export class TestWhitelistModule {}