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

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/65
Merge pull request 'Dev jacy' (#64 ) from dev_jacy into dev
2026-09-02 15:58:25 +08:00 · 2026-09-02 15:58:12 +08:00 · 2026-09-02 15:45:12 +08:00 · 2026-09-02 11:29:22 +08:00 · 2026-09-02 11:14:36 +08:00 · 2026-09-02 11:14:10 +08:00
183 changed files with 8546 additions and 1990 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>
  );
 }
@@ -0,0 +1,88 @@
 import { useEffect, useState } from 'react';
 import { Form, Input, Modal, message } from 'antd';
 import type { UpdateMyHqCredentialsRequest } from '@dukang/shared-types';
 import { request, type HqProfile } from '../lib/api';
 type Props = {
  open: boolean;
  profile: HqProfile | null;
  onClose: () => void;
  onUpdated: (profile: HqProfile) => void;
 };
 export function HqAccountSettingsModal({ open, profile, onClose, onUpdated }: Props) {
  const [form] = Form.useForm<UpdateMyHqCredentialsRequest & { confirmPassword?: string }>();
  const [saving, setSaving] = useState(false);
  useEffect(() => {
    if (!open) return;
    form.setFieldsValue({
      loginName: profile?.loginName ?? '',
      oldPassword: '',
      newPassword: '',
      confirmPassword: '',
    });
  }, [open, profile, form]);
  async function submit() {
    const values = await form.validateFields();
    if (values.newPassword && values.newPassword !== values.confirmPassword) {
      message.error('两次输入的新密码不一致');
      return;
    }
    const body: UpdateMyHqCredentialsRequest = {};
    const nextLogin = values.loginName?.trim();
    if (nextLogin && nextLogin !== (profile?.loginName ?? '')) {
      body.loginName = nextLogin;
    }
    if (values.newPassword?.trim()) {
      body.newPassword = values.newPassword.trim();
      if (values.oldPassword?.trim()) body.oldPassword = values.oldPassword.trim();
    }
    if (!body.loginName && !body.newPassword) {
      message.warning('请填写要修改的内容');
      return;
    }
    setSaving(true);
    try {
      await request('/admin/me/credentials', {
        method: 'PUT',
        body: JSON.stringify(body),
      });
      const updated = await request<HqProfile>('/admin/auth/me');
      message.success('账号信息已更新');
      onUpdated(updated);
      onClose();
    } catch (e) {
      message.error(e instanceof Error ? e.message : '保存失败');
    } finally {
      setSaving(false);
    }
  }
  return (
    <Modal
      title="账号设置"
      open={open}
      onCancel={onClose}
      onOk={() => void submit()}
      confirmLoading={saving}
      destroyOnClose
    >
      <Form form={form} layout="vertical">
        <Form.Item name="loginName" label="登录用户名" rules={[{ required: true, message: '请输入用户名' }]}>
          <Input autoComplete="username" placeholder="用于密码登录" />
        </Form.Item>
        <Form.Item name="oldPassword" label="当前密码" extra="已设置过密码时，修改密码必填">
          <Input.Password autoComplete="current-password" placeholder="不修改密码请留空" />
        </Form.Item>
        <Form.Item name="newPassword" label="新密码" rules={[{ min: 6, message: '至少 6 位' }]}>
          <Input.Password autoComplete="new-password" placeholder="不修改请留空" />
        </Form.Item>
        <Form.Item name="confirmPassword" label="确认新密码">
          <Input.Password autoComplete="new-password" placeholder="不修改请留空" />
        </Form.Item>
      </Form>
    </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,
@@ -29,6 +30,7 @@ import { clearAuth, request, type HqProfile } from '../lib/api';
 import { bindAdminEllipsisTitle } from '../lib/ellipsis-title';
 import { AUDIT_NOTICE_CHANGED_EVENT, PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
 import { ListColumnPrefsProvider } from '../lib/ListColumnPrefsContext';
 import { HqAccountSettingsModal } from '../components/HqAccountSettingsModal';
 const { Header, Sider, Content } = Layout;
@@ -118,6 +120,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 +183,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',
@@ -289,6 +293,7 @@ export default function AdminLayout() {
  const contentRef = useRef<HTMLDivElement>(null);
  const [profile, setProfile] = useState<HqProfile | null>(null);
  const [auditPendingCount, setAuditPendingCount] = useState(0);
  const [accountSettingsOpen, setAccountSettingsOpen] = useState(false);
  function refreshAuditPendingCount() {
    Promise.all([
@@ -416,11 +421,20 @@ export default function AdminLayout() {
            <span style={{ color: '#999' }}>
              {HQ_ROLE_LABELS[profile?.adminRole ?? ''] || profile?.adminRole || ''}
            </span>
            <Button type="text" icon={<UserOutlined />} onClick={() => setAccountSettingsOpen(true)}>
              账号设置
            </Button>
            <Button type="text" icon={<LogoutOutlined />} onClick={logout}>
              退出
            </Button>
          </Space>
        </Header>
        <HqAccountSettingsModal
          open={accountSettingsOpen}
          profile={profile}
          onClose={() => setAccountSettingsOpen(false)}
          onUpdated={setProfile}
        />
        <div
          ref={contentRef}
          className="admin-layout"
@@ -6,6 +6,7 @@ export const CLIENT_APP = 'HQ_WEB';
 export type HqProfile = {
  id: string;
  phone: string;
  loginName?: string | null;
  name: string;
  adminRole: string;
  status: string;
@@ -58,6 +59,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: '门店账号',
@@ -0,0 +1,8 @@
 /** 将列表可见列 key 追加到导出 query */
 export function appendExportColumns(qs: URLSearchParams, keys: string[]) {
  if (keys.length) qs.set('columns', keys.join(','));
 }
 export function exportColumnsBody(keys: string[]): { columns?: string[] } {
  return keys.length ? { columns: keys } : {};
 }
@@ -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(
@@ -8,8 +8,11 @@ export type StoreCreateForm = {
  city?: string;
  district: string;
  districtCode?: string;
  /** @deprecated 使用 categoryIds */
  categoryParentId?: string;
-  categoryId: string;
+  /** @deprecated 使用 categoryIds */
  categoryId?: string;
  categoryIds: string[];
  name: string;
  phone: string;
  address: string;
@@ -52,7 +55,7 @@ export function validateStoreCreateStep1(
    | 'partnerAccountId'
    | 'cityId'
    | 'regionCodes'
-    | 'categoryId'
+    | 'categoryIds'
    | 'name'
    | 'phone'
    | 'address'
@@ -69,7 +72,7 @@ export function validateStoreCreateStep1(
  if (!form.partnerAccountId) return '请选择开城合伙人';
  if (!form.regionCodes || form.regionCodes.length < 3) return '请选择省 / 市 / 区县';
  if (!form.cityId) return '所选地区未匹配到开城城市，请先在「开城 → 城市」配置对应区划';
-  if (!form.categoryId?.trim()) return '请选择门店分类（细类）';
+  if (!form.categoryIds?.length) return '请至少选择一个门店分类（细类）';
  if (!form.name?.trim()) return '请填写门店名称';
  if (!form.phone?.trim()) return '请填写门店手机号';
  if (!PHONE_RE.test(form.phone.trim())) return '门店手机号须为11位手机号';
@@ -11,6 +11,7 @@ import {
  applyColumnPrefs,
  columnKey,
  settingItems,
  visibleColumnKeys,
  type ListColumnSettingItem,
 } from './list-column-prefs';
 import { beginColumnResize, withResizeTitle } from './column-resize';
@@ -48,6 +49,16 @@ export function useAdminListColumns<T>(
  );
  itemsRef.current = items;
  const exportColumnKeys = useMemo(() => {
    const keyed = (allColumns as ColumnType<T>[]).map((col, i) => ({
      col,
      key: columnKey(col, i),
      actions: col.title === '操作' || col.key === ACTIONS_COLUMN_KEY || col.key === 'actions',
    }));
    const defaultKeys = keyed.filter((c) => !c.actions).map((c) => c.key);
    return visibleColumnKeys(defaultKeys, pref);
  }, [allColumns, pref]);
  const serialCol: ColumnType<T> = useMemo(
    () => ({
      key: SERIAL_COLUMN_KEY,
@@ -171,5 +182,5 @@ export function useAdminListColumns<T>(
    />
  );
-  return { columns, settingsButton, settingsModal };
+  return { columns, settingsButton, settingsModal, exportColumnKeys };
 }
@@ -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,
@@ -28,6 +29,7 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { downloadBase64File } from '../lib/exportExcel';
 import { exportColumnsBody } from '../lib/export-columns';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
@@ -46,8 +48,10 @@ 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',
  STOPPED: 'red',
 };
 const DEFAULT_DISPATCH_SUPPLEMENT = '请按以下任务进入开发流程';
@@ -59,6 +63,8 @@ export default function DevPlanTasksPage() {
  const [dispatchOpen, setDispatchOpen] = useState(false);
  const [batchEditOpen, setBatchEditOpen] = useState(false);
  const [batchSaving, setBatchSaving] = useState(false);
  const [creatingVersion, setCreatingVersion] = useState(false);
  const [newVersionNo, setNewVersionNo] = useState('');
  const [versions, setVersions] = useState<DevPlanVersionDto[]>([]);
  const [supportTickets, setSupportTickets] = useState<SupportTicketDto[]>([]);
  const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
@@ -169,9 +175,34 @@ export default function DevPlanTasksPage() {
  function openBatchEdit() {
    batchForm.setFieldsValue({ status: undefined, versionId: undefined });
    setNewVersionNo('');
    setBatchEditOpen(true);
  }
  async function createVersionInBatch() {
    const versionNo = newVersionNo.trim();
    if (!versionNo) {
      message.warning('请输入版本号');
      return;
    }
    setCreatingVersion(true);
    try {
      const created = await request<DevPlanVersionDto>('/admin/dev-plan/versions', {
        method: 'POST',
        body: JSON.stringify({ versionNo }),
      });
      const res = await request<{ items: DevPlanVersionDto[] }>('/admin/dev-plan/versions?pageSize=100');
      setVersions(res.items ?? []);
      batchForm.setFieldsValue({ versionId: created.id });
      setNewVersionNo('');
      message.success(`已创建版本 ${versionNo}`);
    } catch (e) {
      message.error(e instanceof Error ? e.message : '创建失败');
    } finally {
      setCreatingVersion(false);
    }
  }
  async function submitBatchEdit() {
    const values = await batchForm.validateFields();
    if (!values.status && !values.versionId) {
@@ -221,34 +252,6 @@ export default function DevPlanTasksPage() {
    }
  }
  async function exportTasks(scope: 'filter' | 'selected') {
    setExporting(true);
    try {
      const result = await request<{
        filename: string;
        mimeType: string;
        contentBase64: string;
        count: number;
      }>('/admin/dev-plan/tasks/export', {
        method: 'POST',
        body: JSON.stringify({
          scope,
          format: exportFormat,
          ids: scope === 'selected' ? selectedRowKeys : undefined,
          status: filters.status || undefined,
          type: filters.type || undefined,
          keyword: filters.keyword || undefined,
        }),
      });
      downloadBase64File(result.contentBase64, result.filename, result.mimeType);
      message.success(`已导出 ${result.count} 条任务`);
    } catch (e) {
      message.error(e instanceof Error ? e.message : '导出失败');
    } finally {
      setExporting(false);
    }
  }
  const baseColumns: ColumnsType<DevPlanTaskDto> = [
    {
      title: '任务号',
@@ -272,9 +275,17 @@ 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: '附件',
      key: 'attachmentUrls',
      width: 100,
      render: (_, row) =>
        row.attachmentUrls?.length ? (
@@ -289,9 +300,22 @@ 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: '关联版本',
      key: 'versions',
      dataIndex: 'versions',
      width: 140,
      render: (_, row) =>
@@ -325,7 +349,36 @@ export default function DevPlanTasksPage() {
    },
  ];
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('dev-plan-tasks', baseColumns, { page, pageSize });
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('dev-plan-tasks', baseColumns, { page, pageSize });
  async function exportTasks(scope: 'filter' | 'selected') {
    setExporting(true);
    try {
      const result = await request<{
        filename: string;
        mimeType: string;
        contentBase64: string;
        count: number;
      }>('/admin/dev-plan/tasks/export', {
        method: 'POST',
        body: JSON.stringify({
          scope,
          format: exportFormat,
          ids: scope === 'selected' ? selectedRowKeys : undefined,
          status: filters.status || undefined,
          type: filters.type || undefined,
          keyword: filters.keyword || undefined,
          ...exportColumnsBody(exportColumnKeys),
        }),
      });
      downloadBase64File(result.contentBase64, result.filename, result.mimeType);
      message.success(`已导出 ${result.count} 条任务`);
    } catch (e) {
      message.error(e instanceof Error ? e.message : '导出失败');
    } finally {
      setExporting(false);
    }
  }
  return (
    <div>
@@ -377,7 +430,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 }} />
@@ -519,6 +572,19 @@ export default function DevPlanTasksPage() {
              options={versions.map((v) => ({ value: v.id, label: v.versionNo }))}
            />
          </Form.Item>
          <Form.Item label="创建新版本">
            <Space.Compact style={{ width: '100%' }}>
              <Input
                placeholder="版本号，如 v4.0.11"
                value={newVersionNo}
                onChange={(e) => setNewVersionNo(e.target.value)}
                onPressEnter={() => void createVersionInBatch()}
              />
              <Button loading={creatingVersion} onClick={() => void createVersionInBatch()}>
                创建
              </Button>
            </Space.Compact>
          </Form.Item>
        </Form>
      </Modal>
    </div>
@@ -36,6 +36,7 @@ const STATUS_COLOR: Record<DevPlanVersionStatusDto, string> = {
  IN_PROGRESS: 'processing',
  TESTING: 'purple',
  RELEASED: 'green',
  STOPPED: 'red',
 };
 function formatDuration(minutes?: number | null) {
@@ -56,6 +57,7 @@ export default function DevPlanVersionsPage() {
    useAdminList<DevPlanVersionDto>('/admin/dev-plan/versions', () => {
      const qs = new URLSearchParams();
      if (filters.status) qs.set('status', filters.status);
      if (filters.keyword) qs.set('keyword', filters.keyword);
      return qs;
    }, [filters]);
@@ -189,6 +191,9 @@ export default function DevPlanVersionsPage() {
        <Form.Item name="status" label="状态">
          <Select allowClear style={{ width: 120 }} options={STATUS_OPTIONS} />
        </Form.Item>
        <Form.Item name="keyword" label="查找">
          <Input allowClear placeholder="版本号或内容" style={{ width: 220 }} />
        </Form.Item>
        <Button type="primary" htmlType="submit">
          筛选
        </Button>
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
  Button,
  Card,
@@ -27,6 +28,7 @@ import {
 } from '@dukang/shared-types';
 import { fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { appendExportColumns } from '../lib/export-columns';
 import { request } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
@@ -98,6 +100,7 @@ const STATUS_COLORS: Record<string, string> = {
 };
 export default function LogisticsBillsPage() {
  const navigate = useNavigate();
  const [form] = Form.useForm();
  const [summaryForm] = Form.useForm();
  const [filters, setFilters] = useState<Record<string, string>>({});
@@ -202,6 +205,7 @@ export default function LogisticsBillsPage() {
      if (filters.providerId) qs.set('providerId', filters.providerId);
      if (filters.year) qs.set('year', filters.year);
      if (filters.month) qs.set('month', filters.month);
      appendExportColumns(qs, exportColumnKeys);
      const result = await request<{ csv: string; count: number }>(
        `/admin/logistics-bills/export?${qs}`,
      );
@@ -250,6 +254,7 @@ export default function LogisticsBillsPage() {
  const billColumns: ColumnsType<BillRow> = [
    {
      title: '账单号',
      key: '账单号',
      dataIndex: 'billNo',
      width: 170,
      render: (v, row) => (
@@ -258,42 +263,49 @@ export default function LogisticsBillsPage() {
    },
    {
      title: '承运商',
      key: '承运商',
      width: 140,
      render: (_, r) => `${r.providerName || ''} (${r.providerCode || ''})`,
    },
    {
      title: '账期',
      key: '账期',
      width: 200,
      render: (_, r) =>
        `${String(r.periodStart || '').slice(0, 10)} ~ ${String(r.periodEnd || '').slice(0, 10)}`,
    },
    {
      title: '结算方式',
      key: '结算方式',
      dataIndex: 'settlementMethod',
      width: 100,
      render: (v) =>
        LOGISTICS_SETTLEMENT_METHOD_LABELS[v as LogisticsSettlementMethod] || v,
    },
-    { title: '订单数', dataIndex: 'orderCount', width: 80 },
+    { title: '订单数', key: '订单数', dataIndex: 'orderCount', width: 80 },
-    { title: '瓶数', dataIndex: 'bottleCount', width: 80 },
+    { title: '瓶数', key: '瓶数', dataIndex: 'bottleCount', width: 80 },
    {
      title: '物流费',
      key: '物流费',
      dataIndex: 'logisticsAmount',
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '收款户名',
      key: '收款户名',
      width: 100,
      render: (_, r) => providerBank(r)?.bankAccountName || '—',
    },
    {
      title: '收款账号',
      key: '收款账号',
      width: 140,
      render: (_, r) => providerBank(r)?.bankAccountNo || '—',
    },
    {
      title: '状态',
      key: '状态',
      dataIndex: 'status',
      width: 90,
      render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
@@ -398,7 +410,7 @@ export default function LogisticsBillsPage() {
    },
  ];
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-logistics-bills', billColumns, {
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-logistics-bills', billColumns, {
    page,
    pageSize,
  });
@@ -627,7 +639,20 @@ export default function LogisticsBillsPage() {
              pagination={false}
              dataSource={detail.items ?? []}
              columns={[
-                { title: '订单号', dataIndex: 'orderNo' },
+                {
                  title: '订单号',
                  dataIndex: 'orderNo',
                  render: (v: string) =>
                    v ? (
                      <AdminPrimaryLink
                        onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
                      >
                        {v}
                      </AdminPrimaryLink>
                    ) : (
                      '—'
                    ),
                },
                { title: '瓶数', dataIndex: 'quantity', width: 70 },
                {
                  title: '物流费',
@@ -29,6 +29,7 @@ import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { downloadBase64File } from '../lib/exportExcel';
 import { exportColumnsBody } from '../lib/export-columns';
 import {
  ADMIN_OPTIONS_PAGE_SIZE,
  DELIVERY_PROVIDER_LABELS,
@@ -265,8 +266,9 @@ function buildExportPayload(
  format: OrderExportFormat,
  filters: OrderExportFilters,
  selectedIds: string[],
  columns?: string[],
 ) {
-  const payload: Record<string, unknown> = { scope, format };
+  const payload: Record<string, unknown> = { scope, format, ...exportColumnsBody(columns ?? []) };
  if (scope === 'selected') {
    payload.ids = selectedIds;
    return payload;
@@ -671,6 +673,7 @@ export default function OrdersPage() {
          status: selectedStatuses(values.status).length ? values.status : initialStatuses,
        },
        selectedRowKeys,
        exportColumnKeys,
      );
      const result = await request<OrderExportResult>('/admin/orders/export', {
        method: 'POST',
@@ -688,6 +691,7 @@ export default function OrdersPage() {
  const baseColumns: ColumnsType<AdminOrderRow> = [
    {
      title: '订单号',
      key: '订单号',
      dataIndex: 'orderNo',
      width: 180,
      render: (v, row) => (
@@ -699,7 +703,7 @@ export default function OrdersPage() {
    },
    {
      title: '用户',
-      key: 'user',
+      key: '用户',
      width: 200,
      render: (_, row) =>
        row.user?.id ? (
@@ -712,7 +716,7 @@ export default function OrdersPage() {
    },
    {
      title: '商品',
-      key: 'productName',
+      key: '商品',
      width: 180,
      render: (_, row) => (
        <Space size={4} wrap>
@@ -726,12 +730,14 @@ export default function OrdersPage() {
    },
    {
      title: '规格',
      key: '规格',
      dataIndex: 'productSpec',
      width: 140,
      render: (v: string | undefined) => v || '—',
    },
    {
      title: '数量',
      key: '数量',
      dataIndex: 'quantity',
      width: 80,
      render: (v: number | undefined, row) =>
@@ -739,12 +745,14 @@ export default function OrdersPage() {
    },
    {
      title: '配送方式',
      key: '配送方式',
      dataIndex: 'deliveryType',
      width: 100,
      render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
    },
    {
      title: '状态',
      key: '状态',
      dataIndex: 'status',
      width: 100,
      render: (s: string) => (
@@ -753,42 +761,47 @@ export default function OrdersPage() {
    },
    {
      title: '实付',
      key: '实付',
      dataIndex: 'payAmount',
      width: 90,
      render: (v: number) => `¥${v}`,
    },
    {
      title: '运费',
-      key: 'logisticsFee',
+      key: '运费',
      width: 90,
      render: (_, row) =>
        row.delivery?.logisticsFee == null ? '—' : `¥${Number(row.delivery.logisticsFee).toFixed(2)}`,
    },
    {
      title: '好客权益',
      key: '好客权益',
      width: 200,
      render: (_, row) => formatBenefitBrief(row),
    },
    {
      title: '收货人',
      key: '收货人',
      dataIndex: 'receiverName',
      width: 90,
      render: (v: string | undefined) => v || '—',
    },
    {
      title: '电话',
      key: '电话',
      dataIndex: 'receiverPhone',
      width: 120,
      render: (v: string | undefined) => v || '—',
    },
    {
      title: '地址',
-      key: 'receiverAddress',
+      key: '地址',
      width: 260,
      render: (_, row) => formatReceiverAddress(row) || '—',
    },
    {
      title: '下单时间',
      key: '下单时间',
      dataIndex: 'createdAt',
      width: 170,
      render: fmtTime,
@@ -823,7 +836,7 @@ export default function OrdersPage() {
    },
  ];
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('orders', baseColumns, {
    page,
    pageSize,
  });
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
  Button,
  Card,
@@ -14,6 +15,7 @@ import {
  Table,
  Tabs,
  Tag,
  Tooltip,
  Typography,
  message,
 } from 'antd';
@@ -22,6 +24,7 @@ import dayjs, { type Dayjs } from 'dayjs';
 import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { appendExportColumns } from '../lib/export-columns';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
@@ -48,6 +51,7 @@ type Row = {
  redeemCommission: number;
  totalAmount: number;
  status: string;
  billDate: string;
  periodStart: string;
  periodEnd: string;
  rejectReason?: string | null;
@@ -57,6 +61,7 @@ type Row = {
  redeemItems?: BillItemRow[];
  partner?: {
    companyName?: string;
    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -64,6 +69,7 @@ type Row = {
  };
  partnerAccount?: {
    companyName?: string;
    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -71,7 +77,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,7 +95,25 @@ 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() || '—';
 }
 function weekMonday(d: Dayjs) {
  const wd = d.day();
  return d.subtract(wd === 0 ? 6 : wd - 1, 'day').startOf('day');
 }
 export default function PartnerBillsPage() {
  const navigate = useNavigate();
  const [form] = Form.useForm();
  const [filters, setFilters] = useState<Record<string, string>>({});
  const [partners, setPartners] = useState<PartnerOption[]>([]);
@@ -99,8 +123,7 @@ export default function PartnerBillsPage() {
      const qs = new URLSearchParams();
      if (filters.status) qs.set('status', filters.status);
      if (filters.partnerId) qs.set('partnerId', filters.partnerId);
-      if (filters.year) qs.set('year', filters.year);
+      if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd);
      if (filters.month) qs.set('month', filters.month);
      return qs;
    },
    [filters],
@@ -122,19 +145,18 @@ export default function PartnerBillsPage() {
      .catch(() => {});
  }, []);
-  async function generateBill(values: { partnerId?: string; month: Dayjs }) {
+  async function generateBill(values: { partnerId?: string; week: Dayjs }) {
-    const year = values.month.year();
+    const weekStartYmd = weekMonday(values.week).format('YYYY-MM-DD');
    const month = values.month.month() + 1;
    if (!values.partnerId) {
      const result = await request<{ success: number; failed: number; total: number }>(
        '/admin/partner-bills/generate-all',
-        { method: 'POST', body: JSON.stringify({ year, month }) },
+        { method: 'POST', body: JSON.stringify({ weekStartYmd }) },
      );
      message.success(`已生成 ${result.success}/${result.total} 份账单${result.failed ? `，失败 ${result.failed}` : ''}`);
    } else {
      await request('/admin/partner-bills/generate', {
        method: 'POST',
-        body: JSON.stringify({ partnerId: values.partnerId, year, month }),
+        body: JSON.stringify({ partnerId: values.partnerId, weekStartYmd }),
      });
      message.success('账单已生成（待审核）');
    }
@@ -245,10 +267,10 @@ export default function PartnerBillsPage() {
      const qs = new URLSearchParams();
      if (filters.status) qs.set('status', filters.status);
      if (filters.partnerId) qs.set('partnerId', filters.partnerId);
-      if (filters.year) qs.set('year', filters.year);
+      if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd);
-      if (filters.month) qs.set('month', filters.month);
+      appendExportColumns(qs, exportColumnKeys);
      const result = await request<{ csv: string; count: number }>(`/admin/partner-bills/export?${qs}`);
-      const suffix = filters.year && filters.month ? `${filters.year}-${filters.month}` : 'all';
+      const suffix = filters.weekStartYmd || 'all';
      downloadExcelCsv(result.csv, `合伙人账单_${suffix}.csv`);
      message.success(`已导出 ${result.count} 条`);
    } finally {
@@ -257,16 +279,19 @@ 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');
+  const canSend = selectedRows.filter(
    (r) => (r.status === 'PENDING_REVIEW' || r.status === 'REJECTED') && Number(r.totalAmount) > 0,
  );
  const canPay = selectedRows.filter((r) => r.status === 'UNPAID');
  const payAmount = canPay.reduce((s, r) => s + Number(r.totalAmount), 0);
  const baseColumns: ColumnsType<Row> = [
    {
      title: '账单号',
      key: '账单号',
      dataIndex: 'billNo',
      width: 180,
      render: (v, row) => (
@@ -275,45 +300,65 @@ export default function PartnerBillsPage() {
    },
    {
      title: '合伙人',
-      width: 160,
+      key: '合伙人',
      width: 200,
      render: (_, r) => partnerName(r),
    },
    {
      title: (
        <Tooltip title="周账出账日为账期结束后的下周一；历史月账为次月 1 日">
          出账日
        </Tooltip>
      ),
      key: '出账日',
      dataIndex: 'billDate',
      width: 110,
      render: (v) => String(v || '').slice(0, 10),
    },
    {
      title: '账期',
      key: '账期',
      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: '酒单佣金',
      key: '酒单佣金',
      dataIndex: 'orderCommission',
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '核销佣金',
      key: '核销佣金',
      dataIndex: 'redeemCommission',
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '合计应付',
      key: '合计应付',
      dataIndex: 'totalAmount',
-      width: 110,
+      width: 130,
-      render: (v) => `¥${Number(v).toFixed(2)}`,
+      render: (v) =>
        Number(v) <= 0 ? '¥0.00（不同步）' : `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '收款户名',
      key: '收款户名',
      width: 100,
      render: (_, r) => partnerBank(r)?.bankAccountName || '—',
    },
    {
      title: '收款账号',
      key: '收款账号',
      width: 140,
      render: (_, r) => partnerBank(r)?.bankAccountNo || '—',
    },
    {
      title: '状态',
      key: '状态',
      dataIndex: 'status',
      width: 130,
      render: (s, row) => (
@@ -336,7 +381,7 @@ export default function PartnerBillsPage() {
          <Button type="link" size="small" onClick={() => void openDetail(row.id)}>
            明细
          </Button>
-          {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && (
+          {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && Number(row.totalAmount) > 0 && (
            <Button type="link" size="small" onClick={() => sendBills([row.id])}>
              发送
            </Button>
@@ -361,7 +406,7 @@ export default function PartnerBillsPage() {
    },
  ];
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
  return (
    <div>
@@ -369,7 +414,7 @@ export default function PartnerBillsPage() {
      <AdminListHeader
        title="合伙人账单"
        settings={settingsButton}
-        description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
+        description="每周一 8:00 自动生成上周账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款。零元账单不同步给合伙人。"
      />
      {summary && (
@@ -387,12 +432,11 @@ export default function PartnerBillsPage() {
        form={form}
        layout="inline"
        style={{ marginBottom: 16 }}
-        onFinish={(v: { partnerId?: string; status?: string; month?: Dayjs }) => {
+        onFinish={(v: { partnerId?: string; status?: string; week?: Dayjs }) => {
          setFilters({
            partnerId: v.partnerId || '',
            status: v.status || '',
-            year: v.month ? String(v.month.year()) : '',
+            weekStartYmd: v.week ? weekMonday(v.week).format('YYYY-MM-DD') : '',
            month: v.month ? String(v.month.month() + 1) : '',
          });
          setPage(1);
        }}
@@ -406,12 +450,12 @@ 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>
-        <Form.Item name="month" label="账期月">
+        <Form.Item name="week" label="账期周">
-          <DatePicker picker="month" />
+          <DatePicker picker="week" />
        </Form.Item>
        <Form.Item name="status" label="状态">
          <Select
@@ -489,11 +533,11 @@ export default function PartnerBillsPage() {
        <Form
          form={genForm}
          layout="vertical"
-          initialValues={{ month: dayjs().subtract(1, 'month') }}
+          initialValues={{ week: weekMonday(dayjs().subtract(1, 'week')) }}
          onFinish={generateBill}
        >
-          <Form.Item name="month" label="账单月份" rules={[{ required: true }]}>
+          <Form.Item name="week" label="账单周（选任意一天，按周一起算）" rules={[{ required: true }]}>
-            <DatePicker picker="month" style={{ width: '100%' }} />
+            <DatePicker picker="week" style={{ width: '100%' }} />
          </Form.Item>
          <Form.Item name="partnerId" label="指定合伙人（留空则全部主合伙人）">
            <Select
@@ -503,7 +547,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>
@@ -554,6 +598,7 @@ export default function PartnerBillsPage() {
            <Descriptions column={1} size="small" bordered>
              <Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
              <Descriptions.Item label="合伙人">{partnerName(detail)}</Descriptions.Item>
              <Descriptions.Item label="出账日">{String(detail.billDate || '').slice(0, 10)}</Descriptions.Item>
              <Descriptions.Item label="账期">
                {String(detail.periodStart).slice(0, 10)} ~ {String(detail.periodEnd).slice(0, 10)}
              </Descriptions.Item>
@@ -592,7 +637,21 @@ export default function PartnerBillsPage() {
                        pagination={false}
                        dataSource={detail.orderItems ?? []}
                        columns={[
-                          { title: '订单号', dataIndex: 'refNo', width: 160 },
+                          {
                            title: '订单号',
                            dataIndex: 'refNo',
                            width: 160,
                            render: (v: string) =>
                              v ? (
                                <AdminPrimaryLink
                                  onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
                                >
                                  {v}
                                </AdminPrimaryLink>
                              ) : (
                                '—'
                              ),
                          },
                          { title: '商品', dataIndex: 'title' },
                          { title: '数量', dataIndex: 'extra', width: 70 },
                          {
@@ -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 {
@@ -30,6 +31,7 @@ import {
 import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { appendExportColumns } from '../lib/export-columns';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
@@ -43,6 +45,8 @@ type Row = {
  amount: number;
  status: StoreSettlementStatus;
  date: string;
  periodStart?: string | null;
  periodEnd?: string | null;
  overdue?: boolean;
  redeemCount?: number | null;
  redeemAmount?: number | null;
@@ -113,6 +117,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 +145,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) {
@@ -256,6 +201,7 @@ export default function StoreBillsPage() {
      if (filters.storeId) qs.set('storeId', filters.storeId);
      if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
      if (filters.dateTo) qs.set('dateTo', filters.dateTo);
      appendExportColumns(qs, exportColumnKeys);
      const result = await request<{ csv: string; count: number }>(`/admin/store-bills/export?${qs}`);
      downloadExcelCsv(result.csv, `门店对账单_${filters.dateFrom || 'all'}_${filters.dateTo || 'all'}.csv`);
      message.success(`已导出 ${result.count} 条 T+1 账单`);
@@ -276,6 +222,7 @@ export default function StoreBillsPage() {
  const baseColumns: ColumnsType<Row> = [
    {
      title: '类型',
      key: '类型',
      dataIndex: 'kind',
      width: 100,
      render: (k: StoreSettlementKind) => (
@@ -286,6 +233,7 @@ export default function StoreBillsPage() {
    },
    {
      title: '单号',
      key: '账单号',
      dataIndex: 'billNo',
      width: 180,
      render: (v, row) => (
@@ -301,39 +249,58 @@ export default function StoreBillsPage() {
          出账日
        </Tooltip>
      ),
      key: '出账日',
      dataIndex: 'date',
      width: 160,
      render: (v, row) => (row.kind === 'T1_BILL' ? String(v || '').slice(0, 10) : fmtTime(v)),
    },
-    { title: '门店', dataIndex: ['store', 'name'], width: 140 },
+    {
-    { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
+      title: (
-    { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
+        <Tooltip title="T+1 账期为出账日前一日的核销窗口；手动提现无账期">
          账期
        </Tooltip>
      ),
      key: '账期',
      width: 200,
      render: (_, row) =>
        row.kind === 'T1_BILL' && row.periodStart
          ? `${row.periodStart} ~ ${row.periodEnd}`
          : '—',
    },
    { title: '门店', key: '门店', dataIndex: ['store', 'name'], width: 140 },
    { title: '登录手机', key: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
    { title: '城市', key: '城市', dataIndex: ['store', 'cityName'], width: 90 },
    {
      title: '收款户名',
      key: '收款户名',
      width: 100,
      render: (_, row) =>
        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
    },
    {
      title: '收款账号',
      key: '收款账号',
      width: 140,
      render: (_, row) =>
        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
    },
    {
      title: '笔数',
      key: '笔数',
      width: 80,
      render: (_, row) =>
        row.kind === 'T1_BILL' ? (row.redeemCount ?? '—') : (row.payoutCount ?? '—'),
    },
    {
      title: '应付金额',
      key: '应付金额',
      dataIndex: 'amount',
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '状态',
      key: '状态',
      dataIndex: 'status',
      width: 100,
      render: (s: string, row) => (
@@ -383,7 +350,7 @@ export default function StoreBillsPage() {
      }
    | undefined;
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
  return (
    <div>
@@ -553,6 +520,11 @@ export default function StoreBillsPage() {
              <Descriptions.Item label="出账日">
                {String(detail.billDate || '').slice(0, 10)}
              </Descriptions.Item>
              <Descriptions.Item label="账期">
                {detail.periodStart
                  ? `${String(detail.periodStart).slice(0, 10)} ~ ${String(detail.periodEnd || '').slice(0, 10)}`
                  : '—'}
              </Descriptions.Item>
              <Descriptions.Item label="应付">
                ¥{Number(detail.payoutAmount ?? 0).toFixed(2)}
              </Descriptions.Item>
@@ -565,6 +537,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 +624,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 +697,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,
@@ -223,6 +224,7 @@ type StoreRow = {
  settlementRate?: number;
  sortOrder?: number;
  category?: { id: string; name: string; parentId?: string | null } | null;
  categories?: { id: string; name: string; parentId?: string | null }[] | null;
 };
 type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string | null };
@@ -302,6 +304,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);
@@ -348,29 +351,34 @@ export default function StoresPage() {
  const selectedPartnerId = Form.useWatch('partnerAccountId', createForm);
  const selectedRegionCodes = Form.useWatch('regionCodes', createForm);
  const selectedCityId = Form.useWatch('cityId', createForm);
-  const selectedCategoryParentId = Form.useWatch('categoryParentId', createForm);
+  const categoryLeafOptions = useMemo(() => {
-  const editCategoryParentId = Form.useWatch('categoryParentId', editForm);
+    const options: { value: string; label: string }[] = [];
    for (const parent of categoryTree) {
      if (parent.status === 'INACTIVE') continue;
      for (const child of parent.children ?? []) {
        if (child.status === 'INACTIVE') continue;
        options.push({ value: child.id, label: `${parent.name} / ${child.name}` });
      }
    }
    return options;
  }, [categoryTree]);
-  const categoryParentOptions = useMemo(
+  async function deleteStore(id: string) {
-    () =>
+    setDeleting(true);
-      categoryTree
+    try {
-        .filter((n) => n.status !== 'INACTIVE')
+      await request(`/admin/stores/${id}`, { method: 'DELETE' });
-        .map((n) => ({ value: n.id, label: n.name })),
+      message.success('门店及门店账号已删除');
-    [categoryTree],
+      if (detail && String(detail.id) === id) {
-  );
+        setDrawerOpen(false);
-  const categoryChildOptions = useMemo(() => {
+        setDetail(null);
-    const parent = categoryTree.find((n) => n.id === selectedCategoryParentId);
+      }
-    return (parent?.children ?? [])
+      void reload();
-      .filter((n) => n.status !== 'INACTIVE')
+    } catch (e) {
-      .map((n) => ({ value: n.id, label: n.name }));
+      message.error(e instanceof Error ? e.message : '删除失败');
-  }, [categoryTree, selectedCategoryParentId]);
+    } finally {
-
+      setDeleting(false);
-  const editCategoryChildOptions = useMemo(() => {
+    }
-    const parent = categoryTree.find((n) => n.id === editCategoryParentId);
+  }
    return (parent?.children ?? [])
      .filter((n) => n.status !== 'INACTIVE')
      .map((n) => ({ value: n.id, label: n.name }));
  }, [categoryTree, editCategoryParentId]);
  async function openStoreDetail(row: StoreRow, opts?: { tab?: string }) {
    const [d, cats] = await Promise.all([
@@ -395,20 +403,14 @@ export default function StoresPage() {
          bankBranch?: string | null;
        })
      : null;
-    const categoryId = category?.id != null ? String(category.id) : undefined;
+    const categories = Array.isArray(d.categories)
-    let parentId = category?.parentId != null ? String(category.parentId) : undefined;
+      ? (d.categories as { id?: string }[])
-    if (!parentId && categoryId) {
+      : [];
-      for (const parent of cats) {
+    const categoryIds = categories.length
-        if (parent.id === categoryId) {
+      ? categories.map((c) => String(c.id)).filter(Boolean)
-          parentId = parent.id;
+      : category?.id != null
-          break;
+        ? [String(category.id)]
-        }
+        : [];
        if ((parent.children ?? []).some((c) => c.id === categoryId)) {
          parentId = parent.id;
          break;
        }
      }
    }
    const loginPhone =
      (typeof d.loginPhone === 'string' && d.loginPhone) ||
      account?.phone ||
@@ -447,8 +449,7 @@ export default function StoresPage() {
      city: d.cityName,
      district: d.district,
      address: d.address,
-      categoryParentId: parentId,
+      categoryIds,
      categoryId,
      latitude: d.latitude != null ? Number(d.latitude) : undefined,
      longitude: d.longitude != null ? Number(d.longitude) : undefined,
      settlementRate: d.settlementRate != null ? Number(d.settlementRate) * 100 : 60,
@@ -511,7 +512,7 @@ export default function StoresPage() {
          !/^null$/i.test(v.benefitUsageRule.trim())
            ? v.benefitUsageRule.trim()
            : null,
-        categoryId: v.categoryId,
+        categoryIds: v.categoryIds,
        province: v.province,
        city: v.city,
        district: v.district,
@@ -642,8 +643,7 @@ export default function StoresPage() {
          'partnerAccountId',
          'regionCodes',
          'cityId',
-          'categoryParentId',
+          'categoryIds',
          'categoryId',
          'name',
          'phone',
          'address',
@@ -672,7 +672,7 @@ export default function StoresPage() {
        body: JSON.stringify({
          partnerAccountId: values.partnerAccountId,
          cityId: values.cityId,
-          categoryId: values.categoryId,
+          categoryIds: values.categoryIds,
          province: values.province,
          city: values.city,
          name: values.name.trim(),
@@ -750,8 +750,14 @@ export default function StoresPage() {
    {
      key: 'category',
      title: '分类',
-      width: 100,
+      width: 140,
-      render: (_, row) => row.category?.name || '—',
+      render: (_, row) => {
        const cats = Array.isArray(row.categories)
          ? row.categories.map((c: { name?: string }) => c.name).filter(Boolean)
          : [];
        if (cats.length) return cats.join('、');
        return row.category?.name || '—';
      },
    },
    { key: 'cityName', title: '城市', dataIndex: 'cityName', width: 80 },
    { key: 'phone', title: '登录号', dataIndex: 'phone', width: 120 },
@@ -821,7 +827,7 @@ export default function StoresPage() {
    {
      key: 'actions',
      title: '操作',
-      width: 280,
+      width: 320,
      fixed: 'right',
      render: (_, row) => (
        <Space size={0} wrap>
@@ -861,6 +867,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 +1051,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 && (
@@ -1115,29 +1143,17 @@ export default function StoresPage() {
                        <Input placeholder="手机号或座机，如 0379-8888888" />
                      </Form.Item>
                      <Form.Item
-                        name="categoryParentId"
+                        name="categoryIds"
-                        label="门店分类（大类）"
+                        label="门店分类（细类，可多选）"
-                        rules={[{ required: true, message: '请选择门店大类' }]}
+                        rules={[{ required: true, message: '请至少选择一个门店细类' }]}
                      >
                        <Select
                          mode="multiple"
                          showSearch
                          loading={optionsLoading}
                          optionFilterProp="label"
-                          options={categoryParentOptions}
+                          placeholder="选择细类，可多选"
-                          onChange={() => editForm.setFieldValue('categoryId', undefined)}
+                          options={categoryLeafOptions}
                        />
                      </Form.Item>
                      <Form.Item
                        name="categoryId"
                        label="门店分类（细类）"
                        rules={[{ required: true, message: '请选择门店细类' }]}
                      >
                        <Select
                          showSearch
                          optionFilterProp="label"
                          placeholder={editCategoryParentId ? '选择细类' : '请先选大类'}
                          disabled={!editCategoryParentId}
                          options={editCategoryChildOptions}
                        />
                      </Form.Item>
                      <Form.Item name="coverUrl" label="封面图 / 门头照">
@@ -1416,23 +1432,9 @@ export default function StoresPage() {
              <Form.Item name="district" hidden><Input /></Form.Item>
              <Form.Item name="districtCode" hidden><Input /></Form.Item>
              <Form.Item
-                name="categoryParentId"
+                name="categoryIds"
-                label="门店分类（大类）"
+                label="门店分类（细类，可多选）"
-                rules={[{ required: true, message: '请选择门店大类' }]}
+                rules={[{ required: true, message: '请至少选择一个门店细类' }]}
              >
                <Select
                  showSearch
                  loading={optionsLoading}
                  optionFilterProp="label"
                  placeholder={optionsLoading ? '加载中…' : '选择大类'}
                  options={categoryParentOptions}
                  onChange={() => createForm.setFieldValue('categoryId', undefined)}
                />
              </Form.Item>
              <Form.Item
                name="categoryId"
                label="门店分类（细类）"
                rules={[{ required: true, message: '请选择门店细类' }]}
                extra={
                  <Typography.Link onClick={() => navigate('/store-categories')}>
                    去配置门店分类
@@ -1440,11 +1442,12 @@ export default function StoresPage() {
                }
              >
                <Select
                  mode="multiple"
                  showSearch
                  loading={optionsLoading}
                  optionFilterProp="label"
-                  placeholder={selectedCategoryParentId ? '选择细类' : '请先选大类'}
+                  placeholder={optionsLoading ? '加载中…' : '选择细类，可多选'}
-                  disabled={!selectedCategoryParentId}
+                  options={categoryLeafOptions}
                  options={categoryChildOptions}
                />
              </Form.Item>
              <Form.Item name="name" label="门店名称" rules={[{ required: true, message: '请填写门店名称' }]}>
@@ -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>
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
  Button,
  Card,
@@ -13,17 +14,20 @@ 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,
 } from '@dukang/shared-types';
 import { fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { appendExportColumns } from '../lib/export-columns';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
@@ -35,6 +39,8 @@ type Row = {
  id: string;
  billNo: string;
  billDate: string;
  periodStart: string;
  periodEnd: string;
  orderCount: number;
  orderAmount: number;
  wineryRate: number;
@@ -94,6 +100,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 = [
@@ -104,8 +111,10 @@ const WINERY_BANK_KEYS = [
 ] as const;
 export default function WineryBillsPage() {
  const navigate = useNavigate();
  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 +130,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);
@@ -190,6 +201,7 @@ export default function WineryBillsPage() {
      if (filters.month) qs.set('month', filters.month);
      if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
      if (filters.dateTo) qs.set('dateTo', filters.dateTo);
      appendExportColumns(qs, exportColumnKeys);
      const result = await request<{ csv: string; count: number }>(`/admin/winery-bills/export?${qs}`);
      const suffix = filters.year && filters.month ? `${filters.year}-${filters.month}` : 'all';
      downloadExcelCsv(result.csv, `酒厂对账单_${suffix}.csv`);
@@ -199,6 +211,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);
@@ -242,6 +281,7 @@ export default function WineryBillsPage() {
  const baseColumns: ColumnsType<Row> = [
    {
      title: '账单号',
      key: '账单号',
      dataIndex: 'billNo',
      width: 170,
      render: (v, row) => (
@@ -249,32 +289,51 @@ export default function WineryBillsPage() {
      ),
    },
    {
-      title: '账单日',
+      title: (
        <Tooltip title="出账当天的北京日历日；T+3 只决定纳入哪天完成的订单">
          出账日
        </Tooltip>
      ),
      key: '出账日',
      dataIndex: 'billDate',
      width: 110,
      render: (v) => String(v || '').slice(0, 10),
    },
    { title: '订单数', dataIndex: 'orderCount', width: 80 },
    {
-      title: '酒单实付合计',
+      title: (
        <Tooltip title="纳入本账单的订单完成日区间（含起止日）">
          账期
        </Tooltip>
      ),
      key: '账期',
      width: 200,
      render: (_, row) => `${row.periodStart} ~ ${row.periodEnd}`,
    },
    { title: '订单数', key: '订单数', dataIndex: 'orderCount', width: 80 },
    {
      title: '订单总额',
      key: '订单总额',
      dataIndex: 'orderAmount',
      width: 120,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '酒厂比例',
      key: '酒厂比例',
      dataIndex: 'wineryRate',
      width: 90,
      render: (v) => `${Math.round(Number(v) * 100)}%`,
    },
    {
      title: '应付',
      key: '应付',
      dataIndex: 'wineryAmount',
      width: 110,
      render: (v) => `¥${Number(v).toFixed(2)}`,
    },
    {
      title: '状态',
      key: '状态',
      dataIndex: 'status',
      width: 100,
      render: (s, row) => {
@@ -301,7 +360,7 @@ export default function WineryBillsPage() {
    },
  ];
-  const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
  return (
    <div>
@@ -309,13 +368,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>
        }
      />
@@ -323,7 +387,7 @@ export default function WineryBillsPage() {
        <Card size="small" style={{ marginBottom: 16 }}>
          <Space size="large" wrap>
            <Statistic title="账单数" value={summary.count} />
-            <Statistic title="酒单实付合计" value={summary.orderAmount ?? 0} prefix="¥" precision={2} />
+            <Statistic title="订单总额" value={summary.orderAmount ?? 0} prefix="¥" precision={2} />
            <Statistic title="应付合计" value={summary.wineryAmount ?? 0} prefix="¥" precision={2} />
          </Space>
        </Card>
@@ -418,7 +482,10 @@ export default function WineryBillsPage() {
          <>
            <Descriptions column={1} size="small" bordered>
              <Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
-              <Descriptions.Item label="账单日">{String(detail.billDate).slice(0, 10)}</Descriptions.Item>
+              <Descriptions.Item label="出账日">{String(detail.billDate).slice(0, 10)}</Descriptions.Item>
              <Descriptions.Item label="账期">
                {detail.periodStart} ~ {detail.periodEnd}
              </Descriptions.Item>
              <Descriptions.Item label="应付">¥{Number(detail.wineryAmount).toFixed(2)}</Descriptions.Item>
              <Descriptions.Item label="状态">
                {displayWineryStatus(detail.status, detail.wineryAmount).label}
@@ -458,7 +525,20 @@ export default function WineryBillsPage() {
              pagination={false}
              dataSource={detail.items ?? []}
              columns={[
-                { title: '订单号', dataIndex: 'orderNo' },
+                {
                  title: '订单号',
                  dataIndex: 'orderNo',
                  render: (v: string) =>
                    v ? (
                      <AdminPrimaryLink
                        onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
                      >
                        {v}
                      </AdminPrimaryLink>
                    ) : (
                      '—'
                    ),
                },
                {
                  title: '配送',
                  dataIndex: 'deliveryType',
@@ -525,6 +605,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,8 @@ 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';
 import BankAccountPage from './pages/BankAccountPage';
 function PrimaryRoutes() {
  return (
@@ -41,6 +43,8 @@ function PrimaryRoutes() {
      <Route path="/center/settlement" element={<SettlementPage />} />
      <Route path="/center/staff" element={<StaffListPage />} />
      <Route path="/center/staff/new" element={<StaffCreatePage />} />
      <Route path="/center/bank" element={<BankAccountPage />} />
      <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 />} />
@@ -69,6 +73,7 @@ function SubAccountRoutes() {
    <Routes>
      <Route element={<SubAccountLayout navKind={navKind} />}>
        <Route path="/" element={<HomePage />} />
        <Route path="/users" element={<UsersManagePage />} />
        {isWarehouse ? (
          <Route path="/orders" element={<OrderListPage tabRoot />} />
        ) : (
@@ -84,6 +89,7 @@ function SubAccountRoutes() {
        </>
      )}
      <Route path="/leaderboard" element={<LeaderboardPage />} />
      <Route path="/users/:userId/orders" element={<AssocOrdersPage />} />
      {isWarehouse && <Route path="/orders/:id" element={<OrderDetailPage />} />}
      <Route path="*" element={<Navigate to="/" replace />} />
    </Routes>
@@ -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>
  );
 }
@@ -3,12 +3,14 @@ import type { PartnerNavKind } from '../lib/partnerAccess';
 const STORE_STAFF_TABS = [
  { to: '/', end: true, icon: 'dashboard', label: '首页' },
  { to: '/users', icon: 'group', label: '用户管理' },
  { to: '/stores', icon: 'store', label: '门店管理' },
  { to: '/me', icon: 'person', label: '个人中心' },
 ] as const;
 const WAREHOUSE_STAFF_TABS = [
  { to: '/', end: true, icon: 'dashboard', label: '首页' },
  { to: '/users', icon: 'group', label: '用户管理' },
  { to: '/orders', icon: 'receipt_long', label: '订单管理' },
  { to: '/me', icon: 'person', label: '个人中心' },
 ] as const;
@@ -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);
  }
 }
@@ -94,8 +94,8 @@ export function partnerHomePath(account: PartnerMe | null | undefined): string {
  return '/';
 }
-const STORE_STAFF_PREFIXES = ['/', '/stores', '/me', '/leaderboard', '/login'];
+const STORE_STAFF_PREFIXES = ['/', '/stores', '/users', '/me', '/leaderboard', '/login'];
-const WAREHOUSE_STAFF_PREFIXES = ['/', '/orders', '/me', '/leaderboard', '/login'];
+const WAREHOUSE_STAFF_PREFIXES = ['/', '/orders', '/users', '/me', '/leaderboard', '/login'];
 export function isSubAccountPath(pathname: string, navKind: PartnerNavKind = 'store_staff'): boolean {
  if (pathname === '/login') return true;
@@ -0,0 +1,16 @@
 import type { PartnerSettlementPreviewDto } from '@dukang/shared-types';
 export function formatBillPeriod(start?: string | null, end?: string | null) {
  const s = String(start || '').slice(0, 10);
  const e = String(end || '').slice(0, 10);
  if (!s) return '—';
  if (!e || e === s) return s;
  return `${s} ~ ${e}`;
 }
 export function formatIssueLabel(preview: Pick<PartnerSettlementPreviewDto, 'nextIssueAt' | 'cycleLabel'> | null) {
  if (!preview?.nextIssueAt) return preview?.cycleLabel || '每周一 08:00 出账';
  const ymd = new Date(preview.nextIssueAt).toLocaleDateString('sv-SE', { timeZone: 'Asia/Shanghai' });
  if (!ymd || ymd === 'Invalid Date') return preview.cycleLabel || '每周一 08:00 出账';
  return `${ymd} 08:00 出账`;
 }
@@ -25,7 +25,10 @@ export type StoreDraftForm = {
  /** 人均费用（选填） */
  avgPrice: string;
  categoryParentId: string;
  /** @deprecated 使用 categoryIds */
  categoryId: string;
  /** 二级分类多选 */
  categoryIds: string[];
  intro: string;
  /** 好客权益券使用规则 */
  benefitUsageRule: string;
@@ -68,6 +71,7 @@ export const defaultStoreForm = (): StoreDraftForm => ({
  avgPrice: '',
  categoryParentId: '',
  categoryId: '',
  categoryIds: [],
  intro: '',
  benefitUsageRule: '',
  coverUrl: '',
@@ -122,6 +126,20 @@ export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | un
    openTime2: String(raw.openTime2 ?? base.openTime2),
    closeTime2: String(raw.closeTime2 ?? base.closeTime2),
    avgPrice: String(raw.avgPrice ?? base.avgPrice),
    categoryIds: (() => {
      if (Array.isArray(raw.categoryIds) && raw.categoryIds.length) {
        return raw.categoryIds.map(String).filter(Boolean);
      }
      const legacy = String(raw.categoryId ?? '').trim();
      return legacy ? [legacy] : base.categoryIds;
    })(),
    categoryId: (() => {
      const ids = Array.isArray(raw.categoryIds) && raw.categoryIds.length
        ? raw.categoryIds.map(String).filter(Boolean)
        : [];
      if (ids.length) return ids[0];
      return String(raw.categoryId ?? base.categoryId);
    })(),
    envPhotoUrls: normalizeStringArray(raw.envPhotoUrls, MIN_ENV_PHOTO_COUNT),
    // 兼容旧草稿：单个 contractUrl 迁移为数组
    contractUrls: (() => {
@@ -201,7 +219,7 @@ export function validateStoreStep1(
    | 'openTime2'
    | 'closeTime2'
    | 'avgPrice'
-    | 'categoryId'
+    | 'categoryIds'
    | 'intro'
    | 'benefitUsageRule'
  >,
@@ -233,7 +251,7 @@ export function validateStoreStep1(
    const n = Number(form.avgPrice);
    if (Number.isNaN(n) || n < 0) return '人均费用须为非负数字';
  }
-  if (!form.categoryId.trim()) return '请选择店铺类型';
+  if (!form.categoryIds?.length) return '请至少选择一个店铺类型';
  if (form.intro.trim()) {
    const len = form.intro.trim().length;
    if (len < 2 || len > 500) return '门店简介须为 2~500 字';
@@ -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>
      )}
@@ -0,0 +1,141 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import type { PartnerMe, UpdatePartnerBankRequest } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { toastError, toastSuccess } from '../lib/toast';
 type FieldErrors = {
  bankAccountName?: string;
  bankAccountNo?: string;
  bankBranch?: string;
 };
 export default function BankAccountPage() {
  const navigate = useNavigate();
  const { account, refresh } = usePartnerSession();
  const [bankAccountName, setBankAccountName] = useState(account?.bankAccount?.bankAccountName ?? '');
  const [bankAccountNo, setBankAccountNo] = useState(account?.bankAccount?.bankAccountNo ?? '');
  const [bankBranch, setBankBranch] = useState(account?.bankAccount?.bankBranch ?? '');
  const [submitting, setSubmitting] = useState(false);
  const [fieldErrors, setFieldErrors] = useState<FieldErrors>({});
  useEffect(() => {
    document.title = '收款账户';
  }, []);
  useEffect(() => {
    setBankAccountName(account?.bankAccount?.bankAccountName ?? '');
    setBankAccountNo(account?.bankAccount?.bankAccountNo ?? '');
    setBankBranch(account?.bankAccount?.bankBranch ?? '');
  }, [account?.bankAccount]);
  async function submit() {
    const name = bankAccountName.trim();
    const no = bankAccountNo.replace(/\s+/g, '');
    const branch = bankBranch.trim();
    const next: FieldErrors = {};
    if (!name) next.bankAccountName = '请填写收款人';
    if (!/^\d{8,32}$/.test(no)) next.bankAccountNo = '请填写 8～32 位数字账号';
    if (!branch) next.bankBranch = '请填写开户行名称';
    setFieldErrors(next);
    if (Object.keys(next).length) return;
    setSubmitting(true);
    try {
      const body: UpdatePartnerBankRequest = {
        bankAccountName: name,
        bankAccountNo: no,
        bankBranch: branch,
      };
      await request<PartnerMe>('PARTNER_H5', '/partner/me/bank', {
        method: 'PUT',
        body: JSON.stringify(body),
      });
      await refresh();
      toastSuccess('收款账户已保存');
      navigate('/center');
    } catch (e) {
      toastError(e instanceof Error ? e.message : '保存失败');
    } finally {
      setSubmitting(false);
    }
  }
  return (
    <div className="partner-page-sticky">
      <PageHeader title="收款账户" onBack={() => navigate('/center')} />
      <section className="partner-form-card">
        <div className="partner-section-title">
          <div className="partner-section-bar" />
          <h2 className="headline-md">银行账号</h2>
        </div>
        <p className="label-md text-muted" style={{ marginBottom: 16, lineHeight: 1.5 }}>
          用于总部打款。请填写与合同一致的对公或对私账户。
        </p>
        <div className="partner-field">
          <label>收款人 <span className="text-primary">*</span></label>
          <div className="partner-field-input">
            <span className="material-symbols-outlined">person</span>
            <input
              placeholder="户名 / 收款人姓名"
              value={bankAccountName}
              maxLength={64}
              onChange={(e) => setBankAccountName(e.target.value)}
            />
          </div>
          {fieldErrors.bankAccountName && (
            <p className="partner-field-error" role="alert">{fieldErrors.bankAccountName}</p>
          )}
        </div>
        <div className="partner-field">
          <label>银行账号 <span className="text-primary">*</span></label>
          <div className="partner-field-input">
            <span className="material-symbols-outlined">credit_card</span>
            <input
              inputMode="numeric"
              placeholder="请输入银行账号"
              value={bankAccountNo}
              maxLength={32}
              onChange={(e) => setBankAccountNo(e.target.value.replace(/[^\d]/g, ''))}
            />
          </div>
          {fieldErrors.bankAccountNo && (
            <p className="partner-field-error" role="alert">{fieldErrors.bankAccountNo}</p>
          )}
        </div>
        <div className="partner-field">
          <label>开户行名称 <span className="text-primary">*</span></label>
          <div className="partner-field-input">
            <span className="material-symbols-outlined">account_balance</span>
            <input
              placeholder="如 中国工商银行洛阳分行"
              value={bankBranch}
              maxLength={128}
              onChange={(e) => setBankBranch(e.target.value)}
            />
          </div>
          {fieldErrors.bankBranch && (
            <p className="partner-field-error" role="alert">{fieldErrors.bankBranch}</p>
          )}
        </div>
      </section>
      <footer className="partner-sticky-footer">
        <button
          type="button"
          className="partner-btn-primary"
          disabled={submitting}
          onClick={() => void submit()}
        >
          {submitting ? '保存中…' : '保存'}
        </button>
      </footer>
    </div>
  );
 }
@@ -4,6 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import type { PartnerBillDetailDto, PartnerBillDto, PartnerBillItemDto } from '@dukang/shared-types';
 import { isLoggedIn, request } from '../lib/api';
 import { formatBillPeriod } from '../lib/settlement';
 import { toastError, toastSuccess } from '../lib/toast';
 import { usePartnerPageView } from '../lib/usePageView';
@@ -188,7 +189,8 @@ export default function BillsPage() {
            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', marginBottom: 24 }}>
              <div>
                <p className="label-md text-muted" style={{ textTransform: 'uppercase', letterSpacing: '0.1em', marginBottom: 4 }}>SETTLEMENT PERIOD</p>
-                <h2 className="headline-lg" style={{ fontSize: 20 }}>{String(bill.billNo || '月度结算账单')}</h2>
+                <h2 className="headline-lg" style={{ fontSize: 20 }}>{String(bill.billNo || '周结算账单')}</h2>
                <p className="label-md text-muted" style={{ marginTop: 4 }}>{formatBillPeriod(bill.periodStart, bill.periodEnd)}</p>
              </div>
              <span className={`partner-status-pill${isRejected ? ' partner-status-pill--closed' : isUnpaid ? ' partner-status-pill--paused' : isPaid ? ' partner-status-pill--open' : ' partner-status-pill--paused'}`}>
                {billStatusLabel(status)}
@@ -271,7 +273,7 @@ export default function BillsPage() {
                  <div className="partner-store-card-header" style={{ marginBottom: 0 }}>
                    <div>
                      <p className="body-md">{b.billNo}</p>
-                      <p className="label-md text-muted">{billStatusLabel(b.status)}</p>
+                      <p className="label-md text-muted">{formatBillPeriod(b.periodStart, b.periodEnd)} · {billStatusLabel(b.status)}</p>
                      {b.status === 'REJECTED' && b.rejectReason ? (
                        <p className="label-md text-primary" style={{ marginTop: 4 }}>驳回：{b.rejectReason}</p>
                      ) : null}
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';
-import type { PartnerBillDto } from '@dukang/shared-types';
+import type { PartnerBillDto, PartnerSettlementPreviewDto } from '@dukang/shared-types';
 import { isWxAuthorizeEnabled } from '@dukang/shared-types';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { request } from '../lib/api';
@@ -8,6 +8,7 @@ import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { contactSupport } from '../lib/contact';
 import { isPrimaryAccount } from '../lib/partnerAccess';
 import { listPartnerStaff } from '../lib/staff';
 import { formatBillPeriod, formatIssueLabel } from '../lib/settlement';
 import { toastError, toastSuccess } from '../lib/toast';
 import {
  authorizePartnerWechat,
@@ -31,6 +32,7 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
  const isPrimary = variant === 'primary' && isPrimaryAccount(account);
  const [authorizing, setAuthorizing] = useState(false);
  const [bills, setBills] = useState<PartnerBillDto[]>([]);
  const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
  const [staffCount, setStaffCount] = useState(0);
  useEffect(() => {
@@ -44,6 +46,9 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
        request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills')
          .then(setBills)
          .catch(() => setBills([])),
        request<PartnerSettlementPreviewDto>('PARTNER_H5', '/partner/settlement/preview')
          .then(setPreview)
          .catch(() => setPreview(null)),
        listPartnerStaff()
          .then((list) => setStaffCount(list.length))
          .catch(() => setStaffCount(0)),
@@ -188,6 +193,15 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
                <p className="partner-finance-hero-label">账户余额 (元)</p>
                <p className="partner-finance-hero-amount">{fmtMoney(finance.balance)}</p>
              </div>
              <div className="partner-finance-card">
                <p className="label-md text-muted">预付款</p>
                <p className="partner-finance-value text-primary">¥ {fmtMoney(preview?.prepaymentAmount ?? 0)}</p>
                <p className="label-md text-muted" style={{ marginTop: 6, lineHeight: 1.4 }}>
                  {formatBillPeriod(preview?.periodStart, preview?.periodEnd)}
                  <br />
                  {formatIssueLabel(preview)}
                </p>
              </div>
              <Link to="/center/settlement" className="partner-finance-card">
                <p className="label-md text-muted">待结算</p>
                <p className="partner-finance-value text-primary">¥ {fmtMoney(finance.pendingTotal)}</p>
@@ -219,6 +233,31 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
                  <span className="material-symbols-outlined text-muted">chevron_right</span>
                </div>
              </Link>
              <Link to="/center/bank" className="partner-menu-item">
                <div className="partner-menu-item-left">
                  <div className="partner-menu-icon">
                    <span className="material-symbols-outlined">account_balance</span>
                  </div>
                  <span className="body-md" style={{ fontSize: 16 }}>收款账户</span>
                </div>
                <div className="partner-menu-item-right">
                  {account?.bankAccount?.bankAccountNo ? (
                    <span className="label-md text-muted">{account.bankAccount.bankAccountNo.slice(-4)}</span>
                  ) : (
                    <span className="partner-menu-status">未填写</span>
                  )}
                  <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,10 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
-import type { PartnerAssocStats, PartnerLeaderboardEntry } from '@dukang/shared-types';
+import type { PartnerAssocStats, PartnerLeaderboardEntry, PartnerSettlementPreviewDto } from '@dukang/shared-types';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
 import { usePartnerPageView } from '../lib/usePageView';
 import { isLoggedIn, request } from '../lib/api';
 import { fetchPartnerLeaderboard } from '../lib/leaderboard';
 import { formatBillPeriod, formatIssueLabel } from '../lib/settlement';
 import {
  canAccessPartnerDashboard,
  canAccessPartnerOrders,
@@ -154,6 +155,7 @@ export default function HomePage() {
  const [orders, setOrders] = useState<Array<Record<string, unknown>>>([]);
  const [leaderboardEntries, setLeaderboardEntries] = useState<PartnerLeaderboardEntry[]>([]);
  const [assocStats, setAssocStats] = useState<PartnerAssocStats | null>(null);
  const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
  useEffect(() => {
    document.title = '工作台';
@@ -203,9 +205,13 @@ export default function HomePage() {
        request<PartnerAssocStats>('PARTNER_H5', '/partner/assoc/stats', { silent: true })
          .then(setAssocStats)
          .catch(() => setAssocStats(null)),
        request<PartnerSettlementPreviewDto>('PARTNER_H5', '/partner/settlement/preview', { silent: true })
          .then(setPreview)
          .catch(() => setPreview(null)),
      );
    } else {
      setAssocStats(null);
      setPreview(null);
    }
    tasks.push(
@@ -245,27 +251,20 @@ export default function HomePage() {
    ? Math.round(((monthNew - lastMonthNew) / lastMonthNew) * 100)
    : (monthNew > 0 ? 100 : 0);
  const orderCount = Number(dash?.orderCount || orderStats.todayCount || 0);
  const revenue = orderCount * 128.45;
  const profit = revenue * 0.25;
  return (
    <PullToRefresh onRefresh={loadHome} className="page partner-home partner-home--flush-top">
      <main className="partner-home-body">
        {isPrimary && (
          <>
            <section className="partner-revenue-card">
-              <p className="partner-revenue-label">
+              <p className="partner-revenue-label">预付款金额 (CNY)</p>
-                实时营业额 (CNY)
+              <div className="partner-revenue-amount">{fmtMoney(preview?.prepaymentAmount ?? 0)}</div>
-                <span className="material-symbols-outlined" style={{ fontSize: 14 }}>info</span>
+              <p className="partner-revenue-label" style={{ marginTop: 8, opacity: 0.85, lineHeight: 1.5 }}>
                账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)}
              </p>
              <p className="partner-revenue-label" style={{ marginTop: 6, opacity: 0.75 }}>
                本周酒单与核销预估佣金，实际以账单为准
              </p>
              <div className="partner-revenue-amount">{fmtMoney(revenue)}</div>
              <div className="partner-revenue-grid">
                <div>
                  <p className="partner-revenue-label">预计利润</p>
                  <p className="headline-md" style={{ color: '#fff', marginTop: 4 }}>¥ {fmtMoney(profit)}</p>
                </div>
              </div>
            </section>
            <section className="partner-bento-card" style={{ marginBottom: 16 }}>
              <div className="partner-quick-actions">
@@ -2,8 +2,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
-import type { PartnerBillDto } from '@dukang/shared-types';
+import type { PartnerBillDto, PartnerSettlementPreviewDto } from '@dukang/shared-types';
 import { isLoggedIn, request } from '../lib/api';
 import { formatBillPeriod, formatIssueLabel } from '../lib/settlement';
 type StatusFilter = 'all' | 'pending' | 'settled' | 'reviewing' | 'rejected';
@@ -31,25 +32,23 @@ function billStatusClass(status: string) {
  }
 }
-function billPeriodLabel(periodStart: string) {
+function billPeriodLabel(bill: PartnerBillDto) {
-  const d = new Date(periodStart);
+  return formatBillPeriod(bill.periodStart, bill.periodEnd);
  if (Number.isNaN(d.getTime())) return '—';
  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`;
 }
 function billMonthLabel(year: number, month: number) {
  return `${year}年${month}月`;
 }
 export default function SettlementPage() {
  const navigate = useNavigate();
  const [bills, setBills] = useState<PartnerBillDto[]>([]);
-  const now = new Date();
+  const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
  const [month, setMonth] = useState({ year: now.getFullYear(), month: now.getMonth() + 1 });
  const [statusFilter, setStatusFilter] = useState<StatusFilter>('all');
  const loadBills = useCallback(() => {
-    return request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills').then(setBills);
+    return Promise.all([
      request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills').then(setBills),
      request<PartnerSettlementPreviewDto>('PARTNER_H5', '/partner/settlement/preview')
        .then(setPreview)
        .catch(() => setPreview(null)),
    ]).then(() => undefined);
  }, []);
  useEffect(() => {
@@ -60,22 +59,14 @@ export default function SettlementPage() {
  const summary = useMemo(() => {
    const pending = bills.filter((b) => b.status === 'AWAITING_CONFIRM');
    const settled = bills.filter((b) => b.status === 'PAID');
    const currentMonth = bills.filter((b) => {
      const d = new Date(b.periodStart);
      return d.getFullYear() === now.getFullYear() && d.getMonth() === now.getMonth();
    });
    return {
      pendingTotal: pending.reduce((s, b) => s + Number(b.totalAmount || 0), 0),
      settledTotal: settled.reduce((s, b) => s + Number(b.totalAmount || 0), 0),
      monthEstimate: currentMonth.reduce((s, b) => s + Number(b.totalAmount || 0), 0),
    };
-  }, [bills, now]);
+  }, [bills]);
  const filteredBills = useMemo(() => {
    return bills.filter((b) => {
      const d = new Date(b.periodStart);
      const matchMonth = d.getFullYear() === month.year && d.getMonth() + 1 === month.month;
      if (!matchMonth) return false;
      if (statusFilter === 'all') return true;
      if (statusFilter === 'pending') return b.status === 'AWAITING_CONFIRM';
      if (statusFilter === 'settled') return b.status === 'PAID';
@@ -83,16 +74,7 @@ export default function SettlementPage() {
      if (statusFilter === 'rejected') return b.status === 'REJECTED';
      return true;
    });
-  }, [bills, month, statusFilter]);
+  }, [bills, statusFilter]);
  const monthOptions = useMemo(() => {
    const opts: Array<{ year: number; month: number }> = [];
    for (let i = 0; i < 6; i++) {
      const d = new Date(now.getFullYear(), now.getMonth() - i, 1);
      opts.push({ year: d.getFullYear(), month: d.getMonth() + 1 });
    }
    return opts;
  }, [now]);
  function openBill(bill: PartnerBillDto) {
    navigate(bill.id ? `/center/bills?id=${bill.id}` : '/center/bills');
@@ -127,33 +109,18 @@ export default function SettlementPage() {
            </div>
            <div className="partner-settlement-summary-divider" />
            <div>
-              <p className="partner-settlement-summary-sub">本月预估收益</p>
+              <p className="partner-settlement-summary-sub">本周预付款</p>
              <p className="partner-settlement-summary-value partner-settlement-summary-value--accent">
-                ¥{fmtMoney(summary.monthEstimate)}
+                ¥{fmtMoney(preview?.prepaymentAmount ?? 0)}
              </p>
            </div>
          </div>
        </section>
        <section className="partner-settlement-filters">
-          <select
+          <p className="label-md text-muted" style={{ margin: 0, lineHeight: 1.5 }}>
-            className="partner-settlement-month"
+            账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)}
-            value={`${month.year}-${month.month}`}
+          </p>
            onChange={(e) => {
              const [y, m] = e.target.value.split('-').map(Number);
              setMonth({ year: y, month: m });
            }}
          >
            {monthOptions.map((opt) => (
              <option key={`${opt.year}-${opt.month}`} value={`${opt.year}-${opt.month}`}>
                {billMonthLabel(opt.year, opt.month)}
              </option>
            ))}
          </select>
          <button type="button" className="partner-settlement-status-btn">
            <span className="material-symbols-outlined">filter_list</span>
            状态
          </button>
        </section>
        <div className="partner-settlement-chips">
@@ -193,7 +160,7 @@ export default function SettlementPage() {
                  </div>
                  <p className="partner-settlement-item-meta">
                    <span className="material-symbols-outlined">event</span>
-                    {billPeriodLabel(bill.periodStart)}
+                    {billPeriodLabel(bill)}
                    <span className="partner-settlement-dot" />
                    订单分佣 ¥{fmtMoney(Number(bill.orderCommission || 0))}
                  </p>
@@ -205,7 +205,7 @@ export default function StaffCreatePage() {
          <span className="material-symbols-outlined">info</span>
        </div>
        <p className="label-md text-variant" style={{ marginTop: 0, lineHeight: 1.5 }}>
-          子账号创建后默认禁用，需在子账号列表中手动启用后方可登录。
+          子账号创建后默认可登录，可在子账号列表中禁用。
        </p>
      </div>
@@ -206,9 +206,9 @@ export default function StoreCreatePage() {
      .then((list) => {
        const tree = Array.isArray(list) ? list : [];
        setCategoryTree(tree);
-        if (form.categoryId && !form.categoryParentId) {
+        if (form.categoryIds.length && !form.categoryParentId) {
          const parent = tree.find((root) =>
-            (root.children ?? []).some((child) => child.id === form.categoryId),
+            (root.children ?? []).some((child) => form.categoryIds.includes(child.id)),
          );
          if (parent) patchForm({ categoryParentId: parent.id });
        }
@@ -216,12 +216,6 @@ export default function StoreCreatePage() {
      .catch(() => setCategoryTree([]));
  }, []);
  const categoryChildren = useMemo(() => {
    const parent = categoryTree.find((item) => item.id === form.categoryParentId);
    return Array.isArray(parent?.children) ? parent!.children! : [];
  }, [categoryTree, form.categoryParentId]);
  useEffect(() => {
@@ -523,7 +517,8 @@ export default function StoreCreatePage() {
          ...(form.avgPrice.trim() ? { avgPrice: Number(form.avgPrice) } : {}),
-          categoryId: form.categoryId.trim(),
+          categoryIds: form.categoryIds,
          categoryId: form.categoryIds[0] || form.categoryId.trim(),
          intro: form.intro.trim() || undefined,
          benefitUsageRule: form.benefitUsageRule.trim() || undefined,
@@ -690,56 +685,40 @@ export default function StoreCreatePage() {
            <div className="partner-field">
-              <label>店铺类型 <span className="text-primary">*</span></label>
+              <label>店铺类型 <span className="text-primary">*</span> <span className="label-md text-muted">（可多选）</span></label>
              <div className="partner-input-row" style={{ gap: 8 }}>
                <select
                  className="partner-field-input partner-field-input--block"
                  value={form.categoryParentId}
                  onChange={(e) => patchForm({ categoryParentId: e.target.value, categoryId: '' })}
                  aria-label="一级店铺类型"
                >
                  <option value="">选择大类</option>
                  {categoryTree.map((item) => (
                    <option key={item.id} value={item.id}>{item.name}</option>
                  ))}
                </select>
                <select
                  className="partner-field-input partner-field-input--block"
                  value={form.categoryId}
                  onChange={(e) => patchForm({ categoryId: e.target.value })}
                  disabled={!form.categoryParentId}
                  aria-label="二级店铺类型"
                >
                  <option value="">{form.categoryParentId ? '选择细类' : '请先选大类'}</option>
                  {categoryChildren.map((item) => (
                    <option key={item.id} value={item.id}>{item.name}</option>
                  ))}
                </select>
              <div className="partner-category-multi">
                {categoryTree.map((parent) => (
                  <div key={parent.id} className="partner-category-group">
                    <div className="partner-category-group-title">{parent.name}</div>
                    <div className="partner-category-options">
                      {(parent.children ?? []).map((child) => {
                        const checked = form.categoryIds.includes(child.id);
                        return (
                          <label key={child.id} className="partner-category-option">
                            <input
                              type="checkbox"
                              checked={checked}
                              onChange={() => {
                                const next = checked
                                  ? form.categoryIds.filter((id) => id !== child.id)
                                  : [...form.categoryIds, child.id];
                                patchForm({
                                  categoryIds: next,
                                  categoryId: next[0] ?? '',
                                  categoryParentId: next.length
                                    ? parent.id
                                    : form.categoryParentId,
                                });
                              }}
                            />
                            <span>{child.name}</span>
                          </label>
                        );
                      })}
                    </div>
                  </div>
                ))}
              </div>
            </div>
@@ -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,9 +7,17 @@ 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';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { isSubAccount } from '../lib/partnerAccess';
 type ListRes = { items: PartnerAssocUserItem[]; total: number };
@@ -32,10 +40,14 @@ function fmtTime(iso?: string | null) {
 export default function UsersManagePage() {
  usePartnerPageView('partner_users_manage_view');
  const { account } = usePartnerSession();
  const hidePoster = isSubAccount(account);
  const navigate = useNavigate();
  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 +63,37 @@ export default function UsersManagePage() {
  }, []);
  useEffect(() => () => {
-    if (previewUrl) URL.revokeObjectURL(previewUrl);
+    if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
  }, [previewUrl]);
  useEffect(() => {
    const posterId = hidePoster ? null : 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);
    };
  }, [hidePoster, summary?.activityPosterId]);
  const loadSummary = useCallback(async () => {
    const data = await request<PartnerAssocSummary>('PARTNER_H5', '/partner/assoc');
    setSummary(data);
@@ -93,31 +133,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 = hidePoster ? null : 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,26 +194,59 @@ export default function UsersManagePage() {
          <p className="body-md text-muted" style={{ marginBottom: 12 }}>
            用户扫码后首次锁定，后续购酒计入关联订单
          </p>
-          {summary?.qrcodeUrl ? (
+          {summary?.activityPosterId && !hidePoster && (previewUrl || heroUrl) ? (
            <img
-              src={previewUrl || summary.qrcodeUrl}
+              className="partner-longpress-img"
              src={previewUrl || heroUrl || ''}
              alt="活动图"
              style={{ width: '100%', maxWidth: 360, background: '#f5f5f5' }}
            />
          ) : summary?.activityPosterId && !hidePoster && 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' }}
            />
          ) : (
            <p className="body-md text-muted">{loading ? '加载中…' : '关联码尚未生成'}</p>
          )}
-          <p className="label-md text-muted" style={{ marginTop: 8 }}>
+          {(() => {
-            已关联 {summary?.userCount ?? total} 人
+            const scanCount = summary?.scanCount ?? 0;
-          </p>
+            const userCount = summary?.userCount ?? total;
-          <button type="button" className="partner-btn-primary" style={{ marginTop: 16 }} onClick={() => void downloadQr()}>
+            if (scanCount <= 0 && userCount <= 0) return null;
-            下载二维码
+            return (
              <p className="label-md text-muted" style={{ marginTop: 8 }}>
                已扫码 {scanCount} 人 · 已关联 {userCount} 人
              </p>
            );
          })()}
          <button type="button" className="partner-btn-primary" style={{ marginTop: 16 }} onClick={() => void downloadMainImage()}>
            {summary?.activityPosterId && !hidePoster ? '下载活动图' : '下载二维码'}
          </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 && !hidePoster ? '下载活动图' : '下载二维码'}」后长按保存
            </p>
          ) : null}
        </section>
        {!hidePoster && (
        <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>
@@ -203,32 +277,40 @@ export default function UsersManagePage() {
        {!loading && items.length === 0 && <div className="empty">暂无关联用户</div>}
        {items.map((u) => (
          <div key={u.id} className="partner-store-card" style={{ marginBottom: 12 }}>
-            <div className="partner-store-card-header" style={{ marginBottom: 8 }}>
+            <div className="partner-store-card-header" style={{ marginBottom: 4 }}>
-              <div>
+              <p className="body-md">{formatUserLabel(u)}</p>
                <p className="body-md">{formatUserLabel(u)}</p>
                <p className="label-md text-muted">{u.phone || '未绑定手机'}</p>
                <p className="label-md text-muted">注册 {fmtTime(u.createdAt)}</p>
              </div>
              <button
                type="button"
                className="label-md text-primary"
-                style={{ background: 'none', border: 0, padding: 0 }}
+                style={{ background: 'none', border: 0, padding: 0, flexShrink: 0 }}
                onClick={() => navigate(`/users/${u.id}/orders`)}
              >
                {u.orderCount} 单
              </button>
            </div>
-            <button
+            <p className="label-md text-muted">{u.phone || '未绑定手机'}</p>
-              type="button"
+            <div
-              className="label-md text-primary"
+              style={{
-              style={{ background: 'none', border: 0, padding: 0 }}
+                display: 'flex',
-              onClick={() => {
+                justifyContent: 'space-between',
-                setEditing(u);
+                alignItems: 'center',
-                setRemarkDraft(u.partnerRemark ?? '');
+                gap: 12,
                marginTop: 4,
              }}
            >
-              {u.partnerRemark ? '改备注' : '添加备注'}
+              <p className="label-md text-muted">注册 {fmtTime(u.createdAt)}</p>
-            </button>
+              <button
                type="button"
                className="label-md text-primary"
                style={{ background: 'none', border: 0, padding: 0, flexShrink: 0 }}
                onClick={() => {
                  setEditing(u);
                  setRemarkDraft(u.partnerRemark ?? '');
                }}
              >
                {u.partnerRemark ? '改备注' : '添加备注'}
              </button>
            </div>
          </div>
        ))}
      </div>
@@ -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.10",
  "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(() => {});
 }
@@ -162,6 +162,11 @@ export async function capturePromoSceneAndTouchScan(): Promise<void> {
  const assocScene = extractAssocSceneFromEnterOptions(opts);
  if (assocScene) {
    setStoredAssocScene(assocScene);
    const touchKey = `assoc|${assocScene}|${opts?.path || ''}|${JSON.stringify(opts?.query || {})}|${String(opts?.scene ?? '')}`;
    if (touchKey !== lastScanTouchKey) {
      lastScanTouchKey = touchKey;
      await touchAssoc({ scene: assocScene, countScan: true });
    }
    await bindStoredAssocIfLoggedIn();
    return;
  }
@@ -179,6 +184,20 @@ export async function capturePromoSceneAndTouchScan(): Promise<void> {
  // 无新 scene 时不重复扫码计数
 }
 async function touchAssoc(input: { scene: string; countScan: boolean }): Promise<void> {
  try {
    await request('/user/partner-assoc/touch', {
      method: 'POST',
      data: {
        scene: input.scene,
        countScan: input.countScan,
      },
    });
  } catch {
    /* 静默失败，不阻断浏览 */
  }
 }
 /** 登录成功后：用已缓存的活动 ID 做归因（不重复加扫码次数） */
 export async function touchStoredPromoAfterLogin(): Promise<void> {
  await bindStoredAssocIfLoggedIn();
@@ -22,6 +22,7 @@ export function storeCategoryTags(
    tags?: unknown;
    categoryId?: string | null;
    category?: StoreCategoryLike | null;
    categories?: StoreCategoryLike[] | null;
  },
  tree: StoreCategoryTreeNode[] = [],
 ): string[] {
@@ -30,24 +31,125 @@ export function storeCategoryTags(
    : [];
  if (fromJson.length) return fromJson;
-  const names: string[] = [];
+  const multi = Array.isArray(store.categories) ? store.categories : [];
-  const childName = String(store.category?.name || '').trim();
+  if (multi.length) {
-  const parentName = String(store.category?.parent?.name || '').trim();
+    return groupCategoryTags(multi, tree);
-  if (parentName) names.push(parentName);
+  }
  if (childName && childName !== parentName) names.push(childName);
-  const storeCatId = String(store.categoryId || store.category?.id || '');
+  if (store.category || store.categoryId) {
-  const storeParentId = String(store.category?.parentId || '');
+    const grouped = groupCategoryTags(
-  for (const root of tree) {
+      store.category ? [store.category] : [],
-    if (root.id === storeParentId || root.id === storeCatId) {
+      tree,
-      if (root.name && !names.includes(root.name)) names.unshift(root.name);
+      store.categoryId,
-    }
+    );
-    for (const child of root.children ?? []) {
+    if (grouped.length) return grouped;
-      if (child.id === storeCatId) {
+  }
-        if (root.name && !names.includes(root.name)) names.unshift(root.name);
+
-        if (child.name && !names.includes(child.name)) names.push(child.name);
+  const storeCatId = String(store.categoryId || '');
  if (storeCatId) {
    for (const root of tree) {
      for (const child of root.children ?? []) {
        if (child.id === storeCatId) {
          return [`${root.name}|${child.name}`];
        }
      }
    }
  }
-  return names;
+  return [];
 }
 /** 按大类分组：餐饮|火锅·江浙菜、娱乐|KTV */
 function groupCategoryTags(
  categories: StoreCategoryLike[],
  tree: StoreCategoryTreeNode[] = [],
  fallbackCategoryId?: string | null,
 ): string[] {
  if (!categories.length && fallbackCategoryId) {
    return groupCategoryTags([{ id: String(fallbackCategoryId) }], tree);
  }
  const groups = new Map<string, { parentName: string; children: string[] }>();
  const order: string[] = [];
  for (const cat of categories) {
    const resolved = resolveCategoryParts(cat, tree);
    if (!resolved) continue;
    const { parentKey, parentName, childName } = resolved;
    if (!groups.has(parentKey)) {
      groups.set(parentKey, { parentName, children: [] });
      order.push(parentKey);
    }
    const group = groups.get(parentKey)!;
    if (childName && childName !== parentName && !group.children.includes(childName)) {
      group.children.push(childName);
    }
  }
  return order
    .map((key) => {
      const group = groups.get(key)!;
      if (group.parentName && group.children.length) {
        return `${group.parentName}|${group.children.join('·')}`;
      }
      if (group.children.length) return group.children.join('·');
      return group.parentName;
    })
    .filter(Boolean);
 }
 function resolveCategoryParts(
  cat: StoreCategoryLike,
  tree: StoreCategoryTreeNode[] = [],
 ): { parentKey: string; parentName: string; childName: string } | null {
  const childName = String(cat.name || '').trim();
  let parentName = String(cat.parent?.name || '').trim();
  const catId = String(cat.id || '');
  const parentId = String(cat.parentId || '');
  if (!parentName && (parentId || catId)) {
    for (const root of tree) {
      if (parentId && root.id === parentId) {
        parentName = root.name;
        break;
      }
      for (const child of root.children ?? []) {
        if (catId && child.id === catId) {
          parentName = root.name;
          if (!childName) return { parentKey: root.id, parentName, childName: child.name };
          break;
        }
      }
    }
  }
  if (!childName && !parentName) return null;
  const parentKey = parentId || parentName || catId;
  if (!parentName && catId) {
    for (const root of tree) {
      for (const child of root.children ?? []) {
        if (child.id === catId) {
          return { parentKey: root.id, parentName: root.name, childName: child.name };
        }
      }
    }
  }
  return {
    parentKey,
    parentName: parentName || childName,
    childName: childName || parentName,
  };
 }
 export function storeLeafCategoryIds(store: {
  categoryId?: string | null;
  category?: StoreCategoryLike | null;
  categories?: StoreCategoryLike[] | null;
 }): string[] {
  if (Array.isArray(store.categories) && store.categories.length) {
    return store.categories.map((c) => String(c.id || '')).filter(Boolean);
  }
  const id = String(store.categoryId || store.category?.id || '');
  return id ? [id] : [];
 }
@@ -40,7 +40,7 @@ type StoresSession = {
  cache: StoresListCache | null;
 };
-const STORAGE_KEY = 'dukang_stores_session_v2';
+const STORAGE_KEY = 'dukang_stores_session_v3';
 let memory: StoresSession | null = null;
@@ -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) => (
@@ -79,6 +79,12 @@ type Store = {
    parentId?: string | null;
    parent?: { name?: string } | null;
  } | null;
  categories?: {
    id?: string;
    name?: string;
    parentId?: string | null;
    parent?: { name?: string } | null;
  }[] | null;
 };
 type RecentRedeem = {
@@ -406,12 +412,15 @@ export default function StoreDetailPage() {
        <View className="store-detail-title-row">
          <Text className="store-detail-name">{store.name}</Text>
          {storeCategoryTags(store, categoryTree).map((tag) => (
            <Text key={tag} className="store-detail-tag">
              {tag}
            </Text>
          ))}
        </View>
        {(() => {
          const categoryLabels = storeCategoryTags(store, categoryTree);
          return categoryLabels.length ? (
            <View className="store-detail-tags-row">
              <Text className="store-detail-category-line">{categoryLabels.join('、')}</Text>
            </View>
          ) : null;
        })()}
        <View className="store-detail-rating-row">
          <View className="store-detail-stars">
            {[1, 2, 3, 4, 5].map((n) => (
@@ -42,7 +42,7 @@ import {
  toWeappShareTimeline,
 } from '../../lib/wechat-share';
 import BenefitSloganBar from '../../components/BenefitSloganBar';
-import { storeCategoryTags, storeStarCount } from '../../lib/store-display';
+import { storeCategoryTags, storeLeafCategoryIds, storeStarCount } from '../../lib/store-display';
 import openBadgeImg from '../../assets/icons/store-open-badge.png';
 type Store = {
@@ -66,6 +66,12 @@ type Store = {
    parentId?: string | null;
    parent?: { name?: string } | null;
  } | null;
  categories?: {
    id?: string;
    name?: string;
    parentId?: string | null;
    parent?: { name?: string } | null;
  }[] | null;
  tags?: unknown;
  rating?: number | string | null;
  latitude?: number | string | null;
@@ -288,14 +294,21 @@ export default function StoresPage() {
  function matchesCategory(store: Store): boolean {
    if (!category.parentId) return true;
-    const storeCatId = String(store.categoryId || store.category?.id || '');
+    const leafIds = storeLeafCategoryIds(store);
-    const storeParentId = String(store.category?.parentId || '');
+    const parentIds = new Set<string>();
-    if (category.childId) {
+    if (Array.isArray(store.categories)) {
-      return storeCatId === category.childId;
+      for (const cat of store.categories) {
        if (cat.parentId) parentIds.add(String(cat.parentId));
      }
    }
-    if (storeParentId && storeParentId === category.parentId) return true;
+    const legacyParent = String(store.category?.parentId || '');
    if (legacyParent) parentIds.add(legacyParent);
    if (category.childId) {
      return leafIds.includes(category.childId);
    }
    if ([...parentIds].some((id) => id === category.parentId)) return true;
    const siblings = childIdsByParent.get(category.parentId) ?? [];
-    return siblings.includes(storeCatId);
+    return leafIds.some((id) => siblings.includes(id));
  }
  const filtered = useMemo(() => {
@@ -461,14 +474,10 @@ export default function StoresPage() {
                  <Text className="store-card-name">{s.name}</Text>
                </View>
                {(() => {
-                  const tags = storeCategoryTags(s, categoryTree);
+                  const categoryLabels = storeCategoryTags(s, categoryTree);
-                  return tags.length ? (
+                  return categoryLabels.length ? (
-                    <View className="store-card-tags">
+                    <View className="store-card-category-wrap">
-                      {tags.map((tag) => (
+                      <Text className="store-card-category-text">{categoryLabels.join('、')}</Text>
                        <Text key={tag} className="store-card-tag">
                          {tag}
                        </Text>
                      ))}
                    </View>
                  ) : null;
                })()}
@@ -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 {
@@ -100,6 +100,12 @@
 }
 .store-detail-title-row {
  display: flex;
  align-items: center;
  margin-bottom: 6px;
 }
 .store-detail-tags-row {
  display: flex;
  flex-wrap: wrap;
  align-items: center;
@@ -107,6 +113,20 @@
  margin-bottom: 8px;
 }
 .store-detail-category-line {
  display: inline-block;
  max-width: 100%;
  padding: 2px 8px;
  border-radius: 6px;
  background: rgba(166, 29, 36, 0.1);
  box-sizing: border-box;
  font-size: 11px;
  font-weight: 500;
  line-height: 16px;
  color: var(--color-heritage-red);
  word-break: break-all;
 }
 .store-detail-name {
  font-family: var(--font-headline);
  font-size: 20px;
@@ -215,13 +215,32 @@
  white-space: nowrap;
 }
 .store-card-category-wrap {
  align-self: flex-start;
  max-width: 100%;
  padding: 0 6px;
  border-radius: 4px;
  background: rgba(166, 29, 36, 0.1);
  box-sizing: border-box;
  line-height: 1;
 }
 .store-card-category-text {
  font-size: 10px;
  font-weight: 500;
  line-height: 14px;
  color: var(--color-heritage-red);
  word-break: break-all;
 }
 .store-card-tags {
  display: flex;
-  flex-wrap: nowrap;
+  flex-wrap: wrap;
  align-items: center;
  gap: 4px;
  min-width: 0;
-  overflow: hidden;
+  margin-top: 2px;
  margin-bottom: 2px;
 }
 .store-card-tag {
@@ -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
@@ -6,6 +6,15 @@
 #      本地开发机一般不在白名单，因此借道生产服务器 dukang-server 建立隧道。
 #   2. 在本地 dukang-v1-mysql 容器内用 mysqldump 连接隧道端口，导出线上库。
 #   3. 通过管道直接导入本地库（默认 dukang_haoke，即应用本地库名）。
 #   4. 下列表不同步，保留本地数据（环境配置 / 密钥 / 大表日志等）：
 #        · 系统设置：system_config, common_wx_app_config
 #        · 企微机器人：wecom_bot, wecom_message_push, wecom_push_template,
 #          llm_api_config, knowledge_base, knowledge_document
 #        · OSS 资源库：common_resource
 #        · 日志：log_third_party, log_promo_event, log_user_analytics,
 #          log_store_analytics, log_partner_analytics, log_wecom_bot
 #        · 白名单：common_test_whitelist_phone, common_product_visibility_phone,
 #          store_visibility_phone
 #
 # 前置条件：
 #   - deploy.env 中 DEPLOY_HOST / DEPLOY_USER / DEPLOY_PORT 已配置且可无密码 SSH
@@ -35,13 +44,35 @@ DO_BACKUP=1
 ASSUME_YES=0
 DRY_RUN=0
 # 同步时保留本地数据的表（见文件头说明）
 SYNC_EXCLUDE_TABLES=(
  system_config
  common_wx_app_config
  wecom_bot
  wecom_message_push
  wecom_push_template
  llm_api_config
  knowledge_base
  knowledge_document
  common_resource
  log_third_party
  log_promo_event
  log_user_analytics
  log_store_analytics
  log_partner_analytics
  log_wecom_bot
  common_test_whitelist_phone
  common_product_visibility_phone
  store_visibility_phone
 )
 # ---------------- 解析参数 ----------------
 for arg in "$@"; do
  case "$arg" in
    --yes|-y) ASSUME_YES=1 ;;
    --no-backup) DO_BACKUP=0 ;;
    --dry-run) DRY_RUN=1 ;;
-    --help|-h) sed -n '3,30p' "$0"; exit 0 ;;
+    --help|-h) sed -n '3,39p' "$0"; exit 0 ;;
    --tunnel-port=*) TUNNEL_PORT="${arg#*=}" ;;
    --local-db=*) LOCAL_DB="${arg#*=}" ;;
    --container=*) LOCAL_CONTAINER="${arg#*=}" ;;
@@ -103,6 +134,8 @@ echo "  源(线上): $REMOTE_USER@$REMOTE_HOST:$REMOTE_PORT/$REMOTE_DB"
 echo "  目标(本地): root@$LOCAL_CONTAINER:$LOCAL_DB (对外端口 6016)"
 echo "  隧道:      $TARGET -L $TUNNEL_PORT:$REMOTE_HOST:$REMOTE_PORT"
 echo "  本地备份:  $([[ $DO_BACKUP -eq 1 ]] && echo 是 || echo 否)"
 echo "  保留本地（不同步）: ${#SYNC_EXCLUDE_TABLES[@]} 张表"
 printf '    - %s\n' "${SYNC_EXCLUDE_TABLES[@]}"
 if [[ $DRY_RUN -eq 1 ]]; then
  echo "(dry-run) 已结束，未做任何修改。"
  exit 0
@@ -148,13 +181,20 @@ if [[ $ready -ne 1 ]]; then
 fi
 # ---------------- 同步（线上 -> 本地，管道直导） ----------------
 IGNORE_TABLE_ARGS=()
 for tbl in "${SYNC_EXCLUDE_TABLES[@]}"; do
  IGNORE_TABLE_ARGS+=(--ignore-table="${REMOTE_DB}.${tbl}")
 done
 echo "==> 开始同步（管道直导，不落临时文件）"
 echo "    提示：同步前建议本地 Prisma 已追平线上 schema（pnpm db:push 或迁移），否则可能因表结构差异报错。"
 echo "    提示：${#SYNC_EXCLUDE_TABLES[@]} 张环境/配置表保留本地数据，不会被线上覆盖。"
 set +e
 docker exec -i -e "MYSQL_PWD=$REMOTE_PASS" "$LOCAL_CONTAINER" \
  mysqldump -h "$HOST_ALIAS" -P "$TUNNEL_PORT" -u "$REMOTE_USER" \
  --lock-tables=0 --add-drop-table --skip-triggers --no-create-db \
  --skip-routines --skip-events --column-statistics=0 --no-tablespaces --set-gtid-purged=OFF \
  "${IGNORE_TABLE_ARGS[@]}" \
  "$REMOTE_DB" \
  | docker exec -i "$LOCAL_CONTAINER" mysql -uroot -p"$LOCAL_ROOT_PASSWORD" "$LOCAL_DB"
 RC=${PIPESTATUS[0]}
@@ -168,4 +208,4 @@ if [[ $RC -ne 0 ]]; then
  [[ $DO_BACKUP -eq 1 ]] && echo "请用备份恢复: $BK" >&2
  exit 1
 fi
-echo "==> 同步完成 ✅ 本地 $LOCAL_DB 现已是线上 $REMOTE_DB 的副本。"
+echo "==> 同步完成 ✅ 本地 $LOCAL_DB 已同步线上业务数据（${#SYNC_EXCLUDE_TABLES[@]} 张配置/日志表保留本地）。"
@@ -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` 改名「结算任务失败通知」归入系统监控；补提现通过与四账单（城市/合伙人、笔数、累计金额、收款人账号开户行） |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jacy	101b27c92c	Merge pull request 'Dev' (#65 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/65	2026-09-02 15:58:25 +08:00
jacy	5ed9f79a5e	Merge pull request 'Dev jacy' (#64 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/64	2026-09-02 15:58:12 +08:00
jacy	6880b5daf4	v4.0.11HQ后端优化（快链、账单日等） CI / verify (pull_request) Waiting to run Details	2026-09-02 15:45:12 +08:00
jacy	1000b489a0	v4.0.10版本package.json更新	2026-09-02 11:29:22 +08:00
jacy	72fef35807	Merge pull request 'v4.0.9版本更新-门店分类支持多选' (#63 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/63	2026-09-02 11:14:36 +08:00
jacy	f570383717	Merge pull request 'v4.0.9版本更新-门店分类支持多选' (#62 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/62	2026-09-02 11:14:10 +08:00
jacy	fe557c912d	v4.0.9版本更新-门店分类支持多选 CI / verify (pull_request) Waiting to run Details	2026-09-02 11:12:51 +08:00
developer_liu	77e9917a18	Merge branch 'dev' of git.yqidian.com:jacy/dukang into dev-v4.0.10	2026-09-02 09:50:08 +08:00
developer_liu	44bfbe0bef	v4.0.10	2026-09-02 09:49:33 +08:00
jacy	84fb2f314a	Merge pull request 'Dev' (#61 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/61	2026-09-02 09:48:34 +08:00
jacy	11a9bb2414	Merge pull request 'Dev jacy' (#60 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/60	2026-09-02 09:48:16 +08:00
jacy	a4530a64df	Merge commit 'c1f502a5e31f72209af49d1d6e094afa7c5ed6d7' into dev_jacy CI / verify (pull_request) Waiting to run Details	2026-09-02 09:47:28 +08:00
jacy	c905b3f930	V4.0.9版本更新合伙人H5端调整	2026-09-02 09:46:41 +08:00
jacy	af3c4b6f08	Merge commit '52816e38748a2b0cee764da08e906017019c5ce4' into dev_jacy	2026-09-02 08:44:21 +08:00
developer_liu	c1f502a5e3	Merge commit '52816e38748a2b0cee764da08e906017019c5ce4' into dev-v4.0.10	2026-09-02 06:55:54 +08:00
jacy	52816e3874	Merge pull request 'Dev' (#59 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/59	2026-09-02 06:30:44 +08:00
jacy	7f7719f281	Merge pull request 'Dev jacy' (#58 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/58	2026-09-02 06:30:29 +08:00
jacy	a88fd6c29a	v4.0.8任务和版本状态增加“已停止” CI / verify (pull_request) Waiting to run Details	2026-09-02 06:28:47 +08:00
jacy	bbb13cfd1a	Merge commit '2e0518b5b7069f9bffd20612c2049b6d8545822d' into dev_jacy	2026-09-02 05:23:48 +08:00
jacy	2e0518b5b7	Merge remote-tracking branch 'origin/main' into dev-v4.0.8 CI / verify (pull_request) Waiting to run Details	2026-09-02 05:21:23 +08:00
jacy	f8f652a0a6	v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (pull_request) Waiting to run Details	2026-09-02 05:20:53 +08:00
jacy	04d903c554	merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (push) Has been cancelled Details	2026-09-01 15:24:31 +08:00
jacy	30bfcc0d93	merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (pull_request) Has been cancelled 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) Has been cancelled Details	2026-09-01 15:12:48 +08:00
jacy	6a95f47860	merge(dev_jacy): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (pull_request) Has been cancelled 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) Has been cancelled Details	2026-09-01 09:12:11 +08:00
jacy	99c7f8caea	merge(dev_jacy): 后台反收录与百度校验文件 CI / verify (pull_request) Has been cancelled 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