merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报

merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报
feat(mini): v4.0.8 客服卡片主包落地、定位误报修复，合伙人微信内预览保存海报
2026-09-01 15:24:31 +08:00 · 2026-09-01 15:24:19 +08:00 · 2026-09-01 15:23:52 +08:00 · 2026-09-01 15:12:48 +08:00 · 2026-09-01 15:12:28 +08:00 · 2026-09-01 15:12:10 +08:00
131 changed files with 5904 additions and 1253 deletions
@@ -3,7 +3,10 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>杜康好客 · HQ 管理后台</title>
+    <meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet" />
    <title>管理后台</title>
  </head>
  <body>
    <div id="root"></div>
@@ -0,0 +1 @@
 1aacdfe9dcc03f68e4dd855f8c4c8f33
@@ -0,0 +1,2 @@
 User-agent: *
 Allow: /
@@ -0,0 +1,7 @@
 {
  "cleanUrls": false,
  "trailingSlash": false,
  "rewrites": [
    { "source": "**", "destination": "/index.html" }
  ]
 }
@@ -25,6 +25,7 @@ import FulfillmentProvidersPage from './pages/FulfillmentProvidersPage';
 import StoreMediaPage from './pages/StoreMediaPage';
 import StoreCategoriesPage from './pages/StoreCategoriesPage';
 import PromoCodesPage from './pages/PromoCodesPage';
 import ActivityPostersPage from './pages/ActivityPostersPage';
 import PromoCodeDetailLayout from './pages/promo/PromoCodeDetailLayout';
 import PromoCodeDetailPage from './pages/promo/PromoCodeDetailPage';
 import PromoCodeUsersPage from './pages/promo/PromoCodeUsersPage';
@@ -86,6 +87,7 @@ export default function App() {
        <Route path="/wechat-bindings" element={<WechatBindingsPage />} />
        <Route path="/orders" element={<OrdersPage />} />
        <Route path="/promo-codes" element={<PromoCodesPage />} />
        <Route path="/activity-posters" element={<ActivityPostersPage />} />
        <Route path="/promo-codes/:id" element={<PromoCodeDetailLayout />}>
          <Route index element={<PromoCodeDetailPage />} />
          <Route path="users" element={<PromoCodeUsersPage />} />
@@ -220,6 +220,10 @@ body.admin-col-resizing * {
  cursor: pointer;
 }
 a.admin-primary-link {
  color: inherit;
 }
 .admin-primary-link:hover {
  color: #1677ff;
 }
@@ -0,0 +1,100 @@
 import { useEffect, useState } from 'react';
 import { Form, Modal, Select, Typography, message } from 'antd';
 import type { ActivityPosterItem } from '@dukang/shared-types';
 import { request, requestDownload, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE } from '../lib/constants';
 type Props = {
  open: boolean;
  partnerIds: string[];
  onClose: () => void;
 };
 export default function ActivityPosterDownloadModal({ open, partnerIds, onClose }: Props) {
  const [posters, setPosters] = useState<ActivityPosterItem[]>([]);
  const [posterId, setPosterId] = useState<string>();
  const [loading, setLoading] = useState(false);
  const [submitting, setSubmitting] = useState(false);
  const multi = partnerIds.length > 1;
  useEffect(() => {
    if (!open) return;
    setPosterId(undefined);
    setLoading(true);
    void request<Paginated<ActivityPosterItem>>(
      `/admin/activity-posters?status=ACTIVE&page=1&pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
    )
      .then((res) => {
        const items = res.items ?? [];
        setPosters(items);
        setPosterId(items[0]?.id);
      })
      .catch((e) => message.error(e instanceof Error ? e.message : '加载活动图失败'))
      .finally(() => setLoading(false));
  }, [open]);
  async function submit() {
    if (!posterId) {
      message.error('请选择活动图');
      return;
    }
    if (!partnerIds.length) {
      message.error('请选择合伙人');
      return;
    }
    setSubmitting(true);
    try {
      if (partnerIds.length === 1) {
        await requestDownload(
          `/admin/activity-posters/${posterId}/image?partnerId=${encodeURIComponent(partnerIds[0])}`,
          {},
          'activity-poster.png',
        );
      } else {
        await requestDownload(
          `/admin/activity-posters/${posterId}/partner-pack`,
          { method: 'POST', body: JSON.stringify({ partnerIds }) },
          'activity-poster-pack.zip',
        );
      }
      message.success('已开始下载');
      onClose();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '下载失败');
    } finally {
      setSubmitting(false);
    }
  }
  return (
    <Modal
      title={multi ? `导出活动图（${partnerIds.length} 人）` : '下载活动图'}
      open={open}
      onCancel={onClose}
      onOk={() => void submit()}
      confirmLoading={submitting}
      okText="下载"
      okButtonProps={{ disabled: loading || !posterId }}
      destroyOnClose
    >
      <Typography.Paragraph type="secondary">
        {multi
          ? '将把所选主合伙人的关联码贴进同一张活动图，打包为 zip。无关联码或测试账号会跳过。'
          : '将把该主合伙人的关联码贴进所选活动图后下载 PNG。'}
      </Typography.Paragraph>
      <Form layout="vertical">
        <Form.Item label="活动图" required>
          <Select
            loading={loading}
            placeholder={loading ? '加载中' : posters.length ? '选择已上架活动图' : '暂无上架活动图'}
            value={posterId}
            onChange={setPosterId}
            options={posters.map((row) => ({ value: row.id, label: row.title }))}
            showSearch
            optionFilterProp="label"
          />
        </Form.Item>
      </Form>
    </Modal>
  );
 }
@@ -0,0 +1,110 @@
 import { useCallback, useRef } from 'react';
 import { DEFAULT_ACTIVITY_POSTER_QR_SLOT, type ActivityPosterQrSlot } from '@dukang/shared-types';
 type Props = {
  imageUrl?: string;
  value?: ActivityPosterQrSlot;
  onChange?: (slot: ActivityPosterQrSlot) => void;
 };
 export default function ActivityPosterQrSlotEditor({ imageUrl, value, onChange }: Props) {
  const boxRef = useRef<HTMLDivElement>(null);
  const dragRef = useRef<{
    mode: 'move' | 'resize';
    startX: number;
    startY: number;
    start: ActivityPosterQrSlot;
  } | null>(null);
  const slot = value ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT;
  const apply = useCallback((next: ActivityPosterQrSlot) => {
    const size = Math.min(50, Math.max(5, next.qrSizePct));
    const box = boxRef.current;
    const ratio = box && box.clientHeight > 0 ? box.clientWidth / box.clientHeight : 1;
    const heightPct = size * ratio;
    const x = Math.min(100 - size, Math.max(0, next.qrXPct));
    const y = Math.min(Math.max(0, 100 - heightPct), Math.max(0, next.qrYPct));
    onChange?.({
      qrXPct: Number(x.toFixed(2)),
      qrYPct: Number(y.toFixed(2)),
      qrSizePct: Number(size.toFixed(2)),
    });
  }, [onChange]);
  function onPointerDown(mode: 'move' | 'resize', e: React.PointerEvent) {
    e.preventDefault();
    e.stopPropagation();
    (e.currentTarget as HTMLElement).setPointerCapture(e.pointerId);
    dragRef.current = { mode, startX: e.clientX, startY: e.clientY, start: { ...slot } };
  }
  function onPointerMove(e: React.PointerEvent) {
    const drag = dragRef.current;
    const box = boxRef.current;
    if (!drag || !box) return;
    const dx = ((e.clientX - drag.startX) / box.clientWidth) * 100;
    const dy = ((e.clientY - drag.startY) / box.clientHeight) * 100;
    if (drag.mode === 'move') {
      apply({
        ...drag.start,
        qrXPct: drag.start.qrXPct + dx,
        qrYPct: drag.start.qrYPct + dy,
      });
    } else {
      apply({ ...drag.start, qrSizePct: drag.start.qrSizePct + dx });
    }
  }
  function endDrag() {
    dragRef.current = null;
  }
  if (!imageUrl) {
    return <div style={{ color: 'rgba(0,0,0,0.45)' }}>请先上传活动图，再拖拽定位方形码栏</div>;
  }
  return (
    <div>
      <div
        ref={boxRef}
        style={{ position: 'relative', width: '100%', maxWidth: 420, userSelect: 'none', touchAction: 'none' }}
        onPointerMove={onPointerMove}
        onPointerUp={endDrag}
        onPointerCancel={endDrag}
      >
        <img src={imageUrl} alt="活动图预览" style={{ width: '100%', display: 'block' }} draggable={false} />
        <div
          style={{
            position: 'absolute',
            left: `${slot.qrXPct}%`,
            top: `${slot.qrYPct}%`,
            width: `${slot.qrSizePct}%`,
            aspectRatio: '1',
            border: '2px dashed #1677ff',
            background: 'rgba(22,119,255,0.14)',
            cursor: 'move',
            boxSizing: 'border-box',
          }}
          onPointerDown={(e) => onPointerDown('move', e)}
        >
          <div
            style={{
              position: 'absolute',
              right: -6,
              bottom: -6,
              width: 14,
              height: 14,
              background: '#1677ff',
              borderRadius: 2,
              cursor: 'nwse-resize',
            }}
            onPointerDown={(e) => onPointerDown('resize', e)}
          />
        </div>
      </div>
      <div style={{ marginTop: 8, color: 'rgba(0,0,0,0.45)', fontSize: 12 }}>
        拖拽移动码栏，拉右下角调整大小（边长相对图宽 {slot.qrSizePct}%）
      </div>
    </div>
  );
 }
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
  Button,
  Checkbox,
@@ -7,6 +8,7 @@ import {
  Input,
  InputNumber,
  Modal,
  Popconfirm,
  Select,
  Space,
  Table,
@@ -42,6 +44,7 @@ type PartnerRow = {
  districtCodes?: string[] | null;
  orderCommissionRate?: number;
  redeemCommissionRate?: number;
  storeCount?: number;
  accountCount: number;
  createdAt: string;
 };
@@ -121,6 +124,7 @@ export default function CityPartnersPanel({
  maxPartnerCommissionRate = 0.05,
  onChanged,
 }: Props) {
  const navigate = useNavigate();
  const [editForm] = Form.useForm();
  const [createForm] = Form.useForm();
  const [subForm] = Form.useForm();
@@ -204,6 +208,31 @@ export default function CityPartnersPanel({
    }
  }
  async function deletePartner(row: { id: string; storeCount?: number }) {
    if ((row.storeCount ?? 0) > 0) {
      Modal.warning({
        title: '请先删除门店',
        content: `该城市合伙人下还有 ${row.storeCount} 家门店，请先删除门店后再删除合伙人。`,
        okText: '查看门店',
        onOk: () => navigate(`/stores?partnerId=${row.id}`),
      });
      return;
    }
    try {
      await request(`/admin/partners/${row.id}`, { method: 'DELETE' });
      message.success('城市合伙人已删除');
      if (detail?.id === row.id) {
        setDrawerOpen(false);
        setDetail(null);
      }
      void loadPartners();
      onChanged?.();
    } catch (e) {
      const msg = formatApiError(e);
      if (msg) message.error(msg);
    }
  }
  async function deleteSubAccount(subId: string) {
    await request(`/admin/partner-accounts/${subId}`, { method: 'DELETE' });
    message.success('子账号已删除');
@@ -237,11 +266,24 @@ export default function CityPartnersPanel({
    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
    {
      title: '操作',
-      width: 80,
+      width: 140,
      render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+        <Space size={0}>
-          管理
+          <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
-        </Button>
+            管理
          </Button>
          <Popconfirm
            title="确认删除该城市合伙人？"
            description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
            okText="删除"
            okButtonProps={{ danger: true }}
            onConfirm={() => void deletePartner(row)}
          >
            <Button type="link" size="small" danger>
              删除
            </Button>
          </Popconfirm>
        </Space>
      ),
    },
  ];
@@ -272,7 +314,22 @@ export default function CityPartnersPanel({
        width={640}
        open={drawerOpen}
        onClose={() => setDrawerOpen(false)}
-        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
+        extra={
          <Space>
            {detail ? (
              <Popconfirm
                title="确认删除该城市合伙人？"
                description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
                okText="删除"
                okButtonProps={{ danger: true }}
                onConfirm={() => void deletePartner(detail)}
              >
                <Button danger>删除</Button>
              </Popconfirm>
            ) : null}
            <Button type="primary" onClick={() => void savePartner()}>保存</Button>
          </Space>
        }
      >
        {detail && (
          <Tabs
@@ -0,0 +1,97 @@
 import { useEffect, useState } from 'react';
 import { Image, Input, Modal, Space, Typography } from 'antd';
 import { PAYMENT_PROOF_IMAGE_MAX_COUNT } from '@dukang/shared-types';
 import MultiImageUpload from './MultiImageUpload';
 export function parsePaymentProofUrls(raw: unknown): string[] {
  if (!Array.isArray(raw)) return [];
  return raw.map((u) => String(u ?? '').trim()).filter(Boolean);
 }
 export function PaymentProofGallery({ urls }: { urls?: unknown }) {
  const list = parsePaymentProofUrls(urls);
  if (!list.length) return <>—</>;
  return (
    <Image.PreviewGroup>
      <Space wrap size={8}>
        {list.map((url, index) => (
          <Image
            key={`${url}-${index}`}
            src={url}
            width={72}
            height={72}
            style={{ objectFit: 'cover', borderRadius: 6, border: '1px solid #f0f0f0' }}
          />
        ))}
      </Space>
    </Image.PreviewGroup>
  );
 }
 type FinancePayProofModalProps = {
  open: boolean;
  title: string;
  hint: string;
  okText: string;
  confirmLoading?: boolean;
  onCancel: () => void;
  onOk: (payload: { paymentRef?: string; paymentProofUrls?: string[] }) => Promise<void>;
 };
 export function FinancePayProofModal({
  open,
  title,
  hint,
  okText,
  confirmLoading,
  onCancel,
  onOk,
 }: FinancePayProofModalProps) {
  const [paymentRef, setPaymentRef] = useState('');
  const [proofUrls, setProofUrls] = useState<string[]>([]);
  useEffect(() => {
    if (open) {
      setPaymentRef('');
      setProofUrls([]);
    }
  }, [open]);
  return (
    <Modal
      title={title}
      open={open}
      okText={okText}
      cancelText="取消"
      confirmLoading={confirmLoading}
      destroyOnClose
      width={480}
      onCancel={onCancel}
      onOk={async () => {
        await onOk({
          paymentRef: paymentRef.trim() || undefined,
          paymentProofUrls: proofUrls.length ? proofUrls : undefined,
        });
      }}
    >
      <Typography.Paragraph style={{ marginBottom: 12 }}>{hint}</Typography.Paragraph>
      <Input
        placeholder="打款凭证号（可选）"
        value={paymentRef}
        onChange={(e) => setPaymentRef(e.target.value)}
        style={{ marginBottom: 12 }}
      />
      <Typography.Text type="secondary">打款凭证照片（可选，银行转账回单等）</Typography.Text>
      <div style={{ marginTop: 8 }}>
        <MultiImageUpload
          bizType="PAYMENT_PROOF"
          value={proofUrls}
          onChange={setProofUrls}
          maxCount={PAYMENT_PROOF_IMAGE_MAX_COUNT}
          buttonText="上传凭证照片"
          tip={`最多 ${PAYMENT_PROOF_IMAGE_MAX_COUNT} 张，支持一次选择多张`}
        />
      </div>
    </Modal>
  );
 }
@@ -5,6 +5,7 @@ import type { ColumnsType } from 'antd/es/table';
 import type { PartnerAssocSummary, PartnerAssocUserItem } from '@dukang/shared-types';
 import { request, type HqProfile, type Paginated } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import ActivityPosterDownloadModal from './ActivityPosterDownloadModal';
 function formatNicknameWithRemark(row: PartnerAssocUserItem) {
  const name = row.nickname?.trim() || '—';
@@ -24,6 +25,8 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
  const [loading, setLoading] = useState(false);
  const [issuing, setIssuing] = useState(false);
  const [canEditAssoc, setCanEditAssoc] = useState(false);
  const [canDownloadPosters, setCanDownloadPosters] = useState(false);
  const [posterDownloadOpen, setPosterDownloadOpen] = useState(false);
  const loadSummary = useCallback(async () => {
    const data = await request<PartnerAssocSummary>(`/admin/partners/${partnerId}/assoc`);
@@ -46,8 +49,15 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
  useEffect(() => {
    void request<HqProfile>('/admin/auth/me')
-      .then((p) => setCanEditAssoc((p.permissionKeys ?? []).includes('users_partner_assoc')))
+      .then((p) => {
-      .catch(() => setCanEditAssoc(false));
+        const keys = p.permissionKeys ?? [];
        setCanEditAssoc(keys.includes('users_partner_assoc'));
        setCanDownloadPosters(keys.includes('activity_posters'));
      })
      .catch(() => {
        setCanEditAssoc(false);
        setCanDownloadPosters(false);
      });
  }, []);
  useEffect(() => {
@@ -130,6 +140,9 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
          <Button loading={issuing} onClick={() => void reissue()}>
            {summary?.qrcodeUrl ? '补发关联码' : '生成关联码'}
          </Button>
          {canDownloadPosters ? (
            <Button onClick={() => setPosterDownloadOpen(true)}>下载活动图</Button>
          ) : null}
        </div>
      </Space>
      <Table
@@ -145,6 +158,11 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
          onChange: (p) => void loadUsers(p),
        }}
      />
      <ActivityPosterDownloadModal
        open={posterDownloadOpen}
        partnerIds={[partnerId]}
        onClose={() => setPosterDownloadOpen(false)}
      />
    </div>
  );
 }
@@ -19,6 +19,7 @@ import {
  SettingOutlined,
  AccountBookOutlined,
  ProjectOutlined,
  PictureOutlined,
 } from '@ant-design/icons';
 import {
  hasAnySystemSettingsPermission,
@@ -118,6 +119,7 @@ const MENU_ITEMS: MenuProps['items'] = [
  },
  { key: '/invoices', icon: <FileTextOutlined />, label: '发票' },
  { key: '/promo-codes', icon: <GiftOutlined />, label: '推广码' },
  { key: '/activity-posters', icon: <PictureOutlined />, label: '活动图' },
  { key: '/wechat-bindings', icon: <UserOutlined />, label: '微信绑定' },
  {
    key: 'wecom-group',
@@ -180,6 +182,7 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
    '/product-detail-templates': 'products',
    '/orders': 'orders',
    '/promo-codes': 'promo_codes',
    '/activity-posters': 'activity_posters',
    '/wecom/bots': 'wecom_bots',
    '/wecom/pushes': 'wecom_bots',
    'wecom-group': 'wecom_bots',
@@ -58,6 +58,54 @@ export async function request<T>(path: string, options: RequestInit = {}): Promi
  return json.data as T;
 }
 function parseDownloadFileName(header: string | null, fallback: string): string {
  if (!header) return fallback;
  const star = /filename\*=(?:UTF-8''|utf-8'')([^;]+)/i.exec(header);
  if (star?.[1]) {
    try {
      return decodeURIComponent(star[1].trim());
    } catch {
      /* ignore */
    }
  }
  const quoted = /filename="([^"]+)"/i.exec(header);
  if (quoted?.[1]) return quoted[1];
  const plain = /filename=([^;]+)/i.exec(header);
  return plain?.[1]?.trim() || fallback;
 }
 /** Binary download (PNG / zip). JSON error bodies are surfaced as Error. */
 export async function requestDownload(path: string, options: RequestInit = {}, fallbackName: string) {
  const headers: Record<string, string> = {
    'X-Client-App': CLIENT_APP,
    ...(options.headers as Record<string, string>),
  };
  if (options.body && !headers['Content-Type']) headers['Content-Type'] = 'application/json';
  const token = getToken();
  if (token) headers.Authorization = `Bearer ${token}`;
  const res = await fetch(`${apiBase}${path}`, { ...options, headers });
  const contentType = res.headers.get('content-type') || '';
  if (contentType.includes('application/json')) {
    const json = (await res.json()) as { code?: number; message?: string };
    if (json.code === 401) {
      clearAuth();
      window.location.href = '/login';
      throw new Error('未登录');
    }
    throw new Error(json.message || '下载失败');
  }
  if (!res.ok) throw new Error(`下载失败（HTTP ${res.status}）`);
  const blob = await res.blob();
  const fileName = parseDownloadFileName(res.headers.get('content-disposition'), fallbackName);
  const url = URL.createObjectURL(blob);
  const a = document.createElement('a');
  a.href = url;
  a.download = fileName;
  a.click();
  URL.revokeObjectURL(url);
 }
 export type Paginated<T> = {
  items: T[];
  total: number;
@@ -120,6 +120,7 @@ export const RESOURCE_BIZ_TYPE_LABELS: Record<string, string> = {
  QRCODE: '二维码',
  SIGN_PHOTO: '签收照',
  VIDEO: '视频',
  ACTIVITY_POSTER: '活动图',
 };
 export const RESOURCE_STATUS_LABELS: Record<string, string> = {
@@ -43,6 +43,7 @@ export const REF_TYPE_LABELS: Record<string, string> = {
  INVOICE: '发票',
  PROMO: '推广码',
  PROMO_CODE: '推广码',
  ACTIVITY_POSTER: '活动图',
  HQ: '总部',
  HQ_ACCOUNT: 'HQ 账号',
  STORE_ACCOUNT: '门店账号',
@@ -61,6 +61,10 @@ export const HQ_OPERATION_ACTION_OPTIONS = [
  { value: 'PARTNER_BILL_BATCH_MARK_PAID', label: '批量合伙人账单结算' },
  { value: 'WINERY_BILL_CONFIRM', label: '酒厂对账单确认打款' },
  { value: 'WINERY_BILL_BATCH_CONFIRM', label: '批量酒厂对账单打款' },
  { value: 'ACTIVITY_POSTER_CREATE', label: '新增活动图' },
  { value: 'ACTIVITY_POSTER_UPDATE', label: '编辑活动图' },
  { value: 'ACTIVITY_POSTER_UPDATE_STATUS', label: '活动图上下架' },
  { value: 'ACTIVITY_POSTER_DELETE', label: '删除活动图' },
 ] as const;
 export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = Object.fromEntries(
@@ -0,0 +1,308 @@
 import { useEffect, useState } from 'react';
 import { Link, useSearchParams } from 'react-router-dom';
 import {
  Alert, Button, Form, Image, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
  ACTIVITY_POSTER_STATUS_LABELS,
  DEFAULT_ACTIVITY_POSTER_QR_SLOT,
  type ActivityPosterItem,
  type ActivityPosterQrSlot,
  type ActivityPosterStatus,
 } from '@dukang/shared-types';
 import { request, requestDownload } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import OssUpload from '../components/OssUpload';
 import ActivityPosterQrSlotEditor from '../components/ActivityPosterQrSlotEditor';
 type FormValues = {
  title: string;
  copyText?: string;
  imageUrl: string;
  qrXPct: number;
  qrYPct: number;
  qrSizePct: number;
  sortOrder?: number;
  status?: ActivityPosterStatus;
 };
 type PartnerHint = {
  id: string;
  companyName?: string | null;
  name?: string;
  phone?: string;
 };
 export default function ActivityPostersPage() {
  const [searchParams] = useSearchParams();
  const partnerId = searchParams.get('partnerId')?.trim() || '';
  const [form] = Form.useForm();
  const [editForm] = Form.useForm<FormValues>();
  const [filters, setFilters] = useState<Record<string, string>>({});
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<ActivityPosterItem>(
    '/admin/activity-posters',
    () => {
      const qs = new URLSearchParams();
      if (filters.status) qs.set('status', filters.status);
      return qs;
    },
    [filters],
  );
  const [modalOpen, setModalOpen] = useState(false);
  const [editing, setEditing] = useState<ActivityPosterItem | null>(null);
  const [partnerHint, setPartnerHint] = useState<PartnerHint | null>(null);
  const [downloadingId, setDownloadingId] = useState<string | null>(null);
  const imageUrl = Form.useWatch('imageUrl', editForm);
  const qrXPct = Form.useWatch('qrXPct', editForm);
  const qrYPct = Form.useWatch('qrYPct', editForm);
  const qrSizePct = Form.useWatch('qrSizePct', editForm);
  const slot: ActivityPosterQrSlot = {
    qrXPct: qrXPct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrXPct,
    qrYPct: qrYPct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrYPct,
    qrSizePct: qrSizePct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrSizePct,
  };
  useEffect(() => {
    if (!partnerId) {
      setPartnerHint(null);
      return;
    }
    void request<PartnerHint>(`/admin/partners/${partnerId}`)
      .then(setPartnerHint)
      .catch(() => setPartnerHint({ id: partnerId }));
  }, [partnerId]);
  const partnerLabel = partnerHint
    ? (partnerHint.companyName || partnerHint.name || partnerHint.phone || partnerHint.id)
    : partnerId;
  function openCreate() {
    setEditing(null);
    editForm.setFieldsValue({
      title: '',
      copyText: '',
      imageUrl: '',
      ...DEFAULT_ACTIVITY_POSTER_QR_SLOT,
      sortOrder: 0,
      status: 'ACTIVE',
    });
    setModalOpen(true);
  }
  function openEdit(row: ActivityPosterItem) {
    setEditing(row);
    editForm.setFieldsValue({
      title: row.title,
      copyText: row.copyText,
      imageUrl: row.imageUrl,
      qrXPct: row.qrXPct,
      qrYPct: row.qrYPct,
      qrSizePct: row.qrSizePct,
      sortOrder: row.sortOrder,
      status: row.status,
    });
    setModalOpen(true);
  }
  async function save() {
    const v = await editForm.validateFields();
    const body = JSON.stringify(v);
    if (editing) {
      await request(`/admin/activity-posters/${editing.id}`, { method: 'PUT', body });
      message.success('已保存');
    } else {
      await request('/admin/activity-posters', { method: 'POST', body });
      message.success('已创建');
    }
    setModalOpen(false);
    void reload();
  }
  async function downloadForPartner(posterId: string) {
    if (!partnerId) return;
    setDownloadingId(posterId);
    try {
      await requestDownload(
        `/admin/activity-posters/${posterId}/image?partnerId=${encodeURIComponent(partnerId)}`,
        {},
        'activity-poster.png',
      );
      message.success('已开始下载');
    } catch (e) {
      message.error(e instanceof Error ? e.message : '下载失败');
    } finally {
      setDownloadingId(null);
    }
  }
  const baseColumns: ColumnsType<ActivityPosterItem> = [
    {
      title: '标题',
      dataIndex: 'title',
      width: 180,
      render: (v, row) => <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>,
    },
    {
      title: '封面',
      dataIndex: 'imageUrl',
      width: 90,
      render: (url: string) => <Image src={url} width={56} height={56} style={{ objectFit: 'cover' }} />,
    },
    {
      title: '文案',
      dataIndex: 'copyText',
      width: 240,
      render: (v: string) => v || '—',
    },
    { title: '排序', dataIndex: 'sortOrder', width: 70 },
    {
      title: '状态',
      dataIndex: 'status',
      width: 80,
      render: (s: ActivityPosterStatus) => (
        <Tag color={s === 'ACTIVE' ? 'green' : 'default'}>{ACTIVITY_POSTER_STATUS_LABELS[s] || s}</Tag>
      ),
    },
    { title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
    {
      title: '操作',
      width: partnerId ? 280 : 200,
      render: (_, row) => (
        <Space>
          <Button type="link" size="small" onClick={() => openEdit(row)}>编辑</Button>
          {partnerId && row.status === 'ACTIVE' ? (
            <Button
              type="link"
              size="small"
              loading={downloadingId === row.id}
              onClick={() => void downloadForPartner(row.id)}
            >
              为该合伙人下载
            </Button>
          ) : null}
          <Button
            type="link"
            size="small"
            onClick={async () => {
              const next = row.status === 'ACTIVE' ? 'DISABLED' : 'ACTIVE';
              await request(`/admin/activity-posters/${row.id}/status`, {
                method: 'PUT',
                body: JSON.stringify({ status: next }),
              });
              message.success(next === 'ACTIVE' ? '已上架' : '已下架');
              void reload();
            }}
          >
            {row.status === 'ACTIVE' ? '下架' : '上架'}
          </Button>
          <Popconfirm
            title="确认删除该活动图？"
            onConfirm={async () => {
              await request(`/admin/activity-posters/${row.id}`, { method: 'DELETE' });
              message.success('已删除');
              void reload();
            }}
          >
            <Button type="link" size="small" danger>删除</Button>
          </Popconfirm>
        </Space>
      ),
    },
  ];
  const { columns, settingsButton, settingsModal } = useAdminListColumns('activity-posters', baseColumns, {
    page,
    pageSize,
  });
  return (
    <div>
      {settingsModal}
      <AdminListHeader
        title="活动图"
        settings={settingsButton}
        actions={<Button type="primary" onClick={openCreate}>新建活动图</Button>}
      />
      {partnerId ? (
        <Alert
          type="info"
          showIcon
          style={{ marginBottom: 16 }}
          message={
            <>
              正在为合伙人「{partnerLabel}」下载活动图。点行内「为该合伙人下载」，或返回{' '}
              <Link to="/city-partners">城市合伙人</Link>。
            </>
          }
        />
      ) : null}
      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
        <Form.Item name="status" label="状态">
          <Select
            allowClear
            style={{ width: 120 }}
            options={Object.entries(ACTIVITY_POSTER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
          />
        </Form.Item>
        <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
      </Form>
      <Table
        rowKey="id"
        className="admin-table-nowrap"
        loading={loading}
        columns={columns}
        dataSource={data?.items ?? []}
        scroll={{ x: 'max-content' }}
        pagination={{
          current: page,
          pageSize,
          total: data?.total ?? 0,
          showSizeChanger: true,
          onChange: (p, ps) => { setPage(p); setPageSize(ps); },
        }}
      />
      <Modal
        title={editing ? '编辑活动图' : '新建活动图'}
        open={modalOpen}
        onCancel={() => setModalOpen(false)}
        onOk={() => void save()}
        width={720}
        destroyOnClose
      >
        <Form form={editForm} layout="vertical">
          <Form.Item name="title" label="标题" rules={[{ required: true, message: '请填写标题' }]}>
            <Input maxLength={128} />
          </Form.Item>
          <Form.Item name="imageUrl" label="活动图" rules={[{ required: true, message: '请上传活动图' }]}>
            <OssUpload bizType="ACTIVITY_POSTER" />
          </Form.Item>
          <Form.Item name="qrXPct" hidden><InputNumber /></Form.Item>
          <Form.Item name="qrYPct" hidden><InputNumber /></Form.Item>
          <Form.Item name="qrSizePct" hidden><InputNumber /></Form.Item>
          <Form.Item label="二维码栏">
            <ActivityPosterQrSlotEditor
              imageUrl={imageUrl}
              value={slot}
              onChange={(next) => editForm.setFieldsValue(next)}
            />
          </Form.Item>
          <Form.Item name="copyText" label="推广文案">
            <Input.TextArea rows={4} maxLength={4000} placeholder="合伙人可一键复制" />
          </Form.Item>
          <Form.Item name="sortOrder" label="排序" initialValue={0}>
            <InputNumber min={0} style={{ width: '100%' }} />
          </Form.Item>
          <Form.Item name="status" label="状态" initialValue="ACTIVE">
            <Select options={Object.entries(ACTIVITY_POSTER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
          </Form.Item>
        </Form>
      </Modal>
    </div>
  );
 }
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import {
  Alert,
  Button,
@@ -30,7 +30,6 @@ import {
  PARTNER_STAFF_ROLE_LABELS,
  type PartnerPermissionKey,
 } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
 import { omitNullFields } from '../lib/omit-null-fields';
 import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
@@ -38,9 +37,11 @@ import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import PartnerSubAccountList, { type PartnerSubAccountRow } from '../components/PartnerSubAccountList';
 import PartnerAssocPanel from '../components/PartnerAssocPanel';
 import ActivityPosterDownloadModal from '../components/ActivityPosterDownloadModal';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { request, type HqProfile, type Paginated } from '../lib/api';
 type SubRow = PartnerSubAccountRow;
@@ -127,6 +128,7 @@ function formatApiError(err: unknown): string | null {
 }
 export default function CityPartnersPage() {
  const navigate = useNavigate();
  const [filterForm] = Form.useForm();
  const [editForm] = Form.useForm();
  const [createForm] = Form.useForm();
@@ -158,6 +160,9 @@ export default function CityPartnersPage() {
  const [maxCommissionRate, setMaxCommissionRate] = useState(0.05);
  const [createMaxRate, setCreateMaxRate] = useState(0.05);
  const [createCityCode, setCreateCityCode] = useState<string | undefined>();
  const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
  const [posterDownloadIds, setPosterDownloadIds] = useState<string[] | null>(null);
  const [canDownloadPosters, setCanDownloadPosters] = useState(false);
  const loadCities = useCallback(async () => {
    const res = await request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`);
@@ -168,6 +173,12 @@ export default function CityPartnersPage() {
    void loadCities();
  }, [loadCities]);
  useEffect(() => {
    void request<HqProfile>('/admin/auth/me')
      .then((p) => setCanDownloadPosters((p.permissionKeys ?? []).includes('activity_posters')))
      .catch(() => setCanDownloadPosters(false));
  }, []);
  const editCityCode = detail?.cityId
    ? cities.find((c) => c.id === detail.cityId)?.code
    : undefined;
@@ -234,6 +245,30 @@ export default function CityPartnersPage() {
    void reload();
  }
  async function deletePartner(row: { id: string; storeCount?: number }) {
    if ((row.storeCount ?? 0) > 0) {
      Modal.warning({
        title: '请先删除门店',
        content: `该城市合伙人下还有 ${row.storeCount} 家门店，请先删除门店后再删除合伙人。`,
        okText: '查看门店',
        onOk: () => navigate(`/stores?partnerId=${row.id}`),
      });
      return;
    }
    try {
      await request(`/admin/partners/${row.id}`, { method: 'DELETE' });
      message.success('城市合伙人已删除');
      if (detail?.id === row.id) {
        setDrawerOpen(false);
        setDetail(null);
      }
      void reload();
    } catch (e) {
      const msg = formatApiError(e);
      if (msg) message.error(msg);
    }
  }
  async function deleteSubAccount(subId: string, parentId: string) {
    await request(`/admin/partner-accounts/${subId}`, { method: 'DELETE' });
    message.success('子账号已删除');
@@ -348,16 +383,46 @@ export default function CityPartnersPage() {
        </Link>
      ),
    },
    {
      title: '活动图',
      width: 70,
      render: (_, row) => (
        <Link
          to={`/activity-posters?partnerId=${encodeURIComponent(row.id)}`}
          title={`为「${row.companyName || row.phone}」下载活动图`}
        >
          查看
        </Link>
      ),
    },
    { title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
    {
      title: '操作',
-      width: 80,
+      width: 220,
      fixed: 'right',
      render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+        <Space size={0}>
-          管理
+          <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
-        </Button>
+            管理
          </Button>
          {canDownloadPosters ? (
            <Button type="link" size="small" onClick={() => setPosterDownloadIds([row.id])}>
              下载活动图
            </Button>
          ) : null}
          <Popconfirm
            title="确认删除该城市合伙人？"
            description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
            okText="删除"
            okButtonProps={{ danger: true }}
            onConfirm={() => void deletePartner(row)}
          >
            <Button type="link" size="small" danger>
              删除
            </Button>
          </Popconfirm>
        </Space>
      ),
    },
  ];
@@ -372,7 +437,16 @@ export default function CityPartnersPage() {
        settings={settingsButton}
        actions={
          <>
            <Link to="/activity-posters">活动图</Link>
            <Link to="/users?assocPartnerAccountId=any">全部关联用户</Link>
            {canDownloadPosters ? (
              <Button
                disabled={!selectedRowKeys.length}
                onClick={() => setPosterDownloadIds(selectedRowKeys)}
              >
                导出活动图{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
              </Button>
            ) : null}
            <Button
            type="primary"
            onClick={() => {
@@ -460,6 +534,14 @@ export default function CityPartnersPage() {
        dataSource={toTableRows(data?.items ?? [])}
        scroll={{ x: 'max-content' }}
        childrenColumnName="__noTreeChildren__"
        rowSelection={
          canDownloadPosters
            ? {
                selectedRowKeys,
                onChange: (keys) => setSelectedRowKeys(keys.map(String)),
              }
            : undefined
        }
        expandable={{
          expandedRowRender: (record) => (
            <PartnerSubAccountList
@@ -491,9 +573,22 @@ export default function CityPartnersPage() {
        open={drawerOpen}
        onClose={() => setDrawerOpen(false)}
        extra={
-          <Button type="primary" onClick={() => void savePartner()}>
+          <Space>
-            保存
+            {detail ? (
-          </Button>
+              <Popconfirm
                title="确认删除该城市合伙人？"
                description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
                okText="删除"
                okButtonProps={{ danger: true }}
                onConfirm={() => void deletePartner(detail)}
              >
                <Button danger>删除</Button>
              </Popconfirm>
            ) : null}
            <Button type="primary" onClick={() => void savePartner()}>
              保存
            </Button>
          </Space>
        }
      >
        {detail && (
@@ -513,6 +608,21 @@ export default function CityPartnersPage() {
                  {detail.assocUserCount ?? 0}
                </Link>
              </Descriptions.Item>
              <Descriptions.Item label="活动图">
                <Space>
                  <Link
                    to={`/activity-posters?partnerId=${encodeURIComponent(detail.id)}`}
                    title="查看活动图并下载该合伙人合成图"
                  >
                    查看
                  </Link>
                  {canDownloadPosters ? (
                    <Button type="link" size="small" onClick={() => setPosterDownloadIds([detail.id])}>
                      下载
                    </Button>
                  ) : null}
                </Space>
              </Descriptions.Item>
              <Descriptions.Item label="管仓仓库" span={2}>
                {detail.managedWarehouseName ?? (
                  <Typography.Text type="secondary">
@@ -761,6 +871,12 @@ export default function CityPartnersPage() {
          </Form.Item>
        </Form>
      </Modal>
      <ActivityPosterDownloadModal
        open={posterDownloadIds != null && posterDownloadIds.length > 0}
        partnerIds={posterDownloadIds ?? []}
        onClose={() => setPosterDownloadIds(null)}
      />
    </div>
  );
 }
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import {
  Button,
  Form,
@@ -46,6 +47,7 @@ const STATUS_OPTIONS = (Object.keys(DEV_PLAN_TASK_STATUS_LABELS) as DevPlanTaskS
 const STATUS_COLOR: Record<DevPlanTaskStatusDto, string> = {
  TODO: 'default',
  IN_PROGRESS: 'orange',
  DEVELOPED: 'blue',
  RELEASED: 'green',
 };
@@ -272,7 +274,14 @@ export default function DevPlanTasksPage() {
        <Tag color={STATUS_COLOR[s]}>{DEV_PLAN_TASK_STATUS_LABELS[s]}</Tag>
      ),
    },
-    { title: '内容', dataIndex: 'content' },
+    {
      title: '内容',
      dataIndex: 'content',
      width: 360,
      render: (v: string) => (
        <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', maxWidth: 480 }}>{v}</div>
      ),
    },
    {
      title: '附件',
      width: 100,
@@ -289,7 +298,19 @@ export default function DevPlanTasksPage() {
          '—'
        ),
    },
-    { title: '来源工单', dataIndex: 'supportTicketNo', width: 140, render: (v) => v || '—' },
+    {
      title: '来源工单',
      dataIndex: 'supportTicketNo',
      width: 140,
      render: (v, row) =>
        row.supportTicketId && v ? (
          <Link className="admin-primary-link" to={`/tickets/support?id=${row.supportTicketId}`}>
            {v}
          </Link>
        ) : (
          v || '—'
        ),
    },
    {
      title: '关联版本',
      dataIndex: 'versions',
@@ -377,7 +398,7 @@ export default function DevPlanTasksPage() {
          <Select allowClear style={{ width: 100 }} options={TYPE_OPTIONS} />
        </Form.Item>
        <Form.Item name="status" label="状态">
-          <Select allowClear style={{ width: 100 }} options={STATUS_OPTIONS} />
+          <Select allowClear style={{ width: 110 }} options={STATUS_OPTIONS} />
        </Form.Item>
        <Form.Item name="keyword" label="关键词">
          <Input allowClear placeholder="任务号/内容" style={{ width: 160 }} />
@@ -57,6 +57,7 @@ type Row = {
  redeemItems?: BillItemRow[];
  partner?: {
    companyName?: string;
    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -64,6 +65,7 @@ type Row = {
  };
  partnerAccount?: {
    companyName?: string;
    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -71,7 +73,7 @@ type Row = {
  };
 };
-type PartnerOption = { id: string; companyName: string; phone?: string };
+type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string };
 const STATUS_LABELS: Record<string, string> = {
  PENDING_REVIEW: '待审核',
@@ -89,6 +91,18 @@ const STATUS_COLORS: Record<string, string> = {
  REJECTED: 'red',
 };
 function partnerDashLabel(p?: {
  companyName?: string | null;
  name?: string | null;
  phone?: string | null;
 } | null): string {
  if (!p) return '—';
  const company = (p.companyName || '').trim();
  const person = (p.name || '').trim();
  if (company && person) return `${company}-${person}`;
  return company || person || (p.phone || '').trim() || '—';
 }
 export default function PartnerBillsPage() {
  const [form] = Form.useForm();
  const [filters, setFilters] = useState<Record<string, string>>({});
@@ -257,7 +271,7 @@ export default function PartnerBillsPage() {
  }
  const summary = data?.summary;
-  const partnerName = (r: Row) => r.partner?.companyName || r.partnerAccount?.companyName || '—';
+  const partnerName = (r: Row) => partnerDashLabel(r.partnerAccount ?? r.partner);
  const partnerBank = (r: Row) => r.partnerAccount ?? r.partner;
  const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
  const canSend = selectedRows.filter((r) => r.status === 'PENDING_REVIEW' || r.status === 'REJECTED');
@@ -275,14 +289,14 @@ export default function PartnerBillsPage() {
    },
    {
      title: '合伙人',
-      width: 160,
+      width: 200,
      render: (_, r) => partnerName(r),
    },
    {
      title: '账期',
      width: 200,
      render: (_, r) =>
-        `${fmtTime(r.periodStart).slice(0, 10)} ~ ${fmtTime(r.periodEnd).slice(0, 10)}`,
+        `${String(r.periodStart || '').slice(0, 10)} ~ ${String(r.periodEnd || '').slice(0, 10)}`,
    },
    {
      title: '酒单佣金',
@@ -406,7 +420,7 @@ export default function PartnerBillsPage() {
            optionFilterProp="label"
            options={partners.map((p) => ({
              value: p.id,
-              label: p.companyName || p.phone || p.id,
+              label: partnerDashLabel(p),
            }))}
          />
        </Form.Item>
@@ -503,7 +517,7 @@ export default function PartnerBillsPage() {
              placeholder="全部主合伙人"
              options={partners.map((p) => ({
                value: p.id,
-                label: p.companyName || p.phone || p.id,
+                label: partnerDashLabel(p),
              }))}
            />
          </Form.Item>
@@ -18,6 +18,7 @@ import {
  Typography,
  message,
 } from 'antd';
 import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof';
 import type { ColumnsType } from 'antd/es/table';
 import type { Dayjs } from 'dayjs';
 import {
@@ -113,6 +114,13 @@ export default function StoreBillsPage() {
    pendingCount: number;
    overdueCount: number;
  } | null>(null);
  const [payModal, setPayModal] = useState<{
    ids: string[];
    amountHint?: number;
  } | null>(null);
  const [paySubmitting, setPaySubmitting] = useState(false);
  const [withdrawApproveId, setWithdrawApproveId] = useState<string | null>(null);
  const [withdrawSubmitting, setWithdrawSubmitting] = useState(false);
  useEffect(() => {
    form.setFieldsValue({
@@ -134,77 +142,11 @@ export default function StoreBillsPage() {
  }, []);
  function confirmPay(ids: string[], amountHint?: number) {
-    let paymentRef = '';
+    setPayModal({ ids, amountHint });
    Modal.confirm({
      title: '确认打款？',
      content: (
        <div>
          <div>
            将确认 {ids.length} 笔 T+1 门店对账单
            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。
          </div>
          <Input
            placeholder="打款凭证号（可选）"
            style={{ marginTop: 8 }}
            onChange={(e) => {
              paymentRef = e.target.value;
            }}
          />
        </div>
      ),
      okText: '确认打款',
      cancelText: '取消',
      onOk: async () => {
        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
        if (ids.length === 1) {
          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
        } else {
          setBatchLoading(true);
          try {
            await request('/admin/store-bills/batch-confirm', {
              method: 'POST',
              body: JSON.stringify({ ids }),
            });
          } finally {
            setBatchLoading(false);
          }
        }
        message.success('已确认打款');
        setSelectedKeys([]);
        reload();
      },
    });
  }
  function approveWithdraw(id: string) {
-    let paymentRef = '';
+    setWithdrawApproveId(id);
    Modal.confirm({
      title: '审核通过并标记已结算？',
      content: (
        <Input
          placeholder="打款凭证号（可选）"
          onChange={(e) => {
            paymentRef = e.target.value;
          }}
        />
      ),
      okText: '通过并结算',
      cancelText: '取消',
      onOk: async () => {
        await request(`/admin/store-withdrawals/${id}/approve`, {
          method: 'POST',
          body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }),
        });
        message.success('已通过并标记已结算');
        setDrawerOpen(false);
        reload();
        void request<{ pendingCount: number; overdueCount: number }>(
          '/admin/store-withdrawals/overdue-summary',
        )
          .then(setOverdueSummary)
          .catch(() => {});
      },
    });
  }
  function rejectWithdraw(id: string) {
@@ -565,6 +507,9 @@ export default function StoreBillsPage() {
              <Descriptions.Item label="打款凭证">
                {detail.paymentRef ? String(detail.paymentRef) : '—'}
              </Descriptions.Item>
              <Descriptions.Item label="凭证照片">
                <PaymentProofGallery urls={detail.paymentProofUrls} />
              </Descriptions.Item>
            </Descriptions>
            {(detail.storeAccount as {
              bankAccountName?: string;
@@ -649,6 +594,9 @@ export default function StoreBillsPage() {
              <Descriptions.Item label="打款凭证">
                {detail.paymentRef ? String(detail.paymentRef) : '—'}
              </Descriptions.Item>
              <Descriptions.Item label="凭证照片">
                <PaymentProofGallery urls={detail.paymentProofUrls} />
              </Descriptions.Item>
            </Descriptions>
            {storeAccount ? (
              <>
@@ -719,6 +667,71 @@ export default function StoreBillsPage() {
          </>
        )}
      </Drawer>
      <FinancePayProofModal
        open={!!payModal}
        title="确认打款？"
        hint={`将确认 ${payModal?.ids.length ?? 0} 笔 T+1 门店对账单${
          payModal?.amountHint != null ? `，合计约 ¥${payModal.amountHint.toFixed(2)}` : ''
        }。此操作不可撤销。`}
        okText="确认打款"
        confirmLoading={paySubmitting}
        onCancel={() => setPayModal(null)}
        onOk={async (payload) => {
          if (!payModal) return;
          const { ids } = payModal;
          setPaySubmitting(true);
          if (ids.length > 1) setBatchLoading(true);
          try {
            const body = JSON.stringify({
              ...payload,
              ...(ids.length > 1 ? { ids } : {}),
            });
            if (ids.length === 1) {
              await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
            } else {
              await request('/admin/store-bills/batch-confirm', { method: 'POST', body });
            }
            message.success('已确认打款');
            setPayModal(null);
            setSelectedKeys([]);
            reload();
          } finally {
            setPaySubmitting(false);
            setBatchLoading(false);
          }
        }}
      />
      <FinancePayProofModal
        open={!!withdrawApproveId}
        title="审核通过并标记已结算？"
        hint="通过后将标记该提现为已结算，此操作不可撤销。"
        okText="通过并结算"
        confirmLoading={withdrawSubmitting}
        onCancel={() => setWithdrawApproveId(null)}
        onOk={async (payload) => {
          if (!withdrawApproveId) return;
          setWithdrawSubmitting(true);
          try {
            await request(`/admin/store-withdrawals/${withdrawApproveId}/approve`, {
              method: 'POST',
              body: JSON.stringify(payload),
            });
            message.success('已通过并标记已结算');
            setWithdrawApproveId(null);
            setDrawerOpen(false);
            reload();
            void request<{ pendingCount: number; overdueCount: number }>(
              '/admin/store-withdrawals/overdue-summary',
            )
              .then(setOverdueSummary)
              .catch(() => {});
          } finally {
            setWithdrawSubmitting(false);
          }
        }}
      />
    </div>
  );
 }
@@ -23,6 +23,7 @@ import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof';
 type Row = {
@@ -70,6 +71,8 @@ export default function StoreWithdrawalsPage() {
    pendingCount: number;
    overdueCount: number;
  } | null>(null);
  const [approveId, setApproveId] = useState<string | null>(null);
  const [approveSubmitting, setApproveSubmitting] = useState(false);
  useEffect(() => {
    void request<Paginated<StoreOption>>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -89,34 +92,7 @@ export default function StoreWithdrawalsPage() {
  }
  function approve(id: string) {
-    let paymentRef = '';
+    setApproveId(id);
    Modal.confirm({
      title: '审核通过并标记已结算？',
      content: (
        <Input
          placeholder="打款凭证号（可选）"
          onChange={(e) => {
            paymentRef = e.target.value;
          }}
        />
      ),
      okText: '通过并结算',
      cancelText: '取消',
      onOk: async () => {
        await request(`/admin/store-withdrawals/${id}/approve`, {
          method: 'POST',
          body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }),
        });
        message.success('已通过并标记已结算');
        setDrawerOpen(false);
        reload();
        void request<{ pendingCount: number; overdueCount: number }>(
          '/admin/store-withdrawals/overdue-summary',
        )
          .then(setOverdueSummary)
          .catch(() => {});
      },
    });
  }
  function reject(id: string) {
@@ -356,6 +332,9 @@ export default function StoreWithdrawalsPage() {
              {detail.paymentRef ? (
                <Descriptions.Item label="打款凭证">{String(detail.paymentRef)}</Descriptions.Item>
              ) : null}
              <Descriptions.Item label="凭证照片">
                <PaymentProofGallery urls={detail.paymentProofUrls} />
              </Descriptions.Item>
              <Descriptions.Item label="收款户名">
                {storeAccount?.bankAccountName || '—'}
              </Descriptions.Item>
@@ -394,6 +373,36 @@ export default function StoreWithdrawalsPage() {
          </>
        ) : null}
      </Drawer>
      <FinancePayProofModal
        open={!!approveId}
        title="审核通过并标记已结算？"
        hint="通过后将标记该提现为已结算，此操作不可撤销。"
        okText="通过并结算"
        confirmLoading={approveSubmitting}
        onCancel={() => setApproveId(null)}
        onOk={async (payload) => {
          if (!approveId) return;
          setApproveSubmitting(true);
          try {
            await request(`/admin/store-withdrawals/${approveId}/approve`, {
              method: 'POST',
              body: JSON.stringify(payload),
            });
            message.success('已通过并标记已结算');
            setApproveId(null);
            setDrawerOpen(false);
            reload();
            void request<{ pendingCount: number; overdueCount: number }>(
              '/admin/store-withdrawals/overdue-summary',
            )
              .then(setOverdueSummary)
              .catch(() => {});
          } finally {
            setApproveSubmitting(false);
          }
        }}
      />
    </div>
  );
 }
@@ -12,6 +12,7 @@ import {
  Input,
  InputNumber,
  Modal,
  Popconfirm,
  Select,
  Space,
  Steps,
@@ -302,6 +303,7 @@ export default function StoresPage() {
  const [categoryTree, setCategoryTree] = useState<CategoryNode[]>([]);
  const [optionsLoading, setOptionsLoading] = useState(false);
  const [saving, setSaving] = useState(false);
  const [deleting, setDeleting] = useState(false);
  const [phoneMismatch, setPhoneMismatch] = useState<string | null>(null);
  const deepLinkStoreOpenedRef = useRef(false);
@@ -372,6 +374,23 @@ export default function StoresPage() {
      .map((n) => ({ value: n.id, label: n.name }));
  }, [categoryTree, editCategoryParentId]);
  async function deleteStore(id: string) {
    setDeleting(true);
    try {
      await request(`/admin/stores/${id}`, { method: 'DELETE' });
      message.success('门店及门店账号已删除');
      if (detail && String(detail.id) === id) {
        setDrawerOpen(false);
        setDetail(null);
      }
      void reload();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '删除失败');
    } finally {
      setDeleting(false);
    }
  }
  async function openStoreDetail(row: StoreRow, opts?: { tab?: string }) {
    const [d, cats] = await Promise.all([
      request<Record<string, unknown>>(`/admin/stores/${row.id}`),
@@ -821,7 +840,7 @@ export default function StoresPage() {
    {
      key: 'actions',
      title: '操作',
-      width: 280,
+      width: 320,
      fixed: 'right',
      render: (_, row) => (
        <Space size={0} wrap>
@@ -861,6 +880,17 @@ export default function StoresPage() {
          >
            提现
          </Button>
          <Popconfirm
            title="确认删除该门店？"
            description="将同时删除门店账号；若有关联订单或核销单将禁止删除。"
            okText="删除"
            okButtonProps={{ danger: true }}
            onConfirm={() => void deleteStore(row.id)}
          >
            <Button type="link" size="small" danger>
              删除
            </Button>
          </Popconfirm>
        </Space>
      ),
    },
@@ -1034,6 +1064,17 @@ export default function StoresPage() {
                void reload();
              }} />
            <Button type="primary" loading={saving} onClick={() => void saveStoreDetail()}>保存修改</Button>
            {detail?.id ? (
              <Popconfirm
                title="确认删除该门店？"
                description="将同时删除门店账号；若有关联订单或核销单将禁止删除。"
                okText="删除"
                okButtonProps={{ danger: true }}
                onConfirm={() => void deleteStore(String(detail.id))}
              >
                <Button danger loading={deleting}>删除门店</Button>
              </Popconfirm>
            ) : null}
          </Space>
        )}>
        {detail && (
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import {
  Button,
  Card,
@@ -27,6 +28,7 @@ import {
 } from '@ant-design/icons';
 import type { ColumnsType } from 'antd/es/table';
 import {
  DEV_PLAN_TASK_STATUS_LABELS,
  DEV_PLAN_TASK_TYPE_LABELS,
  SUPPORT_TICKET_STATUS_LABELS,
  SUPPORT_TICKET_TYPE_LABELS,
@@ -89,6 +91,8 @@ const TASK_TYPE_OPTIONS = (Object.keys(DEV_PLAN_TASK_TYPE_LABELS) as DevPlanTask
 type TicketRow = SupportTicketDto & { linkedTasks?: SupportTicketLinkedTaskDto[] };
 export default function SupportTicketsPage() {
  const [searchParams] = useSearchParams();
  const deepLinkId = searchParams.get('id')?.trim() || searchParams.get('ticketId')?.trim() || '';
  const [profile, setProfile] = useState<HqProfile | null>(null);
  const [filters, setFilters] = useState<Record<string, string>>({});
  const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
@@ -162,6 +166,11 @@ export default function SupportTicketsPage() {
    setDrawerOpen(true);
  }
  useEffect(() => {
    if (!deepLinkId) return;
    void openDetail(deepLinkId).catch(() => message.error('工单不存在或已删除'));
  }, [deepLinkId]);
  async function submitCreate() {
    const values = await createForm.validateFields();
    setCreating(true);
@@ -914,7 +923,9 @@ export default function SupportTicketsPage() {
                    >
                      {t.content}
                    </Typography.Text>
-                    <Tag style={{ margin: 0, flexShrink: 0 }}>{t.status}</Tag>
+                    <Tag style={{ margin: 0, flexShrink: 0 }}>
                      {DEV_PLAN_TASK_STATUS_LABELS[t.status] ?? t.status}
                    </Tag>
                  </div>
                ))}
              </Card>
@@ -13,11 +13,13 @@ import {
  Statistic,
  Table,
  Tag,
  Tooltip,
  Typography,
  message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import type { Dayjs } from 'dayjs';
 import dayjs from 'dayjs';
 import {
  WINERY_SETTLEMENT_RATE,
  type SystemConfigFormResponse,
@@ -94,6 +96,7 @@ function canConfirmWineryPay(row: { status: string; wineryAmount: number | strin
 const DELIVERY_LABELS: Record<string, string> = {
  LOCAL: '同城',
  CROSS_CITY: '跨城',
  ON_SITE_PICKUP: '现场提货',
 };
 const WINERY_BANK_KEYS = [
@@ -106,6 +109,7 @@ const WINERY_BANK_KEYS = [
 export default function WineryBillsPage() {
  const [form] = Form.useForm();
  const [bankForm] = Form.useForm<Record<string, string>>();
  const [reconcileForm] = Form.useForm<{ range?: [Dayjs, Dayjs] }>();
  const [filters, setFilters] = useState<Record<string, string>>({});
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
    '/admin/winery-bills',
@@ -121,6 +125,8 @@ export default function WineryBillsPage() {
    [filters],
  );
  const [exporting, setExporting] = useState(false);
  const [reconciling, setReconciling] = useState(false);
  const [reconcileOpen, setReconcileOpen] = useState(false);
  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
  const [detail, setDetail] = useState<(Row & { items?: BillItem[] }) | null>(null);
  const [drawerOpen, setDrawerOpen] = useState(false);
@@ -199,6 +205,33 @@ export default function WineryBillsPage() {
    }
  }
  async function runReconcile(values: { range?: [Dayjs, Dayjs] }) {
    setReconciling(true);
    try {
      const body: { dateFrom?: string; dateTo?: string } = {};
      if (values.range?.[0]) body.dateFrom = values.range[0].format('YYYY-MM-DD');
      if (values.range?.[1]) body.dateTo = values.range[1].format('YYYY-MM-DD');
      const result = await request<{
        generated: number;
        skipped: number;
        orphanOrders: number;
        days: number;
      }>('/admin/winery-bills/reconcile', {
        method: 'POST',
        body: JSON.stringify(body),
      });
      message.success(
        `核对完成：重算 ${result.generated} 天，跳过 ${result.skipped} 天，补入孤儿订单 ${result.orphanOrders} 笔`,
      );
      setReconcileOpen(false);
      reload();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '核对失败');
    } finally {
      setReconciling(false);
    }
  }
  async function openBankModal() {
    setBankOpen(true);
    setBankLoading(true);
@@ -249,7 +282,11 @@ export default function WineryBillsPage() {
      ),
    },
    {
-      title: '账单日',
+      title: (
        <Tooltip title="出账当天的北京日历日；T+3 只决定纳入哪天完成的订单">
          账单日
        </Tooltip>
      ),
      dataIndex: 'billDate',
      width: 110,
      render: (v) => String(v || '').slice(0, 10),
@@ -309,13 +346,18 @@ export default function WineryBillsPage() {
      <AdminListHeader
        title="酒厂对账单"
        settings={settingsButton}
-        description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
+        description={`T+3：每 3 天出一期（相对 2026-08-01），纳入上期 3 天同城/跨城/现场提货已付已完成订单（实付 × ${ratePct}%）；应付为 0 仍出账「无需打款」`}
        actions={
-          canEditWineryBank ? (
+          <Space>
-            <Button type="default" onClick={() => void openBankModal()}>
+            <Button type="primary" onClick={() => setReconcileOpen(true)}>
-              酒厂银行账户信息配置
+              核对补生成
            </Button>
-          ) : null
+            {canEditWineryBank ? (
              <Button type="default" onClick={() => void openBankModal()}>
                酒厂银行账户信息配置
              </Button>
            ) : null}
          </Space>
        }
      />
@@ -525,6 +567,32 @@ export default function WineryBillsPage() {
          </Form.Item>
        </Form>
      </Modal>
      <Modal
        title="核对补生成酒厂账单"
        open={reconcileOpen}
        onCancel={() => setReconcileOpen(false)}
        footer={null}
        destroyOnClose
      >
        <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
          核对时会补齐同城配送、跨城配送、现场提货的已付已完成订单；并修复历史现场单缺完成时间的问题。
          实付或应付为 0 也会出账，状态显示为「无需打款」。已打款账单不回刷。
        </Typography.Paragraph>
        <Form
          form={reconcileForm}
          layout="vertical"
          initialValues={{ range: [dayjs().subtract(60, 'day'), dayjs()] }}
          onFinish={(v) => void runReconcile(v)}
        >
          <Form.Item name="range" label="出账日区间（可留空则默认近 60 天）">
            <DatePicker.RangePicker style={{ width: '100%' }} />
          </Form.Item>
          <Button type="primary" htmlType="submit" block loading={reconciling}>
            开始核对
          </Button>
        </Form>
      </Modal>
    </div>
  );
 }
@@ -3,6 +3,8 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover" />
    <meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
    <title>城市合伙人</title>
    <link rel="preconnect" href="https://fonts.googleapis.com" />
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -0,0 +1,2 @@
 User-agent: *
 Allow: /
@@ -25,6 +25,7 @@ import LeaderboardPage from './pages/LeaderboardPage';
 import UsersManagePage from './pages/UsersManagePage';
 import AssocOrdersPage from './pages/AssocOrdersPage';
 import CommissionOrdersPage from './pages/CommissionOrdersPage';
 import ActivityPostersPage from './pages/ActivityPostersPage';
 function PrimaryRoutes() {
  return (
@@ -41,6 +42,7 @@ function PrimaryRoutes() {
      <Route path="/center/settlement" element={<SettlementPage />} />
      <Route path="/center/staff" element={<StaffListPage />} />
      <Route path="/center/staff/new" element={<StaffCreatePage />} />
      <Route path="/center/activity-posters" element={<ActivityPostersPage />} />
      <Route path="/center/assoc" element={<Navigate to="/users" replace />} />
      <Route path="/center/assoc/users" element={<Navigate to="/users" replace />} />
      <Route path="/users/orders" element={<AssocOrdersPage />} />
@@ -0,0 +1,248 @@
 import { useEffect, useRef, useState } from 'react';
 import type { ActivityPosterItem, PartnerAssocSummary } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import {
  copyActivityCopy,
  downloadBlob,
  fetchActivityPosterImage,
  fetchAssocQrcodeImage,
  getActivityPosterSelection,
  listActivityPosters,
  saveActivityPosterSelection,
 } from '../lib/activity-posters';
 import { toastError, toastSuccess } from '../lib/toast';
 import { blobToDataUrl, isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
 import { isWechatEnv } from '../lib/weixin';
 const NONE_ID = 'none';
 type Props = {
  initialId?: string | null;
 };
 export default function ActivityPosterPicker({ initialId }: Props) {
  const [items, setItems] = useState<ActivityPosterItem[]>([]);
  const [qrcodeUrl, setQrcodeUrl] = useState<string | null>(null);
  const [partnerId, setPartnerId] = useState<string>('');
  const [selectedId, setSelectedId] = useState<string>(NONE_ID);
  const [previewUrls, setPreviewUrls] = useState<Record<string, string>>({});
  const [listLoading, setListLoading] = useState(true);
  const [previewLoading, setPreviewLoading] = useState(false);
  const [downloading, setDownloading] = useState(false);
  const blobsRef = useRef(new Map<string, Blob>());
  const urlsRef = useRef<string[]>([]);
  useEffect(() => () => {
    urlsRef.current.forEach((url) => URL.revokeObjectURL(url));
  }, []);
  useEffect(() => {
    let cancelled = false;
    Promise.all([
      listActivityPosters(),
      request<PartnerAssocSummary>('PARTNER_H5', '/partner/assoc', { silent: true }),
      getActivityPosterSelection().catch(() => ({ posterId: null })),
    ])
      .then(([list, assoc, selection]) => {
        if (cancelled) return;
        setItems(list);
        setQrcodeUrl(assoc.qrcodeUrl);
        setPartnerId(assoc.partnerId);
        const saved = selection.posterId && list.some((item) => item.id === selection.posterId)
          ? selection.posterId
          : null;
        const fromQuery = initialId && list.some((item) => item.id === initialId) ? initialId : null;
        const next = saved || fromQuery || NONE_ID;
        setSelectedId(next);
        if (!saved && fromQuery) {
          void saveActivityPosterSelection(fromQuery).catch((err) => {
            toastError(err instanceof Error ? err.message : '保存失败');
          });
        }
      })
      .catch((e) => toastError(e instanceof Error ? e.message : '加载活动图失败'))
      .finally(() => {
        if (!cancelled) setListLoading(false);
      });
    return () => {
      cancelled = true;
    };
  }, [initialId]);
  useEffect(() => {
    if (selectedId === NONE_ID || previewUrls[selectedId] || blobsRef.current.has(selectedId)) return;
    let cancelled = false;
    setPreviewLoading(true);
    fetchActivityPosterImage(selectedId)
      .then((blob) => {
        if (cancelled) return;
        blobsRef.current.set(selectedId, blob);
        const url = URL.createObjectURL(blob);
        urlsRef.current.push(url);
        setPreviewUrls((prev) => ({ ...prev, [selectedId]: url }));
      })
      .catch((e) => {
        if (!cancelled) toastError(e instanceof Error ? e.message : '预览失败');
      })
      .finally(() => {
        if (!cancelled) setPreviewLoading(false);
      });
    return () => {
      cancelled = true;
    };
  }, [selectedId, previewUrls]);
  const selected = items.find((item) => item.id === selectedId) ?? null;
  const previewUrl = selectedId !== NONE_ID ? previewUrls[selectedId] : undefined;
  async function downloadSelected() {
    setDownloading(true);
    try {
      if (selectedId === NONE_ID) {
        if (isWechatEnv() && isHttpImageUrl(qrcodeUrl)) {
          await previewSaveableImage(qrcodeUrl);
          return;
        }
        const blob = await fetchAssocQrcodeImage();
        if (isWechatEnv()) {
          setQrcodeUrl(await blobToDataUrl(blob));
          toastSuccess('请长按上方图片保存到相册');
          return;
        }
        downloadBlob(blob, `partner-assoc-${partnerId || 'qr'}.png`);
        toastSuccess('已开始下载');
        return;
      }
      if (!selected) return;
      let blob = blobsRef.current.get(selected.id);
      if (!blob) {
        blob = await fetchActivityPosterImage(selected.id);
        blobsRef.current.set(selected.id, blob);
      }
      if (isWechatEnv()) {
        let url = previewUrls[selected.id];
        if (!url || url.startsWith('blob:')) {
          url = await blobToDataUrl(blob);
          setPreviewUrls((prev) => ({ ...prev, [selected.id]: url }));
        }
        toastSuccess('请长按上方图片保存到相册');
        return;
      }
      downloadBlob(blob, `activity-poster-${selected.id}.png`);
      toastSuccess('已开始下载');
    } catch (e) {
      toastError(e instanceof Error ? e.message : '下载失败');
    } finally {
      setDownloading(false);
    }
  }
  async function selectPoster(id: string) {
    const prev = selectedId;
    setSelectedId(id);
    try {
      await saveActivityPosterSelection(id === NONE_ID ? null : id);
    } catch (e) {
      setSelectedId(prev);
      toastError(e instanceof Error ? e.message : '保存失败');
    }
  }
  function renderRadioRow(id: string, label: string) {
    return (
      <label className="partner-activity-radio-row">
        <span className="headline-md">{label}</span>
        <input
          type="radio"
          name="activity-poster"
          checked={selectedId === id}
          onChange={() => void selectPoster(id)}
        />
      </label>
    );
  }
  if (listLoading) {
    return <div className="empty">加载活动图…</div>;
  }
  return (
    <div className="partner-activity-picker">
      <section className="partner-bill-card" style={{ overflow: 'hidden' }}>
        {renderRadioRow(NONE_ID, '无')}
        {selectedId === NONE_ID && (
          <div className="partner-activity-panel">
            {qrcodeUrl ? (
              <div className="partner-activity-preview partner-activity-preview--qr">
                <img className="partner-longpress-img" src={qrcodeUrl} alt="关联码" />
              </div>
            ) : (
              <p className="body-md text-muted" style={{ marginBottom: 12 }}>关联码尚未生成</p>
            )}
            <button
              type="button"
              className="partner-btn-primary"
              disabled={downloading || !qrcodeUrl}
              onClick={() => void downloadSelected()}
            >
              {downloading ? '下载中…' : '下载二维码'}
            </button>
            {isWechatEnv() && (
              <p className="label-md text-muted" style={{ marginTop: 12 }}>
                微信内请长按上方图片保存
              </p>
            )}
          </div>
        )}
      </section>
      {items.map((item) => (
        <section key={item.id} className="partner-bill-card" style={{ marginTop: 12, overflow: 'hidden' }}>
          {renderRadioRow(item.id, item.title)}
          {selectedId === item.id && (
            <div className="partner-activity-panel">
              <div className="partner-activity-preview">
                <img className="partner-longpress-img" src={previewUrl || item.imageUrl} alt={item.title} />
                {previewLoading && !previewUrl && (
                  <div className="partner-activity-preview-mask">正在贴入二维码…</div>
                )}
              </div>
              {item.copyText ? (
                <p className="body-md" style={{ whiteSpace: 'pre-wrap', margin: '12px 0' }}>{item.copyText}</p>
              ) : (
                <p className="body-md text-muted" style={{ margin: '12px 0' }}>暂无推广文案</p>
              )}
              <div style={{ display: 'flex', gap: 12 }}>
                <button
                  type="button"
                  className="partner-btn-outline"
                  onClick={() => {
                    void copyActivityCopy(item.copyText)
                      .then(() => toastSuccess('文案已复制'))
                      .catch((e) => toastError(e instanceof Error ? e.message : '复制失败'));
                  }}
                >
                  复制文案
                </button>
                <button
                  type="button"
                  className="partner-btn-primary"
                  style={{ flex: 1, width: 'auto', padding: 0, height: 48 }}
                  disabled={downloading || previewLoading}
                  onClick={() => void downloadSelected()}
                >
                  {downloading || previewLoading ? '生成中…' : '下载活动图'}
                </button>
              </div>
              {previewUrl && isWechatEnv() && (
                <p className="label-md text-muted" style={{ marginTop: 12 }}>
                  微信内请长按上方图片保存
                </p>
              )}
            </div>
          )}
        </section>
      ))}
    </div>
  );
 }
@@ -0,0 +1,74 @@
 import type { ActivityPosterItem, ActivityPosterSelection } from '@dukang/shared-types';
 import { request } from './api';
 export async function listActivityPosters() {
  const data = await request<ActivityPosterItem[]>('PARTNER_H5', '/partner/activity-posters', {
    silent: true,
  });
  return Array.isArray(data) ? data : [];
 }
 export async function fetchAssocQrcodeImage(): Promise<Blob> {
  const token = localStorage.getItem('accessToken');
  const res = await fetch('/api/v1/partner/assoc/qrcode', {
    headers: {
      Authorization: token ? `Bearer ${token}` : '',
      'X-Client-App': 'PARTNER_H5',
    },
  });
  if (!res.ok) throw new Error('下载二维码失败');
  return res.blob();
 }
 export async function fetchActivityPosterImage(id: string): Promise<Blob> {
  const token = localStorage.getItem('accessToken');
  const res = await fetch(`/api/v1/partner/activity-posters/${id}/image`, {
    headers: {
      Authorization: token ? `Bearer ${token}` : '',
      'X-Client-App': 'PARTNER_H5',
    },
  });
  if (!res.ok) {
    const json = await res.json().catch(() => null) as { message?: string } | null;
    throw new Error(json?.message || '生成活动图失败');
  }
  return res.blob();
 }
 export function downloadBlob(blob: Blob, fileName: string) {
  const url = URL.createObjectURL(blob);
  const a = document.createElement('a');
  a.href = url;
  a.download = fileName;
  a.click();
  URL.revokeObjectURL(url);
 }
 export async function getActivityPosterSelection() {
  return request<ActivityPosterSelection>('PARTNER_H5', '/partner/activity-posters/selection', {
    silent: true,
  });
 }
 export async function saveActivityPosterSelection(posterId: string | null) {
  return request<ActivityPosterSelection>('PARTNER_H5', '/partner/activity-posters/selection', {
    method: 'PUT',
    body: JSON.stringify({ posterId }),
    silent: true,
  });
 }
 export async function copyActivityCopy(text: string) {
  const value = text.trim();
  if (!value) throw new Error('暂无文案');
  try {
    await navigator.clipboard.writeText(value);
  } catch {
    const ta = document.createElement('textarea');
    ta.value = value;
    document.body.appendChild(ta);
    ta.select();
    document.execCommand('copy');
    document.body.removeChild(ta);
  }
 }
@@ -0,0 +1,31 @@
 import { isHttpImageUrl } from '@dukang/weixin-sdk';
 import { toastSuccess } from './toast';
 import { isWechatEnv, weixinSdk } from './weixin';
 export { isHttpImageUrl };
 export function blobToDataUrl(blob: Blob): Promise<string> {
  return new Promise((resolve, reject) => {
    const reader = new FileReader();
    reader.onload = () => resolve(String(reader.result || ''));
    reader.onerror = () => reject(new Error('读取图片失败'));
    reader.readAsDataURL(blob);
  });
 }
 /**
 * 微信内用 previewImage 打开可公网访问的图片，用户长按即可保存。
 * blob / data URL 不能走该接口。
 */
 export async function previewSaveableImage(url: string): Promise<boolean> {
  const href = url.trim();
  if (!isWechatEnv() || !isHttpImageUrl(href)) return false;
  try {
    await weixinSdk.previewImage(href);
    toastSuccess('请长按图片保存到相册');
    return true;
  } catch {
    toastSuccess('请长按上方图片保存到相册');
    return false;
  }
 }
@@ -0,0 +1,25 @@
 import { useEffect } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import ActivityPosterPicker from '../components/ActivityPosterPicker';
 import { usePartnerPageView } from '../lib/usePageView';
 export default function ActivityPostersPage() {
  usePartnerPageView('partner_activity_posters_view');
  const navigate = useNavigate();
  const [searchParams] = useSearchParams();
  const initialId = searchParams.get('id');
  useEffect(() => {
    document.title = '活动图';
  }, []);
  return (
    <div>
      <PageHeader title="活动图" onBack={() => navigate(-1)} />
      <div style={{ padding: 16 }}>
        <ActivityPosterPicker initialId={initialId} />
      </div>
    </div>
  );
 }
@@ -4,6 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader';
 import type { PartnerAssocSummary } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { toastError, toastSuccess } from '../lib/toast';
 import { isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
 import { isWechatEnv } from '../lib/weixin';
 import { usePartnerPageView } from '../lib/usePageView';
@@ -11,7 +12,6 @@ export default function AssocQrcodePage() {
  usePartnerPageView('partner_assoc_qrcode_view');
  const navigate = useNavigate();
  const [summary, setSummary] = useState<PartnerAssocSummary | null>(null);
  const [previewUrl, setPreviewUrl] = useState<string | null>(null);
  const [loading, setLoading] = useState(true);
  useEffect(() => {
@@ -21,11 +21,12 @@ export default function AssocQrcodePage() {
      .finally(() => setLoading(false));
  }, []);
  useEffect(() => () => {
    if (previewUrl) URL.revokeObjectURL(previewUrl);
  }, [previewUrl]);
  async function downloadQr() {
    const publicUrl = summary?.qrcodeUrl;
    if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
      await previewSaveableImage(publicUrl);
      return;
    }
    const token = localStorage.getItem('accessToken');
    try {
      const res = await fetch('/api/v1/partner/assoc/qrcode', {
@@ -37,11 +38,6 @@ export default function AssocQrcodePage() {
      if (!res.ok) throw new Error('下载失败');
      const blob = await res.blob();
      const url = URL.createObjectURL(blob);
      if (isWechatEnv()) {
        setPreviewUrl(url);
        toastSuccess('请长按图片保存到相册');
        return;
      }
      const a = document.createElement('a');
      a.href = url;
      a.download = `partner-assoc-${summary?.partnerId || 'qr'}.png`;
@@ -49,9 +45,8 @@ export default function AssocQrcodePage() {
      URL.revokeObjectURL(url);
      toastSuccess('已开始下载');
    } catch (e) {
-      if (summary?.qrcodeUrl) {
+      if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
-        setPreviewUrl(summary.qrcodeUrl);
+        await previewSaveableImage(publicUrl);
        toastSuccess('请长按图片保存到相册');
        return;
      }
      toastError(e instanceof Error ? e.message : '下载失败');
@@ -70,7 +65,8 @@ export default function AssocQrcodePage() {
            </p>
            {summary?.qrcodeUrl ? (
              <img
-                src={previewUrl || summary.qrcodeUrl}
+                className="partner-longpress-img"
                src={summary.qrcodeUrl}
                alt="关联码"
                style={{ width: 220, height: 220, background: '#fff' }}
              />
@@ -83,11 +79,11 @@ export default function AssocQrcodePage() {
            <button type="button" className="partner-btn-primary" style={{ marginTop: 20 }} onClick={() => void downloadQr()}>
              下载二维码
            </button>
-            {previewUrl && isWechatEnv() && (
+            {isWechatEnv() && summary?.qrcodeUrl ? (
              <p className="label-md text-muted" style={{ marginTop: 12 }}>
-                微信内请长按上方图片保存
+                微信内请点「下载二维码」后长按保存
              </p>
-            )}
+            ) : null}
          </div>
        </section>
      )}
@@ -219,6 +219,15 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
                  <span className="material-symbols-outlined text-muted">chevron_right</span>
                </div>
              </Link>
              <Link to="/center/activity-posters" className="partner-menu-item">
                <div className="partner-menu-item-left">
                  <div className="partner-menu-icon">
                    <span className="material-symbols-outlined">image</span>
                  </div>
                  <span className="body-md" style={{ fontSize: 16 }}>活动图</span>
                </div>
                <span className="material-symbols-outlined text-muted">chevron_right</span>
              </Link>
              <Link to="/users" className="partner-menu-item">
                <div className="partner-menu-item-left">
                  <div className="partner-menu-icon">
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import type {
  PartnerAssocSummary,
@@ -7,7 +7,13 @@ import type {
  PartnerAssocUserSort,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import {
  downloadBlob,
  fetchActivityPosterImage,
  fetchAssocQrcodeImage,
 } from '../lib/activity-posters';
 import { toastError, toastSuccess } from '../lib/toast';
 import { blobToDataUrl, isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
 import { isWechatEnv } from '../lib/weixin';
 import { usePartnerPageView } from '../lib/usePageView';
@@ -36,6 +42,8 @@ export default function UsersManagePage() {
  const [searchParams] = useSearchParams();
  const [summary, setSummary] = useState<PartnerAssocSummary | null>(null);
  const [previewUrl, setPreviewUrl] = useState<string | null>(null);
  const [heroUrl, setHeroUrl] = useState<string | null>(null);
  const [heroLoading, setHeroLoading] = useState(false);
  const [items, setItems] = useState<PartnerAssocUserItem[]>([]);
  const [total, setTotal] = useState(0);
  const [loading, setLoading] = useState(true);
@@ -51,9 +59,37 @@ export default function UsersManagePage() {
  }, []);
  useEffect(() => () => {
-    if (previewUrl) URL.revokeObjectURL(previewUrl);
+    if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
  }, [previewUrl]);
  useEffect(() => {
    const posterId = summary?.activityPosterId;
    if (!posterId) {
      setHeroUrl(null);
      setHeroLoading(false);
      return;
    }
    let cancelled = false;
    const acc = { url: null as string | null };
    setHeroLoading(true);
    fetchActivityPosterImage(posterId)
      .then((blob) => {
        if (cancelled) return;
        acc.url = URL.createObjectURL(blob);
        setHeroUrl(acc.url);
      })
      .catch(() => {
        if (!cancelled) setHeroUrl(null);
      })
      .finally(() => {
        if (!cancelled) setHeroLoading(false);
      });
    return () => {
      cancelled = true;
      if (acc.url) URL.revokeObjectURL(acc.url);
    };
  }, [summary?.activityPosterId]);
  const loadSummary = useCallback(async () => {
    const data = await request<PartnerAssocSummary>('PARTNER_H5', '/partner/assoc');
    setSummary(data);
@@ -93,31 +129,32 @@ export default function UsersManagePage() {
    if (uid) navigate(`/users/${uid}/orders`, { replace: true });
  }, [searchParams, navigate]);
-  async function downloadQr() {
+  async function downloadMainImage() {
-    const token = localStorage.getItem('accessToken');
+    const posterId = summary?.activityPosterId;
    try {
-      const res = await fetch('/api/v1/partner/assoc/qrcode', {
+      if (isWechatEnv() && !posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
-        headers: {
+        await previewSaveableImage(summary.qrcodeUrl);
          Authorization: token ? `Bearer ${token}` : '',
          'X-Client-App': 'PARTNER_H5',
        },
      });
      if (!res.ok) throw new Error('下载失败');
      const blob = await res.blob();
      const url = URL.createObjectURL(blob);
      if (isWechatEnv()) {
        setPreviewUrl(url);
        toastSuccess('请长按图片保存到相册');
        return;
      }
-      const a = document.createElement('a');
+      const blob = posterId
-      a.href = url;
+        ? await fetchActivityPosterImage(posterId)
-      a.download = `partner-assoc-${summary?.partnerId || 'qr'}.png`;
+        : await fetchAssocQrcodeImage();
-      a.click();
+      if (isWechatEnv()) {
-      URL.revokeObjectURL(url);
+        if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
        setPreviewUrl(await blobToDataUrl(blob));
        toastSuccess('请长按上方图片保存到相册');
        return;
      }
      downloadBlob(blob, posterId
        ? `activity-poster-${posterId}.png`
        : `partner-assoc-${summary?.partnerId || 'qr'}.png`);
      toastSuccess('已开始下载');
    } catch (e) {
-      if (summary?.qrcodeUrl) {
+      if (!posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
        if (isWechatEnv()) {
          await previewSaveableImage(summary.qrcodeUrl);
          return;
        }
        setPreviewUrl(summary.qrcodeUrl);
        toastSuccess('请长按图片保存到相册');
        return;
@@ -153,9 +190,19 @@ export default function UsersManagePage() {
          <p className="body-md text-muted" style={{ marginBottom: 12 }}>
            用户扫码后首次锁定，后续购酒计入关联订单
          </p>
-          {summary?.qrcodeUrl ? (
+          {summary?.activityPosterId && (previewUrl || heroUrl) ? (
            <img
-              src={previewUrl || summary.qrcodeUrl}
+              className="partner-longpress-img"
              src={previewUrl || heroUrl || ''}
              alt="活动图"
              style={{ width: '100%', maxWidth: 360, background: '#f5f5f5' }}
            />
          ) : summary?.activityPosterId && heroLoading ? (
            <p className="body-md text-muted">正在生成活动图…</p>
          ) : previewUrl || summary?.qrcodeUrl ? (
            <img
              className="partner-longpress-img"
              src={previewUrl || summary?.qrcodeUrl || ''}
              alt="关联码"
              style={{ width: 200, height: 200, background: '#fff' }}
            />
@@ -165,14 +212,28 @@ export default function UsersManagePage() {
          <p className="label-md text-muted" style={{ marginTop: 8 }}>
            已关联 {summary?.userCount ?? total} 人
          </p>
-          <button type="button" className="partner-btn-primary" style={{ marginTop: 16 }} onClick={() => void downloadQr()}>
+          <button type="button" className="partner-btn-primary" style={{ marginTop: 16 }} onClick={() => void downloadMainImage()}>
-            下载二维码
+            {summary?.activityPosterId ? '下载活动图' : '下载二维码'}
          </button>
-          {previewUrl && isWechatEnv() && (
+          {isWechatEnv() && (previewUrl || summary?.qrcodeUrl) ? (
-            <p className="label-md text-muted" style={{ marginTop: 8 }}>微信内请长按上方图片保存</p>
+            <p className="label-md text-muted" style={{ marginTop: 8 }}>
-          )}
+              微信内请点「{summary?.activityPosterId ? '下载活动图' : '下载二维码'}」后长按保存
            </p>
          ) : null}
        </section>
        <Link to="/center/activity-posters" className="partner-menu-card" style={{ display: 'block', marginBottom: 20, textDecoration: 'none', color: 'inherit' }}>
          <div className="partner-menu-item">
            <div className="partner-menu-item-left">
              <div className="partner-menu-icon">
                <span className="material-symbols-outlined">image</span>
              </div>
              <span className="body-md" style={{ fontSize: 16 }}>活动图</span>
            </div>
            <span className="material-symbols-outlined text-muted">chevron_right</span>
          </div>
        </Link>
        <h2 className="headline-md" style={{ marginBottom: 12 }}>已关联用户</h2>
        <div className="partner-search">
          <span className="material-symbols-outlined">search</span>
@@ -3971,3 +3971,127 @@ header:has(> .app-page-title:only-child),
  padding: 20px 20px calc(20px + env(safe-area-inset-bottom, 0px));
  box-sizing: border-box;
 }
 .partner-activity-scroll {
  display: flex;
  gap: 10px;
  overflow-x: auto;
  padding-bottom: 4px;
  -webkit-overflow-scrolling: touch;
 }
 .partner-activity-chip {
  flex: 0 0 92px;
  border: 1px solid var(--color-outline-variant, #eee);
  border-radius: 12px;
  background: #fff;
  padding: 6px;
  text-align: left;
  cursor: pointer;
 }
 .partner-activity-chip img {
  width: 100%;
  height: 92px;
  object-fit: cover;
  border-radius: 8px;
  display: block;
  background: #f5f5f5;
 }
 .partner-activity-chip span {
  display: block;
  margin-top: 6px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
 .partner-activity-chip.is-active {
  border-color: var(--color-heritage-red);
  box-shadow: 0 0 0 1px var(--color-heritage-red);
 }
 .partner-activity-preview {
  position: relative;
  background: #f5f5f5;
 }
 .partner-activity-preview img {
  width: 100%;
  display: block;
 }
 .partner-activity-preview-mask {
  position: absolute;
  inset: 0;
  display: flex;
  align-items: center;
  justify-content: center;
  background: rgba(255, 255, 255, 0.62);
  color: var(--color-on-surface-variant, #666);
  font-size: 14px;
 }
 .partner-activity-center-card {
  flex: 0 0 120px;
  text-decoration: none;
  color: inherit;
 }
 .partner-activity-center-card img {
  width: 100%;
  height: 120px;
  object-fit: cover;
  border-radius: 12px;
  display: block;
  background: #f5f5f5;
 }
 .partner-activity-center-card span {
  display: block;
  margin-top: 6px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
 .partner-activity-radio-row {
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 12px;
  padding: 14px 16px;
  cursor: pointer;
 }
 .partner-activity-radio-row input[type='radio'] {
  width: 20px;
  height: 20px;
  flex-shrink: 0;
  accent-color: var(--color-heritage-red);
 }
 .partner-activity-panel {
  padding: 0 16px 16px;
 }
 .partner-activity-preview--qr {
  display: flex;
  justify-content: center;
  background: #fff;
  margin-bottom: 12px;
 }
 .partner-activity-preview--qr img {
  width: 200px;
  height: 200px;
 }
 /* 微信内长按保存：不要禁用系统菜单 */
 img.partner-longpress-img {
  -webkit-touch-callout: default;
  -webkit-user-select: none;
  user-select: none;
  pointer-events: auto;
 }
@@ -3,6 +3,8 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
    <meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
    <meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
    <title>门店管理中心</title>
    <link rel="preconnect" href="https://fonts.googleapis.com" />
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -0,0 +1,2 @@
 User-agent: *
 Allow: /
@@ -14,6 +14,9 @@ const API_ORIGIN =
  (isDevMode ? 'http://192.168.1.10:3010' : 'https://api.dukanghaoke.com');
 const requireFromApp = createRequire(path.resolve(__dirname, '../package.json'));
 const { version: APP_PKG_VERSION } = requireFromApp(path.resolve(__dirname, '../package.json')) as {
  version: string;
 };
 /** 解析包目录/文件，避免 pnpm/Vite 把同一 runtime 打成两份 → useDidShow 读到空 reactMeta */
 function resolvePkgFile(id: string): string {
@@ -54,6 +57,7 @@ export default defineConfig(async () => ({
  },
  defineConstants: {
    TARO_APP_API_ORIGIN: JSON.stringify(API_ORIGIN),
    TARO_APP_VERSION: JSON.stringify(APP_PKG_VERSION),
  },
  copy: {
    patterns: [
@@ -1,6 +1,6 @@
 {
  "name": "@dukang/mini-user",
-  "version": "3.5.16",
+  "version": "4.0.4",
  "private": true,
  "description": "杜康好客 · C 端用户微信小程序（Taro）",
  "scripts": {
@@ -4,6 +4,7 @@ export default defineAppConfig({
    'pages/stores/index',
    'pages/benefit/index',
    'pages/mine/index',
    'pages/open/index',
  ],
  subPackages: [
    { root: 'pages/product-detail', pages: ['index'] },
@@ -7,7 +7,7 @@
@import './styles/mine.css';
@import './styles/address.css';
@import './styles/benefit-promo.css';
-@import './components/JiuzuSplash.css';
+@import './components/HomeSplash.css';
 page,
 body {
@@ -6,14 +6,12 @@ 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 { prefetchJiuzuSplashAssets } from './lib/jiuzu-splash';
 import './app.css';
 // H5：在首屏 page hooks 执行前，把 Taro.useDidShow 等绑到与 createReactApp 同一份 runtime
 patchTaroH5Hooks();
 installClientErrorReporting();
 prefetchShareBrandAssets();
 prefetchJiuzuSplashAssets();
 function App({ children }: PropsWithChildren) {
  const handlingRef = useRef(false);
@@ -4,14 +4,14 @@ import Taro, { useDidShow } from '@tarojs/taro';
 import { handleWechatOrderConfirmShow } from './lib/wechat-order-confirm';
 import { installClientErrorReporting } from './lib/client-error';
 import { prefetchShareBrandAssets } from './lib/wechat-share';
-import { prefetchJiuzuSplashAssets } from './lib/jiuzu-splash';
+import { prefetchHomeSplashAssets } from './lib/home-splash';
 import { capturePromoSceneAndTouchScan } from './lib/promo';
 import { initClientVersionChecks } from './lib/client-version';
 import './app.css';
 installClientErrorReporting();
 prefetchShareBrandAssets();
-prefetchJiuzuSplashAssets();
+prefetchHomeSplashAssets();
 function App({ children }: PropsWithChildren) {
  const handlingRef = useRef(false);
@@ -3,7 +3,7 @@ import { Button, Text } from '@tarojs/components';
 import type { ReactNode } from 'react';
 import { toast } from '../lib/api';
 import { getBrandAssetsSync, loadBrandAssets } from '../lib/brand-assets';
-import { formatOpenCsError, openWecomCustomerServiceChat } from '../lib/wecom-cs';
+import { buildCsSharePath, buildCsShareTitle, formatOpenCsError, openWecomCustomerServiceChat } from '../lib/wecom-cs';
 export type ContactCsSessionContext = {
  orderId?: string;
@@ -91,6 +91,9 @@ export default function ContactCsButton({
      className={className}
      openType="contact"
      sessionFrom={buildCsSessionFrom(session)}
      showMessageCard
      sendMessageTitle={buildCsShareTitle(session?.orderNo)}
      sendMessagePath={buildCsSharePath(session?.orderId)}
      hoverClass="none"
    >
      {typeof children === 'string' ? <Text>{children}</Text> : children}
@@ -0,0 +1,272 @@
 /* 首页开场：半透明底 + 酒瓶 + 分流光 + 文字渐显 */
 .home-splash {
  position: fixed;
  top: 0;
  right: 0;
  bottom: 0;
  left: 0;
  z-index: 10010;
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
  overflow: hidden;
  pointer-events: auto;
 }
 .home-splash--out {
  animation: home-splash-out 0.8s ease-in forwards;
  pointer-events: none;
 }
 .home-splash-veil {
  position: absolute;
  z-index: 0;
  top: 0;
  right: 0;
  bottom: 0;
  left: 0;
  background-color: rgba(20, 8, 8, 0.58);
  background-image: radial-gradient(
    ellipse at 50% 48%,
    rgba(166, 29, 36, 0.42) 0%,
    rgba(20, 8, 8, 0.62) 62%,
    rgba(10, 4, 4, 0.72) 100%
  );
  opacity: 0;
  animation: home-splash-fade 0.7s ease-out forwards;
 }
 .home-splash-copy {
  position: relative;
  z-index: 3;
  display: flex;
  flex-direction: column;
  align-items: center;
  margin-bottom: 8px;
 }
 .home-splash-title {
  font-family: 'Songti SC', 'STSong', 'Noto Serif SC', 'PingFang SC', serif;
  font-size: 40px;
  font-weight: 700;
  line-height: 1.2;
  letter-spacing: 0.22em;
  color: #f5d76e;
  text-shadow: 0 0 14px rgba(255, 191, 0, 0.55), 0 2px 10px rgba(20, 8, 8, 0.45);
  opacity: 0;
  animation: home-splash-fade 1.1s 0.65s ease-out forwards;
 }
 .home-splash-sub {
  margin-top: 10px;
  font-size: 13px;
  letter-spacing: 0.16em;
  color: rgba(255, 248, 210, 0.88);
  opacity: 0;
  animation: home-splash-fade 1.1s 1.35s ease-out forwards;
 }
 .home-splash-stage {
  position: relative;
  z-index: 2;
  width: 220px;
  height: 420px;
  overflow: hidden;
  opacity: 0;
  animation: home-splash-fade 1s 0.2s ease-out forwards;
 }
 .home-splash-glow {
  position: absolute;
  z-index: 0;
  left: 18px;
  right: 18px;
  top: 18%;
  bottom: 8%;
  border-radius: 50%;
  background: radial-gradient(ellipse at 50% 50%, rgba(255, 191, 0, 0.34) 0%, rgba(255, 191, 0, 0) 72%);
  opacity: 0;
  animation: home-splash-glow 2.6s 0.8s ease-in-out infinite;
 }
 .home-splash-beam {
  position: absolute;
  z-index: 1;
  top: 0;
  bottom: 0;
  left: 50%;
  width: 46px;
  margin-left: -23px;
  background: linear-gradient(
    180deg,
    rgba(255, 248, 210, 0) 0%,
    rgba(255, 248, 210, 0.16) 28%,
    rgba(255, 191, 0, 0.22) 50%,
    rgba(255, 248, 210, 0.1) 78%,
    rgba(255, 248, 210, 0) 100%
  );
  opacity: 0;
  animation: home-splash-beam 3.2s 1.1s ease-in-out infinite;
 }
 .home-splash-bottle {
  position: relative;
  z-index: 2;
  display: block;
  width: 220px;
  height: 420px;
 }
 .home-splash-bottle img {
  width: 100%;
  height: 100%;
  object-fit: contain;
 }
 .home-splash-lights {
  position: absolute;
  z-index: 3;
  top: 0;
  left: 0;
  width: 220px;
  height: 420px;
  overflow: hidden;
  pointer-events: none;
  -webkit-mask-size: contain;
  mask-size: contain;
  -webkit-mask-repeat: no-repeat;
  mask-repeat: no-repeat;
  -webkit-mask-position: center;
  mask-mode: alpha;
 }
 .home-splash-sheen {
  position: absolute;
  z-index: 3;
  top: -12%;
  bottom: -12%;
  pointer-events: none;
  opacity: 0;
 }
 .home-splash-sheen--a {
  width: 48px;
  left: 0;
  background: linear-gradient(
    90deg,
    rgba(255, 255, 255, 0) 0%,
    rgba(255, 248, 210, 0.08) 28%,
    rgba(255, 248, 210, 0.55) 50%,
    rgba(255, 191, 0, 0.18) 72%,
    rgba(255, 255, 255, 0) 100%
  );
  transform: translateX(-70px) skewX(-22deg);
  animation: home-splash-sheen-a 2.8s 1.4s ease-in-out infinite;
 }
 .home-splash-sheen--b {
  width: 22px;
  left: 0;
  background: linear-gradient(
    90deg,
    rgba(255, 255, 255, 0) 0%,
    rgba(255, 255, 255, 0.42) 50%,
    rgba(255, 255, 255, 0) 100%
  );
  transform: translateX(-50px) skewX(-18deg);
  animation: home-splash-sheen-b 3.6s 2.3s ease-in-out infinite;
 }
 .home-splash-skip {
  position: absolute;
  top: 16px;
  right: 16px;
  z-index: 4;
  padding: 6px 14px;
  border-radius: 999px;
  border: 1px solid rgba(245, 215, 110, 0.45);
  background: rgba(20, 8, 8, 0.35);
  opacity: 0;
  animation: home-splash-fade 0.6s 0.35s ease-out forwards;
 }
 .home-splash-skip-text {
  color: rgba(255, 248, 210, 0.92);
  font-size: 12px;
  line-height: 1.4;
  letter-spacing: 0.08em;
 }
@keyframes home-splash-fade {
  from {
    opacity: 0;
  }
  to {
    opacity: 1;
  }
 }
@keyframes home-splash-out {
  from {
    opacity: 1;
  }
  to {
    opacity: 0;
  }
 }
@keyframes home-splash-glow {
  0%,
  100% {
    opacity: 0.35;
  }
  50% {
    opacity: 0.85;
  }
 }
@keyframes home-splash-beam {
  0%,
  100% {
    opacity: 0;
  }
  40% {
    opacity: 0.7;
  }
  70% {
    opacity: 0.15;
  }
 }
@keyframes home-splash-sheen-a {
  0% {
    opacity: 0;
    transform: translateX(-70px) skewX(-22deg);
  }
  18% {
    opacity: 1;
  }
  82% {
    opacity: 0.7;
  }
  100% {
    opacity: 0;
    transform: translateX(250px) skewX(-22deg);
  }
 }
@keyframes home-splash-sheen-b {
  0% {
    opacity: 0;
    transform: translateX(-40px) skewX(-18deg);
  }
  22% {
    opacity: 0.9;
  }
  100% {
    opacity: 0;
    transform: translateX(240px) skewX(-18deg);
  }
 }
@@ -0,0 +1,121 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Image, Text, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import { HOME_SPLASH_BOTTLE_URL } from '@dukang/shared-types';
 import { markHomeSplashPlayed } from '../lib/home-splash';
 const SPLASH_NAV_BG = '#140808';
 const HOME_NAV_BG = '#FAF9F7';
 const FADE_AT_MS = 4800;
 const FADE_MS = 800;
 type HomeSplashProps = {
  onDone: () => void;
 };
 function applySplashChrome() {
  try {
    void Taro.hideTabBar({ animation: false });
  } catch {
    /* H5 无原生 TabBar */
  }
  void Taro.setNavigationBarColor({
    frontColor: '#ffffff',
    backgroundColor: SPLASH_NAV_BG,
    animation: { duration: 200, timingFunc: 'easeIn' },
  }).catch(() => {});
 }
 function restoreChrome() {
  try {
    void Taro.showTabBar({ animation: false });
  } catch {
    /* H5 无原生 TabBar */
  }
  void Taro.setNavigationBarColor({
    frontColor: '#000000',
    backgroundColor: HOME_NAV_BG,
    animation: { duration: 200, timingFunc: 'easeOut' },
  }).catch(() => {});
 }
 export default function HomeSplash({ onDone }: HomeSplashProps) {
  const finishedRef = useRef(false);
  const fadingRef = useRef(false);
  const onDoneRef = useRef(onDone);
  onDoneRef.current = onDone;
  const [leaving, setLeaving] = useState(false);
  const finish = useCallback(() => {
    if (finishedRef.current) return;
    finishedRef.current = true;
    restoreChrome();
    onDoneRef.current();
  }, []);
  const beginExit = useCallback(() => {
    if (fadingRef.current || finishedRef.current) return;
    fadingRef.current = true;
    setLeaving(true);
    setTimeout(finish, FADE_MS);
  }, [finish]);
  useEffect(() => {
    markHomeSplashPlayed();
    applySplashChrome();
    const timer = setTimeout(beginExit, FADE_AT_MS);
    return () => {
      clearTimeout(timer);
      if (!finishedRef.current) restoreChrome();
    };
  }, [beginExit]);
  return (
    <View
      className={`home-splash${leaving ? ' home-splash--out' : ''}`}
      catchMove
      onTouchMove={(e) => {
        e.stopPropagation?.();
      }}
    >
      <View className="home-splash-veil" />
      <View className="home-splash-copy">
        <Text className="home-splash-title">杜康好客</Text>
        <Text className="home-splash-sub">购杜康好酒，赠好客权益</Text>
      </View>
      <View className="home-splash-stage">
        <View className="home-splash-glow" />
        <Image
          className="home-splash-bottle"
          src={HOME_SPLASH_BOTTLE_URL}
          mode="aspectFit"
          style={{ width: '220px', height: '420px' }}
        />
        <View
          className="home-splash-lights"
          style={{
            width: '220px',
            height: '420px',
            WebkitMaskImage: `url(${HOME_SPLASH_BOTTLE_URL})`,
            maskImage: `url(${HOME_SPLASH_BOTTLE_URL})`,
            WebkitMaskSize: 'contain',
            maskSize: 'contain',
            WebkitMaskRepeat: 'no-repeat',
            maskRepeat: 'no-repeat',
            WebkitMaskPosition: 'center',
          }}
        >
          <View className="home-splash-beam" />
          <View className="home-splash-sheen home-splash-sheen--a" />
          <View className="home-splash-sheen home-splash-sheen--b" />
        </View>
      </View>
      <View className="home-splash-skip" onClick={finish}>
        <Text className="home-splash-skip-text">跳过</Text>
      </View>
    </View>
  );
 }
@@ -1,266 +0,0 @@
 /* 酒祖杜康开场：黑红底 → GIF 播完消失 → 四字上移 → 副标题跟上 */
 .jiuzu-splash {
  position: fixed;
  top: 0;
  right: 0;
  bottom: 0;
  left: 0;
  z-index: 10010;
  overflow: hidden;
  background-color: #140808;
  background-image: radial-gradient(ellipse at 50% 42%, #5a1014 0%, #2a080a 48%, #140808 100%);
  animation: jiuzu-bg-in 0.35s ease-out both;
 }
 .jiuzu-splash--out {
  animation: jiuzu-bg-out 0.8s ease-in forwards;
  pointer-events: none;
 }
 .jiuzu-splash-mist {
  position: absolute;
  z-index: 0;
  border-radius: 50%;
  pointer-events: none;
  filter: blur(48px);
 }
 .jiuzu-splash-mist--a {
  width: 280px;
  height: 280px;
  left: -72px;
  top: 12%;
  background: rgba(166, 29, 36, 0.38);
 }
 .jiuzu-splash-mist--b {
  width: 240px;
  height: 240px;
  right: -56px;
  bottom: 16%;
  background: rgba(90, 16, 20, 0.5);
 }
 .jiuzu-splash-gif {
  position: absolute;
  z-index: 5;
  top: 0;
  right: 0;
  bottom: 0;
  left: 0;
  display: block;
  width: 100%;
  height: 100%;
  pointer-events: none;
 }
 .jiuzu-splash-gif--out {
  animation: jiuzu-bg-out 0.35s ease-in forwards;
 }
 .jiuzu-splash-gif img {
  width: 100%;
  height: 100%;
  object-fit: cover;
 }
 .jiuzu-splash-copy {
  position: absolute;
  z-index: 2;
  left: 0;
  right: 0;
  top: 26%;
  display: flex;
  flex-direction: column;
  align-items: center;
 }
 .jiuzu-splash-lockup {
  position: relative;
  width: 320px;
  height: 180px;
  display: flex;
  align-items: center;
  justify-content: center;
 }
 .jiuzu-splash-title {
  position: relative;
  z-index: 2;
  opacity: 0;
  transform: translateY(48vh);
 }
 .jiuzu-splash--after-gif .jiuzu-splash-title {
  animation: jiuzu-title-rise 2.4s cubic-bezier(0.22, 1, 0.32, 1) forwards;
 }
 .jiuzu-splash-mark {
  position: absolute;
  z-index: 0;
  top: 0;
  left: 0;
  width: 320px;
  height: 180px;
  opacity: 0;
  pointer-events: none;
 }
 .jiuzu-splash--after-gif .jiuzu-splash-mark {
  animation: fadeInTo4 1s ease-out both;
 }
 .jiuzu-splash-mark img {
  width: 100%;
  height: 100%;
  object-fit: contain;
 }
 .jiuzu-splash-chars {
  position: relative;
  z-index: 2;
  display: flex;
  flex-direction: row;
  align-items: center;
  justify-content: center;
  overflow: hidden;
  padding: 8px 4px;
 }
 .jiuzu-splash-char {
  width: 52px;
 }
 .jiuzu-splash-char-text {
  display: block;
  width: 100%;
  font-family: 'Songti SC', 'STSong', 'Noto Serif SC', 'PingFang SC', serif;
  font-size: 46px;
  font-weight: 700;
  line-height: 1.15;
  text-align: center;
  color: #f5d76e;
  text-shadow: 0 0 12px rgba(255, 191, 0, 0.85), 0 0 28px rgba(20, 8, 8, 0.65);
 }
 .jiuzu-splash-shimmer {
  position: absolute;
  top: -10%;
  bottom: -10%;
  width: 36px;
  z-index: 3;
  pointer-events: none;
  opacity: 0;
  background: linear-gradient(
    90deg,
    rgba(255, 255, 255, 0) 0%,
    rgba(255, 248, 210, 0.55) 50%,
    rgba(255, 255, 255, 0) 100%
  );
  transform: translateX(-80px) skewX(-18deg);
 }
 .jiuzu-splash--after-gif .jiuzu-splash-shimmer {
  animation: jiuzu-shimmer 0.7s 2.2s ease-out both;
 }
 .jiuzu-splash-sub {
  position: relative;
  z-index: 2;
  margin-top: 4px;
  opacity: 0;
  transform: translateY(36vh);
 }
 .jiuzu-splash--after-gif .jiuzu-splash-sub {
  animation: jiuzu-sub-rise 0.4s 1.3s cubic-bezier(0.22, 1, 0.32, 1) forwards;
 }
 .jiuzu-splash-sub-text {
  font-size: 13px;
  letter-spacing: 0.28em;
  color: rgba(245, 215, 110, 0.88);
 }
 .jiuzu-splash-skip {
  position: absolute;
  top: 16px;
  right: 16px;
  z-index: 6;
  padding: 6px 14px;
  border-radius: 999px;
  border: 1px solid rgba(245, 215, 110, 0.45);
  background: rgba(20, 8, 8, 0.35);
 }
 .jiuzu-splash-skip-text {
  color: rgba(255, 248, 210, 0.92);
  font-size: 12px;
  line-height: 1.4;
  letter-spacing: 0.08em;
 }
@keyframes fadeInTo4 {
  0% { opacity: 0; }
  100% { opacity: 0.4; }
 }
@keyframes jiuzu-bg-in {
  from {
    opacity: 0;
  }
  to {
    opacity: 1;
  }
 }
@keyframes jiuzu-bg-out {
  from {
    opacity: 1;
  }
  to {
    opacity: 0;
  }
 }
@keyframes jiuzu-title-rise {
  0% {
    opacity: 0;
    transform: translateY(48vh);
  }
  14% {
    opacity: 1;
    transform: translateY(48vh);
  }
  100% {
    opacity: 1;
    transform: translateY(0);
  }
 }
@keyframes jiuzu-sub-rise {
  0% {
    opacity: 0;
    transform: translateY(36vh);
  }
  18% {
    opacity: 1;
    transform: translateY(36vh);
  }
  100% {
    opacity: 1;
    transform: translateY(0);
  }
 }
@keyframes jiuzu-shimmer {
  from {
    transform: translateX(-80px) skewX(-18deg);
    opacity: 0.2;
  }
  to {
    transform: translateX(280px) skewX(-18deg);
    opacity: 0;
  }
 }
@@ -1,140 +0,0 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Image, Text, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import { JIUZU_SPLASH_GIF_URL, JIUZU_SPLASH_MARK_URL } from '@dukang/shared-types';
 import { markJiuzuSplashPlayed } from '../lib/jiuzu-splash';
 const CHARS = ['酒', '祖', '杜', '康'] as const;
 const SPLASH_NAV_BG = '#140808';
 const HOME_NAV_BG = '#FAF9F7';
 /** GIF 21 帧 × 80ms，略提前淡出避免循环 */
 const GIF_MS = 1650;
 const GIF_FADE_MS = 350;
 /** 四字显现并升到偏上位置 */
 const TITLE_MS = 2400;
 /** 副标题在四字到位后再升起 */
 const SUB_DELAY_MS = 2300;
 const SUB_MS = 1400;
 const HOLD_MS = 900;
 const FADE_MS = 800;
 const FADE_AT_MS = GIF_MS + SUB_DELAY_MS + SUB_MS + HOLD_MS;
 type JiuzuSplashProps = {
  onDone: () => void;
 };
 function applySplashChrome() {
  try {
    void Taro.hideTabBar({ animation: false });
  } catch {
    /* H5 无原生 TabBar */
  }
  void Taro.setNavigationBarColor({
    frontColor: '#ffffff',
    backgroundColor: SPLASH_NAV_BG,
    animation: { duration: 200, timingFunc: 'easeIn' },
  }).catch(() => {});
 }
 function restoreChrome() {
  try {
    void Taro.showTabBar({ animation: false });
  } catch {
    /* H5 无原生 TabBar */
  }
  void Taro.setNavigationBarColor({
    frontColor: '#000000',
    backgroundColor: HOME_NAV_BG,
    animation: { duration: 200, timingFunc: 'easeOut' },
  }).catch(() => {});
 }
 export default function JiuzuSplash({ onDone }: JiuzuSplashProps) {
  const finishedRef = useRef(false);
  const fadingRef = useRef(false);
  const onDoneRef = useRef(onDone);
  onDoneRef.current = onDone;
  const [leaving, setLeaving] = useState(false);
  const [gifDone, setGifDone] = useState(false);
  const [gifGone, setGifGone] = useState(false);
  const finish = useCallback(() => {
    if (finishedRef.current) return;
    finishedRef.current = true;
    restoreChrome();
    onDoneRef.current();
  }, []);
  const beginExit = useCallback(() => {
    if (fadingRef.current || finishedRef.current) return;
    fadingRef.current = true;
    setLeaving(true);
    setTimeout(finish, FADE_MS);
  }, [finish]);
  useEffect(() => {
    markJiuzuSplashPlayed();
    applySplashChrome();
    const gifTimer = setTimeout(() => setGifDone(true), GIF_MS);
    const gifGoneTimer = setTimeout(() => setGifGone(true), GIF_MS + GIF_FADE_MS);
    const exitTimer = setTimeout(beginExit, FADE_AT_MS);
    return () => {
      clearTimeout(gifTimer);
      clearTimeout(gifGoneTimer);
      clearTimeout(exitTimer);
      if (!finishedRef.current) restoreChrome();
    };
  }, [beginExit]);
  return (
    <View
      className={`jiuzu-splash${gifDone ? ' jiuzu-splash--after-gif' : ''}${leaving ? ' jiuzu-splash--out' : ''}`}
      catchMove
      onTouchMove={(e) => {
        e.stopPropagation?.();
      }}
    >
      <View className="jiuzu-splash-mist jiuzu-splash-mist--a" />
      <View className="jiuzu-splash-mist jiuzu-splash-mist--b" />
      {gifGone ? null : (
        <Image
          className={`jiuzu-splash-gif${gifDone ? ' jiuzu-splash-gif--out' : ''}`}
          src={JIUZU_SPLASH_GIF_URL}
          mode="aspectFill"
          style={{ width: '100%', height: '100%' }}
        />
      )}
      <View className="jiuzu-splash-copy">
        <View className="jiuzu-splash-lockup">
          <Image
            className="jiuzu-splash-mark"
            src={JIUZU_SPLASH_MARK_URL}
            mode="aspectFit"
            style={{ width: '320px', height: '180px' }}
          />
          <View className="jiuzu-splash-title">
            <View className="jiuzu-splash-chars">
              <View className="jiuzu-splash-shimmer" />
              {CHARS.map((ch) => (
                <View key={ch} className="jiuzu-splash-char">
                  <Text className="jiuzu-splash-char-text">{ch}</Text>
                </View>
              ))}
            </View>
          </View>
        </View>
        <View className="jiuzu-splash-sub">
          <Text className="jiuzu-splash-sub-text">千年酒祖 · 杜康好客</Text>
        </View>
      </View>
      <View className="jiuzu-splash-skip" onClick={finish}>
        <Text className="jiuzu-splash-skip-text">跳过</Text>
      </View>
    </View>
  );
 }
@@ -130,10 +130,12 @@ export function toast(title: string, icon: 'success' | 'error' | 'none' = 'none'
  const text = title.trim();
  if (!text) return;
  if (icon !== 'success' && showFloatingToast(text)) {
-    void Taro.hideToast();
+    void Promise.resolve(Taro.hideToast() as void | Promise<unknown>).catch(() => {});
    return;
  }
-  Taro.showToast({ title: text, icon, duration: 1800 });
+  void Promise.resolve(
    Taro.showToast({ title: text, icon, duration: 1800 }) as void | Promise<unknown>,
  ).catch(() => {});
 }
 export type SessionPayload = {
@@ -21,6 +21,14 @@ export type ClientErrorPayload = {
  extra?: Record<string, unknown>;
 };
 /** 微信预期失败，不应按 P1 未捕获上报 */
 const IGNORED_REJECTION =
  /getLocation:fail|hideToast:fail:toast can't be found|showToast:fail|authorize:fail auth deny/i;
 function shouldIgnoreRejection(message: string): boolean {
  return IGNORED_REJECTION.test(message);
 }
 function currentPagePath(): string | undefined {
  try {
    const pages = Taro.getCurrentPages();
@@ -97,6 +105,7 @@ export function installClientErrorReporting(): void {
          : typeof reason === 'string'
            ? reason
            : JSON.stringify(reason);
      if (shouldIgnoreRejection(message || '')) return;
      const stack = reason instanceof Error ? reason.stack : undefined;
      reportClientError({
        level: 'error',
@@ -121,15 +130,17 @@ export function installClientErrorReporting(): void {
    });
    window.addEventListener('unhandledrejection', (ev) => {
      const reason = ev.reason;
      const message =
        reason instanceof Error
          ? reason.message
          : typeof reason === 'string'
            ? reason
            : 'unhandledrejection';
      if (shouldIgnoreRejection(message)) return;
      reportClientError({
        level: 'error',
        category: 'unhandled_rejection',
-        message:
+        message,
          reason instanceof Error
            ? reason.message
            : typeof reason === 'string'
              ? reason
              : 'unhandledrejection',
        stack: reason instanceof Error ? reason.stack : undefined,
      });
    });
@@ -14,13 +14,7 @@ export async function tryGetClientGpsLocation(): Promise<ClientGpsLocation | nul
  if (process.env.TARO_ENV === 'weapp') {
    try {
      const Taro = (await import('@tarojs/taro')).default;
-      const loc = await new Promise<{ latitude: number; longitude: number }>((resolve, reject) => {
+      const loc = await Taro.getLocation({ type: 'gcj02' });
        Taro.getLocation({
          type: 'gcj02',
          success: resolve,
          fail: reject,
        });
      });
      return { latitude: loc.latitude, longitude: loc.longitude };
    } catch {
      return null;
@@ -11,13 +11,7 @@ export type ClientGpsLocation = {
 export async function tryGetClientGpsLocation(): Promise<ClientGpsLocation | null> {
  try {
-    const loc = await new Promise<{ latitude: number; longitude: number }>((resolve, reject) => {
+    const loc = await Taro.getLocation({ type: 'gcj02' });
      Taro.getLocation({
        type: 'gcj02',
        success: resolve,
        fail: reject,
      });
    });
    return { latitude: loc.latitude, longitude: loc.longitude };
  } catch {
    return null;
@@ -1,13 +1,18 @@
 import Taro from '@tarojs/taro';
 import { fetchClientConfig } from './pay-wechat';
-/** 与 package.json version 同步，供服务端 minClientVersion 比对 */
+/** 与 package.json version 同步（Taro defineConstants 注入），供 minClientVersion 比对 */
-export const APP_VERSION = '3.5.16';
+export const APP_VERSION =
  (typeof TARO_APP_VERSION !== 'undefined' && String(TARO_APP_VERSION).trim()) || '4.0.4';
-export const APP_VERSION_LABEL = `v${APP_VERSION}`;
+export const APP_VERSION_LABEL = `v${APP_VERSION.replace(/^v/i, '')}`;
 function normalizeVersion(v: string): string {
  return String(v || '').trim().replace(/^v/i, '');
 }
 function parseSemver(v: string): number[] {
-  return v.split('.').map((n) => parseInt(n, 10) || 0);
+  return normalizeVersion(v).split('.').map((n) => parseInt(n, 10) || 0);
 }
 export function compareSemver(a: string, b: string): number {
@@ -89,7 +94,7 @@ async function enforceMinClientVersion(min: string) {
 export async function checkClientVersionGate() {
  try {
    const config = await fetchClientConfig();
-    const min = config.minClientVersion?.trim();
+    const min = normalizeVersion(config.minClientVersion ?? '');
    if (min && compareSemver(APP_VERSION, min) < 0) {
      await enforceMinClientVersion(min);
    }
@@ -0,0 +1,21 @@
 import Taro from '@tarojs/taro';
 import { HOME_SPLASH_BOTTLE_URL } from '@dukang/shared-types';
 /** 冷启动会话内是否已播过首页开场（进程级，切 Tab 不重播） */
 let played = false;
 export function hasHomeSplashPlayed() {
  return played;
 }
 export function markHomeSplashPlayed() {
  played = true;
 }
 /** 冷启动预拉 OSS 开场图（仅 weapp；H5 的 getImageInfo 会走 CORS） */
 export function prefetchHomeSplashAssets() {
  if (played) return;
  if (process.env.TARO_ENV !== 'weapp') return;
  void Taro.getImageInfo({ src: HOME_SPLASH_BOTTLE_URL }).catch(() => {});
 }
@@ -1,316 +0,0 @@
 /** Canvas 金龙：盘成一圈，仿照立体金龙的鳞片、须、角、爪与光晕 */
 export type DragonCanvasNode = {
  width: number;
  height: number;
  getContext: (type: '2d') => CanvasRenderingContext2D;
  requestAnimationFrame?: (cb: (time: number) => void) => number;
  cancelAnimationFrame?: (id: number) => void;
 };
 type SpinePt = {
  x: number;
  y: number;
  ang: number;
  nx: number;
  ny: number;
  w: number;
 };
 const GOLD_HI = '#fff6c8';
 const GOLD = '#ffbf00';
 const GOLD_MID = '#e8a800';
 const GOLD_DEEP = '#b87500';
 function lerp(a: number, b: number, t: number) {
  return a + (b - a) * t;
 }
 function fillOval(
  ctx: CanvasRenderingContext2D,
  x: number,
  y: number,
  rw: number,
  rh: number,
  rot: number,
 ) {
  ctx.save();
  ctx.translate(x, y);
  ctx.rotate(rot);
  ctx.scale(Math.max(0.01, rw), Math.max(0.01, rh));
  ctx.beginPath();
  ctx.arc(0, 0, 1, 0, Math.PI * 2);
  ctx.fill();
  ctx.restore();
 }
 function easeInCubic(t: number) {
  return t * t * t;
 }
 function buildSpine(cx: number, cy: number, r: number, phase: number, segs: number): SpinePt[] {
  const pts: SpinePt[] = [];
  const turns = 0.94;
  for (let i = 0; i < segs; i++) {
    const u = i / (segs - 1);
    const ang = -Math.PI / 2 + u * Math.PI * 2 * turns;
    const wobble = Math.sin(u * 14 + phase) * r * 0.042 + Math.sin(u * 5.5 - phase * 0.7) * r * 0.02;
    const rr = r + wobble;
    const nx = Math.cos(ang);
    const ny = Math.sin(ang);
    pts.push({
      x: cx + nx * rr,
      y: cy + ny * rr,
      ang,
      nx,
      ny,
      w: lerp(20, 6.5, u ** 0.62),
    });
  }
  return pts;
 }
 function strokeRibbon(
  ctx: CanvasRenderingContext2D,
  pts: SpinePt[],
  widthScale: number,
  color: string,
  alpha: number,
 ) {
  if (pts.length < 2) return;
  ctx.save();
  ctx.globalAlpha = alpha;
  ctx.strokeStyle = color;
  ctx.lineCap = 'round';
  ctx.lineJoin = 'round';
  ctx.beginPath();
  ctx.moveTo(pts[0].x, pts[0].y);
  for (let i = 1; i < pts.length; i++) ctx.lineTo(pts[i].x, pts[i].y);
  ctx.lineWidth = pts[Math.floor(pts.length * 0.15)].w * widthScale;
  ctx.stroke();
  ctx.restore();
 }
 function drawScales(ctx: CanvasRenderingContext2D, pts: SpinePt[]) {
  for (let i = 2; i < pts.length - 1; i += 1) {
    const p = pts[i];
    const u = i / (pts.length - 1);
    const ox = p.x + p.nx * p.w * 0.18;
    const oy = p.y + p.ny * p.w * 0.18;
    ctx.save();
    ctx.translate(ox, oy);
    ctx.rotate(p.ang + Math.PI / 2);
    ctx.fillStyle = i % 2 === 0 ? GOLD_HI : GOLD;
    ctx.globalAlpha = 0.55 + (1 - u) * 0.25;
    fillOval(ctx, 0, 0, p.w * 0.55, p.w * 0.38, 0);
    ctx.restore();
  }
 }
 function drawSpines(ctx: CanvasRenderingContext2D, pts: SpinePt[]) {
  ctx.fillStyle = GOLD_HI;
  for (let i = 3; i < pts.length - 6; i += 3) {
    const p = pts[i];
    const len = p.w * 1.35;
    ctx.save();
    ctx.globalAlpha = 0.85;
    ctx.beginPath();
    ctx.moveTo(p.x + p.nx * p.w * 0.2, p.y + p.ny * p.w * 0.2);
    ctx.lineTo(
      p.x + p.nx * (p.w + len),
      p.y + p.ny * (p.w + len),
    );
    const tx = -p.ny;
    const ty = p.nx;
    ctx.lineTo(p.x + tx * 2.2, p.y + ty * 2.2);
    ctx.closePath();
    ctx.fill();
    ctx.restore();
  }
 }
 function drawClaw(ctx: CanvasRenderingContext2D, p: SpinePt, side: number) {
  const tx = -p.ny * side;
  const ty = p.nx * side;
  const baseX = p.x + tx * p.w * 0.7;
  const baseY = p.y + ty * p.w * 0.7;
  ctx.save();
  ctx.translate(baseX, baseY);
  ctx.rotate(Math.atan2(ty, tx));
  ctx.fillStyle = GOLD;
  ctx.strokeStyle = GOLD_DEEP;
  ctx.lineWidth = 0.8;
  for (let k = -1; k <= 1; k++) {
    ctx.beginPath();
    ctx.moveTo(0, k * 4);
    ctx.quadraticCurveTo(10, k * 6 - 2, 18, k * 5);
    ctx.quadraticCurveTo(10, k * 4, 0, k * 3);
    ctx.closePath();
    ctx.fill();
    ctx.stroke();
  }
  ctx.restore();
 }
 function drawHead(ctx: CanvasRenderingContext2D, p: SpinePt, phase: number) {
  ctx.save();
  ctx.translate(p.x + p.nx * 10, p.y + p.ny * 10);
  ctx.rotate(Math.atan2(p.ny, p.nx) + Math.PI / 2);
  const mane = 6;
  for (let i = 0; i < mane; i++) {
    const a = -0.9 + (i / (mane - 1)) * 1.8;
    ctx.beginPath();
    ctx.strokeStyle = i % 2 ? GOLD_HI : GOLD;
    ctx.globalAlpha = 0.7;
    ctx.lineWidth = 2.2;
    ctx.moveTo(Math.sin(a) * 6, -4);
    ctx.quadraticCurveTo(Math.sin(a) * 16, -18 - Math.sin(phase + i) * 3, Math.sin(a) * 8, -28);
    ctx.stroke();
  }
  ctx.globalAlpha = 1;
  ctx.beginPath();
  ctx.moveTo(-7, -18);
  ctx.quadraticCurveTo(-16, -32, -5, -38);
  ctx.quadraticCurveTo(-2, -26, -3, -16);
  ctx.fillStyle = GOLD_MID;
  ctx.fill();
  ctx.beginPath();
  ctx.moveTo(7, -18);
  ctx.quadraticCurveTo(16, -32, 5, -38);
  ctx.quadraticCurveTo(2, -26, 3, -16);
  ctx.fill();
  const g = ctx.createRadialGradient(-4, -4, 2, 0, 4, 20);
  g.addColorStop(0, GOLD_HI);
  g.addColorStop(0.45, GOLD);
  g.addColorStop(1, GOLD_DEEP);
  ctx.fillStyle = g;
  fillOval(ctx, 0, 2, 16, 18, 0);
  ctx.fillStyle = GOLD_MID;
  fillOval(ctx, 0, 10, 9, 8, 0);
  for (const sx of [-6.5, 6.5]) {
    ctx.fillStyle = '#3a1a00';
    fillOval(ctx, sx, -2, 3.2, 3.6, 0);
    ctx.fillStyle = '#ffe566';
    fillOval(ctx, sx, -2.4, 1.5, 1.7, 0);
    ctx.fillStyle = '#fff';
    fillOval(ctx, sx - 0.5, -3, 0.6, 0.6, 0);
  }
  ctx.strokeStyle = GOLD_HI;
  ctx.lineWidth = 1.15;
  ctx.globalAlpha = 0.9;
  for (const side of [-1, 1]) {
    ctx.beginPath();
    ctx.moveTo(side * 12, 6);
    ctx.quadraticCurveTo(side * 36, 10 + Math.sin(phase) * 2, side * 42, 22);
    ctx.stroke();
    ctx.beginPath();
    ctx.moveTo(side * 10, 9);
    ctx.quadraticCurveTo(side * 28, 18, side * 34, 28);
    ctx.stroke();
  }
  ctx.globalAlpha = 1;
  ctx.restore();
 }
 function drawSparks(
  ctx: CanvasRenderingContext2D,
  cx: number,
  cy: number,
  r: number,
  phase: number,
 ) {
  for (let i = 0; i < 28; i++) {
    const a = (i / 28) * Math.PI * 2 + phase * 0.35;
    const rr = r * (0.72 + ((i * 17) % 10) / 40);
    const x = cx + Math.cos(a) * rr + Math.sin(phase * 1.4 + i) * 4;
    const y = cy + Math.sin(a) * rr + Math.cos(phase * 1.1 + i) * 3;
    const s = 1.1 + (i % 5) * 0.35;
    ctx.beginPath();
    ctx.globalAlpha = 0.25 + (Math.sin(phase * 2 + i) + 1) * 0.25;
    ctx.fillStyle = i % 3 === 0 ? GOLD_HI : GOLD;
    ctx.arc(x, y, s, 0, Math.PI * 2);
    ctx.fill();
  }
  ctx.globalAlpha = 1;
 }
 export function drawJiuzuDragonFrame(
  ctx: CanvasRenderingContext2D,
  width: number,
  height: number,
  elapsedMs: number,
 ) {
  const cx = width / 2;
  const cy = height * 0.42;
  const radius = Math.min(width, height) * 0.3;
  const fadeIn = Math.min(1, elapsedMs / 380);
  const spinT = Math.min(1, Math.max(0, (elapsedMs - 120) / 2050));
  const flyT = Math.min(1, Math.max(0, (elapsedMs - 2200) / 1200));
  const spin = spinT * Math.PI * 2;
  const fly = easeInCubic(flyT);
  const phase = elapsedMs / 220;
  ctx.clearRect(0, 0, width, height);
  ctx.save();
  ctx.globalAlpha = fadeIn * (1 - fly);
  ctx.translate(cx, cy + fly * -height * 0.42);
  ctx.scale(1 + fly * 0.55, 1 + fly * 0.55);
  ctx.rotate(spin);
  ctx.translate(-cx, -cy);
  const pts = buildSpine(cx, cy, radius, phase, 56);
  strokeRibbon(ctx, pts, 2.4, 'rgba(255, 191, 0, 0.18)', 1);
  strokeRibbon(ctx, pts, 1.55, 'rgba(255, 214, 80, 0.4)', 1);
  ctx.save();
  ctx.lineCap = 'round';
  ctx.lineJoin = 'round';
  ctx.beginPath();
  ctx.moveTo(pts[0].x, pts[0].y);
  for (let i = 1; i < pts.length; i++) ctx.lineTo(pts[i].x, pts[i].y);
  const bodyGrad = ctx.createLinearGradient(cx - radius, cy, cx + radius, cy);
  bodyGrad.addColorStop(0, GOLD_DEEP);
  bodyGrad.addColorStop(0.5, GOLD);
  bodyGrad.addColorStop(1, GOLD_HI);
  ctx.strokeStyle = bodyGrad;
  ctx.lineWidth = pts[0].w * 1.15;
  ctx.shadowColor = 'rgba(255, 191, 0, 0.7)';
  ctx.shadowBlur = 16;
  ctx.stroke();
  ctx.shadowBlur = 0;
  ctx.restore();
  drawScales(ctx, pts);
  drawSpines(ctx, pts);
  drawClaw(ctx, pts[Math.floor(pts.length * 0.32)], 1);
  drawClaw(ctx, pts[Math.floor(pts.length * 0.68)], -1);
  drawHead(ctx, pts[0], phase);
  drawSparks(ctx, cx, cy, radius, phase);
  ctx.restore();
 }
 export function scheduleDragonFrame(
  canvas: DragonCanvasNode,
  cb: (time: number) => void,
 ): number {
  if (typeof canvas.requestAnimationFrame === 'function') {
    return canvas.requestAnimationFrame(cb);
  }
  return requestAnimationFrame(cb);
 }
 export function cancelDragonFrame(canvas: DragonCanvasNode, id: number) {
  if (typeof canvas.cancelAnimationFrame === 'function') {
    canvas.cancelAnimationFrame(id);
    return;
  }
  cancelAnimationFrame(id);
 }
@@ -1,22 +0,0 @@
 import Taro from '@tarojs/taro';
 import { JIUZU_SPLASH_GIF_URL, JIUZU_SPLASH_MARK_URL } from '@dukang/shared-types';
 /** 冷启动会话内是否已播过「酒祖杜康」开场（进程级，切 Tab 不重播） */
 let played = false;
 export function hasJiuzuSplashPlayed() {
  return played;
 }
 export function markJiuzuSplashPlayed() {
  played = true;
 }
 /** 冷启动预拉 OSS 开场图（仅 weapp；H5 的 getImageInfo 会走 CORS） */
 export function prefetchJiuzuSplashAssets() {
  if (played) return;
  if (process.env.TARO_ENV !== 'weapp') return;
  void Taro.getImageInfo({ src: JIUZU_SPLASH_GIF_URL }).catch(() => {});
  void Taro.getImageInfo({ src: JIUZU_SPLASH_MARK_URL }).catch(() => {});
 }
@@ -59,6 +59,23 @@ function clearLocationDenied() {
  }
 }
 function wxErrorMessage(err: unknown): string {
  if (!err) return '';
  if (typeof err === 'string') return err;
  if (err instanceof Error) return err.message;
  if (typeof err === 'object') {
    const o = err as { errMsg?: unknown; message?: unknown };
    if (typeof o.errMsg === 'string' && o.errMsg) return o.errMsg;
    if (typeof o.message === 'string' && o.message) return o.message;
    try {
      return JSON.stringify(err);
    } catch {
      return '';
    }
  }
  return String(err);
 }
 function isDenyMessage(errMsg?: string): boolean {
  return /auth deny|authorize|permission|denied|拒绝|用户拒绝|getLocation:fail/i.test(
    errMsg || '',
@@ -179,14 +196,13 @@ async function promptLocationAuthOnce() {
  }).catch(() => {});
 }
-function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
+async function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
-  return new Promise((resolve, reject) => {
+  const setting = await Taro.getSetting().catch(() => null);
-    Taro.getLocation({
+  if (setting?.authSetting?.['scope.userLocation'] === false) {
-      type: 'gcj02',
+    throw new Error('getLocation:fail auth deny');
-      success: resolve,
+  }
-      fail: reject,
+  // 只用返回的 Promise，避免 callback + Promise 双重 reject 变成未捕获
-    });
+  return Taro.getLocation({ type: 'gcj02' });
  });
 }
 async function resolveViaH5Jssdk(): Promise<ResolvedUserCity | null> {
@@ -263,7 +279,7 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
      return resolved;
    }
  } catch (err) {
-    const errMsg = err instanceof Error ? err.message : String(err);
+    const errMsg = wxErrorMessage(err);
    const denied = isDenyMessage(errMsg);
    if (denied && !isLocationDenied()) {
      await promptLocationAuthOnce();
@@ -57,6 +57,23 @@ function clearLocationDenied() {
  }
 }
 function wxErrorMessage(err: unknown): string {
  if (!err) return '';
  if (typeof err === 'string') return err;
  if (err instanceof Error) return err.message;
  if (typeof err === 'object') {
    const o = err as { errMsg?: unknown; message?: unknown };
    if (typeof o.errMsg === 'string' && o.errMsg) return o.errMsg;
    if (typeof o.message === 'string' && o.message) return o.message;
    try {
      return JSON.stringify(err);
    } catch {
      return '';
    }
  }
  return String(err);
 }
 function isDenyMessage(errMsg?: string): boolean {
  return /auth deny|authorize|permission|denied|拒绝|用户拒绝|getLocation:fail/i.test(
    errMsg || '',
@@ -175,14 +192,13 @@ async function promptLocationAuthOnce() {
  }).catch(() => {});
 }
-function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
+async function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
-  return new Promise((resolve, reject) => {
+  const setting = await Taro.getSetting().catch(() => null);
-    Taro.getLocation({
+  if (setting?.authSetting?.['scope.userLocation'] === false) {
-      type: 'gcj02',
+    throw new Error('getLocation:fail auth deny');
-      success: resolve,
+  }
-      fail: reject,
+  // 只用返回的 Promise，避免 callback + Promise 双重 reject 变成未捕获
-    });
+  return Taro.getLocation({ type: 'gcj02' });
  });
 }
 export async function resolveUserCity(force = false): Promise<ResolvedUserCity> {
@@ -211,7 +227,7 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
      return resolved;
    }
  } catch (err) {
-    const errMsg = err instanceof Error ? err.message : String(err);
+    const errMsg = wxErrorMessage(err);
    const denied = isDenyMessage(errMsg);
    if (denied && !isLocationDenied()) {
      await promptLocationAuthOnce();
@@ -4,6 +4,17 @@ export type WecomCsSessionContext = {
  from?: string;
 };
 /** 客服消息卡片必须落主包页；分包（订单详情）作启动页会白屏 */
 export function buildCsSharePath(orderId?: string): string {
  const id = (orderId || '').trim();
  return id ? `pages/open/index?id=${encodeURIComponent(id)}` : 'pages/home/index';
 }
 export function buildCsShareTitle(orderNo?: string): string {
  const no = (orderNo || '').trim();
  return no ? `订单 ${no}` : '杜康好客';
 }
 type OpenCsChatOption = {
  extInfo: { url: string };
  corpId: string;
@@ -97,16 +108,10 @@ export async function openWecomCustomerServiceChat(params: {
  const option: OpenCsChatOption = {
    extInfo: { url },
    corpId,
    showMessageCard: true,
    sendMessageTitle: buildCsShareTitle(params.session?.orderNo),
    sendMessagePath: buildCsSharePath(params.session?.orderId),
  };
  if (params.session?.orderNo || params.session?.orderId) {
    option.showMessageCard = true;
    option.sendMessageTitle = params.session.orderNo
      ? `订单 ${params.session.orderNo}`
      : '订单咨询';
    if (params.session.orderId) {
      option.sendMessagePath = `pages/order-detail/index?id=${params.session.orderId}`;
    }
  }
  await new Promise<void>((resolve, reject) => {
    wxApi({
@@ -13,9 +13,9 @@ import BenefitSloganBar from '../../components/BenefitSloganBar';
 import { BENEFIT_GIFT_TAG, BENEFIT_TAG } from '../../lib/benefit-copy';
 import WechatShareReady from '../../components/WechatShareReady';
 import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar';
-import JiuzuSplash from '../../components/JiuzuSplash';
+import HomeSplash from '../../components/HomeSplash';
 import { goLogin } from '../../lib/auth-nav';
-import { hasJiuzuSplashPlayed } from '../../lib/jiuzu-splash';
+import { hasHomeSplashPlayed } from '../../lib/home-splash';
 import { getToken, isLoggedIn, request, toast } from '../../lib/api';
 import {
  getHomeCatalogCache,
@@ -83,7 +83,7 @@ function formatBenefitCorner(p: Product): string {
 }
 export default function HomePage() {
-  const [showSplash, setShowSplash] = useState(() => !hasJiuzuSplashPlayed());
+  const [showSplash, setShowSplash] = useState(() => false); // !hasHomeSplashPlayed()
  const [activeAroma, setActiveAroma] = useState<AromaKey>('QINGXIANG');
  const [products, setProducts] = useState<Product[]>([]);
  const [loading, setLoading] = useState(true);
@@ -428,7 +428,7 @@ export default function HomePage() {
      ) : null}
      {shouldRenderPageTabBar() && !showSplash ? <UserTabBar selected={0} /> : null}
-      {showSplash ? <JiuzuSplash onDone={() => setShowSplash(false)} /> : null}
+      {showSplash ? <HomeSplash onDone={() => setShowSplash(false)} /> : null}
    </PageShell>
  );
 }
@@ -0,0 +1,3 @@
 export default definePageConfig({
  navigationBarTitleText: '杜康好客',
 });
@@ -0,0 +1,42 @@
 import { View, Text } from '@tarojs/components';
 import Taro, { useLoad } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
 import { goLogin } from '../../lib/auth-nav';
 import { isLoggedIn } from '../../lib/api';
 function goHome() {
  Taro.switchTab({ url: '/pages/home/index' }).catch(() => {
    Taro.reLaunch({ url: '/pages/home/index' });
  });
 }
 function openOrder(orderId: string) {
  const detail = `/pages/order-detail/index?id=${encodeURIComponent(orderId)}`;
  if (!isLoggedIn()) {
    goLogin(detail);
    return;
  }
  Taro.redirectTo({ url: detail }).catch(() => {
    Taro.reLaunch({ url: detail });
  });
 }
 /** 主包落地：客服卡片 / 外链打开分包页（订单详情）前先落到这里，避免白屏 */
 export default function OpenPage() {
  useLoad((query?: Record<string, string | undefined>) => {
    const orderId = String(query?.id || query?.orderId || '').trim();
    if (!orderId) {
      goHome();
      return;
    }
    openOrder(orderId);
  });
  return (
    <PageShell variant="plain">
      <View className="u-empty">
        <Text>正在打开…</Text>
      </View>
    </PageShell>
  );
 }
@@ -116,6 +116,7 @@ export default function OrderDetailPage() {
  const orderId = router.params.id ?? '';
  usePageView('order_detail_view', orderId ? { orderId } : undefined);
  const [order, setOrder] = useState<OrderDetail | null>(null);
  const [loadError, setLoadError] = useState('');
  const [confirming, setConfirming] = useState(false);
  const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
  const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
@@ -147,14 +148,18 @@ export default function OrderDetailPage() {
  }
  useEffect(() => {
-    if (!orderId) return;
+    if (!orderId) {
      setLoadError('订单信息缺失');
      return;
    }
    request<OrderDetail>(`/trade/orders/${orderId}`)
      .then((data) => {
        setOrder(data);
        setLoadError('');
        void loadOrderTrack(data.delivery, data.status);
        applyLocalDeliveryHint(data, setLocalHintHtml);
      })
-      .catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
+      .catch((e) => setLoadError(e instanceof Error ? e.message : '加载失败'));
  }, [orderId]);
  useDidShow(() => {
@@ -293,7 +298,9 @@ export default function OrderDetailPage() {
      />
      <View className="sub-page-body">
        {!order ? (
-          <View className="u-empty">加载中…</View>
+          <View className="u-empty" onClick={loadError ? () => Taro.switchTab({ url: '/pages/home/index' }) : undefined}>
            <Text>{loadError || '加载中…'}</Text>
          </View>
        ) : (
          <>
            <View className="order-card">
@@ -35,8 +35,15 @@ import {
  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import iconHome from '../../assets/tabbar/home.png';
 import iconStoreBenefit from '../../assets/icons/store-benefit-y.png';
 import { usePageView } from '../../lib/usePageView';
 /** 封面斜角权益额：SKU benefitAmount ?? 商品 benefitDisplay ?? 售价 */
 function formatBenefitCorner(amount: number): string {
  if (!Number.isFinite(amount) || amount <= 0) return '';
  return String(Math.round(amount));
 }
 type Product = ProductImageSource & {
  id: string;
  name: string;
@@ -157,6 +164,14 @@ export default function ProductDetailPage() {
  }, [product, specEnabled, skus, selected, attrs]);
  const displayPrice = activeSku ? Number(activeSku.price) : Number(product?.price ?? 0);
  const benefitCorner = formatBenefitCorner(
    Number(
      activeSku?.benefitAmount ??
        product?.benefitDisplay ??
        product?.benefitAmount ??
        displayPrice,
    ),
  );
  const fulfillment = activeSku
    ? {
        allowOnlinePurchase: activeSku.allowOnlinePurchase,
@@ -271,6 +286,20 @@ export default function ProductDetailPage() {
      <View className="product-detail-main">
        <View className="product-detail-hero full-bleed">
          <ProductCarousel images={carouselImages} alt={product.name} variant="detail" previewable />
          {benefitCorner ? (
            <View className="product-detail-benefit-ribbon-clip">
              <View className="product-detail-benefit-ribbon">
                <View className="product-detail-benefit-ribbon-dk">
                  <Image
                    className="product-detail-benefit-ribbon-dk-icon"
                    src={iconStoreBenefit}
                    mode="aspectFit"
                  />
                </View>
                <Text className="product-detail-benefit-ribbon-num">{benefitCorner}</Text>
              </View>
            </View>
          ) : null}
        </View>
        <View className="product-detail-info">
@@ -288,6 +317,21 @@ export default function ProductDetailPage() {
            <Text className="product-detail-subtitle">{activeSku.specText}</Text>
          ) : null}
          {allowOnline || allowOnSite ? (
            <View className="product-detail-fulfill-tags">
              {allowOnline ? (
                <Text className="product-detail-fulfill-tag product-detail-fulfill-tag--local">
                  同城订单24小时内送达
                </Text>
              ) : null}
              {allowOnSite ? (
                <Text className="product-detail-fulfill-tag product-detail-fulfill-tag--pickup">
                  支持现场取货
                </Text>
              ) : null}
            </View>
          ) : null}
          {specEnabled ? (
            <View className="product-detail-specs">
              {attrs.map((attr) => (
@@ -8,9 +8,64 @@
 }
 .product-detail-hero {
  position: relative;
  overflow: hidden;
  background: var(--color-card);
 }
 .product-detail-benefit-ribbon-clip {
  position: absolute;
  top: 0;
  left: 0;
  width: 192px;
  height: 192px;
  overflow: hidden;
  pointer-events: none;
  z-index: 2;
 }
 .product-detail-benefit-ribbon {
  position: absolute;
  top: 40px;
  left: -52px;
  width: 256px;
  height: 48px;
  display: flex;
  flex-direction: row;
  align-items: center;
  justify-content: center;
  gap: 8px;
  overflow: hidden;
  background: #8b1a20;
  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.28);
  transform: rotate(-45deg);
 }
 .product-detail-benefit-ribbon-dk {
  flex-shrink: 0;
  width: 32px;
  height: 32px;
  border-radius: 1px;
  display: flex;
  align-items: center;
  justify-content: center;
 }
 .product-detail-benefit-ribbon-dk-icon {
  width: 28px;
  height: 28px;
  display: block;
 }
 .product-detail-benefit-ribbon-num {
  flex-shrink: 0;
  color: #dcb46f;
  font-size: 28px;
  font-weight: 700;
  line-height: 48px;
  letter-spacing: 0.02em;
 }
 .detail-carousel-wrap {
  position: relative;
  width: 100%;
@@ -129,7 +184,35 @@
  font-size: 14px;
  line-height: 20px;
  color: var(--color-on-surface-variant);
-  margin-bottom: 24px;
+  margin-bottom: 8px;
 }
 .product-detail-fulfill-tags {
  display: flex;
  flex-wrap: wrap;
  align-items: center;
  gap: 8px;
  margin: 8px 0 16px;
 }
 .product-detail-fulfill-tag {
  display: inline-flex;
  align-items: center;
  padding: 3px 10px;
  border-radius: 4px;
  font-size: 12px;
  line-height: 18px;
  font-weight: 500;
 }
 .product-detail-fulfill-tag--local {
  background: #f5d56a;
  color: #1a1a1a;
 }
 .product-detail-fulfill-tag--pickup {
  background: #f8e4e4;
  color: #a61d24;
 }
 .product-detail-promo {
@@ -13,6 +13,7 @@ declare const defineAppConfig: (config: Record<string, unknown>) => Record<strin
 declare const definePageConfig: (config: Record<string, unknown>) => Record<string, unknown>;
 declare const TARO_APP_API_ORIGIN: string;
 declare const TARO_APP_VERSION: string;
 /** 微信小程序全局（Taro 未封装的 API 如 openBusinessView 需直接调用） */
 declare const wx: {
@@ -46,10 +46,11 @@ module.exports = {
      exec_mode: 'fork',
    },
    {
      // cleanUrls:false 见 apps/admin-web/serve.json；否则百度校验 .html 会被 301 去后缀
      name: 'dukang-admin-web',
      cwd: `${APP_ROOT}/apps/admin-web`,
      script: 'npx',
-      args: 'serve -s dist -l 8094',
+      args: 'serve dist -l 8094 -c serve.json',
      interpreter: 'none',
      instances: 1,
      exec_mode: 'fork',
@@ -46,7 +46,7 @@ module.exports = {
      name: 'dukang-stg-admin-web',
      cwd: `${APP_ROOT}/apps/admin-web`,
      script: 'npx',
-      args: 'serve -s dist -l 8194',
+      args: 'serve dist -l 8194 -c serve.json',
      interpreter: 'none',
      instances: 1,
      exec_mode: 'fork',
@@ -33,6 +33,19 @@ server {
    client_max_body_size 50m;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location / {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
@@ -104,6 +117,7 @@ server {
    client_max_body_size 50m;
    include /opt/dukang-staging/deploy/nginx-mp-verify-staging.conf;
    include /opt/dukang-staging/deploy/nginx-no-crawler.conf;
    location /api/ {
        proxy_pass http://127.0.0.1:8190;
@@ -142,6 +156,7 @@ server {
    client_max_body_size 50m;
    include /opt/dukang-staging/deploy/nginx-mp-verify-staging.conf;
    include /opt/dukang-staging/deploy/nginx-no-crawler.conf;
    location /api/ {
        proxy_pass http://127.0.0.1:8190;
@@ -179,6 +194,21 @@ server {
    client_max_body_size 50m;
    include /opt/dukang-staging/deploy/nginx-no-crawler.conf;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location /api/ {
        proxy_pass http://127.0.0.1:8190;
        proxy_http_version 1.1;
@@ -31,6 +31,19 @@ server {
    include /opt/dukang/deploy/nginx-deploy-webhook.conf;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location / {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
@@ -94,6 +107,7 @@ server {
    client_max_body_size 50m;
    include /opt/dukang/deploy/nginx-mp-verify.conf;
    include /opt/dukang/deploy/nginx-no-crawler.conf;
    location /api/ {
        proxy_pass http://127.0.0.1:8090;
@@ -132,6 +146,7 @@ server {
    client_max_body_size 50m;
    include /opt/dukang/deploy/nginx-mp-verify.conf;
    include /opt/dukang/deploy/nginx-no-crawler.conf;
    location /api/ {
        proxy_pass http://127.0.0.1:8090;
@@ -169,6 +184,21 @@ server {
    client_max_body_size 50m;
    include /opt/dukang/deploy/nginx-no-crawler.conf;
    location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Connection "";
        proxy_buffering off;
        proxy_read_timeout 120s;
        proxy_send_timeout 120s;
    }
    location /api/ {
        proxy_pass http://127.0.0.1:8090;
        proxy_http_version 1.1;
@@ -0,0 +1,12 @@
 # 禁止搜索引擎收录（shop / partner / admin，含测试域）
 # 必须允许抓取页面：Disallow:/ 会让百度无法读到 noindex，旧标题会一直留在 SERP。
 # X-Robots-Tag 覆盖不先读 robots.txt / 不执行 JS 的抓取器。
 add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet" always;
 location = /robots.txt {
    default_type text/plain;
    charset utf-8;
    add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet" always;
    return 200 "User-agent: *\nAllow: /\n";
 }
@@ -138,19 +138,26 @@ if [[ "$SKIP_BUILD" == false ]]; then
  if [[ -f "$APP_ROOT/apps/mini-user/serve.json" ]]; then
    cp -f "$APP_ROOT/apps/mini-user/serve.json" "$APP_ROOT/apps/mini-user/dist/serve.json"
  fi
  if [[ -f "$APP_ROOT/apps/admin-web/serve.json" ]]; then
    cp -f "$APP_ROOT/apps/admin-web/serve.json" "$APP_ROOT/apps/admin-web/dist/serve.json"
  fi
 else
  echo "==> 4. 跳过构建"
  if [[ -f "$APP_ROOT/apps/mini-user/serve.json" && -d "$APP_ROOT/apps/mini-user/dist" ]]; then
    cp -f "$APP_ROOT/apps/mini-user/serve.json" "$APP_ROOT/apps/mini-user/dist/serve.json"
  fi
  if [[ -f "$APP_ROOT/apps/admin-web/serve.json" && -d "$APP_ROOT/apps/admin-web/dist" ]]; then
    cp -f "$APP_ROOT/apps/admin-web/serve.json" "$APP_ROOT/apps/admin-web/dist/serve.json"
  fi
 fi
 echo "==> 5. 重启 PM2 ($ECOSYSTEM_FILE)"
 if pm2 describe "$PM2_API" &>/dev/null; then
  pm2 delete "$PM2_USER" 2>/dev/null || true
  pm2 delete "$PM2_ADMIN" 2>/dev/null || true
  pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE" --only "$PM2_USER"
-  pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER" "$PM2_ADMIN" 2>/dev/null \
+  pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE" --only "$PM2_ADMIN"
-    || pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER"
+  pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER" 2>/dev/null || true
 else
  pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE"
 fi
@@ -173,11 +180,9 @@ APP_ROOT="$APP_ROOT" DEPLOY_TRIGGER="${DEPLOY_TRIGGER:-manual}" DUKANG_ENV_FILE=
 echo "==> 发版完成 ($DUKANG_DEPLOY_ENV)"
-if [[ "$DUKANG_DEPLOY_ENV" == "staging" ]]; then
+echo "==> 8. 重载 nginx（robots.txt / 校验文件等 include 配置）"
-  echo "==> 8. 重载 nginx（staging）"
+if command -v nginx >/dev/null 2>&1 && nginx -t 2>/dev/null; then
-  if command -v nginx >/dev/null 2>&1 && nginx -t 2>/dev/null; then
+  systemctl reload nginx || echo "WARN: nginx reload failed"
-    systemctl reload nginx || echo "WARN: nginx reload failed"
+else
-  else
+  echo "WARN: nginx 未安装或配置校验失败，跳过重载"
    echo "WARN: nginx 未安装或配置校验失败，跳过重载"
  fi
 fi
@@ -1,7 +1,7 @@
 # 杜康好客 · V3.0 PRD
 > **v3.0**（2026-07-10）· 3.x 产品事实源 · 冲突时 **V3 > V2**  
-> **4.0 起**（关联码 / 订单佣金归属 / 合伙人账单明细）见 [`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)，冲突时 **V4 > V3**。  
+> **4.0 起**（关联码 / 订单佣金归属 / 合伙人账单明细 / 活动图）见 [`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)，冲突时 **V4 > V3**。  
 > 实现：[`v3编码手册`](./杜康好客-v3编码手册.md) · 审计：[`v3-现状对照`](./杜康好客-v3-现状对照.md)
 ## 0. 说明
@@ -113,9 +113,11 @@
 **HQ 财务打款信息**（`admin-web` 财务四页，v3.5.6）：
 - 门店/合伙人/酒厂/物流账单列表、详情、导出展示收款账户（户名、账号、开户行）
- 确认打款时可填写打款凭证号（`paymentRef`），已打款后在详情与导出中展示
+- 确认打款时可填写打款凭证号（`paymentRef`），并可上传凭证照片（`paymentProofUrls`，最多 9 张）；已打款后在详情与导出中展示
 - 门店账单统一列表：T+1 终态「已打款」、手动提现终态「已结算」（均为 `PAID`，文案区分业务类型）
 - 门店 T+1「出账日」= 出账当天（核销窗口「昨日 00:00–今日 00:00」中的今天）
 - **账单日一律为出账当天的北京日历日**（Asia/Shanghai）：门店 T+1、酒厂 T+3 期账单的 `billDate`；合伙人/物流月账的账期按北京自然月。酒厂 T+3 = **每 3 天出一期**，纳入上期 3 天完成订单。
 - **酒厂账单与订单完全比对**（v4.0.6）：全部已完成已付订单均入账（含现场提货）；出账日无单或应付为 0 仍生成账单，业务状态展示「无需打款」（DB 仍为 `UNPAID`）；支持按出账周期核对补生成漏账。
 - 核销详情展示核销门店主账户收款信息
 ### 3.4~3.8 Wave 能力
@@ -131,7 +133,7 @@
 | § | 主题 | 文档 |
 |---|------|------|
 | 3.9 | 门店套餐 ≤10 条、独立审核 | v3.4.10 |
-| 3.10 | 开发计划/任务/版本/技术支持联动；任务导出 md/docx/xlsx/pdf；任务附件 | v3.4.11 / v3.5.6 |
+| 3.10 | 开发计划/任务/版本/技术支持联动；任务状态含开发中；来源工单可点进技术支持；任务导出 md/docx/xlsx/pdf；任务附件 | v3.4.11 / v3.5.6 |
 | 3.11 | 企微智能机器人 + 消息推送 Webhook | v3.4.11 |
 | 3.12 | **登录手机号 ≠ 对外联系电话**；体验优化 | v3.4.16 |
@@ -71,6 +71,7 @@
 | 日期 | 说明 |
 |------|------|
 | 2026-08-30 | HQ 门店账单确认打款支持上传凭证照片（`payment_proof_urls`） |
 | 2026-08-26 | v3.5.14：`order_submit`/`pay_success` 埋点改用真实 `clientApp`；线上这两类 `USER_H5` 回填为 `USER_MINI` |
 | 2026-08-26 | v3.5.12：订单大屏循环 BGM；HQ 日志/订单状态流转/用户行为时间线英文码改中文；修复删除门店分类后被 `ensureDefaults` 回种；HQ 侧栏按业务前 11 项重排、系统设置置底 |
 | 2026-08-26 | v3.5.11：城市三种履约起购；企微补提交人/订单规格物流收货/核销用户（昵称+明文手机+HQ备注）；`alert.settlement` 改名「结算任务失败通知」归入系统监控；补提现通过与四账单（城市/合伙人、笔数、累计金额、收款人账号开户行） |
@@ -1,7 +1,7 @@
 # 杜康好客 · V3 编码手册（交付业务版）
 > **事实源**：[`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) · **审计**：[`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)  
-> **佣金归属 / 关联码 / 合伙人账单明细（v4.0.1）**：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)，冲突时 **V4 > V3**。  
+> **佣金归属 / 关联码 / 合伙人账单明细（v4.0.1）· 活动图（v4.0.2）**：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)，冲突时 **V4 > V3**。  
 > V2/preV1 **非需求依据**。总部交付 = **`apps/admin-web`**（非 H5）。
 ## 1. 交付目标（六条）
@@ -54,12 +54,18 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 **用户日志端（v3.5.14）**：`order_submit` / `pay_success` 的 `clientApp` 取 JWT（小程序 `USER_MINI`）；微信支付回调沿用该订单已有埋点，缺省小程序。禁止再写死 `USER_H5`。
 **HQ 门店账单打款凭证**：确认打款 / 提现通过可填 `paymentRef`，并可上传照片（`paymentProofUrls`，OSS `PAYMENT_PROOF`，最多 9 张）。详情与 T+1 导出展示。
 **活动图（v4.0.2 / v4.0.7）**：规则见 v4-PRD §6。表 `activity_poster`；HQ `GET/POST/PUT/DELETE /admin/activity-posters`（权限 `activity_posters`）；合伙人 `GET /partner/activity-posters` · `GET/PUT /partner/activity-posters/selection`（写入 `partner_account.activity_poster_id`）· `GET /partner/activity-posters/:id/image`（合成本人关联码）。`GET /partner/assoc` 返回 `activityPosterId`。码栏百分比相对图宽。子账号无入口。v4.0.7：HQ `GET /admin/activity-posters/:id/image?partnerId=` 单张合成 PNG；`POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }` 流式 zip（仅勾选，测试号/无码 skip）。城市合伙人快链 `/activity-posters?partnerId=`。不预生成缓存图、不批量调微信补码。
 **合伙人关联与订单佣金（v4.0.1）**：规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定；`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入（禁止区县解析）。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`（勿写 `hq_remark`）。`POST /user/partner-assoc/bind` · `GET /partner/assoc` · `GET /partner/assoc/stats`（关联用户 / 当前关联用户已付购酒单，本日/本月）· `GET /partner/assoc/users?keyword&sort`（合伙人侧返回 `partnerRemark`，不返回 `hqRemark`）· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword`、`assocPartnerAccountId`（`none` / `any` / 主账号 ID）· `GET /admin/orders` 支持 `assocPartnerAccountId`（筛本单快照，`none`=无快照）· `PUT /admin/users/:id/assoc`（权限 `users_partner_assoc`）改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))`。
 ## 5. 验收用例（必过）
 **主链路 15 项**：登录、4 SKU、起购、支付+权益、双通道核销、payout、关店不可见、拓店审核、配送完成、退款、T+1/T+30…  
-**后台 8 项**：商品/门店/订单/权益/核销/工单/日志/财务。
+**后台 8 项**：商品/门店/订单/权益/核销/工单/日志/财务。  
 **开发计划任务**：状态 `TODO` 待开发 / `IN_PROGRESS` 开发中 / `DEVELOPED` 已开发 / `RELEASED` 已上线；任务列表「来源工单」链到 `/tickets/support?id=`。  
 **财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；合伙人/物流账期按北京自然月）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。酒厂应付为 0 仍出账（展示无需打款）。
 ## 6. 技术债（摘要）
@@ -1,14 +1,17 @@
 # 杜康好客 · V4 PRD
-> **v4.0**（2026-08-29）· 关联码与分佣事实源  
+> **v4.0**（2026-08-29）· 关联码与分佣事实源；**v4.0.6** 酒厂对账；**v4.0.7** HQ 活动图快链与勾选导出  
-> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（仅本主题：订单佣金归属、关联码、合伙人账单明细）。  
+> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（本主题：订单佣金归属、关联码、合伙人账单明细、活动图、酒厂对账）。  
-> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · 审计：[`v4-现状对照`](./杜康好客-v4-现状对照.md)
+> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · [`v4.0.2 开发文档`](./杜康好客-v4.0.2-开发文档.md) · [`v4.0.6 开发文档`](./杜康好客-v4.0.6-开发文档.md) · [`v4.0.7 开发文档`](./杜康好客-v4.0.7-开发文档.md) · 审计：[`v4-现状对照`](./杜康好客-v4-现状对照.md)
 ## 0. 版本
 | 版 | 日期 | 要点 | 开发文档 |
 |----|------|------|----------|
 | 4.0.1 | 08-29 / 08-30 | 合伙人关联码；订单佣金只认关联；账单酒单/核销分列；去掉区县酒单佣金；HQ 关联筛选与快链；合伙人 H5 用户管理与首页统计 | [`v4.0.1`](./杜康好客-v4.0.1-开发文档.md) |
 | 4.0.2 | 08-30 | HQ 活动图模板（底图 + 方形码栏 + 文案）；合伙人下载合成关联码；所选图写入库并作为用户管理主图 | [`v4.0.2`](./杜康好客-v4.0.2-开发文档.md) |
 | 4.0.6 | 08-31 | 酒厂 T+3=每 3 天出一期；全部已完成已付订单（含现场提货）；应付为 0 仍出账；核对补生成 | [`v4.0.6`](./杜康好客-v4.0.6-开发文档.md) |
 | 4.0.7 | 09-01 | HQ 城市合伙人活动图快链；指定一张活动图为单个或勾选主合伙人合成下载（PNG / zip） | [`v4.0.7`](./杜康好客-v4.0.7-开发文档.md) |
 ## 1. 锚点（沿用 V3，佣金归属改写）
@@ -63,6 +66,25 @@
 HQ 财务详情与合伙人确认页均展示两段列表。不再「无快照则全城已付单 × 当前费率」。
-## 6. 不做
+## 6. 活动图
-改推广码体系；改核销归属；子账号自己的码；回刷已打款账单；区县佣金双轨。
+- 一套活动图 = 底图 + 方形码栏（相对坐标）+ 标题 + 推广文案 + 排序 + 上架状态。文案由 HQ 手填，不自动生成。
 - 码栏用相对百分比存储，与底图像素无关：`qrXPct` / `qrYPct` 为左上角，`qrSizePct` 为边长（相对**图宽**，保证正方形）。HQ 上传后在预览图上拖拽定位、拉角改尺寸。
 - 合入的码固定为 **主合伙人关联码**（v4.0.1，`getwxacodeunlimit`，scene=`pa_{partnerId}`）。不复用推广码。
 - 合伙人 H5（仅主账号）可浏览已上架活动图、一键复制文案、下载合成图。下载时服务端把本人关联码 PNG 贴进码栏后返回整图。
 - 列表第一项「无」= 只用关联码。单选立即写入 `partner_account.activity_poster_id`（空=无）；用户管理主图按该选择展示，下次登录仍有效。下架/删除后回退为关联码。
 - 微信内下载失败则预览 + 长按保存（与关联码下载一致）。
 - 合伙人只看 `ACTIVE`；下架后列表不再出现。无关联码则不可下载并明确报错。
 - HQ 持权限 `activity_posters`（默认超管 + 运营）可增删改、上下架。
 - HQ 城市合伙人页提供活动图快链（列表列 / 详情 / 顶栏，进入 `/activity-posters?partnerId=`）。可指定一张已上架活动图：**单个下载**合成 PNG，或 **勾选主合伙人导出 zip**（仅已勾选，不做隐式全量）。合入码为已有 OSS 关联码；无码则单张报错、zip 记入跳过清单。不在本路径批量调微信补码，不预生成每人缓存图。
 ## 7. 酒厂对账（v4.0.6）
 - 口径：T+3 = **每 3 个自然日出具一张账单**（对齐起点 `2026-08-01`，出账日如 8/4、8/7、8/10…）；纳入窗口为上一期 3 天 `[出账日−3, 出账日)` 内全部 **COMPLETED + PAID** 订单（含现场提货）；`billDate` = 出账当天北京日历日；应付 = 实付合计 × 30%。
 - **与订单完全比对**：上述订单均须进入对应出账日账单明细；漏账可通过 HQ「核对补生成」或每日任务回扫补齐。
 - **应付为 0 仍出账**：出账日无订单或应付为 0 仍生成账单；业务状态展示「无需打款」（DB 仍为 `UNPAID`，不可确认打款）。
 - **已打款不回刷**；未打款账单可重算；明细 `orderId` 冲突时从其他未打款账单迁入。
 ## 8. 不做
 改推广码体系；改核销归属；子账号自己的码；回刷已打款账单；区县佣金双轨；AI 出图/出文案；C 端/门店端活动图；预生成每人缓存图。
@@ -3,22 +3,29 @@
 > 基准：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)  
 > V3 进度仍见 [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)，不混表。
-## 0. 总览（2026-08-29）
+## 0. 总览（2026-09-01）
 | 维度 | 结论 |
 |------|------|
-| 版本线 | **v4.0.1** 关联码 + 分佣账单 |
+| 版本线 | **v4.0.7** HQ 活动图快链与勾选导出 |
 | 订单佣金 | 区县归属已删除；只认关联 / 代下单选择 |
-| 账单 | 酒订单 / 核销订单分列 |
+| 账单 | 酒订单 / 核销订单分列；酒厂含现场提货，零应付仍出账（无需打款） |
 | 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；HQ 可指定一张图为勾选主合伙人合成下载 |
 ## 1. 版本交付
 | 版本 | 文档 | 状态 |
 |------|------|------|
 | 4.0.1 | [`关联码与分佣账单`](./杜康好客-v4.0.1-开发文档.md) | ✅ 已实现 |
 | 4.0.2 | [`活动图模板与关联码合成`](./杜康好客-v4.0.2-开发文档.md) | ✅ 已实现 |
 | 4.0.6 | [`酒厂对账核对`](./杜康好客-v4.0.6-开发文档.md) | ✅ 已实现 |
 | 4.0.7 | [`活动图快链与勾选导出`](./杜康好客-v4.0.7-开发文档.md) | ✅ 已实现 |
 | 日期 | 说明 |
 |------|------|
 | 2026-08-29 | v4.0.1：合伙人关联码、订单佣金只认关联、账单两段明细、去掉区县酒单佣金、HQ 改费率修复 |
 | 2026-08-30 | HQ 订单/用户详情展示关联合伙人；改绑权限 `users_partner_assoc`；用户/订单筛选关联合伙人；开城关联用户快链 |
 | 2026-08-30 | 合伙人 H5：首页关联用户/关联用户订单统计；用户管理 Tab（关联码+列表+备注）；`partner_user_note` 与 HQ `hqRemark` 隔离 |
 | 2026-08-30 | v4.0.2：HQ 活动图（底图 + 拖拽码栏 + 文案）；合伙人复制文案、下载合成关联码；选择写入库，用户管理主图下次登录仍显示 |
 | 2026-08-31 | v4.0.6：酒厂 T+3=每 3 天出一期（非每日）；含现场提货；零应付仍出账；核对补生成 |
 | 2026-09-01 | v4.0.7：HQ 城市合伙人活动图快链；单张/勾选导出合成图（PNG / zip） |
@@ -0,0 +1,49 @@
 # 杜康好客 · v4.0.2 开发文档
 > **2026-08-30** · ops / common / store / admin-web / h5-partner  
 > **主题**：HQ 活动图模板（底图 + 方形码栏 + 文案）；合伙人下载时合成本人关联码；所选图写入库并作为用户管理主图
 需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §6
 ---
 ## 1. 版本目标
 | # | 任务 | 类型 | 交付 |
 |---|------|------|------|
 | 1 | HQ 活动图管理 | 需求 | 上传底图、拖拽方形码栏、手填文案、排序、上下架、删除 |
 | 2 | 合伙人下载 | 需求 | 主账号列表已上架图；复制文案；服务端把关联码贴进码栏后返回 PNG |
 | 3 | 微信保存 | 需求 | 下载失败则预览 + 长按保存（复用关联码下载） |
 | 4 | 选择持久化 | 需求 | 单选立即写入 `partner_account.activity_poster_id`；用户管理主图跟选择走，下次登录仍显示 |
 **不做**：AI 出图/出文案；子账号码；C 端/门店端；预生成每人缓存图。
 ---
 ## 2. 规则
 见 v4-PRD §6。码栏百分比相对图宽；合入码 = 主合伙人关联码。列表第一项「无」= 只用关联码。下架/删除后回退为关联码。
 ---
 ## 3. 变更面
 - 表 [`activity_poster`](../server/dukang-api/prisma/schema.prisma)；SQL [`migrate-activity-poster-v402.sql`](../server/dukang-api/prisma/migrate-activity-poster-v402.sql) · [`migrate-partner-activity-poster-pref-v402.sql`](../server/dukang-api/prisma/migrate-partner-activity-poster-pref-v402.sql)
 - `ResourceBizType` 增 `ACTIVITY_POSTER`
 - HQ：`/admin/activity-posters` CRUD + 状态；权限 `activity_posters`（超管全量；运营默认含此项，存量 OPS 角色需执行 SQL 或在权限分配中勾选）
 - 合伙人：`GET /partner/activity-posters` · `GET/PUT /partner/activity-posters/selection` · `GET /partner/activity-posters/:id/image`
 - `partner_account.activity_poster_id` 记所选活动图；`GET /partner/assoc` 返回 `activityPosterId`
 - admin-web：`/activity-posters` 列表 + 拖拽码栏编辑器
 - h5-partner：中心 / 用户管理入口 → `/center/activity-posters`；用户管理主图按选择展示合成图或关联码
 ---
 ## 4. 验收
 - HQ 上传后可拖出方形栏并保存；改位置/尺寸后合伙人下载落点一致
 - 文案保存后合伙人可一键复制
 - 下架图不出现在合伙人列表
 - 合成图为本人关联码；无码时明确报错
 - 浏览器可下载 PNG；微信内可长按保存
 - 子账号无入口
 - 合伙人单选活动图后立即写入 `partner_account.activity_poster_id`；用户管理主图跟选择走，重新登录仍显示
@@ -0,0 +1,63 @@
 # 杜康好客 · v4.0.6 开发文档
 > **2026-08-31** · settlement / admin-web  
 > **主题**：酒厂 T+3 = 每 3 天出一期；与全部已完成已付订单完全比对（含现场提货）；应付为 0 仍出账（无需打款）；核对补生成
 需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §7 · V3 财务锚点仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) §3.3
 ---
 ## 1. 版本目标
 | # | 任务 | 类型 | 交付 |
 |---|------|------|------|
 | 1 | T+3 出账节奏 | 修 | **每 3 天一张账单**（非每日）；纳入上期 3 个自然日全部已付已完成订单 |
 | 2 | 含现场提货 | 修 | 不限配送类型 |
 | 3 | 零应付 / 无单仍出账 | 修 | 出账日仍生成账单，展示「无需打款」 |
 | 4 | 核对补生成 | 需求 | HQ 按区间重算周期出账日；清理旧「每日一账」空账单 |
 ---
 ## 2. 规则
 对齐起点 `WINERY_BILL_EPOCH_YMD = 2026-08-01`，周期 `WINERY_SETTLEMENT_PERIOD_DAYS = 3`。
 | 出账日 | 纳入完成日窗口 |
 |--------|----------------|
 | 8/4 | [8/1, 8/4) |
 | 8/7 | [8/4, 8/7) |
 | 8/28 | [8/25, 8/28) |
 | 8/31 | [8/28, 8/31) |
 - 应付 = `round2(Σ payAmount × 0.3)`
 - `wineryAmount === 0` → UI/导出「无需打款」；确认打款拒绝
 - 非周期日不生成；每日 cron 仅在出账日真正落账
 ### 旧逻辑为何对不上
 旧实现是「**每天**出账，只收 **3 天前那一天** 的订单」：当天窗口无完成单就 skip → 8/4～8/28 大量空白；8/28、8/29 连着出是因为两天各自都有「D−3」完成单。
 ---
 ## 3. 变更面
 | 位置 | 说明 |
 |------|------|
 | `packages/domain` | `isWineryIssueDay` / `shanghaiWineryPeriodWindow` / `wineryIssueDateFromCompletedAt` / `listWineryIssueDays` |
 | `shared-types` | `WINERY_SETTLEMENT_PERIOD_DAYS`、`WINERY_BILL_EPOCH_YMD` |
 | `settlement.service` | 周期出账；`reconcileWineryBills` 只跑周期日并清理非周期空账单 |
 | `settlement.scheduler` | 每日尝试出账（非周期日 skip）+ 近 45 日核对 |
 | `admin-web` | 文案 + 核对补生成 |
 无 Prisma 迁移。线上历史账单一次性修复：`server/dukang-api/prisma/sql/fix-winery-bills-v406.sql`（补现场提货入账、中间 0 账、迁错期明细）。
 ---
 ## 4. 验收
 - [ ] 账单日仅为 8/4、8/7、8/10… 这类周期日，不会连续两天各出一张（除非跨期）
 - [ ] 核对补生成后，同城配送与现场提货订单均出现在对应期账单明细（历史现场单缺 `completedAt` 会自动用 `paidAt` 补齐）
 - [ ] 每张账单明细覆盖上期 3 天全部已付已完成订单（含现场提货/同城/跨城）
 - [ ] 出账日无单仍有账单，「无需打款」
 - [ ] HQ「核对补生成」可选 8/4～今天，补齐中间漏期并清理误生成的每日账单
 - [ ] 已打款账单不回刷
@@ -0,0 +1,49 @@
 # 杜康好客 · v4.0.7 开发文档
 > **2026-09-01** · ops / store / admin-web  
 > **主题**：HQ 城市合伙人页活动图快链；指定一张活动图为单个或勾选的主合伙人合成关联码并下载（单张 PNG / zip）
 需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §6
 ---
 ## 1. 版本目标
 | # | 任务 | 类型 | 交付 |
 |---|------|------|------|
 | 1 | 快链 | 需求 | 城市合伙人列表/详情/顶栏跳转活动图页（`?partnerId=`） |
 | 2 | 单个下载 | 需求 | 行操作、详情抽屉、活动图页「为该合伙人下载」；弹窗选已上架活动图 → PNG |
 | 3 | 勾选导出 | 需求 | 列表勾选主合伙人 → 选活动图 → zip（仅已勾选，非隐式全量） |
 **不做**：预生成每人缓存图；批量调微信补码；按每人当前所选活动图分别出图；BullMQ 异步包。
 ---
 ## 2. 规则
 - 合入码 = 主合伙人已有 OSS 关联码。无码则单张报错、zip 写入 `_skipped.txt`。不在本路径调用 `getwxacodeunlimit`。
 - HQ 指定 **一张** 已上架活动图，贴进所有目标合伙人。
 - zip 仅含请求体 `partnerIds`；测试号（`isTest`）跳过。
 - 底图最长边 ≤ 2500 且宽×高 ≤ 4e6，超限报错。
 - Sharp 合成并发 1；底图只下载一次；zip 流式写出。
 ---
 ## 3. 变更面
 - HQ：`GET /admin/activity-posters/:id/image?partnerId=` · `POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }`；权限 `activity_posters`
 - admin-web：城市合伙人快链 / 勾选导出 / 弹窗选图；活动图页 `?partnerId=` 上下文下载
 - nginx：partner-pack 路径 `proxy_buffering off` + `proxy_read_timeout 120s`
 - `archiver` 依赖
 无 Prisma 迁移。
 ---
 ## 4. 验收
 - [ ] 城市合伙人「活动图」列、详情、顶栏快链进入活动图页；带 `partnerId` 时可「为该合伙人下载」
 - [ ] 行内/详情「下载活动图」弹窗选已上架图，得到该人合成 PNG；无关联码明确报错
 - [ ] 勾选 N 人导出 zip，文件名含城市/公司或姓名/id；缺码与测试号进 `_skipped.txt`
 - [ ] 未勾选时导出按钮禁用；不做隐式全量
 - [ ] 底图过大被拒绝；打包期间不调用微信补码
@@ -1,5 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import {
  assertCanDeleteCityPartner,
  assertCanDeleteStore,
  validatePartnerCityBinding,
  validatePartnerCommissionRates,
 } from './city-partner';
@@ -70,3 +72,33 @@ describe('validatePartnerCommissionRates', () => {
    expect(validatePartnerCommissionRates(0.05, 0.04, 0.08).ok).toBe(false);
  });
 });
 describe('assertCanDeleteCityPartner', () => {
  it('requires stores to be deleted first', () => {
    const result = assertCanDeleteCityPartner({ storeCount: 2, orderCount: 0, redeemCount: 0 });
    expect(result.ok).toBe(false);
    expect(result.message).toContain('请先删除门店');
  });
  it('blocks when orders exist', () => {
    const result = assertCanDeleteCityPartner({ storeCount: 0, orderCount: 1, redeemCount: 0 });
    expect(result.ok).toBe(false);
    expect(result.message).toContain('关联订单');
  });
  it('allows delete when empty', () => {
    expect(assertCanDeleteCityPartner({ storeCount: 0, orderCount: 0, redeemCount: 0 }).ok).toBe(true);
  });
 });
 describe('assertCanDeleteStore', () => {
  it('blocks when redeem records exist', () => {
    const result = assertCanDeleteStore({ orderCount: 0, redeemCount: 3 });
    expect(result.ok).toBe(false);
    expect(result.message).toContain('关联核销单');
  });
  it('allows delete when no orders or redeems', () => {
    expect(assertCanDeleteStore({ orderCount: 0, redeemCount: 0 }).ok).toBe(true);
  });
 });
@@ -66,3 +66,33 @@ export function validatePartnerCommissionRates(
  }
  return { ok: true };
 }
 export function assertCanDeleteCityPartner(input: {
  storeCount: number;
  orderCount: number;
  redeemCount: number;
 }): PartnerCityValidationResult {
  if (input.storeCount > 0) {
    return { ok: false, message: '该城市合伙人下还有门店，请先删除门店' };
  }
  if (input.orderCount > 0) {
    return { ok: false, message: '该账号下有关联订单，禁止删除' };
  }
  if (input.redeemCount > 0) {
    return { ok: false, message: '该账号下有关联核销单，禁止删除' };
  }
  return { ok: true };
 }
 export function assertCanDeleteStore(input: {
  orderCount: number;
  redeemCount: number;
 }): PartnerCityValidationResult {
  if (input.orderCount > 0) {
    return { ok: false, message: '该账号下有关联订单，禁止删除' };
  }
  if (input.redeemCount > 0) {
    return { ok: false, message: '该账号下有关联核销单，禁止删除' };
  }
  return { ok: true };
 }
@@ -0,0 +1,25 @@
 import { describe, expect, it } from 'vitest';
 import {
  resolveTaskStatusFromVersions,
  taskStatusFromVersionStatus,
 } from './dev-plan';
 describe('taskStatusFromVersionStatus', () => {
  it('maps version status to task status', () => {
    expect(taskStatusFromVersionStatus('PENDING')).toBe('TODO');
    expect(taskStatusFromVersionStatus('IN_PROGRESS')).toBe('IN_PROGRESS');
    expect(taskStatusFromVersionStatus('TESTING')).toBe('DEVELOPED');
    expect(taskStatusFromVersionStatus('RELEASED')).toBe('RELEASED');
  });
 });
 describe('resolveTaskStatusFromVersions', () => {
  it('returns null when no versions', () => {
    expect(resolveTaskStatusFromVersions([])).toBeNull();
  });
  it('picks the highest mapped status across versions', () => {
    expect(resolveTaskStatusFromVersions(['PENDING', 'TESTING'])).toBe('DEVELOPED');
    expect(resolveTaskStatusFromVersions(['IN_PROGRESS', 'RELEASED'])).toBe('RELEASED');
  });
 });
@@ -1,4 +1,4 @@
-export type DevPlanTaskStatus = 'TODO' | 'DEVELOPED' | 'RELEASED';
+export type DevPlanTaskStatus = 'TODO' | 'IN_PROGRESS' | 'DEVELOPED' | 'RELEASED';
 export type DevPlanVersionStatus = 'PENDING' | 'IN_PROGRESS' | 'TESTING' | 'RELEASED';
 export function computeDurationMinutes(
@@ -61,3 +61,36 @@ export function taskCompletedAtOnStatus(
  void prev;
  return undefined;
 }
 const TASK_STATUS_RANK: Record<DevPlanTaskStatus, number> = {
  TODO: 0,
  IN_PROGRESS: 1,
  DEVELOPED: 2,
  RELEASED: 3,
 };
 /** 版本状态 → 任务状态：待开始/开发中/测试中/已发布 ↔ 待处理/进行中/已开发/已发布 */
 export function taskStatusFromVersionStatus(status: DevPlanVersionStatus): DevPlanTaskStatus {
  switch (status) {
    case 'PENDING':
      return 'TODO';
    case 'IN_PROGRESS':
      return 'IN_PROGRESS';
    case 'TESTING':
      return 'DEVELOPED';
    case 'RELEASED':
      return 'RELEASED';
  }
 }
 /** 任务挂多个版本时取进度最高的对应状态 */
 export function resolveTaskStatusFromVersions(
  versionStatuses: DevPlanVersionStatus[],
 ): DevPlanTaskStatus | null {
  if (!versionStatuses.length) return null;
  return versionStatuses
    .map(taskStatusFromVersionStatus)
    .reduce((highest, current) =>
      TASK_STATUS_RANK[current] > TASK_STATUS_RANK[highest] ? current : highest,
    );
 }
@@ -409,3 +409,4 @@ export * from './city-partner';
 export * from './dev-plan';
 export * from './support-ticket';
 export * from './phone';
 export * from './shanghai-date';
@@ -0,0 +1,147 @@
 import { describe, expect, it } from 'vitest';
 import {
  addShanghaiDays,
  isWineryIssueDay,
  listWineryIssueDays,
  previousShanghaiMonth,
  shanghaiLaggedIssueWindow,
  shanghaiMonthLastInstant,
  shanghaiMonthRange,
  shanghaiPeriodYmds,
  shanghaiT1DayWindow,
  shanghaiWineryPeriodWindow,
  shanghaiYmd,
  startOfShanghaiDay,
  wineryIssueDateFromCompletedAt,
 } from './shanghai-date';
 describe('shanghaiYmd / startOfShanghaiDay', () => {
  it('UTC 16:00 已是北京次日 00:00，账单日取北京日历日', () => {
    const utc = new Date('2026-08-30T16:00:00.000Z');
    expect(shanghaiYmd(utc)).toBe('2026-08-31');
    expect(startOfShanghaiDay(utc).toISOString()).toBe('2026-08-30T16:00:00.000Z');
  });
  it('UTC 15:59 仍是北京当日', () => {
    const utc = new Date('2026-08-30T15:59:59.000Z');
    expect(shanghaiYmd(utc)).toBe('2026-08-30');
    expect(startOfShanghaiDay(utc).toISOString()).toBe('2026-08-29T16:00:00.000Z');
  });
  it('不依赖服务器本地时区：输入 ISO 即得到北京自然日 00:00', () => {
    const noonUtc = new Date('2026-08-30T04:00:00.000Z'); // 北京 12:00
    expect(shanghaiYmd(noonUtc)).toBe('2026-08-30');
    expect(startOfShanghaiDay(noonUtc).toISOString()).toBe('2026-08-29T16:00:00.000Z');
  });
 });
 describe('shanghaiT1DayWindow', () => {
  it('北京 8 月 30 日 08:00 出账：出账日 30 日，窗口为 29 日全天', () => {
    const { start, end, billDate } = shanghaiT1DayWindow(new Date('2026-08-30T00:00:00.000Z'));
    expect(shanghaiYmd(billDate)).toBe('2026-08-30');
    expect(shanghaiYmd(start)).toBe('2026-08-29');
    expect(end.toISOString()).toBe(billDate.toISOString());
  });
  it('北京 8 月 31 日 00:05：出账日仍是 31 日，不是 UTC 的 30 日', () => {
    const { billDate } = shanghaiT1DayWindow(new Date('2026-08-30T16:05:00.000Z'));
    expect(shanghaiYmd(billDate)).toBe('2026-08-31');
  });
 });
 describe('shanghaiLaggedIssueWindow', () => {
  it('旧日滞后：出账日是今天，纳入 3 天前完成的订单', () => {
    const { start, end, billDate } = shanghaiLaggedIssueWindow(
      new Date('2026-08-31T00:00:00.000Z'),
      3,
    );
    expect(shanghaiYmd(billDate)).toBe('2026-08-31');
    expect(shanghaiYmd(start)).toBe('2026-08-28');
    expect(shanghaiYmd(end)).toBe('2026-08-29');
  });
 });
 describe('酒厂 T+3 每 3 天一期', () => {
  const epoch = '2026-08-01';
  const period = 3;
  it('出账日：8/4、8/7、8/28；非 8/5、8/29', () => {
    expect(isWineryIssueDay(new Date('2026-08-04T00:00:00+08:00'), period, epoch)).toBe(true);
    expect(isWineryIssueDay(new Date('2026-08-07T00:00:00+08:00'), period, epoch)).toBe(true);
    expect(isWineryIssueDay(new Date('2026-08-28T00:00:00+08:00'), period, epoch)).toBe(true);
    expect(isWineryIssueDay(new Date('2026-08-01T00:00:00+08:00'), period, epoch)).toBe(false);
    expect(isWineryIssueDay(new Date('2026-08-05T00:00:00+08:00'), period, epoch)).toBe(false);
    expect(isWineryIssueDay(new Date('2026-08-29T00:00:00+08:00'), period, epoch)).toBe(false);
  });
  it('窗口：出账日 8/28 → 完成日 [8/25, 8/28)', () => {
    const { start, end, billDate } = shanghaiWineryPeriodWindow(
      new Date('2026-08-28T00:00:00+08:00'),
      period,
    );
    expect(shanghaiYmd(billDate)).toBe('2026-08-28');
    expect(shanghaiYmd(start)).toBe('2026-08-25');
    expect(shanghaiYmd(end)).toBe('2026-08-28');
  });
  it('完成日归属出账日', () => {
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-01T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-04');
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-03T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-04');
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-04T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-07');
    expect(
      shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-27T04:00:00.000Z'), period, epoch)),
    ).toBe('2026-08-28');
  });
  it('listWineryIssueDays 只返回周期日', () => {
    const days = listWineryIssueDays(
      new Date('2026-08-01T00:00:00+08:00'),
      new Date('2026-08-10T00:00:00+08:00'),
      period,
      epoch,
    ).map(shanghaiYmd);
    expect(days).toEqual(['2026-08-04', '2026-08-07', '2026-08-10']);
  });
 });
 describe('addShanghaiDays', () => {
  it('跨月跨年按北京日历加减', () => {
    expect(shanghaiYmd(addShanghaiDays(new Date('2026-08-31T16:00:00.000Z'), 1))).toBe(
      '2026-09-02',
    );
    expect(shanghaiYmd(addShanghaiDays(new Date('2026-01-01T00:00:00.000Z'), -1))).toBe(
      '2025-12-31',
    );
  });
 });
 describe('shanghaiMonthRange', () => {
  it('8 月账期为北京 8/1 00:00 至 9/1 00:00（不含）', () => {
    const { start, endExclusive } = shanghaiMonthRange(2026, 8);
    expect(start.toISOString()).toBe('2026-07-31T16:00:00.000Z');
    expect(endExclusive.toISOString()).toBe('2026-08-31T16:00:00.000Z');
    expect(shanghaiYmd(shanghaiMonthLastInstant(2026, 8))).toBe('2026-08-31');
  });
  it('UTC 月末 23:59:59 不会把账期止日滚成下月', () => {
    const periodStart = new Date('2026-08-01T00:00:00.000Z');
    const ymds = shanghaiPeriodYmds(periodStart);
    expect(ymds.periodStart).toBe('2026-08-01');
    expect(ymds.periodEnd).toBe('2026-08-31');
  });
 });
 describe('previousShanghaiMonth', () => {
  it('北京 9 月 1 日取上月为 8 月', () => {
    expect(previousShanghaiMonth(new Date('2026-08-31T16:00:00.000Z'))).toEqual({
      year: 2026,
      month: 8,
    });
  });
 });
@@ -0,0 +1,129 @@
 /** 财务账单日 / 账期一律按中国北京时间（Asia/Shanghai，无夏令时） */
 export const SHANGHAI_TIME_ZONE = 'Asia/Shanghai';
 function pad2(n: number): string {
  return String(n).padStart(2, '0');
 }
 export function shanghaiYmd(d: Date): string {
  return d.toLocaleDateString('sv-SE', { timeZone: SHANGHAI_TIME_ZONE });
 }
 export function parseShanghaiYmd(ymd: string): Date {
  return new Date(`${ymd}T00:00:00+08:00`);
 }
 export function startOfShanghaiDay(d: Date = new Date()): Date {
  return parseShanghaiYmd(shanghaiYmd(d));
 }
 export function addShanghaiDays(d: Date, days: number): Date {
  const [y, m, day] = shanghaiYmd(startOfShanghaiDay(d)).split('-').map(Number);
  const utc = new Date(Date.UTC(y, m - 1, day + days));
  const ymd = `${utc.getUTCFullYear()}-${pad2(utc.getUTCMonth() + 1)}-${pad2(utc.getUTCDate())}`;
  return new Date(`${ymd}T00:00:00+08:00`);
 }
 /** 门店 T+1：核销窗口 [昨日 00:00, 今日 00:00)；出账日 = 今天 */
 export function shanghaiT1DayWindow(anchor = new Date()) {
  const billDate = startOfShanghaiDay(anchor);
  const start = addShanghaiDays(billDate, -1);
  return { start, end: billDate, billDate };
 }
 /**
 * 酒厂日滞后窗口（旧：每天出账只收 lagDays 前那一天）。
 * 现网酒厂已改为「每 periodDays 天出一期」，见 shanghaiWineryPeriodWindow。
 */
 export function shanghaiLaggedIssueWindow(anchor = new Date(), lagDays: number) {
  const billDate = startOfShanghaiDay(anchor);
  const start = addShanghaiDays(billDate, -lagDays);
  const end = addShanghaiDays(start, 1);
  return { start, end, billDate };
 }
 /** 两个北京自然日之间相差天数（b − a；可为负） */
 export function shanghaiCalendarDaysBetween(a: Date, b: Date): number {
  const sa = startOfShanghaiDay(a).getTime();
  const sb = startOfShanghaiDay(b).getTime();
  return Math.round((sb - sa) / (24 * 60 * 60 * 1000));
 }
 /** 是否酒厂出账日：相对 epoch，每 periodDays 天一次（首张 = epoch + periodDays） */
 export function isWineryIssueDay(anchor: Date, periodDays: number, epochYmd: string): boolean {
  const billDate = startOfShanghaiDay(anchor);
  const epoch = parseShanghaiYmd(epochYmd);
  const diff = shanghaiCalendarDaysBetween(epoch, billDate);
  return diff >= periodDays && diff % periodDays === 0;
 }
 /**
 * 酒厂 T+N 期账单窗口：出账日 = anchor 当天；纳入 [出账日 − periodDays, 出账日) 内完成的订单。
 * 调用方应先用 isWineryIssueDay 判断是否出账日。
 */
 export function shanghaiWineryPeriodWindow(anchor = new Date(), periodDays: number) {
  const billDate = startOfShanghaiDay(anchor);
  const start = addShanghaiDays(billDate, -periodDays);
  return { start, end: billDate, billDate };
 }
 /** 订单完成日 → 所属酒厂出账日（落入下一期出账日） */
 export function wineryIssueDateFromCompletedAt(
  completedAt: Date,
  periodDays: number,
  epochYmd: string,
 ) {
  const c = startOfShanghaiDay(completedAt);
  const epoch = parseShanghaiYmd(epochYmd);
  const daysFromEpoch = shanghaiCalendarDaysBetween(epoch, c);
  if (daysFromEpoch < 0) {
    return addShanghaiDays(epoch, periodDays);
  }
  const k = Math.floor(daysFromEpoch / periodDays) + 1;
  return addShanghaiDays(epoch, k * periodDays);
 }
 /** 枚举 [from, to] 内（含）的全部酒厂出账日 */
 export function listWineryIssueDays(from: Date, to: Date, periodDays: number, epochYmd: string): Date[] {
  const start = startOfShanghaiDay(from);
  const end = startOfShanghaiDay(to);
  const out: Date[] = [];
  for (let d = start; d.getTime() <= end.getTime(); d = addShanghaiDays(d, 1)) {
    if (isWineryIssueDay(d, periodDays, epochYmd)) out.push(d);
  }
  return out;
 }
 export function shanghaiMonthRange(year: number, month: number): { start: Date; endExclusive: Date } {
  const start = new Date(`${year}-${pad2(month)}-01T00:00:00+08:00`);
  const endMonth = month === 12 ? 1 : month + 1;
  const endYear = month === 12 ? year + 1 : year;
  const endExclusive = new Date(`${endYear}-${pad2(endMonth)}-01T00:00:00+08:00`);
  return { start, endExclusive };
 }
 export function shanghaiMonthLastInstant(year: number, month: number): Date {
  return new Date(shanghaiMonthRange(year, month).endExclusive.getTime() - 1);
 }
 export function previousShanghaiMonth(anchor = new Date()): { year: number; month: number } {
  const [y, m] = shanghaiYmd(anchor).split('-').map(Number);
  if (m === 1) return { year: y - 1, month: 12 };
  return { year: y, month: m - 1 };
 }
 export function shanghaiYearMonth(anchor = new Date()): { year: number; month: number } {
  const [y, m] = shanghaiYmd(anchor).split('-').map(Number);
  return { year: y, month: m };
 }
 /** 账期展示：以 periodStart 所在北京月的首末日，避免 UTC 23:59:59 滚到下月 */
 export function shanghaiPeriodYmds(periodStart: Date): { periodStart: string; periodEnd: string } {
  const [y, m] = shanghaiYmd(periodStart).split('-').map(Number);
  const { start, endExclusive } = shanghaiMonthRange(y, m);
  return {
    periodStart: shanghaiYmd(start),
    periodEnd: shanghaiYmd(new Date(endExclusive.getTime() - 1)),
  };
 }
@@ -0,0 +1,66 @@
 import { describe, expect, it } from 'vitest';
 import {
  activityPosterPackFileName,
  activityPosterQrSlotPx,
  activityPosterTemplateTooLarge,
 } from './activity-poster';
 describe('activityPosterQrSlotPx', () => {
  it('uses width for square size', () => {
    expect(activityPosterQrSlotPx(1000, 2000, 10, 20, 18)).toEqual({
      left: 100,
      top: 400,
      size: 180,
    });
  });
  it('clamps slot inside the canvas', () => {
    expect(activityPosterQrSlotPx(100, 80, 90, 90, 30)).toEqual({
      left: 70,
      top: 50,
      size: 30,
    });
  });
 });
 describe('activityPosterTemplateTooLarge', () => {
  it('allows 1080x1920', () => {
    expect(activityPosterTemplateTooLarge(1080, 1920)).toBe(false);
  });
  it('rejects edge over 2500', () => {
    expect(activityPosterTemplateTooLarge(2501, 1000)).toBe(true);
  });
  it('rejects pixel count over 4e6', () => {
    expect(activityPosterTemplateTooLarge(2500, 2000)).toBe(true);
  });
 });
 describe('activityPosterPackFileName', () => {
  it('uses city, company, id', () => {
    expect(activityPosterPackFileName({
      cityName: '郑州',
      companyName: '杜康合伙',
      partnerName: '张三',
      partnerId: '12',
    })).toBe('郑州_杜康合伙_12.png');
  });
  it('falls back to partner name when company empty', () => {
    expect(activityPosterPackFileName({
      cityName: '洛阳',
      companyName: '  ',
      partnerName: '李四',
      partnerId: '9',
    })).toBe('洛阳_李四_9.png');
  });
  it('strips path separators', () => {
    expect(activityPosterPackFileName({
      cityName: 'a/b',
      companyName: 'c:d',
      partnerId: '1',
    })).toBe('a-b_c-d_1.png');
  });
 });
@@ -0,0 +1,105 @@
 export const ACTIVITY_POSTER_STATUSES = ['ACTIVE', 'DISABLED'] as const;
 export type ActivityPosterStatus = (typeof ACTIVITY_POSTER_STATUSES)[number];
 export const ACTIVITY_POSTER_STATUS_LABELS: Record<ActivityPosterStatus, string> = {
  ACTIVE: '上架',
  DISABLED: '下架',
 };
 export const DEFAULT_ACTIVITY_POSTER_QR_SLOT = {
  qrXPct: 78,
  qrYPct: 78,
  qrSizePct: 18,
 } as const;
 export type ActivityPosterQrSlot = {
  qrXPct: number;
  qrYPct: number;
  qrSizePct: number;
 };
 export type ActivityPosterItem = {
  id: string;
  title: string;
  copyText: string;
  imageUrl: string;
  qrXPct: number;
  qrYPct: number;
  qrSizePct: number;
  sortOrder: number;
  status: ActivityPosterStatus;
  createdAt: string;
  updatedAt: string;
 };
 export type ActivityPosterUpsertRequest = {
  title: string;
  copyText?: string;
  imageUrl: string;
  qrXPct: number;
  qrYPct: number;
  qrSizePct: number;
  sortOrder?: number;
  status?: ActivityPosterStatus;
 };
 export type ActivityPosterStatusRequest = {
  status: ActivityPosterStatus;
 };
 export type ActivityPosterSelection = {
  posterId: string | null;
 };
 export type ActivityPosterSelectionRequest = {
  posterId?: string | null;
 };
 export type ActivityPosterPackRequest = {
  partnerIds: string[];
 };
 /** 底图最长边（px）；超出则拒绝合成，避免单进程 Sharp 撑爆内存 */
 export const ACTIVITY_POSTER_MAX_EDGE = 2500;
 /** 底图像素上限（宽×高） */
 export const ACTIVITY_POSTER_MAX_PIXELS = 4_000_000;
 /** 单次 zip 最多合伙人数 */
 export const ACTIVITY_POSTER_PACK_MAX_PARTNERS = 200;
 export function activityPosterTemplateTooLarge(width: number, height: number): boolean {
  const w = Math.max(0, Math.round(width));
  const h = Math.max(0, Math.round(height));
  return w > ACTIVITY_POSTER_MAX_EDGE || h > ACTIVITY_POSTER_MAX_EDGE || w * h > ACTIVITY_POSTER_MAX_PIXELS;
 }
 /** zip / 单张下载文件名：`{城市}_{公司或姓名}_{id}.png` */
 export function activityPosterPackFileName(input: {
  cityName?: string | null;
  companyName?: string | null;
  partnerName?: string | null;
  partnerId: string;
 }): string {
  const label = (input.companyName?.trim() || input.partnerName?.trim() || '').trim();
  const raw = [input.cityName?.trim(), label, input.partnerId.trim()]
    .filter(Boolean)
    .join('_')
    .replace(/[\\/:*?"<>|]+/g, '-')
    .replace(/\s+/g, '');
  return `${raw || input.partnerId}.png`;
 }
 /** 码栏百分比 → 像素。size 相对图宽，保证正方形；落点夹在画布内。 */
 export function activityPosterQrSlotPx(
  width: number,
  height: number,
  qrXPct: number,
  qrYPct: number,
  qrSizePct: number,
 ): { left: number; top: number; size: number } {
  const w = Math.max(1, Math.round(width));
  const h = Math.max(1, Math.round(height));
  const size = Math.max(1, Math.min(w, Math.round((qrSizePct / 100) * w)));
  const left = Math.max(0, Math.min(w - size, Math.round((qrXPct / 100) * w)));
  const top = Math.max(0, Math.min(h - size, Math.round((qrYPct / 100) * h)));
  return { left, top, size };
 }
@@ -54,16 +54,13 @@ 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/';
+  'https://dukang-prod.oss-cn-hangzhou.aliyuncs.com/static/mini-user/';
 /** 「我的」页资质公示长图（默认；系统设置 QUALIFICATION_DISCLOSURE_URL 可覆盖） */
 export const QUALIFICATION_DISCLOSURE_URL = `${MINI_USER_STATIC_OSS_BASE}qualification-disclosure.png`;
-/** 小程序开场金龙 GIF（冷启动；不进主包，走 OSS） */
+/** 首页开场酒瓶图（不进主包，走 OSS） */
-export const JIUZU_SPLASH_GIF_URL = `${MINI_USER_STATIC_OSS_BASE}jiuzu-dragon.gif`;
+export const HOME_SPLASH_BOTTLE_URL = `${MINI_USER_STATIC_OSS_BASE}home-splash-bottle.png`;
 /** 小程序开场酒祖印记图（冷启动；不进主包，走 OSS） */
 export const JIUZU_SPLASH_MARK_URL = `${MINI_USER_STATIC_OSS_BASE}jiuzu-dragon-mark.png`;
 /** 总部客服电话（默认；系统设置 CUSTOMER_SERVICE_PHONE 可覆盖） */
 export const CUSTOMER_SERVICE_PHONE = '13203801799';
@@ -22,11 +22,11 @@ export const DEV_PLAN_TASK_TYPE_LABELS: Record<DevPlanTaskTypeDto, string> = {
 /** 开发计划任务状态 */
-export type DevPlanTaskStatusDto = 'TODO' | 'DEVELOPED' | 'RELEASED';
+export type DevPlanTaskStatusDto = 'TODO' | 'IN_PROGRESS' | 'DEVELOPED' | 'RELEASED';
-export const DEV_PLAN_TASK_STATUSES = ['TODO', 'DEVELOPED', 'RELEASED'] as const;
+export const DEV_PLAN_TASK_STATUSES = ['TODO', 'IN_PROGRESS', 'DEVELOPED', 'RELEASED'] as const;
@@ -34,6 +34,8 @@ export const DEV_PLAN_TASK_STATUS_LABELS: Record<DevPlanTaskStatusDto, string> =
  TODO: '待开发',
  IN_PROGRESS: '开发中',
  DEVELOPED: '已开发',
  RELEASED: '已上线',
@@ -8,6 +8,7 @@ export const HQ_LIST_COLUMN_KEYS = [
  'orders',
  'promo-codes',
  'promo-code-users',
  'activity-posters',
  'wecom-bots',
  'wecom-pushes',
  'llm-configs',
@@ -6,6 +6,7 @@ export const HQ_PERMISSION_CATALOG = [
  { key: 'products', label: '商品管理', group: '业务' },
  { key: 'orders', label: '订单管理', group: '业务' },
  { key: 'promo_codes', label: '推广码', group: '业务' },
  { key: 'activity_posters', label: '活动图', group: '业务' },
  { key: 'stores', label: '门店列表', group: '业务' },
  { key: 'store_audits', label: '门店审核', group: '业务' },
  { key: 'store_ratings', label: '门店评价', group: '业务' },
@@ -178,6 +179,7 @@ export const HQ_ROLE_DEFAULT_PERMISSIONS: Record<HqAdminRoleValue, HqPermissionK
    'products',
    'orders',
    'promo_codes',
    'activity_posters',
    ...OPS_STORE_KEYS,
    'store_categories_delete',
    'partners',
@@ -22,6 +22,7 @@ export * from './hq-permissions';
 export * from './hq-list-columns';
 export * from './partner';
 export * from './partner-assoc';
 export * from './activity-poster';
 export * from './shop';
 export * from './city-partner';
 export * from './city-warehouse';
@@ -16,6 +16,8 @@ export type PartnerAssocSummary = {
  userCount: number;
  companyName?: string | null;
  name: string;
  /** 所选活动图；空表示用户管理主图只用关联码 */
  activityPosterId?: string | null;
 };
 export type PartnerAssocStats = {
@@ -66,6 +66,14 @@ export interface StoreWithdrawSummaryDto {
  bankAccount?: StoreWithdrawBankAccountDto | null;
 }
 /** 确认打款 / 提现通过时可附带的凭证照片上限 */
 export const PAYMENT_PROOF_IMAGE_MAX_COUNT = 9;
 export interface ConfirmFinancePayDto {
  paymentRef?: string;
  paymentProofUrls?: string[];
 }
 export interface StoreWithdrawRequestDto {
  id: string;
  withdrawNo: string;
@@ -78,6 +86,7 @@ export interface StoreWithdrawRequestDto {
  reviewedAt?: string | null;
  paidAt?: string | null;
  paymentRef?: string | null;
  paymentProofUrls?: string[];
 }
 export interface StorePayoutDto {
@@ -171,16 +180,23 @@ export interface StoreBillDto {
  payoutAmount: number;
  status: FinancePayStatus;
  paidAt?: string | null;
  paymentRef?: string | null;
  paymentProofUrls?: string[];
 }
 export interface WineryBillDto {
  id: string;
  billNo: string;
  /** 出账日 YYYY-MM-DD（北京时间；T+3 = 每 3 天一期，纳入上期 3 天完成订单） */
  billDate: string;
  orderCount: number;
  orderAmount: number;
  wineryRate: number;
  wineryAmount: number;
  /**
   * DB：UNPAID | PAID。
   * 业务展示：wineryAmount === 0 时视为「无需打款」（NO_PAYMENT_NEEDED），仍保留账单以便与订单完全比对。
   */
  status: FinancePayStatus;
  paidAt?: string | null;
 }
@@ -198,11 +214,20 @@ export interface WineryBillItemDto {
 /** 门店结算默认比例（核销金额 × 比例） */
 export const STORE_SETTLEMENT_DEFAULT_RATE = 0.6;
-/** 酒厂账单结算比例（酒单实付 × 比例），暂定 30% */
+/** 酒厂账单结算比例（订单实付 × 比例），暂定 30%；含现场提货/同城/跨城 */
 export const WINERY_SETTLEMENT_RATE = 0.3;
-/** 酒厂账单出账滞后自然日（T+3：订单完成日 + 3 天后纳入账单） */
+/**
-export const WINERY_SETTLEMENT_LAG_DAYS = 3;
+ * 酒厂 T+3：每 3 个自然日出具一张账单；出账日纳入上一期 3 天内完成的已付订单。
 * 例：出账日 8/4 → 完成日 [8/1, 8/4)；下一张 8/7 → [8/4, 8/7)。
 */
 export const WINERY_SETTLEMENT_PERIOD_DAYS = 3;
 /** @deprecated 使用 WINERY_SETTLEMENT_PERIOD_DAYS；保留别名避免旧引用断裂 */
 export const WINERY_SETTLEMENT_LAG_DAYS = WINERY_SETTLEMENT_PERIOD_DAYS;
 /** 酒厂账期对齐起点（北京日）；首张出账日 = 起点 + PERIOD_DAYS */
 export const WINERY_BILL_EPOCH_YMD = '2026-08-01';
 export type { LogisticsSettlementMethod } from './enums';
 export { LOGISTICS_SETTLEMENT_METHOD_LABELS } from './enums';
@@ -25,6 +25,7 @@ export { scanQrCode } from './scan';
 export { invokeWechatPay } from './pay';
 export { chooseWechatImages, canUseWechatChooseImage, formatChooseImageFailMessage } from './chooseImage';
 export type { ChooseWechatImageOptions } from './chooseImage';
 export { previewWechatImage, isHttpImageUrl } from './previewImage';
 export {
  setWechatShareData,
  canUseWechatShare,
@@ -53,6 +54,7 @@ import { getWechatLocation, getWechatLocationDetailed } from './location';
 import { scanQrCode } from './scan';
 import { invokeWechatPay } from './pay';
 import { chooseWechatImages } from './chooseImage';
 import { previewWechatImage } from './previewImage';
 import { setWechatShareData, shareViaWechatSdk } from './share';
 import {
  wechatLogin,
@@ -76,6 +78,7 @@ export function createWeixinSdk(config: WeixinSdkConfig) {
    scanQrCode: (options?: Parameters<typeof scanQrCode>[1]) => scanQrCode(config, options),
    chooseImages: (options?: Parameters<typeof chooseWechatImages>[1]) =>
      chooseWechatImages(config, options),
    previewImage: (url: string) => previewWechatImage(config, url),
    pay: (prepay: Parameters<typeof invokeWechatPay>[0]) =>
      invokeWechatPay(prepay, {
        apiBase: config.apiBase ?? '/api/v1',
@@ -0,0 +1,33 @@
 import { ensureJssdkReady } from './jssdk';
 import type { WeixinSdkConfig } from './types';
 export function isHttpImageUrl(url?: string | null): url is string {
  return !!url && /^https?:\/\//i.test(url.trim());
 }
 /** 微信内预览图片，便于长按保存到相册（须是可公网访问的 http(s) 地址） */
 export async function previewWechatImage(config: WeixinSdkConfig, url: string): Promise<void> {
  const href = url.trim();
  if (!isHttpImageUrl(href)) {
    throw new Error('图片地址无效');
  }
  await ensureJssdkReady({
    apiBase: config.apiBase ?? '/api/v1',
    clientApp: config.clientApp,
    getAccessToken: config.getAccessToken,
  });
  if (!window.wx?.previewImage) {
    throw new Error('微信预览图片不可用');
  }
  await new Promise<void>((resolve, reject) => {
    window.wx!.previewImage!({
      current: href,
      urls: [href],
      success: () => resolve(),
      fail: (res) => reject(new Error(res?.errMsg || '预览失败')),
    });
  });
 }
@@ -58,6 +58,12 @@ export type WxApi = {
    success?: (res: { localData: string }) => void;
    fail?: (res: { errMsg: string }) => void;
  }) => void;
  previewImage: (options: {
    current: string;
    urls: string[];
    success?: () => void;
    fail?: (res: { errMsg: string }) => void;
  }) => void;
  updateAppMessageShareData: (options: {
    title: string;
    desc: string;
@@ -121,6 +127,7 @@ export const DEFAULT_JS_API_LIST = [
  'chooseWXPay',
  'chooseImage',
  'getLocalImgData',
  'previewImage',
  'updateAppMessageShareData',
  'updateTimelineShareData',
  'onMenuShareAppMessage',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jacy	04d903c554	merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (push) Waiting to run Details	2026-09-01 15:24:31 +08:00
jacy	30bfcc0d93	merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (pull_request) Waiting to run Details	2026-09-01 15:24:19 +08:00
jacy	283e6651aa	feat(mini): v4.0.8 客服卡片主包落地、定位误报修复，合伙人微信内预览保存海报 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-09-01 15:23:52 +08:00
jacy	0e883d3e70	merge(dev): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (push) Waiting to run Details	2026-09-01 15:12:48 +08:00
jacy	6a95f47860	merge(dev_jacy): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (pull_request) Waiting to run Details	2026-09-01 15:12:28 +08:00
jacy	cdc4b82931	feat(ops): v4.0.7 HQ 活动图快链与勾选导出 HQ 指定一张活动图为勾选主合伙人合成 PNG/zip；城市合伙人页增加快链与单下/导出。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-09-01 15:12:10 +08:00
jacy	9a35c4aea9	merge(dev): 后台反收录与百度校验文件 CI / verify (push) Waiting to run Details	2026-09-01 09:12:11 +08:00
jacy	99c7f8caea	merge(dev_jacy): 后台反收录与百度校验文件 CI / verify (pull_request) Waiting to run Details	2026-09-01 09:12:08 +08:00
jacy	eeee55e215	fix(admin): 后台校验文件避免 301，并让搜索引擎读到 noindex serve -s 会把 .html 301 去后缀，百度站长验证失败；同时放开 robots 抓取，避免旧标题一直留在 SERP。	2026-09-01 09:11:43 +08:00
jacy	971b8aaa7b	merge(dev): v4.0.6 酒厂账单与订单完全比对 CI / verify (push) Has been cancelled Details	2026-08-31 17:28:09 +08:00
jacy	d555240295	merge(dev_jacy): v4.0.6 酒厂账单与订单完全比对 CI / verify (pull_request) Has been cancelled Details	2026-08-31 17:28:00 +08:00
jacy	f35e1a3ba5	feat(settlement): v4.0.6 酒厂 T+3 每 3 天出一期并与订单完全比对含现场提货入账、零应付仍出账、核对补生成，以及线上历史账单修复 SQL。	2026-08-31 17:27:38 +08:00
jacy	4b9ab79acb	merge(dev): v4.0.4 开发任务/合伙人删除/账单合伙人列 CI / verify (push) Has been cancelled Details	2026-08-31 16:09:20 +08:00
jacy	d9725b1914	merge(dev_jacy): v4.0.4 开发任务/合伙人删除/账单合伙人列 CI / verify (pull_request) Has been cancelled Details	2026-08-31 16:09:09 +08:00
jacy	ac94f5f5de	feat(ops): v4.0.4 开发任务多行与版本状态同步、合伙人/门店删除、账单合伙人列 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-31 16:08:55 +08:00
jacy	874ae93a9b	Merge pull request 'v4.0.3版本' (#55 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/55	2026-08-31 14:27:47 +08:00
jacy	fbb92e00d5	Merge pull request 'v4.0.3版本' (#54 ) from dev_jacy into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/54	2026-08-31 14:27:26 +08:00
jacy	e26206b93c	v4.0.3版本 CI / verify (pull_request) Has been cancelled Details 总部后端，开发计划-任务列表-来源工单支持链接总部端-开发计划-任务列表-编辑任务-增加“开发中”状态账单日期修正	2026-08-31 14:22:49 +08:00
jacy	bb831f0580	merge(dev_jacy): v4.0.2 活动图模板与合伙人选择持久化 CI / verify (push) Has been cancelled Details	2026-08-30 21:37:04 +08:00
jacy	3166467518	feat(ops): v4.0.2 活动图模板、合伙人选择持久化与用户管理主图 HQ 上传底图与码栏；合伙人单选写入 partner_account.activity_poster_id，用户管理下次登录仍显示同一张图。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-30 21:36:43 +08:00
jacy	0ff61c2cd1	chore(deploy): shop/partner/admin 禁止搜索引擎抓取 nginx 直出 robots.txt 并加 X-Robots-Tag，避免内部三端被收录。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-30 15:50:22 +08:00
jacy	fb66258b6a	merge(dev_jacy): 门店账单确认打款支持上传凭证照片 CI / verify (push) Has been cancelled Details	2026-08-30 15:26:32 +08:00
jacy	e68eb4d38c	feat(settlement): 门店账单确认打款支持上传凭证照片财务确认打款与提现通过可附带 OSS 凭证图，详情与导出展示。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-30 15:25:56 +08:00
jacy	b375fab44a	v3.5.16小程序首页动画	2026-08-30 15:07:58 +08:00