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

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/67
Merge pull request 'v4.0.14概览和日报' (#66 ) from dev_jacy into dev
2026-09-02 21:13:16 +08:00 · 2026-09-02 21:13:02 +08:00 · 2026-09-02 21:11:58 +08:00 · 2026-09-02 17:57:10 +08:00 · 2026-09-02 17:20:40 +08:00 · 2026-09-02 16:25:59 +08:00
299 changed files with 20239 additions and 4158 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>
@@ -18,6 +18,7 @@
    "echarts": "^6.1.0",
    "echarts-for-react": "^3.0.6",
    "element-china-area-data": "^6.1.0",
+    "jspdf": "^4.2.1",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
    "react-router-dom": "^6.26.0"
@@ -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';
@@ -50,6 +51,7 @@ import SystemSettingsPage from './pages/SystemSettingsPage';
 import TestWhitelistPage from './pages/TestWhitelistPage';
 import WecomBotsPage from './pages/WecomBotsPage';
 import WecomMessagePushesPage from './pages/WecomMessagePushesPage';
+import WecomReportsPage from './pages/WecomReportsPage';
 import WecomBotLogsPage from './pages/WecomBotLogsPage';
 import LlmConfigsPage from './pages/LlmConfigsPage';
 import KnowledgeBasesPage from './pages/KnowledgeBasesPage';
@@ -86,6 +88,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 />} />
@@ -93,6 +96,7 @@ export default function App() {
        <Route path="/wecom-bots" element={<Navigate to="/wecom/bots" replace />} />
        <Route path="/wecom/bots" element={<WecomBotsPage />} />
        <Route path="/wecom/pushes" element={<WecomMessagePushesPage />} />
+        <Route path="/wecom/reports" element={<WecomReportsPage />} />
        <Route path="/logs/wecom-bots" element={<WecomBotLogsPage />} />
        <Route path="/llm-configs" element={<LlmConfigsPage />} />
        <Route path="/knowledge-bases" element={<KnowledgeBasesPage />} />
@@ -74,6 +74,60 @@ body.admin-col-resizing * {
  user-select: none !important;
 }

+/* 订单页筛选：第一行常驻，第二行起可收起 */
+.admin-orders-filter-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px 16px;
+  align-items: flex-end;
+  margin-bottom: 12px;
+}
+
+.admin-orders-filter-row--tools {
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 16px;
+}
+
+.admin-orders-filter-item {
+  margin-bottom: 0 !important;
+}
+
+.admin-orders-filter-item--sm {
+  width: 140px;
+}
+
+.admin-orders-filter-item--md {
+  width: 168px;
+}
+
+.admin-orders-filter-item--search {
+  width: 180px;
+}
+
+.admin-users-filter-item--keyword {
+  width: 240px;
+}
+
+.admin-orders-filter-item--status {
+  width: 220px;
+  min-width: 180px;
+  flex: 1 1 180px;
+  max-width: 280px;
+}
+
+.admin-orders-filter-item--date {
+  flex: 1 1 auto;
+}
+
+.admin-orders-filter-actions {
+  margin-left: auto;
+}
+
+.admin-orders-date-picker {
+  width: 240px;
+}
+
 /* 列表页顶栏：标题左、主操作右、列设置最右 */
 .admin-list-header {
  display: flex;
@@ -166,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,458 +1,522 @@
-import { useCallback, useEffect, useState } from 'react';
-import {
-  Button,
-  Checkbox,
-  Drawer,
-  Form,
-  Input,
-  InputNumber,
-  Modal,
-  Select,
-  Space,
-  Table,
-  Tabs,
-  Typography,
-  message,
-} from 'antd';
-import type { ColumnsType } from 'antd/es/table';
-import {
-  CITY_PARTNER_SCOPE_LABELS,
-  CITY_PARTNER_STATUS_LABELS,
-  CityPartnerScopeType,
-  CityPartnerStatus,
-  PARTNER_PERMISSION_KEYS,
-  PARTNER_PERMISSION_LABELS,
-  PARTNER_STAFF_ROLE_LABELS,
-  type PartnerPermissionKey,
-} from '@dukang/shared-types';
-import { request, type Paginated } from '../lib/api';
-import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
-import { fmtTime } from '../lib/constants';
-import CityDistrictMultiSelect from './CityDistrictMultiSelect';
-import PartnerSubAccountList from './PartnerSubAccountList';
-
-type PartnerRow = {
-  id: string;
-  companyName: string;
-  phone: string;
-  name: string;
-  scopeType?: string;
-  districtCodes?: string[] | null;
-  orderCommissionRate?: number;
-  redeemCommissionRate?: number;
-  accountCount: number;
-  createdAt: string;
-};
-
-type PartnerDetail = PartnerRow & {
-  address?: string;
-  districtCodes?: string[] | null;
-  bindingStatus?: string;
-  bankAccountName?: string | null;
-  bankAccountNo?: string | null;
-  bankBranch?: string | null;
-  managedWarehouseId?: string | null;
-  managedWarehouseName?: string | null;
-  contactPhone?: string | null;
-  children?: Array<{
-    id: string;
-    phone: string;
-    name: string;
-    staffRole?: string;
-    permissions?: string[];
-    status: string;
-  }>;
-};
-
-type Props = {
-  cityId: string;
-  cityCode?: string;
-  maxPartnerCommissionRate?: number;
-  onChanged?: () => void;
-};
-
-const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
-const BINDING_OPTIONS = Object.entries(CITY_PARTNER_STATUS_LABELS).map(([value, label]) => ({ value, label }));
-const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({
-  value: k,
-  label: PARTNER_PERMISSION_LABELS[k],
-}));
-const STAFF_ROLE_OPTIONS = Object.entries(PARTNER_STAFF_ROLE_LABELS)
-  .filter(([value]) => value !== 'PARTNER')
-  .map(([value, label]) => ({ value, label }));
-
-function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
-  if (!values?.length) return [];
-  if (Array.isArray(values[0])) {
-    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
-  }
-  return values as string[];
-}
-
-function commissionSumError(
-  orderPercent: number,
-  redeemPercent: number,
-  maxRate: number,
-): string | null {
-  // API 可能把 Prisma Decimal 序列化为字符串；`"0.05" + 1e-9` 会变成字符串拼接导致误判超限
-  const max = Number(maxRate);
-  const sum = Number(orderPercent) / 100 + Number(redeemPercent) / 100;
-  if (!Number.isFinite(max) || !Number.isFinite(sum)) return '佣金比例无效';
-  if (sum > max + 1e-9) {
-    return `订单佣金与核销佣金合计不得超过 ${(max * 100).toFixed(2)}%（当前 ${(sum * 100).toFixed(2)}%）`;
-  }
-  return null;
-}
-
-function formatApiError(err: unknown): string | null {
-  if (err && typeof err === 'object' && 'errorFields' in err) return null;
-  if (!(err instanceof Error)) return '操作失败';
-  return err.message.replace(/\b(\d{6})\b/g, (code) => {
-    const label = districtCodeLabel(code);
-    return label !== code ? `${label}(${code})` : code;
-  });
-}
-
-export default function CityPartnersPanel({
-  cityId,
-  cityCode,
-  maxPartnerCommissionRate = 0.05,
-  onChanged,
-}: Props) {
-  const [editForm] = Form.useForm();
-  const [createForm] = Form.useForm();
-  const [subForm] = Form.useForm();
-  const [subEditForm] = Form.useForm();
-  const [partners, setPartners] = useState<PartnerRow[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [detail, setDetail] = useState<PartnerDetail | null>(null);
-  const [drawerOpen, setDrawerOpen] = useState(false);
-  const [createOpen, setCreateOpen] = useState(false);
-  const [subOpen, setSubOpen] = useState(false);
-  const [subEditOpen, setSubEditOpen] = useState(false);
-  const [subEditId, setSubEditId] = useState<string | null>(null);
-  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
-
-  const loadPartners = useCallback(async () => {
-    setLoading(true);
-    try {
-      const res = await request<Paginated<PartnerRow>>(`/admin/partners?cityId=${cityId}&pageSize=100`);
-      setPartners(res.items);
-    } finally {
-      setLoading(false);
-    }
-  }, [cityId]);
-
-  useEffect(() => {
-    void loadPartners();
-  }, [loadPartners]);
-
-  async function openPartner(id: string) {
-    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
-    setDetail(d);
-    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
-    editForm.setFieldsValue({
-      name: d.name,
-      phone: d.phone,
-      companyName: d.companyName,
-      contactPhone: d.contactPhone ?? d.phone,
-      address: d.address ?? '',
-      scopeType: d.scopeType,
-      districtCodes: d.districtCodes ?? [],
-      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
-      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
-      bindingStatus: d.bindingStatus ?? CityPartnerStatus.ACTIVE,
-      bankAccountName: d.bankAccountName ?? '',
-      bankAccountNo: d.bankAccountNo ?? '',
-      bankBranch: d.bankBranch ?? '',
-    });
-    setDrawerOpen(true);
-  }
-
-  async function savePartner() {
-    if (!detail) return;
-    try {
-      const v = await editForm.validateFields();
-      const err = commissionSumError(
-        Number(v.orderCommissionRate ?? 0),
-        Number(v.redeemCommissionRate ?? 0),
-        maxPartnerCommissionRate,
-      );
-      if (err) {
-        message.error(err);
-        return;
-      }
-      await request(`/admin/partners/${detail.id}`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          ...v,
-          orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-          redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-          districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-        }),
-      });
-      message.success('已保存');
-      setDrawerOpen(false);
-      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('子账号已删除');
-    if (detail) void openPartner(detail.id);
-    void loadPartners();
-    onChanged?.();
-  }
-
-  const columns: ColumnsType<PartnerRow> = [
-    {
-      title: '区县',
-      dataIndex: 'districtCodes',
-      width: 160,
-
-      render: (codes: string[] | null | undefined, row) =>
-        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
-    },
-    { title: '公司名', dataIndex: 'companyName' },
-    { title: '主账号', dataIndex: 'phone', width: 120 },
-    {
-      title: '管辖',
-      dataIndex: 'scopeType',
-      width: 100,
-      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
-    },
-    {
-      title: '佣金',
-      width: 120,
-      render: (_, row) => `${Math.round((row.orderCommissionRate ?? 0) * 100)}% / ${Math.round((row.redeemCommissionRate ?? 0.03) * 100)}%`,
-    },
-    { title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
-    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
-    {
-      title: '操作',
-      width: 80,
-      render: (_, row) => (
-        <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
-          管理
-        </Button>
-      ),
-    },
-  ];
-
-  return (
-    <>
-      <Button
-        type="primary"
-        style={{ marginBottom: 12 }}
-        onClick={() => {
-          createForm.resetFields();
-          createForm.setFieldsValue({
-            cityId,
-            orderCommissionRate: 0,
-            redeemCommissionRate: 3,
-            scopeType: CityPartnerScopeType.CITY_WIDE,
-          });
-          setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
-          setCreateOpen(true);
-        }}
-      >
-        新建合伙人
-      </Button>
-      <Table rowKey="id" size="small" loading={loading} columns={columns} dataSource={partners} pagination={false} />
-
-      <Drawer
-        title="城市合伙人"
-        width={640}
-        open={drawerOpen}
-        onClose={() => setDrawerOpen(false)}
-        extra={<Button type="primary" onClick={() => void savePartner()}>保存</Button>}
-      >
-        {detail && (
-          <Tabs
-            items={[
-              {
-                key: 'info',
-                label: '主账号',
-                children: (
-                  <Form form={editForm} layout="vertical">
-                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-                    <Form.Item name="contactPhone" label="业务联系电话"><Input /></Form.Item>
-                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-                    <Form.Item name="bindingStatus" label="绑定状态" rules={[{ required: true }]}>
-                      <Select options={BINDING_OPTIONS} />
-                    </Form.Item>
-                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
-                    </Form.Item>
-                    {editScopeType === CityPartnerScopeType.DISTRICT && (
-                      <Form.Item
-                        name="districtCodes"
-                        label="区县"
-                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
-                      >
-                        <CityDistrictMultiSelect cityCode={cityCode} />
-                      </Form.Item>
-                    )}
-                    <Space style={{ width: '100%' }} size="large">
-                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-                    </Space>
-                    <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
-                      订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%（可在城市基本信息中调整）
-                    </Typography.Text>
-                    <Form.Item label="管仓仓库">
-                      <Input
-                        disabled
-                        value={detail.managedWarehouseName ?? '未分配（请在仓库管理中设置）'}
-                      />
-                    </Form.Item>
-                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
-                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
-                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
-                  </Form>
-                ),
-              },
-              {
-                key: 'staff',
-                label: `子账号 (${Math.max(0, (detail.accountCount ?? 1) - 1)})`,
-                children: (
-                  <PartnerSubAccountList
-                    subs={detail.children ?? []}
-                    onAdd={() => {
-                      subForm.resetFields();
-                      subForm.setFieldsValue({ staffRole: 'INTERNAL', permissions: ['store:create', 'store:manage'] });
-                      setSubOpen(true);
-                    }}
-                    onEdit={(row) => {
-                      setSubEditId(row.id);
-                      subEditForm.setFieldsValue({
-                        name: row.name,
-                        phone: row.phone,
-                        staffRole: row.staffRole ?? 'INTERNAL',
-                        permissions: row.permissions ?? [],
-                        status: row.status,
-                      });
-                      setSubEditOpen(true);
-                    }}
-                    onDelete={(subId) => void deleteSubAccount(subId)}
-                  />
-                ),
-              },
-            ]}
-          />
-        )}
-      </Drawer>
-
-      <Modal title="新建城市合伙人" open={createOpen} width={560} onCancel={() => setCreateOpen(false)} onOk={async () => {
-        try {
-          const v = await createForm.validateFields();
-          const err = commissionSumError(
-            Number(v.orderCommissionRate ?? 0),
-            Number(v.redeemCommissionRate ?? 3),
-            maxPartnerCommissionRate,
-          );
-          if (err) {
-            message.error(err);
-            return;
-          }
-          await request('/admin/partners', {
-            method: 'POST',
-            body: JSON.stringify({
-              ...v,
-              cityId,
-              orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
-              redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
-              districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
-            }),
-          });
-          message.success('已创建');
-          setCreateOpen(false);
-          void loadPartners();
-          onChanged?.();
-        } catch (e) {
-          const msg = formatApiError(e);
-          if (msg) message.error(msg);
-        }
-      }}>
-        <Form form={createForm} layout="vertical">
-          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
-          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
-            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
-          </Form.Item>
-          {createScopeType === CityPartnerScopeType.DISTRICT && (
-            <Form.Item
-              name="districtCodes"
-              label="区县"
-              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
-            >
-              <CityDistrictMultiSelect cityCode={cityCode} />
-            </Form.Item>
-          )}
-          <Space style={{ width: '100%' }} size="large">
-            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
-          </Space>
-          <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
-            订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%
-          </Typography.Text>
-        </Form>
-      </Modal>
-
-      <Modal title="添加子账号" open={subOpen} onCancel={() => setSubOpen(false)} onOk={async () => {
-        if (!detail) return;
-        const v = await subForm.validateFields();
-        await request('/admin/partner-accounts', {
-          method: 'POST',
-          body: JSON.stringify({ ...v, parentAccountId: detail.id }),
-        });
-        message.success('已创建');
-        setSubOpen(false);
-        void openPartner(detail.id);
-        void loadPartners();
-        onChanged?.();
-      }}>
-        <Form form={subForm} layout="vertical">
-          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="staffRole" label="角色" initialValue="INTERNAL">
-            <Select options={STAFF_ROLE_OPTIONS} />
-          </Form.Item>
-          <Form.Item name="permissions" label="权限">
-            <Checkbox.Group options={PERM_OPTIONS} />
-          </Form.Item>
-        </Form>
-      </Modal>
-
-      <Modal title="编辑子账号" open={subEditOpen} onCancel={() => setSubEditOpen(false)} onOk={async () => {
-        if (!subEditId || !detail) return;
-        const v = await subEditForm.validateFields();
-        await request(`/admin/partner-accounts/${subEditId}`, { method: 'PUT', body: JSON.stringify(v) });
-        message.success('已更新');
-        setSubEditOpen(false);
-        void openPartner(detail.id);
-      }}>
-        <Form form={subEditForm} layout="vertical">
-          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="staffRole" label="角色"><Select options={STAFF_ROLE_OPTIONS} /></Form.Item>
-          <Form.Item name="status" label="状态">
-            <Select options={[{ value: 'ACTIVE', label: '启用' }, { value: 'DISABLED', label: '停用' }]} />
-          </Form.Item>
-          <Form.Item name="permissions" label="权限">
-            <Checkbox.Group options={PERM_OPTIONS} />
-          </Form.Item>
-        </Form>
-      </Modal>
-    </>
-  );
+import { useCallback, useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import {
+  Button,
+  Checkbox,
+  Drawer,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  Popconfirm,
+  Select,
+  Space,
+  Table,
+  Tabs,
+  Typography,
+  message,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  CITY_PARTNER_SCOPE_LABELS,
+  CITY_PARTNER_STATUS_LABELS,
+  CityPartnerScopeType,
+  CityPartnerStatus,
+  PARTNER_PERMISSION_KEYS,
+  PARTNER_PERMISSION_LABELS,
+  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 { fmtTime } from '../lib/constants';
+import CityDistrictMultiSelect from './CityDistrictMultiSelect';
+import PartnerSubAccountList from './PartnerSubAccountList';
+import PartnerAssocPanel from './PartnerAssocPanel';
+
+type PartnerRow = {
+  id: string;
+  companyName: string;
+  phone: string;
+  name: string;
+  scopeType?: string;
+  districtCodes?: string[] | null;
+  orderCommissionRate?: number;
+  redeemCommissionRate?: number;
+  storeCount?: number;
+  accountCount: number;
+  createdAt: string;
+};
+
+type PartnerDetail = PartnerRow & {
+  address?: string;
+  districtCodes?: string[] | null;
+  bindingStatus?: string;
+  bankAccountName?: string | null;
+  bankAccountNo?: string | null;
+  bankBranch?: string | null;
+  managedWarehouseId?: string | null;
+  managedWarehouseName?: string | null;
+  contactPhone?: string | null;
+  children?: Array<{
+    id: string;
+    phone: string;
+    name: string;
+    staffRole?: string;
+    permissions?: string[];
+    status: string;
+  }>;
+};
+
+type Props = {
+  cityId: string;
+  cityCode?: string;
+  maxPartnerCommissionRate?: number;
+  onChanged?: () => void;
+};
+
+const SCOPE_OPTIONS = Object.entries(CITY_PARTNER_SCOPE_LABELS).map(([value, label]) => ({ value, label }));
+const BINDING_OPTIONS = Object.entries(CITY_PARTNER_STATUS_LABELS).map(([value, label]) => ({ value, label }));
+const PERM_OPTIONS = PARTNER_PERMISSION_KEYS.map((k: PartnerPermissionKey) => ({
+  value: k,
+  label: PARTNER_PERMISSION_LABELS[k],
+}));
+const STAFF_ROLE_OPTIONS = Object.entries(PARTNER_STAFF_ROLE_LABELS)
+  .filter(([value]) => value !== 'PARTNER')
+  .map(([value, label]) => ({ value, label }));
+
+function flattenDistrictCodes(values: string[] | string[][] | undefined): string[] {
+  if (!values?.length) return [];
+  if (Array.isArray(values[0])) {
+    return (values as string[][]).map((path) => path[path.length - 1]).filter(Boolean);
+  }
+  return values as string[];
+}
+
+function commissionSumError(
+  orderPercent: number,
+  redeemPercent: number,
+  maxRate: number,
+): string | null {
+  // API 可能把 Prisma Decimal 序列化为字符串；`"0.05" + 1e-9` 会变成字符串拼接导致误判超限
+  const max = Number(maxRate);
+  const sum = Number(orderPercent) / 100 + Number(redeemPercent) / 100;
+  if (!Number.isFinite(max) || !Number.isFinite(sum)) return '佣金比例无效';
+  if (sum > max + 1e-9) {
+    return `订单佣金与核销佣金合计不得超过 ${(max * 100).toFixed(2)}%（当前 ${(sum * 100).toFixed(2)}%）`;
+  }
+  return null;
+}
+
+function formatApiError(err: unknown): string | null {
+  if (err && typeof err === 'object' && 'errorFields' in err) return null;
+  if (!(err instanceof Error)) return '操作失败';
+  return err.message.replace(/\b(\d{6})\b/g, (code) => {
+    const label = districtCodeLabel(code);
+    return label !== code ? `${label}(${code})` : code;
+  });
+}
+
+export default function CityPartnersPanel({
+  cityId,
+  cityCode,
+  maxPartnerCommissionRate = 0.05,
+  onChanged,
+}: Props) {
+  const navigate = useNavigate();
+  const [editForm] = Form.useForm();
+  const [createForm] = Form.useForm();
+  const [subForm] = Form.useForm();
+  const [subEditForm] = Form.useForm();
+  const [partners, setPartners] = useState<PartnerRow[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [detail, setDetail] = useState<PartnerDetail | null>(null);
+  const [drawerOpen, setDrawerOpen] = useState(false);
+  const [createOpen, setCreateOpen] = useState(false);
+  const [subOpen, setSubOpen] = useState(false);
+  const [subEditOpen, setSubEditOpen] = useState(false);
+  const [subEditId, setSubEditId] = useState<string | null>(null);
+  const [createScopeType, setCreateScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+  const [editScopeType, setEditScopeType] = useState<CityPartnerScopeType>(CityPartnerScopeType.CITY_WIDE);
+
+  const loadPartners = useCallback(async () => {
+    setLoading(true);
+    try {
+      const res = await request<Paginated<PartnerRow>>(`/admin/partners?cityId=${cityId}&pageSize=100`);
+      setPartners(res.items);
+    } finally {
+      setLoading(false);
+    }
+  }, [cityId]);
+
+  useEffect(() => {
+    void loadPartners();
+  }, [loadPartners]);
+
+  async function openPartner(id: string) {
+    const d = await request<PartnerDetail>(`/admin/partners/${id}`);
+    setDetail(d);
+    setEditScopeType((d.scopeType as CityPartnerScopeType) || CityPartnerScopeType.CITY_WIDE);
+    editForm.setFieldsValue({
+      name: d.name,
+      phone: d.phone,
+      companyName: d.companyName,
+      contactPhone: d.contactPhone ?? d.phone,
+      address: d.address ?? '',
+      scopeType: d.scopeType,
+      districtCodes: d.districtCodes ?? [],
+      orderCommissionRate: (d.orderCommissionRate ?? 0) * 100,
+      redeemCommissionRate: (d.redeemCommissionRate ?? 0.03) * 100,
+      bindingStatus: d.bindingStatus ?? CityPartnerStatus.ACTIVE,
+      bankAccountName: d.bankAccountName ?? '',
+      bankAccountNo: d.bankAccountNo ?? '',
+      bankBranch: d.bankBranch ?? '',
+    });
+    setDrawerOpen(true);
+  }
+
+  async function savePartner() {
+    if (!detail) return;
+    try {
+      const v = await editForm.validateFields();
+      const err = commissionSumError(
+        Number(v.orderCommissionRate ?? 0),
+        Number(v.redeemCommissionRate ?? 0),
+        maxPartnerCommissionRate,
+      );
+      if (err) {
+        message.error(err);
+        return;
+      }
+      await request(`/admin/partners/${detail.id}`, {
+        method: 'PUT',
+        body: JSON.stringify({
+          ...omitNullFields(v),
+          orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+          redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+          districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+        }),
+      });
+      message.success('已保存');
+      setDrawerOpen(false);
+      void loadPartners();
+      onChanged?.();
+    } catch (e) {
+      const msg = formatApiError(e);
+      if (msg) message.error(msg);
+    }
+  }
+
+  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('子账号已删除');
+    if (detail) void openPartner(detail.id);
+    void loadPartners();
+    onChanged?.();
+  }
+
+  const columns: ColumnsType<PartnerRow> = [
+    {
+      title: '区县',
+      dataIndex: 'districtCodes',
+      width: 160,
+      render: (codes: string[] | null | undefined, row) =>
+        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
+    },
+    { title: '公司名', dataIndex: 'companyName' },
+    { title: '主账号', dataIndex: 'phone', width: 120 },
+    {
+      title: '管辖',
+      dataIndex: 'scopeType',
+      width: 100,
+      render: (v) => (v ? CITY_PARTNER_SCOPE_LABELS[v as keyof typeof CITY_PARTNER_SCOPE_LABELS] || v : '—'),
+    },
+    {
+      title: '佣金',
+      width: 120,
+      render: (_, row) => `${Math.round((row.orderCommissionRate ?? 0) * 100)}% / ${Math.round((row.redeemCommissionRate ?? 0.03) * 100)}%`,
+    },
+    { title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
+    { title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
+    {
+      title: '操作',
+      width: 140,
+      render: (_, row) => (
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+            管理
+          </Button>
+          <Popconfirm
+            title="确认删除该城市合伙人？"
+            description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
+            okText="删除"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => void deletePartner(row)}
+          >
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Button
+        type="primary"
+        style={{ marginBottom: 12 }}
+        onClick={() => {
+          createForm.resetFields();
+          createForm.setFieldsValue({
+            cityId,
+            orderCommissionRate: 0,
+            redeemCommissionRate: 3,
+            scopeType: CityPartnerScopeType.CITY_WIDE,
+          });
+          setCreateScopeType(CityPartnerScopeType.CITY_WIDE);
+          setCreateOpen(true);
+        }}
+      >
+        新建合伙人
+      </Button>
+      <Table rowKey="id" size="small" loading={loading} columns={columns} dataSource={partners} pagination={false} />
+
+      <Drawer
+        title="城市合伙人"
+        width={640}
+        open={drawerOpen}
+        onClose={() => setDrawerOpen(false)}
+        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
+            items={[
+              {
+                key: 'info',
+                label: '主账号',
+                children: (
+                  <Form form={editForm} layout="vertical">
+                    <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+                    <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+                    <Form.Item name="contactPhone" label="业务联系电话"><Input /></Form.Item>
+                    <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+                    <Form.Item name="bindingStatus" label="绑定状态" rules={[{ required: true }]}>
+                      <Select options={BINDING_OPTIONS} />
+                    </Form.Item>
+                    <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+                      <Select options={SCOPE_OPTIONS} onChange={(v) => setEditScopeType(v)} />
+                    </Form.Item>
+                    {editScopeType === CityPartnerScopeType.DISTRICT && (
+                      <Form.Item
+                        name="districtCodes"
+                        label="区县"
+                        extra="仅作标识，可多选当前城市下的区县（不做互斥）"
+                      >
+                        <CityDistrictMultiSelect cityCode={cityCode} />
+                      </Form.Item>
+                    )}
+                    <Space style={{ width: '100%' }} size="large">
+                      <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                      <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+                    </Space>
+                    <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
+                      订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%（可在城市基本信息中调整）
+                    </Typography.Text>
+                    <Form.Item label="管仓仓库">
+                      <Input
+                        disabled
+                        value={detail.managedWarehouseName ?? '未分配（请在仓库管理中设置）'}
+                      />
+                    </Form.Item>
+                    <Form.Item name="bankAccountName" label="户名"><Input /></Form.Item>
+                    <Form.Item name="bankAccountNo" label="账号"><Input /></Form.Item>
+                    <Form.Item name="bankBranch" label="开户行"><Input /></Form.Item>
+                  </Form>
+                ),
+              },
+              {
+                key: 'staff',
+                label: `子账号 (${Math.max(0, (detail.accountCount ?? 1) - 1)})`,
+                children: (
+                  <PartnerSubAccountList
+                    subs={detail.children ?? []}
+                    onAdd={() => {
+                      subForm.resetFields();
+                      subForm.setFieldsValue({ staffRole: 'INTERNAL', permissions: ['store:create', 'store:manage'] });
+                      setSubOpen(true);
+                    }}
+                    onEdit={(row) => {
+                      setSubEditId(row.id);
+                      subEditForm.setFieldsValue({
+                        name: row.name,
+                        phone: row.phone,
+                        staffRole: row.staffRole ?? 'INTERNAL',
+                        permissions: row.permissions ?? [],
+                        status: row.status,
+                      });
+                      setSubEditOpen(true);
+                    }}
+                    onDelete={(subId) => void deleteSubAccount(subId)}
+                  />
+                ),
+              },
+              {
+                key: 'assoc',
+                label: '关联码',
+                children: <PartnerAssocPanel partnerId={detail.id} />,
+              },
+            ]}
+          />
+        )}
+      </Drawer>
+
+      <Modal title="新建城市合伙人" open={createOpen} width={560} onCancel={() => setCreateOpen(false)} onOk={async () => {
+        try {
+          const v = await createForm.validateFields();
+          const err = commissionSumError(
+            Number(v.orderCommissionRate ?? 0),
+            Number(v.redeemCommissionRate ?? 3),
+            maxPartnerCommissionRate,
+          );
+          if (err) {
+            message.error(err);
+            return;
+          }
+          await request('/admin/partners', {
+            method: 'POST',
+            body: JSON.stringify({
+              ...v,
+              cityId,
+              orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
+              redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
+              districtCodes: createScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
+            }),
+          });
+          message.success('已创建');
+          setCreateOpen(false);
+          void loadPartners();
+          onChanged?.();
+        } catch (e) {
+          const msg = formatApiError(e);
+          if (msg) message.error(msg);
+        }
+      }}>
+        <Form form={createForm} layout="vertical">
+          <Form.Item name="companyName" label="公司名"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="name" label="主账号姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="登录手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="address" label="地址"><Input placeholder="选填" /></Form.Item>
+          <Form.Item name="scopeType" label="管辖类型" rules={[{ required: true }]}>
+            <Select options={SCOPE_OPTIONS} onChange={(v) => setCreateScopeType(v)} />
+          </Form.Item>
+          {createScopeType === CityPartnerScopeType.DISTRICT && (
+            <Form.Item
+              name="districtCodes"
+              label="区县"
+              extra="选填；仅作标识，可多选当前城市下的区县（不做互斥）"
+            >
+              <CityDistrictMultiSelect cityCode={cityCode} />
+            </Form.Item>
+          )}
+          <Space style={{ width: '100%' }} size="large">
+            <Form.Item name="orderCommissionRate" label="订单佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+            <Form.Item name="redeemCommissionRate" label="核销佣金 %"><InputNumber min={0} max={100} precision={2} /></Form.Item>
+          </Space>
+          <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>
+            订单 + 核销合计不得超过 {(maxPartnerCommissionRate * 100).toFixed(2)}%
+          </Typography.Text>
+        </Form>
+      </Modal>
+
+      <Modal title="添加子账号" open={subOpen} onCancel={() => setSubOpen(false)} onOk={async () => {
+        if (!detail) return;
+        const v = await subForm.validateFields();
+        await request('/admin/partner-accounts', {
+          method: 'POST',
+          body: JSON.stringify({ ...v, parentAccountId: detail.id }),
+        });
+        message.success('已创建');
+        setSubOpen(false);
+        void openPartner(detail.id);
+        void loadPartners();
+        onChanged?.();
+      }}>
+        <Form form={subForm} layout="vertical">
+          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="staffRole" label="角色" initialValue="INTERNAL">
+            <Select options={STAFF_ROLE_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="permissions" label="权限">
+            <Checkbox.Group options={PERM_OPTIONS} />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Modal title="编辑子账号" open={subEditOpen} onCancel={() => setSubEditOpen(false)} onOk={async () => {
+        if (!subEditId || !detail) return;
+        const v = await subEditForm.validateFields();
+        await request(`/admin/partner-accounts/${subEditId}`, { method: 'PUT', body: JSON.stringify(v) });
+        message.success('已更新');
+        setSubEditOpen(false);
+        void openPartner(detail.id);
+      }}>
+        <Form form={subEditForm} layout="vertical">
+          <Form.Item name="name" label="姓名" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="phone" label="手机号" rules={[{ required: true }]}><Input /></Form.Item>
+          <Form.Item name="staffRole" label="角色"><Select options={STAFF_ROLE_OPTIONS} /></Form.Item>
+          <Form.Item name="status" label="状态">
+            <Select options={[{ value: 'ACTIVE', label: '启用' }, { value: 'DISABLED', label: '停用' }]} />
+          </Form.Item>
+          <Form.Item name="permissions" label="权限">
+            <Checkbox.Group options={PERM_OPTIONS} />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
+}
@@ -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>
+  );
+}
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import {
+  Alert,
  Button,
  Descriptions,
  Drawer,
@@ -140,6 +141,14 @@ export default function OrderTrackDrawer({
              </Space>
            </Image.PreviewGroup>
          </div>
+        ) : nodes.some((n) => n.statusName?.includes('签收') || n.trackInfo?.includes('签收')) ? (
+          <Alert
+            type="info"
+            showIcon
+            style={{ marginBottom: 16 }}
+            message="暂无签收照片"
+            description="小飞侠 100108 未返回图片（可能是本人签收未拍照，或照片已过期）。可在「小飞侠联调」用运单号复测。"
+          />
        ) : null}

        <Typography.Title level={5} style={{ marginTop: 0 }}>
@@ -0,0 +1,168 @@
+import { useCallback, useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
+import { Button, Popconfirm, Space, Table, Typography, message } from 'antd';
+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() || '—';
+  const remark = row.hqRemark?.trim();
+  return remark ? `${name}（${remark}）` : name;
+}
+
+type PartnerAssocPanelProps = {
+  partnerId: string;
+};
+
+export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps) {
+  const [summary, setSummary] = useState<PartnerAssocSummary | null>(null);
+  const [users, setUsers] = useState<PartnerAssocUserItem[]>([]);
+  const [total, setTotal] = useState(0);
+  const [page, setPage] = useState(1);
+  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`);
+    setSummary(data);
+  }, [partnerId]);
+
+  const loadUsers = useCallback(async (p = 1) => {
+    setLoading(true);
+    try {
+      const res = await request<Paginated<PartnerAssocUserItem>>(
+        `/admin/partners/${partnerId}/assoc/users?page=${p}&pageSize=20`,
+      );
+      setUsers(res.items ?? []);
+      setTotal(res.total ?? 0);
+      setPage(p);
+    } finally {
+      setLoading(false);
+    }
+  }, [partnerId]);
+
+  useEffect(() => {
+    void request<HqProfile>('/admin/auth/me')
+      .then((p) => {
+        const keys = p.permissionKeys ?? [];
+        setCanEditAssoc(keys.includes('users_partner_assoc'));
+        setCanDownloadPosters(keys.includes('activity_posters'));
+      })
+      .catch(() => {
+        setCanEditAssoc(false);
+        setCanDownloadPosters(false);
+      });
+  }, []);
+
+  useEffect(() => {
+    void loadSummary().catch((e) => message.error(e instanceof Error ? e.message : '加载关联码失败'));
+    void loadUsers(1).catch(() => undefined);
+  }, [loadSummary, loadUsers]);
+
+  async function reissue() {
+    setIssuing(true);
+    try {
+      await request(`/admin/partners/${partnerId}/assoc/qrcode`, { method: 'POST' });
+      message.success('已重新生成关联码');
+      await loadSummary();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '生成失败');
+    } finally {
+      setIssuing(false);
+    }
+  }
+
+  async function unbind(userId: string) {
+    try {
+      await request(`/admin/partners/${partnerId}/assoc/users/${userId}/unbind`, { method: 'POST' });
+      message.success('已解绑');
+      await Promise.all([loadSummary(), loadUsers(page)]);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '解绑失败');
+    }
+  }
+
+  const columns: ColumnsType<PartnerAssocUserItem> = [
+    { title: '用户编号', dataIndex: 'userNo', width: 140 },
+    {
+      title: '用户',
+      dataIndex: 'nickname',
+      render: (_, row) => (
+        <Link
+          className="admin-primary-link"
+          to={`/users?userId=${encodeURIComponent(row.id)}`}
+          title="在用户列表中查看"
+        >
+          {formatNicknameWithRemark(row)}
+        </Link>
+      ),
+    },
+    { title: '手机', dataIndex: 'phone', render: (v) => v || '—' },
+    { title: '关联时间', dataIndex: 'boundAt', render: (v) => (v ? fmtTime(v) : '—') },
+    { title: '已付订单', dataIndex: 'orderCount', width: 90 },
+    ...(canEditAssoc
+      ? [
+          {
+            title: '操作',
+            width: 90,
+            render: (_: unknown, row: PartnerAssocUserItem) => (
+              <Popconfirm title="解绑后该用户新单不再计订单佣金" onConfirm={() => void unbind(row.id)}>
+                <Button type="link" size="small" danger>
+                  解绑
+                </Button>
+              </Popconfirm>
+            ),
+          } satisfies ColumnsType<PartnerAssocUserItem>[number],
+        ]
+      : []),
+  ];
+
+  return (
+    <div>
+      <Space align="start" style={{ marginBottom: 16 }} wrap>
+        {summary?.qrcodeUrl ? (
+          <img src={summary.qrcodeUrl} alt="关联码" style={{ width: 160, height: 160, background: '#fff' }} />
+        ) : (
+          <Typography.Text type="secondary">尚未生成关联码</Typography.Text>
+        )}
+        <div>
+          <Typography.Paragraph style={{ marginBottom: 8 }}>
+            <Link to={`/users?assocPartnerAccountId=${encodeURIComponent(partnerId)}`}>
+              关联用户 {summary?.userCount ?? 0} 人
+            </Link>
+          </Typography.Paragraph>
+          <Button loading={issuing} onClick={() => void reissue()}>
+            {summary?.qrcodeUrl ? '补发关联码' : '生成关联码'}
+          </Button>
+          {canDownloadPosters ? (
+            <Button onClick={() => setPosterDownloadOpen(true)}>下载活动图</Button>
+          ) : null}
+        </div>
+      </Space>
+      <Table
+        rowKey="id"
+        size="small"
+        loading={loading}
+        columns={columns}
+        dataSource={users}
+        pagination={{
+          current: page,
+          pageSize: 20,
+          total,
+          onChange: (p) => void loadUsers(p),
+        }}
+      />
+      <ActivityPosterDownloadModal
+        open={posterDownloadOpen}
+        partnerIds={[partnerId]}
+        onClose={() => setPosterDownloadOpen(false)}
+      />
+    </div>
+  );
+}
@@ -54,6 +54,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
  const [skuId, setSkuId] = useState<string>();
  const [quantity, setQuantity] = useState(2);
  const [promoCodeId, setPromoCodeId] = useState<string>();
+  const [assocPartnerAccountId, setAssocPartnerAccountId] = useState<string>();
  const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>('ADDRESS');
  const [autoReceive, setAutoReceive] = useState(false);
  const [preview, setPreview] = useState<PartnerProxyOrderPreviewResult | null>(null);
@@ -168,6 +169,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
    setProductId(undefined);
    setSkuId(undefined);
    setPromoCodeId(undefined);
+    setAssocPartnerAccountId(undefined);
    setDeliveryMode('ADDRESS');
    setAutoReceive(false);
    setPreview(null);
@@ -235,6 +237,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
      quantity,
      promoCodeId: promoCodeId || undefined,
      skuId: skuId || undefined,
+      assocPartnerAccountId: assocPartnerAccountId || undefined,
    };

    setSubmitting(true);
@@ -388,6 +391,21 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
              />
            </Form.Item>

+            <Form.Item label="关联合伙人（选填）">
+              <Select
+                allowClear
+                showSearch
+                optionFilterProp="label"
+                placeholder="不选则本单不计订单佣金"
+                value={assocPartnerAccountId}
+                onChange={setAssocPartnerAccountId}
+                options={(options?.partners ?? []).map((p) => ({
+                  value: p.id,
+                  label: `${p.companyName || p.name}${p.phone ? ` · ${p.phone}` : ''}`,
+                }))}
+              />
+            </Form.Item>
+
            {(options?.promoCodes.length ?? 0) > 0 ? (
              <Form.Item label="绑定推广码（选填）">
                <Select
@@ -15,7 +15,13 @@ type Props = {

 export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone = false }: Props) {
  const user = detail.user as
-    | { userNo?: string; nickname?: string | null; phone?: string | null }
+    | {
+        id?: string;
+        userNo?: string;
+        nickname?: string | null;
+        phone?: string | null;
+        hqRemark?: string | null;
+      }
    | undefined;
  const store = detail.store as
    | {
@@ -41,7 +47,13 @@ export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone =
      <Descriptions.Item label="结算额">¥{Number(detail.settleAmount ?? 0).toFixed(2)}</Descriptions.Item>
      <Descriptions.Item label="时间">{fmtTime(String(detail.createdAt ?? ''))}</Descriptions.Item>
      <Descriptions.Item label="用户编号">{user?.userNo ?? '—'}</Descriptions.Item>
-      <Descriptions.Item label="用户昵称">{user?.nickname?.trim() || '—'}</Descriptions.Item>
+      <Descriptions.Item label="用户昵称">
+        {(() => {
+          const name = user?.nickname?.trim() || '—';
+          const remark = user?.hqRemark?.trim();
+          return remark ? `${name}（${remark}）` : name;
+        })()}
+      </Descriptions.Item>
      <Descriptions.Item label="用户手机">
        {maskUserPhone ? maskPhone(user?.phone) : user?.phone || '—'}
      </Descriptions.Item>
@@ -91,6 +103,9 @@ export default function RedeemRecordDetailDescriptions({ detail, maskUserPhone =
        <Descriptions.Item label="评价">
          服务 {(detail.rating as { serviceScore?: number }).serviceScore ?? '—'} 分 / 环境{' '}
          {(detail.rating as { envScore?: number }).envScore ?? '—'} 分
+          {(detail.rating as { comment?: string | null }).comment
+            ? ` · ${(detail.rating as { comment?: string }).comment}`
+            : ''}
        </Descriptions.Item>
      ) : null}
    </Descriptions>
@@ -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',
@@ -126,6 +129,7 @@ const MENU_ITEMS: MenuProps['items'] = [
    children: [
      { key: '/wecom/bots', label: '智能机器人' },
      { key: '/wecom/pushes', label: '消息推送' },
+      { key: '/wecom/reports', label: '报告' },
    ],
  },
  { key: '/llm-configs', icon: <RobotOutlined />, label: '语言模型' },
@@ -180,8 +184,10 @@ 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/reports': 'wecom_bots',
    'wecom-group': 'wecom_bots',
    '/llm-configs': 'llm_configs',
    '/knowledge-bases': 'knowledge_bases',
@@ -289,6 +295,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 +423,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;
@@ -98,50 +147,12 @@ export type DashboardStats = {
  ordersByStatus: Array<{ status: string; count: number }>;
 };

-export type DashboardAnalytics = {
-  summary: {
-    users: number;
-    orders: number;
-    payingUsers: number;
-    partners: number;
-    stores: number;
-    redeems: number;
-    redeemAmount: number;
-  };
-  byDate: Array<{
-    date: string;
-    users: number;
-    orders: number;
-    partners: number;
-    stores: number;
-    redeems: number;
-    redeemAmount: number;
-  }>;
-  byCity: Array<{
-    cityId: string;
-    cityName: string;
-    users: number;
-    orders: number;
-    partners: number;
-    stores: number;
-    redeems: number;
-    redeemAmount: number;
-  }>;
-  byPromo: Array<{
-    promoCodeId: string | null;
-    code: string;
-    name: string;
-    users: number;
-    orders: number;
-  }>;
-  byPartner: Array<{
-    partnerAccountId: string;
-    companyName: string;
-    stores: number;
-    redeems: number;
-    redeemAmount: number;
-  }>;
-};
+export type {
+  DashboardAnalytics,
+  DashboardGranularity,
+  DashboardLineChart,
+  DashboardLineHref,
+} from '@dukang/shared-types';

 export type SystemVersion = {
  id: string;
@@ -183,6 +194,12 @@ export type AdminUserRow = {
  benefitUsedAmount?: number;
  /** 好客权益·剩余未使用 */
  benefitBalance?: number;
+  assocPartner?: {
+    id: string;
+    name: string;
+    companyName?: string | null;
+    phone?: string | null;
+  } | null;
 };

 export type AdminOrderItem = {
@@ -229,7 +246,7 @@ export type AdminOrderRow = {
  proxyPartnerName?: string | null;
  proxyPartnerPhone?: string | null;
  isTest?: boolean;
-  user?: { id: string; userNo: string; phone: string | null; nickname: string | null };
+  user?: { id: string; userNo: string; phone: string | null; nickname: string | null; hqRemark?: string | null };
  delivery?: {
    provider: string;
    trackingNo: string | null;
@@ -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> = {
@@ -0,0 +1,94 @@
+import type { ECharts } from 'echarts';
+
+const TITLE_FONT = 'bold 32px "Microsoft YaHei","PingFang SC","Noto Sans SC",sans-serif';
+const SUB_FONT = '22px "Microsoft YaHei","PingFang SC","Noto Sans SC",sans-serif';
+
+type ChartShot = {
+  title: string;
+  instance: ECharts | undefined;
+};
+
+function loadImage(src: string): Promise<HTMLImageElement> {
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.onload = () => resolve(img);
+    img.onerror = () => reject(new Error('图表截图失败'));
+    img.src = src;
+  });
+}
+
+async function composePage(params: {
+  chartPng: string;
+  title: string;
+  subtitle: string;
+}): Promise<{ dataUrl: string; width: number; height: number }> {
+  const img = await loadImage(params.chartPng);
+  const header = 96;
+  const canvas = document.createElement('canvas');
+  canvas.width = img.width;
+  canvas.height = img.height + header;
+  const ctx = canvas.getContext('2d');
+  if (!ctx) throw new Error('无法生成 PDF 画布');
+  ctx.fillStyle = '#ffffff';
+  ctx.fillRect(0, 0, canvas.width, canvas.height);
+  ctx.textBaseline = 'top';
+  ctx.fillStyle = '#1f1f1f';
+  ctx.font = TITLE_FONT;
+  ctx.fillText(params.title, 24, 16, canvas.width - 48);
+  ctx.fillStyle = '#8c8c8c';
+  ctx.font = SUB_FONT;
+  ctx.fillText(params.subtitle, 24, 56, canvas.width - 48);
+  ctx.drawImage(img, 0, header);
+  return {
+    dataUrl: canvas.toDataURL('image/jpeg', 0.92),
+    width: canvas.width,
+    height: canvas.height,
+  };
+}
+
+/** 把当前已渲染折线图打成横向 A4 PDF（不含 KPI / 待办）。 */
+export async function downloadDashboardChartsPdf(params: {
+  filename: string;
+  subtitle: string;
+  charts: ChartShot[];
+}): Promise<void> {
+  const ready = params.charts.filter((c): c is { title: string; instance: ECharts } => !!c.instance);
+  if (ready.length === 0) {
+    throw new Error('暂无可下载的图');
+  }
+  if (ready.length !== params.charts.length) {
+    throw new Error('图表尚未渲染完成，请稍后再试');
+  }
+
+  const { jsPDF } = await import('jspdf');
+  const pdf = new jsPDF({ orientation: 'landscape', unit: 'mm', format: 'a4' });
+  const pageW = pdf.internal.pageSize.getWidth();
+  const pageH = pdf.internal.pageSize.getHeight();
+  const margin = 10;
+
+  for (let i = 0; i < ready.length; i += 1) {
+    const chart = ready[i];
+    const png = chart.instance.getDataURL({
+      type: 'png',
+      pixelRatio: 2,
+      backgroundColor: '#ffffff',
+    });
+    const page = await composePage({
+      chartPng: png,
+      title: chart.title,
+      subtitle: params.subtitle,
+    });
+    const maxW = pageW - margin * 2;
+    const maxH = pageH - margin * 2;
+    const ratio = Math.min(maxW / page.width, maxH / page.height);
+    const w = page.width * ratio;
+    const h = page.height * ratio;
+    const x = (pageW - w) / 2;
+    const y = margin + (maxH - h) / 2;
+    if (i > 0) pdf.addPage();
+    pdf.addImage(page.dataUrl, 'JPEG', x, y, w, h);
+  }
+
+  const filename = params.filename.endsWith('.pdf') ? params.filename : `${params.filename}.pdf`;
+  pdf.save(filename);
+}
@@ -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 } : {};
+}
@@ -16,6 +16,7 @@ export const HQ_OPERATION_ACTION_OPTIONS = [
  { value: 'HQ_ACCOUNT_CREATE', label: '新增 HQ 管理员' },
  { value: 'HQ_ACCOUNT_UPDATE', label: '编辑 HQ 管理员' },
  { value: 'HQ_PERMISSION_UPDATE', label: '配置 HQ 权限' },
+  { value: 'USER_ASSOC_UPDATE', label: '修改用户关联合伙人' },
  { value: 'USER_DELETE', label: '删除用户' },
  { value: 'USER_BATCH_DELETE', label: '批量删除用户' },
  { value: 'ORDER_SHIP', label: '订单发货' },
@@ -60,6 +61,10 @@ export const HQ_OPERATION_ACTION_OPTIONS = [
  { value: 'PARTNER_BILL_BATCH_MARK_PAID', label: '批量合伙人账单结算' },
  { value: 'WINERY_BILL_CONFIRM', label: '酒厂对账单确认打款' },
  { value: 'WINERY_BILL_BATCH_CONFIRM', label: '批量酒厂对账单打款' },
+  { value: 'ACTIVITY_POSTER_CREATE', label: '新增活动图' },
+  { value: 'ACTIVITY_POSTER_UPDATE', label: '编辑活动图' },
+  { value: 'ACTIVITY_POSTER_UPDATE_STATUS', label: '活动图上下架' },
+  { value: 'ACTIVITY_POSTER_DELETE', label: '删除活动图' },
 ] as const;

 export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = Object.fromEntries(
@@ -0,0 +1,9 @@
+/** 表单选填项常为 null，PUT 时去掉以免后端对 null 调 trim */
+export function omitNullFields<T extends Record<string, unknown>>(input: T): Partial<T> {
+  const out: Partial<T> = {};
+  for (const [key, value] of Object.entries(input)) {
+    if (value === null || value === undefined) continue;
+    (out as Record<string, unknown>)[key] = value;
+  }
+  return out;
+}
@@ -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 { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useEffect, useRef, useState } from 'react';
+import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import {
  Button,
  Descriptions,
@@ -111,9 +111,16 @@ type CouponDetail = Row & {

 export default function BenefitCouponsPage() {
  const navigate = useNavigate();
+  const location = useLocation();
+  const [searchParams] = useSearchParams();
+  const initialCouponNo = searchParams.get('couponNo')?.trim() || '';
  const [form] = Form.useForm();
  const [grantForm] = Form.useForm<AdminBenefitGrantRequest>();
-  const [filters, setFilters] = useState<Record<string, string>>({});
+  const [filters, setFilters] = useState<Record<string, string>>(() => {
+    const init: Record<string, string> = {};
+    if (initialCouponNo) init.couponNo = initialCouponNo;
+    return init;
+  });
  const [grantOpen, setGrantOpen] = useState(false);
  const [granting, setGranting] = useState(false);
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
@@ -132,6 +139,35 @@ export default function BenefitCouponsPage() {
  const [redeemDetail, setRedeemDetail] = useState<Record<string, unknown> | null>(null);
  const [redeemDrawerOpen, setRedeemDrawerOpen] = useState(false);
  const [redeemDetailLoading, setRedeemDetailLoading] = useState(false);
+  const deepLinkOpenedRef = useRef(false);
+
+  async function openCouponDetail(id: string) {
+    setDetail(await request<CouponDetail>(`/admin/benefit/coupons/${id}`));
+    setDrawerOpen(true);
+  }
+
+  useEffect(() => {
+    if (initialCouponNo) form.setFieldsValue({ couponNo: initialCouponNo });
+  }, [form, initialCouponNo]);
+
+  useEffect(() => {
+    const openCouponId = (location.state as { openCouponId?: string } | null)?.openCouponId;
+    if (openCouponId && !deepLinkOpenedRef.current) {
+      deepLinkOpenedRef.current = true;
+      void openCouponDetail(openCouponId).catch((e) => {
+        message.error(e instanceof Error ? e.message : '加载权益券失败');
+      });
+      return;
+    }
+    if (!initialCouponNo || deepLinkOpenedRef.current || loading) return;
+    const first = data?.items?.[0];
+    if (first && String(first.couponNo) === initialCouponNo) {
+      deepLinkOpenedRef.current = true;
+      void openCouponDetail(first.id).catch((e) => {
+        message.error(e instanceof Error ? e.message : '加载权益券失败');
+      });
+    }
+  }, [data, initialCouponNo, loading, location.state]);

  async function openRedeemDetail(redeemId: string) {
    setRedeemDetailLoading(true);
@@ -154,12 +190,7 @@ export default function BenefitCouponsPage() {
      width: 200,
      ellipsis: false,
      render: (v, row) => (
-        <AdminPrimaryLink
-          onClick={async () => {
-            setDetail(await request(`/admin/benefit/coupons/${row.id}`));
-            setDrawerOpen(true);
-          }}
-        >
+        <AdminPrimaryLink onClick={() => void openCouponDetail(row.id)}>
          {v}
        </AdminPrimaryLink>
      ),
@@ -211,10 +242,7 @@ export default function BenefitCouponsPage() {
        <Button
          type="link"
          size="small"
-          onClick={async () => {
-            setDetail(await request(`/admin/benefit/coupons/${row.id}`));
-            setDrawerOpen(true);
-          }}
+          onClick={() => void openCouponDetail(row.id)}
        >
          详情
        </Button>
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import {
  Alert,
  Button,
@@ -30,15 +30,18 @@ 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';
 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;
@@ -60,6 +63,7 @@ type Row = {
  managedWarehouseName?: string | null;
  maxPartnerCommissionRate?: number | null;
  storeCount: number;
+  assocUserCount?: number;
  accountCount: number;
  subAccounts?: SubRow[];
  createdAt: string;
@@ -124,12 +128,19 @@ function formatApiError(err: unknown): string | null {
 }

 export default function CityPartnersPage() {
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const initialCityId = searchParams.get('cityId')?.trim() || '';
  const [filterForm] = Form.useForm();
  const [editForm] = Form.useForm();
  const [createForm] = Form.useForm();
  const [subForm] = Form.useForm();
  const [subEditForm] = Form.useForm();
-  const [filters, setFilters] = useState<Record<string, string | boolean>>({});
+  const [filters, setFilters] = useState<Record<string, string | boolean>>(() => {
+    const init: Record<string, string | boolean> = {};
+    if (initialCityId) init.cityId = initialCityId;
+    return init;
+  });
  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
    '/admin/partners',
    () => {
@@ -155,6 +166,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}`);
@@ -165,6 +179,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;
@@ -209,7 +229,7 @@ export default function CityPartnersPage() {
      await request(`/admin/partners/${detail.id}`, {
        method: 'PUT',
        body: JSON.stringify({
-          ...v,
+          ...omitNullFields(v),
          orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
          redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
          districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
@@ -231,6 +251,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('子账号已删除');
@@ -332,16 +376,59 @@ export default function CityPartnersPage() {
        </Link>
      ),
    },
+    {
+      title: '关联用户',
+      dataIndex: 'assocUserCount',
+      width: 80,
+      render: (n: number, row) => (
+        <Link
+          to={`/users?assocPartnerAccountId=${encodeURIComponent(row.id)}`}
+          title={`查看「${row.companyName || row.phone}」关联用户`}
+        >
+          {n ?? 0}
+        </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)}>
-          管理
-        </Button>
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => void openPartner(row.id)}>
+            管理
+          </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>
      ),
    },
  ];
@@ -355,7 +442,18 @@ export default function CityPartnersPage() {
        title="城市合伙人"
        settings={settingsButton}
        actions={
-          <Button
+          <>
+            <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={() => {
              createForm.resetFields();
@@ -372,6 +470,7 @@ export default function CityPartnersPage() {
          >
            新建合伙人
          </Button>
+          </>
        }
      />

@@ -391,6 +490,7 @@ export default function CityPartnersPage() {
        form={filterForm}
        layout="inline"
        style={{ marginBottom: 16 }}
+        initialValues={initialCityId ? { cityId: initialCityId } : undefined}
        onFinish={(v) => {
          setFilters(v);
          setPage(1);
@@ -441,6 +541,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
@@ -472,9 +580,22 @@ export default function CityPartnersPage() {
        open={drawerOpen}
        onClose={() => setDrawerOpen(false)}
        extra={
-          <Button type="primary" onClick={() => void savePartner()}>
-            保存
-          </Button>
+          <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 && (
@@ -486,6 +607,29 @@ export default function CityPartnersPage() {
                  {detail.storeCount ?? 0}
                </Link>
              </Descriptions.Item>
+              <Descriptions.Item label="关联用户">
+                <Link
+                  to={`/users?assocPartnerAccountId=${encodeURIComponent(detail.id)}`}
+                  title="查看该城市合伙人关联用户"
+                >
+                  {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">
@@ -570,6 +714,11 @@ export default function CityPartnersPage() {
                    />
                  ),
                },
+                {
+                  key: 'assoc',
+                  label: '关联码',
+                  children: <PartnerAssocPanel partnerId={detail.id} />,
+                },
              ]}
            />
          </>
@@ -729,6 +878,12 @@ export default function CityPartnersPage() {
          </Form.Item>
        </Form>
      </Modal>
+
+      <ActivityPosterDownloadModal
+        open={posterDownloadIds != null && posterDownloadIds.length > 0}
+        partnerIds={posterDownloadIds ?? []}
+        onClose={() => setPosterDownloadIds(null)}
+      />
    </div>
  );
 }
@@ -1,12 +1,23 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
 import {
-  Button, Card, Col, DatePicker, Descriptions, Form, Modal, Row, Select, Space, Statistic, Table, Typography, message,
+  Button, Card, Col, DatePicker, Descriptions, Form, Modal, Row, Segmented, Select, Space, Statistic, Table, Typography, message,
 } from 'antd';
-import { CloudUploadOutlined, ReloadOutlined } from '@ant-design/icons';
+import { CloudUploadOutlined, DownloadOutlined, ReloadOutlined } from '@ant-design/icons';
 import dayjs, { type Dayjs } from 'dayjs';
 import ReactECharts from 'echarts-for-react';
-import type { EChartsOption } from 'echarts';
+import { getInstanceByDom, type EChartsOption } from 'echarts';
+import {
+  addShanghaiDays,
+  defaultShanghaiRangeYmds,
+  shanghaiMonthRange,
+  shanghaiQuarterIndex,
+  shanghaiQuarterRange,
+  shanghaiWeekRange,
+  shanghaiYearMonth,
+  shanghaiYmd,
+} from '@dukang/domain';
+import type { DashboardGranularity, DashboardLineChart, DashboardLineHref } from '@dukang/shared-types';
 import {
  request,
  type DashboardAnalytics,
@@ -17,6 +28,7 @@ import {
  type SystemVersion,
 } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
+import { downloadDashboardChartsPdf } from '../lib/dashboard-charts-pdf';

 const STATUS_LABELS: Record<string, string> = {
  PENDING_PAY: '待付款',
@@ -36,26 +48,121 @@ const DEPLOYED_BY_LABELS: Record<string, string> = {
  admin: 'Admin 发布',
 };

+const GRAIN_OPTIONS: Array<{ label: string; value: DashboardGranularity }> = [
+  { label: '日', value: 'day' },
+  { label: '周', value: 'week' },
+  { label: '月', value: 'month' },
+  { label: '季', value: 'quarter' },
+  { label: '年', value: 'year' },
+];
+
+type ChartMetric = 'total' | 'increment';
+
+const METRIC_OPTIONS: Array<{ label: string; value: ChartMetric }> = [
+  { label: '总量', value: 'total' },
+  { label: '增量', value: 'increment' },
+];
+
+function toDayjsRange(from: Date, toInclusive: Date): [Dayjs, Dayjs] {
+  return [dayjs(shanghaiYmd(from)), dayjs(shanghaiYmd(toInclusive))];
+}
+
+/** 完整上一自然周 / 上月 / 上季（北京日历） */
+function datePresetRange(kind: 'lastWeek' | 'lastMonth' | 'lastQuarter'): [Dayjs, Dayjs] {
+  const today = new Date();
+  if (kind === 'lastWeek') {
+    const thisMonday = shanghaiWeekRange(today).start;
+    return toDayjsRange(addShanghaiDays(thisMonday, -7), addShanghaiDays(thisMonday, -1));
+  }
+  if (kind === 'lastMonth') {
+    const { year, month } = shanghaiYearMonth(today);
+    const prev = month === 1 ? { year: year - 1, month: 12 } : { year, month: month - 1 };
+    const r = shanghaiMonthRange(prev.year, prev.month);
+    return toDayjsRange(r.start, addShanghaiDays(r.endExclusive, -1));
+  }
+  const { year, quarter } = shanghaiQuarterIndex(today);
+  const prev = quarter === 1 ? { year: year - 1, quarter: 4 } : { year, quarter: quarter - 1 };
+  const r = shanghaiQuarterRange(prev.year, prev.quarter);
+  return toDayjsRange(r.start, addShanghaiDays(r.endExclusive, -1));
+}
+
+const DATE_PRESETS: Array<{ key: 'lastWeek' | 'lastMonth' | 'lastQuarter'; label: string }> = [
+  { key: 'lastWeek', label: '上周' },
+  { key: 'lastMonth', label: '上月' },
+  { key: 'lastQuarter', label: '上季度' },
+];
+
+function chartIsMetric(key: string, metric: ChartMetric): boolean {
+  const isInc = key.includes('.increment');
+  return metric === 'increment' ? isInc : !isInc;
+}
+
+const HREF_PATH: Record<DashboardLineHref, string> = {
+  users: '/users',
+  partners: '/city-partners',
+  stores: '/stores',
+  orders: '/orders',
+  redeems: '/redeem-records',
+};
+
 type CityOption = { id: string; name: string; code: string };
-type PromoOption = { id: string; code: string; name: string };

 type AnalyticsFilters = {
+  granularity: DashboardGranularity;
  range: [Dayjs, Dayjs];
  cityId?: string;
-  promoCodeId?: string;
-  partnerAccountId?: string;
 };

+function defaultRange(grain: DashboardGranularity): [Dayjs, Dayjs] {
+  const y = defaultShanghaiRangeYmds(grain);
+  return [dayjs(y.from), dayjs(y.to)];
+}
+
 function buildAnalyticsQs(f: AnalyticsFilters) {
  const qs = new URLSearchParams();
+  qs.set('granularity', f.granularity);
  qs.set('dateFrom', f.range[0].format('YYYY-MM-DD'));
  qs.set('dateTo', f.range[1].format('YYYY-MM-DD'));
  if (f.cityId) qs.set('cityId', f.cityId);
-  if (f.promoCodeId) qs.set('promoCodeId', f.promoCodeId);
-  if (f.partnerAccountId) qs.set('partnerAccountId', f.partnerAccountId);
  return qs.toString();
 }

+function listHref(kind: DashboardLineHref, f: AnalyticsFilters): string {
+  const qs = new URLSearchParams();
+  qs.set('createdFrom', f.range[0].format('YYYY-MM-DD'));
+  qs.set('createdTo', f.range[1].format('YYYY-MM-DD'));
+  if (f.cityId && f.cityId !== 'none') qs.set('cityId', f.cityId);
+  const s = qs.toString();
+  return s ? `${HREF_PATH[kind]}?${s}` : HREF_PATH[kind];
+}
+
+function lineOption(
+  periods: Array<{ key: string; label: string }>,
+  chart: DashboardLineChart,
+): EChartsOption {
+  return {
+    tooltip: { trigger: 'axis' },
+    legend: { type: 'scroll', top: 0 },
+    grid: { left: 56, right: 28, top: 48, bottom: periods.length > 14 ? 64 : 36 },
+    xAxis: {
+      type: 'category',
+      data: periods.map((p) => p.label),
+      axisLabel: { rotate: periods.length > 14 ? 45 : 0 },
+    },
+    yAxis: {
+      type: 'value',
+      minInterval: chart.unit === 'count' ? 1 : undefined,
+    },
+    series: chart.series.map((s) => ({
+      name: s.name,
+      type: 'line' as const,
+      smooth: true,
+      showSymbol: periods.length <= 24,
+      data: s.values,
+    })),
+  };
+}
+
 export default function DashboardPage() {
  const [stats, setStats] = useState<DashboardStats | null>(null);
  const [version, setVersion] = useState<SystemVersion | null>(null);
@@ -72,27 +179,27 @@ export default function DashboardPage() {
  const canStores = has('stores');
  const canStoreAudits = has('store_audits');
  const canPartners = has('partners');
-  const canPromo = has('promo_codes');
  const canFinance = has('finance');
  const canBenefit = has('benefit');
  const canDeliveries = has('deliveries');
  const canTickets = has('tickets');
  const permsReady = profile !== null;
+  const hasAnalytics = canUsers || canOrders || canPartners || canStores || canBenefit;

  const [filterForm] = Form.useForm<{
    range: [Dayjs, Dayjs];
    cityId?: string;
-    promoCodeId?: string;
-    partnerAccountId?: string;
  }>();
  const [filters, setFilters] = useState<AnalyticsFilters>({
-    range: [dayjs().subtract(29, 'day'), dayjs()],
+    granularity: 'day',
+    range: defaultRange('day'),
  });
  const [analytics, setAnalytics] = useState<DashboardAnalytics | null>(null);
  const [analyticsLoading, setAnalyticsLoading] = useState(true);
  const [cities, setCities] = useState<CityOption[]>([]);
-  const [promos, setPromos] = useState<PromoOption[]>([]);
-  const [partners, setPartners] = useState<Array<{ id: string; companyName?: string | null; name: string }>>([]);
+  const [metric, setMetric] = useState<ChartMetric>('total');
+  const [pdfLoading, setPdfLoading] = useState(false);
+  const chartsWrapRef = useRef<HTMLDivElement>(null);

  const loadVersion = useCallback(() => {
    setVersionLoading(true);
@@ -136,18 +243,6 @@ export default function DashboardPage() {
    void request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
      .then((res) => setCities(res.items ?? []))
      .catch(() => setCities([]));
-    if ((profile.permissionKeys ?? []).includes('promo_codes')) {
-      void request<Paginated<PromoOption>>(`/admin/promo-codes?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
-        .then((res) => setPromos(res.items ?? []))
-        .catch(() => setPromos([]));
-    }
-    if ((profile.permissionKeys ?? []).includes('partners')) {
-      void request<Paginated<{ id: string; companyName?: string | null; name: string }>>(
-        `/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
-      )
-        .then((res) => setPartners(res.items ?? []))
-        .catch(() => setPartners([]));
-    }
  }, [profile]);

  useEffect(() => {
@@ -157,42 +252,22 @@ export default function DashboardPage() {
  function applyFilters(values: {
    range?: [Dayjs, Dayjs];
    cityId?: string;
-    promoCodeId?: string;
-    partnerAccountId?: string;
  }) {
-    const next: AnalyticsFilters = {
-      range: values.range ?? filters.range,
+    setFilters((prev) => ({
+      ...prev,
+      range: values.range ?? prev.range,
      cityId: values.cityId || undefined,
-      promoCodeId: values.promoCodeId || undefined,
-      partnerAccountId: values.partnerAccountId || undefined,
-    };
-    setFilters(next);
+    }));
  }

-  function setCityFilter(cityId: string) {
-    const next = { ...filters, cityId: cityId === filters.cityId ? undefined : cityId };
-    filterForm.setFieldsValue({ cityId: next.cityId });
-    setFilters(next);
+  function setGranularity(granularity: DashboardGranularity) {
+    setFilters((prev) => ({ ...prev, granularity }));
  }

-  function setPromoFilter(promoCodeId: string) {
-    const key = promoCodeId === 'null' || promoCodeId === '' ? 'none' : promoCodeId;
-    const next = {
-      ...filters,
-      promoCodeId: key === filters.promoCodeId ? undefined : key,
-    };
-    filterForm.setFieldsValue({ promoCodeId: next.promoCodeId });
-    setFilters(next);
-  }
-
-  function setPartnerFilter(partnerAccountId: string) {
-    const next = {
-      ...filters,
-      partnerAccountId:
-        partnerAccountId === filters.partnerAccountId ? undefined : partnerAccountId,
-    };
-    filterForm.setFieldsValue({ partnerAccountId: next.partnerAccountId });
-    setFilters(next);
+  function applyDatePreset(kind: 'lastWeek' | 'lastMonth' | 'lastQuarter') {
+    const range = datePresetRange(kind);
+    filterForm.setFieldsValue({ range });
+    setFilters((prev) => ({ ...prev, range }));
  }

  function handleDeploy() {
@@ -217,224 +292,51 @@ export default function DashboardPage() {
  }

  const shortSha = version?.commitId ? version.commitId.slice(0, 7) : '—';
+  const periods = analytics?.periods ?? [];
+  const chartOptions = useMemo(
+    () =>
+      (analytics?.charts ?? [])
+        .filter((chart) => chartIsMetric(chart.key, metric))
+        .map((chart) => ({
+          chart,
+          option: lineOption(periods, chart),
+        })),
+    [analytics, periods, metric],
+  );

-  const ordersDrillQs = useMemo(() => {
-    const qs = new URLSearchParams();
-    qs.set('createdFrom', filters.range[0].format('YYYY-MM-DD'));
-    qs.set('createdTo', filters.range[1].format('YYYY-MM-DD'));
-    if (filters.cityId && filters.cityId !== 'none') qs.set('cityId', filters.cityId);
-    return qs.toString();
-  }, [filters]);
-
-  const byDateOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byDate ?? [];
-    const legend: string[] = [];
-    const series: EChartsOption['series'] = [];
-    if (canUsers) {
-      legend.push('新增用户');
-      series.push({ name: '新增用户', type: 'line', smooth: true, data: rows.map((r) => r.users) });
+  async function handleDownloadPdf() {
+    if (analyticsLoading || chartOptions.length === 0) {
+      message.warning('暂无可下载的图');
+      return;
    }
-    if (canOrders) {
-      legend.push('订单数');
-      series.push({ name: '订单数', type: 'line', smooth: true, data: rows.map((r) => r.orders) });
-    }
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: legend },
-      grid: { left: 40, right: 20, top: 40, bottom: 40 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.date.slice(5)),
-        axisLabel: { rotate: rows.length > 14 ? 45 : 0 },
-      },
-      yAxis: { type: 'value', minInterval: 1 },
-      series,
-    };
-  }, [analytics, canUsers, canOrders]);
-
-  const byCityOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byCity ?? [];
-    const legend: string[] = [];
-    const series: EChartsOption['series'] = [];
-    if (canUsers) {
-      legend.push('用户');
-      series.push({ name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 });
-    }
-    if (canOrders) {
-      legend.push('订单');
-      series.push({ name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 });
-    }
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: legend },
-      grid: { left: 48, right: 20, top: 40, bottom: 48 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.cityName),
-        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
-      },
-      yAxis: { type: 'value', minInterval: 1 },
-      series,
-    };
-  }, [analytics, canUsers, canOrders]);
-
-  const byPromoOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byPromo ?? [];
-    const legend: string[] = [];
-    const series: EChartsOption['series'] = [];
-    if (canUsers) {
-      legend.push('用户');
-      series.push({ name: '用户', type: 'bar', data: rows.map((r) => r.users), barMaxWidth: 36 });
-    }
-    if (canOrders) {
-      legend.push('订单');
-      series.push({ name: '订单', type: 'bar', data: rows.map((r) => r.orders), barMaxWidth: 36 });
-    }
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: legend },
-      grid: { left: 48, right: 20, top: 40, bottom: 64 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.name || r.code),
-        axisLabel: { interval: 0, rotate: rows.length > 3 ? 30 : 0 },
-      },
-      yAxis: { type: 'value', minInterval: 1 },
-      series,
-    };
-  }, [analytics, canUsers, canOrders]);
-
-  const opsByDateOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byDate ?? [];
-    const legend: string[] = [];
-    const series: NonNullable<EChartsOption['series']> = [];
-    if (canPartners) {
-      legend.push('新增合伙人');
-      series.push({ name: '新增合伙人', type: 'line', smooth: true, data: rows.map((r) => r.partners) });
-    }
-    if (canStores) {
-      legend.push('新签门店');
-      series.push({ name: '新签门店', type: 'line', smooth: true, data: rows.map((r) => r.stores) });
-    }
-    if (canBenefit) {
-      legend.push('核销笔数', '核销金额');
-      series.push({ name: '核销笔数', type: 'line', smooth: true, data: rows.map((r) => r.redeems) });
-      series.push({
-        name: '核销金额',
-        type: 'line',
-        smooth: true,
-        yAxisIndex: 1,
-        data: rows.map((r) => r.redeemAmount),
+    const grainLabel = GRAIN_OPTIONS.find((o) => o.value === filters.granularity)?.label ?? filters.granularity;
+    const metricLabel = metric === 'increment' ? '增量' : '总量';
+    const cityLabel = !filters.cityId
+      ? (cityScoped ? '全部负责城市' : '全部开城')
+      : filters.cityId === 'none'
+        ? '未选城'
+        : (cities.find((c) => c.id === filters.cityId)?.name ?? '城市');
+    const from = filters.range[0].format('YYYY-MM-DD');
+    const to = filters.range[1].format('YYYY-MM-DD');
+    setPdfLoading(true);
+    try {
+      const doms = [
+        ...(chartsWrapRef.current?.querySelectorAll<HTMLElement>('[_echarts_instance_]') ?? []),
+      ];
+      await downloadDashboardChartsPdf({
+        filename: `数据概览-${metricLabel}-${grainLabel}-${from}_${to}.pdf`,
+        subtitle: `${metricLabel} · ${grainLabel} · ${from} ~ ${to} · ${cityLabel}`,
+        charts: chartOptions.map(({ chart }, index) => ({
+          title: chart.title,
+          instance: doms[index] ? getInstanceByDom(doms[index]) : undefined,
+        })),
      });
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '下载 PDF 失败');
+    } finally {
+      setPdfLoading(false);
    }
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: legend },
-      grid: { left: 48, right: 48, top: 48, bottom: 40 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.date.slice(5)),
-        axisLabel: { rotate: rows.length > 14 ? 45 : 0 },
-      },
-      yAxis: [
-        { type: 'value', name: '数量', minInterval: 1 },
-        { type: 'value', name: '金额', minInterval: 1 },
-      ],
-      series,
-    };
-  }, [analytics, canPartners, canStores, canBenefit]);
-
-  const opsByCityOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byCity ?? [];
-    const legend: string[] = [];
-    const series: EChartsOption['series'] = [];
-    if (canPartners) {
-      legend.push('合伙人');
-      series.push({ name: '合伙人', type: 'bar', data: rows.map((r) => r.partners), barMaxWidth: 28 });
-    }
-    if (canStores) {
-      legend.push('门店');
-      series.push({ name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 });
-    }
-    if (canBenefit) {
-      legend.push('核销笔数');
-      series.push({ name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 });
-    }
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: legend },
-      grid: { left: 48, right: 20, top: 40, bottom: 48 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.cityName),
-        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
-      },
-      yAxis: { type: 'value', minInterval: 1 },
-      series,
-    };
-  }, [analytics, canPartners, canStores, canBenefit]);
-
-  const opsByPartnerOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byPartner ?? [];
-    const legend: string[] = [];
-    const series: NonNullable<EChartsOption['series']> = [];
-    if (canStores) {
-      legend.push('门店');
-      series.push({ name: '门店', type: 'bar', data: rows.map((r) => r.stores), barMaxWidth: 28 });
-    }
-    if (canBenefit) {
-      legend.push('核销笔数', '核销金额');
-      series.push({ name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 28 });
-      series.push({
-        name: '核销金额',
-        type: 'line',
-        yAxisIndex: 1,
-        data: rows.map((r) => r.redeemAmount),
-      });
-    }
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: legend },
-      grid: { left: 48, right: 48, top: 40, bottom: 64 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.companyName),
-        axisLabel: { interval: 0, rotate: rows.length > 3 ? 30 : 0 },
-      },
-      yAxis: [
-        { type: 'value', name: '数量', minInterval: 1 },
-        { type: 'value', name: '金额' },
-      ],
-      series,
-    };
-  }, [analytics, canStores, canBenefit]);
-
-  const redeemByCityOption = useMemo<EChartsOption>(() => {
-    const rows = analytics?.byCity ?? [];
-    return {
-      tooltip: { trigger: 'axis' },
-      legend: { data: ['核销笔数', '核销金额'] },
-      grid: { left: 48, right: 48, top: 40, bottom: 48 },
-      xAxis: {
-        type: 'category',
-        data: rows.map((r) => r.cityName),
-        axisLabel: { interval: 0, rotate: rows.length > 4 ? 30 : 0 },
-      },
-      yAxis: [
-        { type: 'value', name: '笔数', minInterval: 1 },
-        { type: 'value', name: '金额' },
-      ],
-      series: [
-        { name: '核销笔数', type: 'bar', data: rows.map((r) => r.redeems), barMaxWidth: 36 },
-        {
-          name: '核销金额',
-          type: 'line',
-          yAxisIndex: 1,
-          data: rows.map((r) => r.redeemAmount),
-        },
-      ],
-    };
-  }, [analytics]);
+  }

  return (
    <div>
@@ -574,7 +476,7 @@ export default function DashboardPage() {
      </Row>

      <Card
-        title="数据统计筛选"
+        title="全局筛选"
        style={{ marginBottom: 24 }}
        extra={
          <Button
@@ -592,8 +494,24 @@ export default function DashboardPage() {
          initialValues={{ range: filters.range }}
          onFinish={applyFilters}
        >
-          <Form.Item name="range" label="日期" rules={[{ required: true, message: '请选择日期' }]}>
-            <DatePicker.RangePicker allowClear={false} />
+          <Form.Item label="粒度">
+            <Segmented
+              options={GRAIN_OPTIONS}
+              value={filters.granularity}
+              onChange={(v) => setGranularity(v as DashboardGranularity)}
+            />
+          </Form.Item>
+          <Form.Item label="日期" required>
+            <Space size={8} wrap>
+              <Form.Item name="range" noStyle rules={[{ required: true, message: '请选择日期' }]}>
+                <DatePicker.RangePicker allowClear={false} />
+              </Form.Item>
+              {DATE_PRESETS.map((preset) => (
+                <Button key={preset.key} autoInsertSpace={false} onClick={() => applyDatePreset(preset.key)}>
+                  {preset.label}
+                </Button>
+              ))}
+            </Space>
          </Form.Item>
          <Form.Item name="cityId" label="城市">
            <Select
@@ -606,230 +524,49 @@ export default function DashboardPage() {
              ]}
            />
          </Form.Item>
-          {canPromo ? (
-            <Form.Item name="promoCodeId" label="推广码">
-              <Select
-                allowClear
-                placeholder="全部来源"
-                style={{ width: 200 }}
-                options={[
-                  { value: 'none', label: '自然量 / 无推广码' },
-                  ...promos.map((p) => ({ value: p.id, label: `${p.name}（${p.code}）` })),
-                ]}
-              />
-            </Form.Item>
-          ) : null}
-          {canPartners ? (
-            <Form.Item name="partnerAccountId" label="合伙人">
-              <Select
-                allowClear
-                placeholder="全部合伙人"
-                style={{ width: 200 }}
-                options={partners.map((p) => ({
-                  value: p.id,
-                  label: p.companyName || p.name,
-                }))}
-              />
-            </Form.Item>
-          ) : null}
+          <Form.Item label="指标">
+            <Segmented
+              options={METRIC_OPTIONS}
+              value={metric}
+              onChange={(v) => setMetric(v as ChartMetric)}
+            />
+          </Form.Item>
          <Form.Item>
            <Button type="primary" htmlType="submit">查询</Button>
          </Form.Item>
+          <Form.Item>
+            <Button
+              icon={<DownloadOutlined />}
+              loading={pdfLoading}
+              disabled={!hasAnalytics || analyticsLoading || chartOptions.length === 0}
+              onClick={() => void handleDownloadPdf()}
+            >
+              下载PDF
+            </Button>
+          </Form.Item>
        </Form>
      </Card>

-      {canUsers || canOrders ? (
-      <Card
-        title={canUsers && canOrders ? '用户 / 订单统计' : canUsers ? '用户统计' : '订单统计'}
-        style={{ marginBottom: 24 }}
-        extra={
-          <Space>
-            {canOrders ? <Link to={`/orders?${ordersDrillQs}`}>查看订单</Link> : null}
-            {canUsers ? <Link to="/users">查看用户</Link> : null}
-          </Space>
-        }
-      >
-        <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
-          {canUsers ? (
-            <Col xs={24} sm={8}>
-              <Statistic title="区间新增用户" value={analytics?.summary.users ?? 0} />
-            </Col>
-          ) : null}
-          {canOrders ? (
-            <Col xs={24} sm={8}>
-              <Statistic title="区间订单数" value={analytics?.summary.orders ?? 0} />
-            </Col>
-          ) : null}
-          {canOrders ? (
-            <Col xs={24} sm={8}>
-              <Statistic title="区间付费用户" value={analytics?.summary.payingUsers ?? 0} />
-            </Col>
-          ) : null}
-        </Row>
-
-        <Row gutter={[16, 16]}>
-          <Col xs={24}>
-            <Card type="inner" title="按日趋势" loading={analyticsLoading} size="small">
-              <ReactECharts option={byDateOption} style={{ height: 320 }} notMerge />
-            </Card>
-          </Col>
-          <Col xs={24} lg={canPromo ? 12 : 24}>
-            <Card
-              type="inner"
-              title="按城市（点击柱联动筛选）"
-              loading={analyticsLoading}
-              size="small"
-            >
-              <ReactECharts
-                option={byCityOption}
-                style={{ height: 300 }}
-                notMerge
-                onEvents={{
-                  click: (params: { name?: string }) => {
-                    const row = (analytics?.byCity ?? []).find((r) => r.cityName === params.name);
-                    if (row) setCityFilter(row.cityId);
-                  },
-                }}
-              />
-            </Card>
-          </Col>
-          {canPromo ? (
-          <Col xs={24} lg={12}>
-            <Card
-              type="inner"
-              title="按推广码（点击柱联动筛选）"
-              loading={analyticsLoading}
-              size="small"
-            >
-              <ReactECharts
-                option={byPromoOption}
-                style={{ height: 300 }}
-                notMerge
-                onEvents={{
-                  click: (params: { name?: string }) => {
-                    const row = (analytics?.byPromo ?? []).find(
-                      (r) => (r.name || r.code) === params.name,
-                    );
-                    if (row) setPromoFilter(row.promoCodeId ?? 'none');
-                  },
-                }}
-              />
-            </Card>
-          </Col>
-          ) : null}
-        </Row>
-      </Card>
+      {permsReady && !hasAnalytics ? (
+        <Card style={{ marginBottom: 24 }}>
+          <Typography.Text type="secondary">当前账号无可视指标</Typography.Text>
+        </Card>
      ) : null}

-      {canPartners || canStores || canBenefit ? (
-      <Card
-        title={[canPartners && '合伙人', canStores && '门店', canBenefit && '核销'].filter(Boolean).join(' / ') + '统计'}
-        style={{ marginBottom: 24 }}
-        extra={
-          <Space>
-            {canPartners ? <Link to="/city-partners">查看合伙人</Link> : null}
-            {canStores ? <Link to="/stores">查看门店</Link> : null}
-            {canBenefit ? <Link to="/redeem-records">查看核销</Link> : null}
-          </Space>
-        }
-      >
-        <Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
-          {canPartners ? (
-            <Col xs={24} sm={6}>
-              <Statistic title="区间新增合伙人" value={analytics?.summary.partners ?? 0} />
-            </Col>
-          ) : null}
-          {canStores ? (
-            <Col xs={24} sm={6}>
-              <Statistic title="区间新签门店" value={analytics?.summary.stores ?? 0} />
-            </Col>
-          ) : null}
-          {canBenefit ? (
-            <Col xs={24} sm={6}>
-              <Statistic title="区间核销笔数" value={analytics?.summary.redeems ?? 0} />
-            </Col>
-          ) : null}
-          {canBenefit ? (
-            <Col xs={24} sm={6}>
-              <Statistic title="区间核销金额" value={analytics?.summary.redeemAmount ?? 0} precision={2} />
-            </Col>
-          ) : null}
-        </Row>
-
-        <Row gutter={[16, 16]}>
-          <Col xs={24}>
-            <Card type="inner" title="按日趋势" loading={analyticsLoading} size="small">
-              <ReactECharts option={opsByDateOption} style={{ height: 320 }} notMerge />
-            </Card>
-          </Col>
-          <Col xs={24} lg={canBenefit ? 12 : 24}>
+      {hasAnalytics ? (
+        <div ref={chartsWrapRef} style={{ marginBottom: 24 }}>
+          {chartOptions.map(({ chart, option }) => (
            <Card
-              type="inner"
-              title="按城市（点击柱联动筛选）"
+              key={chart.key}
+              title={chart.title}
+              extra={<Link to={listHref(chart.href, filters)}>查看</Link>}
              loading={analyticsLoading}
-              size="small"
+              style={{ marginBottom: 16 }}
            >
-              <ReactECharts
-                option={opsByCityOption}
-                style={{ height: 300 }}
-                notMerge
-                onEvents={{
-                  click: (params: { name?: string }) => {
-                    const row = (analytics?.byCity ?? []).find((r) => r.cityName === params.name);
-                    if (row) setCityFilter(row.cityId);
-                  },
-                }}
-              />
+              <ReactECharts option={option} style={{ height: 320, width: '100%' }} notMerge />
            </Card>
-          </Col>
-          {canBenefit ? (
-          <Col xs={24} lg={12}>
-            <Card
-              type="inner"
-              title="按城市核销金额"
-              loading={analyticsLoading}
-              size="small"
-            >
-              <ReactECharts
-                option={redeemByCityOption}
-                style={{ height: 300 }}
-                notMerge
-                onEvents={{
-                  click: (params: { name?: string }) => {
-                    const row = (analytics?.byCity ?? []).find((r) => r.cityName === params.name);
-                    if (row) setCityFilter(row.cityId);
-                  },
-                }}
-              />
-            </Card>
-          </Col>
-          ) : null}
-          {canPartners && (canStores || canBenefit) ? (
-          <Col xs={24}>
-            <Card
-              type="inner"
-              title="按合伙人（门店 / 核销，点击联动筛选）"
-              loading={analyticsLoading}
-              size="small"
-            >
-              <ReactECharts
-                option={opsByPartnerOption}
-                style={{ height: 320 }}
-                notMerge
-                onEvents={{
-                  click: (params: { name?: string }) => {
-                    const row = (analytics?.byPartner ?? []).find(
-                      (r) => r.companyName === params.name,
-                    );
-                    if (row) setPartnerFilter(row.partnerAccountId);
-                  },
-                }}
-              />
-            </Card>
-          </Col>
-          ) : null}
-        </Row>
-      </Card>
+          ))}
+        </div>
      ) : null}

      {canFinance || canTickets ? (
@@ -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);
@@ -71,11 +77,11 @@ export default function DevPlanTasksPage() {
  const [batchForm] = Form.useForm<{ status?: DevPlanTaskStatusDto; versionId?: string }>();

  useEffect(() => {
-    if (!batchEditOpen) return;
+    if (!modalOpen && !batchEditOpen) return;
    request<{ items: DevPlanVersionDto[] }>('/admin/dev-plan/versions?pageSize=100')
      .then((res) => setVersions(res.items ?? []))
      .catch(() => setVersions([]));
-  }, [batchEditOpen]);
+  }, [modalOpen, batchEditOpen]);

  useEffect(() => {
    if (!modalOpen || editing) return;
@@ -108,6 +114,7 @@ export default function DevPlanTasksPage() {
      content: row.content,
      type: row.type,
      status: row.status,
+      versionIds: row.versionIds?.length ? row.versionIds : row.versions?.map((v) => v.id) ?? [],
      attachmentUrls: row.attachmentUrls?.length ? row.attachmentUrls : [''],
    });
    setModalOpen(true);
@@ -121,7 +128,11 @@ export default function DevPlanTasksPage() {
      if (editing) {
        await request(`/admin/dev-plan/tasks/${editing.id}`, {
          method: 'PUT',
-          body: JSON.stringify({ ...values, attachmentUrls }),
+          body: JSON.stringify({
+            ...values,
+            attachmentUrls,
+            versionIds: values.versionIds ?? [],
+          }),
        });
        message.success('已更新');
      } else {
@@ -164,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) {
@@ -216,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: '任务号',
@@ -267,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 ? (
@@ -284,7 +300,35 @@ 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) =>
+        row.versions?.length ? (
+          <Space size={4} wrap>
+            {row.versions.map((v) => (
+              <Tag key={v.id}>{v.versionNo}</Tag>
+            ))}
+          </Space>
+        ) : (
+          '—'
+        ),
+    },
    { title: '创建人', dataIndex: 'creatorName', width: 90 },
    { title: '创建时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
@@ -305,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>
@@ -357,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 }} />
@@ -405,9 +478,21 @@ export default function DevPlanTasksPage() {
            <Select options={TYPE_OPTIONS} />
          </Form.Item>
          {editing ? (
-            <Form.Item name="status" label="状态" rules={[{ required: true }]}>
-              <Select options={STATUS_OPTIONS} />
-            </Form.Item>
+            <>
+              <Form.Item name="status" label="状态" rules={[{ required: true }]}>
+                <Select options={STATUS_OPTIONS} />
+              </Form.Item>
+              <Form.Item name="versionIds" label="关联版本">
+                <Select
+                  mode="multiple"
+                  allowClear
+                  showSearch
+                  optionFilterProp="label"
+                  placeholder="可选：关联版本"
+                  options={versions.map((v) => ({ value: v.id, label: v.versionNo }))}
+                />
+              </Form.Item>
+            </>
          ) : (
            <Form.Item name="supportTicketId" label="绑定技术支持工单">
              <Select
@@ -487,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>
@@ -244,7 +244,7 @@ export default function HqPermissionsPage() {
      <Typography.Title level={4}>权限分配</Typography.Title>
      <Typography.Paragraph type="secondary">
        按角色配置基础权限；按用户可追加或撤销。最终生效权限 =（角色权限 ∪ 追加）− 撤销。
-        超级管理员默认拥有除「危险操作」外的全部权限；删除用户/订单/城市需在「按用户分配」中单独勾选（默认均无）。
+        超级管理员默认拥有除「危险操作」外的全部权限；删除用户/订单/城市、修改用户关联合伙人需在「按用户分配」或「按角色分配」中单独勾选（默认均无）。
        运营/财务默认可删除门店分类；城市门店服务可新增分类，不可删除。
        「系统设置」已拆分为各配置分组；「财务」对应门店/合伙人/酒厂账单。
      </Typography.Paragraph>
@@ -274,7 +274,7 @@ export default function HqPermissionsPage() {
                  <Alert
                    type="info"
                    showIcon
-                    message="超级管理员基础权限固定（不含危险操作）。删除用户/订单/城市请到「按用户分配」为具体账号勾选。"
+                    message="超级管理员基础权限固定（不含危险操作）。删除用户/订单/城市、修改用户关联合伙人请到「按用户分配」为具体账号勾选。"
                  />
                ) : (
                  <>
@@ -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: '瓶数', dataIndex: 'bottleCount', width: 80 },
+    { title: '订单数', key: '订单数', dataIndex: 'orderCount', 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: '物流费',
@@ -1,10 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import { Link, useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import {
  Alert,
  Button,
  Checkbox,
-  Col,
  Collapse,
  DatePicker,
  Descriptions,
@@ -14,7 +13,6 @@ import {
  InputNumber,
  Modal,
  Radio,
-  Row,
  Select,
  Space,
  Table,
@@ -24,12 +22,14 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import dayjs, { type Dayjs } from 'dayjs';
+import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { ORDER_TYPE_LABELS } from '@dukang/shared-types';
 import { request, type AdminOrderItem, type AdminOrderRow, type HqProfile, type Paginated } from '../lib/api';
 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,
@@ -58,6 +58,7 @@ type ShipDefaults = {
 };

 type CityOption = { id: string; name: string; code: string };
+type PartnerOption = { id: string; companyName?: string | null; name?: string; phone?: string };

 type WarehouseOption = {
  id: string;
@@ -94,6 +95,20 @@ type OrderRedeemSummary = {
  redeemRecordSum: number;
 };

+type AssocPartnerBrief = {
+  id: string;
+  name: string;
+  companyName?: string | null;
+  phone?: string | null;
+  orderCommissionRate?: number | null;
+};
+
+function formatAssocPartner(p?: AssocPartnerBrief | null) {
+  if (!p) return '—';
+  const title = p.companyName || p.name;
+  return [title, p.phone].filter(Boolean).join(' / ') || '—';
+}
+
 type OrderDetail = AdminOrderRow & {
  receiverAddress?: string;
  receiverProvince?: string;
@@ -137,6 +152,11 @@ type OrderDetail = AdminOrderRow & {
    lng?: number | null;
    lat?: number | null;
  } | null;
+  assocPartnerAtPay?: AssocPartnerBrief | null;
+  orderCommissionRateAtPay?: number | null;
+  user?: AdminOrderRow['user'] & {
+    assocPartner?: AssocPartnerBrief | null;
+  };
 };

 type ShipMode = 'WAREHOUSE' | 'EXPRESS';
@@ -150,9 +170,12 @@ type OrderExportFilters = {
  orderType?: string;
  cityId?: string;
  receiverPhone?: string;
+  userKeyword?: string;
+  productKeyword?: string;
  fulfillmentHold?: boolean;
-  excludeTest?: boolean;
  deliveryType?: string;
+  promoCodeId?: string;
+  assocPartnerAccountId?: string;
  dateRange?: [Dayjs, Dayjs];
 };

@@ -212,6 +235,17 @@ const DATE_PRESETS: Array<{ key: 'day' | 'week' | 'month' | 'quarter' | 'year';
  { key: 'year', label: '当年' },
 ];

+const FILTERS_COLLAPSED_KEY = 'admin-orders-filters-collapsed';
+
+function formatUserWithRemark(user?: {
+  userNo?: string;
+  hqRemark?: string | null;
+} | null) {
+  const userNo = user?.userNo || '—';
+  const remark = user?.hqRemark?.trim();
+  return remark ? `${userNo}（${remark}）` : userNo;
+}
+
 function formatBenefitBrief(row: AdminOrderRow) {
  const coupon = row.benefitCoupon;
  if (coupon) {
@@ -232,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;
@@ -244,9 +279,12 @@ function buildExportPayload(
  if (filters.orderType) payload.orderType = filters.orderType;
  if (filters.cityId) payload.cityId = filters.cityId;
  if (filters.receiverPhone) payload.receiverPhone = filters.receiverPhone;
+  if (filters.userKeyword) payload.userKeyword = filters.userKeyword;
+  if (filters.productKeyword) payload.productKeyword = filters.productKeyword;
  if (filters.deliveryType) payload.deliveryType = filters.deliveryType;
  if (filters.fulfillmentHold) payload.fulfillmentHold = true;
-  if (filters.excludeTest) payload.excludeTest = true;
+  if (filters.promoCodeId) payload.promoCodeId = filters.promoCodeId;
+  if (filters.assocPartnerAccountId) payload.assocPartnerAccountId = filters.assocPartnerAccountId;
  if (filters.dateRange?.[0]) payload.createdFrom = filters.dateRange[0].format('YYYY-MM-DD');
  if (filters.dateRange?.[1]) payload.createdTo = filters.dateRange[1].format('YYYY-MM-DD');
  return payload;
@@ -285,8 +323,18 @@ function warehouseToDefaults(wh: WarehouseOption, base?: ShipDefaults | null): S

 export default function OrdersPage() {
  const navigate = useNavigate();
+  const location = useLocation();
  const [searchParams] = useSearchParams();
  const initialOrderNo = searchParams.get('orderNo')?.trim() || '';
+  const initialPromoCodeId = searchParams.get('promoCodeId')?.trim() || '';
+  const initialCityId = searchParams.get('cityId')?.trim() || '';
+  const initialCreatedFrom = searchParams.get('createdFrom')?.trim() || '';
+  const initialCreatedTo = searchParams.get('createdTo')?.trim() || '';
+  const initialStatusParam = searchParams.getAll('status').join(',');
+  const initialStatuses = useMemo(
+    () => initialStatusParam.split(',').map((s) => s.trim()).filter(Boolean),
+    [initialStatusParam],
+  );
  const [form] = Form.useForm();
  const [shipForm] = Form.useForm();
  const [logisticsForm] = Form.useForm();
@@ -309,6 +357,7 @@ export default function OrdersPage() {
  const [shipping, setShipping] = useState(false);
  const [logisticsShipping, setLogisticsShipping] = useState(false);
  const [cities, setCities] = useState<CityOption[]>([]);
+  const [partners, setPartners] = useState<PartnerOption[]>([]);
  const [shipModalOpen, setShipModalOpen] = useState(false);
  const [shipTarget, setShipTarget] = useState<OrderDetail | null>(null);
  const [shipMode, setShipMode] = useState<ShipMode>('EXPRESS');
@@ -317,6 +366,13 @@ export default function OrdersPage() {
  const [trackOpen, setTrackOpen] = useState(false);
  const [exporting, setExporting] = useState(false);
  const [exportFormat, setExportFormat] = useState<OrderExportFormat>('xlsx');
+  const [filtersCollapsed, setFiltersCollapsed] = useState(() => {
+    try {
+      return localStorage.getItem(FILTERS_COLLAPSED_KEY) === '1';
+    } catch {
+      return false;
+    }
+  });
  const canDeleteOrders = (profile?.permissionKeys ?? []).includes('orders_delete');
  const canProxyOrder = (profile?.permissionKeys ?? []).includes('orders');
  const canExportOrders = (profile?.permissionKeys ?? []).includes('orders');
@@ -336,6 +392,32 @@ export default function OrdersPage() {
    }
  }, [form, initialOrderNo]);

+  useEffect(() => {
+    const patch: { cityId?: string; dateRange?: [Dayjs, Dayjs] } = {};
+    if (initialCityId) patch.cityId = initialCityId;
+    if (
+      /^\d{4}-\d{2}-\d{2}$/.test(initialCreatedFrom) &&
+      /^\d{4}-\d{2}-\d{2}$/.test(initialCreatedTo)
+    ) {
+      patch.dateRange = [dayjs(initialCreatedFrom), dayjs(initialCreatedTo)];
+    }
+    if (Object.keys(patch).length) form.setFieldsValue(patch);
+  }, [form, initialCityId, initialCreatedFrom, initialCreatedTo]);
+
+  useEffect(() => {
+    if (initialStatuses.length) {
+      form.setFieldsValue({ status: initialStatuses });
+    }
+  }, [form, initialStatuses]);
+
+  useEffect(() => {
+    const openOrderId = (location.state as { openOrderId?: string } | null)?.openOrderId;
+    if (openOrderId) {
+      void openDetail(openOrderId);
+      navigate(`${location.pathname}${location.search}`, { replace: true, state: null });
+    }
+  }, [location.state, location.pathname, location.search, navigate]);
+
  useEffect(() => {
    if (!initialOrderNo || deepLinkOpenedRef.current || loading) return;
    const first = data?.items?.[0];
@@ -366,21 +448,28 @@ export default function OrdersPage() {
      const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
      if (initialOrderNo) qs.set('orderNo', initialOrderNo);
      if (values.orderNo) qs.set('orderNo', values.orderNo);
-      for (const status of selectedStatuses(values.status)) qs.append('status', status);
+      const statuses = selectedStatuses(values.status);
+      const statusList = statuses.length ? statuses : initialStatuses;
+      for (const status of statusList) qs.append('status', status);
      if (values.orderType) qs.set('orderType', values.orderType);
-      if (values.cityId) qs.set('cityId', values.cityId);
+      if (values.cityId || initialCityId) qs.set('cityId', values.cityId || initialCityId);
      if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
+      if (values.userKeyword) qs.set('userKeyword', values.userKeyword);
+      if (values.productKeyword) qs.set('productKeyword', values.productKeyword);
      if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true');
-      if (values.excludeTest) qs.set('excludeTest', 'true');
      if (values.deliveryType) qs.set('deliveryType', values.deliveryType);
-      if (values.dateRange?.[0]) qs.set('createdFrom', values.dateRange[0].format('YYYY-MM-DD'));
-      if (values.dateRange?.[1]) qs.set('createdTo', values.dateRange[1].format('YYYY-MM-DD'));
+      if (values.assocPartnerAccountId) qs.set('assocPartnerAccountId', values.assocPartnerAccountId);
+      if (initialPromoCodeId) qs.set('promoCodeId', initialPromoCodeId);
+      const createdFrom = values.dateRange?.[0]?.format('YYYY-MM-DD') || initialCreatedFrom;
+      const createdTo = values.dateRange?.[1]?.format('YYYY-MM-DD') || initialCreatedTo;
+      if (createdFrom) qs.set('createdFrom', createdFrom);
+      if (createdTo) qs.set('createdTo', createdTo);
      const res = await request<Paginated<AdminOrderRow>>(`/admin/orders?${qs}`);
      setData(res);
    } finally {
      setLoading(false);
    }
-  }, [form, page, pageSize, initialOrderNo]);
+  }, [form, page, pageSize, initialOrderNo, initialPromoCodeId, initialStatuses, initialCityId, initialCreatedFrom, initialCreatedTo]);

  useEffect(() => {
    void load();
@@ -391,6 +480,9 @@ export default function OrdersPage() {
    void request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
      .then((res) => setCities(res.items ?? []))
      .catch(() => {});
+    void request<Paginated<PartnerOption>>(`/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setPartners(res.items ?? []))
+      .catch(() => setPartners([]));
  }, []);

  function applyShipDefaults(defaults: ShipDefaults, warehouseId?: string | null) {
@@ -589,7 +681,17 @@ export default function OrdersPage() {
    }
    setExporting(true);
    try {
-      const payload = buildExportPayload(scope, exportFormat, values, selectedRowKeys);
+      const payload = buildExportPayload(
+        scope,
+        exportFormat,
+        {
+          ...values,
+          promoCodeId: initialPromoCodeId || values.promoCodeId,
+          status: selectedStatuses(values.status).length ? values.status : initialStatuses,
+        },
+        selectedRowKeys,
+        exportColumnKeys,
+      );
      const result = await request<OrderExportResult>('/admin/orders/export', {
        method: 'POST',
        body: JSON.stringify(payload),
@@ -606,6 +708,7 @@ export default function OrdersPage() {
  const baseColumns: ColumnsType<AdminOrderRow> = [
    {
      title: '订单号',
+      key: '订单号',
      dataIndex: 'orderNo',
      width: 180,
      render: (v, row) => (
@@ -617,25 +720,33 @@ export default function OrdersPage() {
    },
    {
      title: '用户',
-      key: 'user',
-      width: 120,
+      key: '用户',
+      width: 200,
      render: (_, row) =>
        row.user?.id ? (
-          <AdminPrimaryLink onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}>
-            {row.user.userNo}
+          <AdminPrimaryLink onClick={() => navigate(`/users?userId=${encodeURIComponent(String(row.user!.id))}`)}>
+            {formatUserWithRemark(row.user)}
          </AdminPrimaryLink>
        ) : (
-          (row.user?.userNo || '—')
+          formatUserWithRemark(row.user)
        ),
    },
    {
      title: '商品',
-      key: 'productName',
+      key: '商品',
      width: 180,
      render: (_, row) => (
        <Space size={4} wrap>
          <span>{row.productName || '—'}</span>
-          {row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
+          {row.fulfillmentHold ? (
+            <Tag color="orange">
+              {row.fulfillmentHoldReason === 'LARGE_ORDER_GE_10_BOXES'
+                ? '大单'
+                : row.fulfillmentHoldReason === 'COURIER_OUT_OF_SERVICE'
+                  ? '超区'
+                  : '推单失败'}
+            </Tag>
+          ) : null}
          {row.orderType === 'PROXY' || row.isProxyOrder ? (
            <Tag color="purple">代下单</Tag>
          ) : null}
@@ -644,12 +755,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) =>
@@ -657,12 +770,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) => (
@@ -671,42 +786,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,
@@ -741,7 +861,7 @@ export default function OrdersPage() {
    },
  ];

-  const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
+  const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('orders', baseColumns, {
    page,
    pageSize,
  });
@@ -778,15 +898,117 @@ export default function OrdersPage() {
        />
      ) : null}

+      {initialPromoCodeId ? (
+        <Alert
+          type="info"
+          showIcon
+          closable
+          style={{ marginBottom: 16 }}
+          message={
+            initialStatuses.includes('COMPLETED') && initialStatuses.length === 1
+              ? '已按推广码筛选已完成订单'
+              : '已按推广码筛选订单'
+          }
+          action={
+            <Button size="small" onClick={() => navigate('/orders')}>
+              清除筛选
+            </Button>
+          }
+          onClose={() => navigate('/orders')}
+        />
+      ) : null}
+
      <Form form={form} layout="vertical" onFinish={() => { setPage(1); void load(); }}>
-        <Row gutter={[16, 8]}>
-          <Col xs={24} md={14} lg={12}>
-            <Form.Item label="下单日期" style={{ marginBottom: 12 }}>
-              <Space direction="vertical" size={8} style={{ width: '100%' }}>
-                <Form.Item name="dateRange" noStyle>
-                  <DatePicker.RangePicker allowClear style={{ width: '100%' }} />
-                </Form.Item>
+        <div className="admin-orders-filter-row">
+          <Form.Item name="cityId" label="城市" className="admin-orders-filter-item admin-orders-filter-item--sm">
+            <Select
+              allowClear
+              showSearch
+              optionFilterProp="label"
+              placeholder="全部"
+              options={cities.map((c) => ({ value: c.id, label: c.name }))}
+            />
+          </Form.Item>
+          <Form.Item name="receiverPhone" label="手机号" className="admin-orders-filter-item admin-orders-filter-item--md">
+            <Input allowClear placeholder="手机号" />
+          </Form.Item>
+          <Form.Item name="userKeyword" label="用户" className="admin-orders-filter-item admin-orders-filter-item--search">
+            <Input allowClear placeholder="编号/昵称/备注/手机" />
+          </Form.Item>
+          <Form.Item name="productKeyword" label="商品" className="admin-orders-filter-item admin-orders-filter-item--search">
+            <Input allowClear placeholder="名称/规格" />
+          </Form.Item>
+          <Form.Item name="status" label="状态" className="admin-orders-filter-item admin-orders-filter-item--status">
+            <Select
+              mode="multiple"
+              allowClear
+              maxTagCount="responsive"
+              placeholder="全部"
+              options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
+            />
+          </Form.Item>
+          <Form.Item name="orderType" label="类型" className="admin-orders-filter-item admin-orders-filter-item--sm">
+            <Select allowClear placeholder="全部" options={ORDER_TYPE_OPTIONS} />
+          </Form.Item>
+          <Form.Item name="deliveryType" label="配送" className="admin-orders-filter-item admin-orders-filter-item--sm">
+            <Select allowClear placeholder="全部" options={DELIVERY_TYPE_OPTIONS} />
+          </Form.Item>
+          <Form.Item
+            name="assocPartnerAccountId"
+            label="关联合伙人"
+            className="admin-orders-filter-item admin-orders-filter-item--status"
+          >
+            <Select
+              allowClear
+              showSearch
+              optionFilterProp="label"
+              placeholder="全部"
+              options={[
+                { value: 'none', label: '未关联' },
+                ...partners.map((p) => ({
+                  value: p.id,
+                  label: formatAssocPartner({
+                    id: p.id,
+                    name: p.name || p.id,
+                    companyName: p.companyName,
+                    phone: p.phone,
+                  }),
+                })),
+              ]}
+            />
+          </Form.Item>
+          <Form.Item label=" " colon={false} className="admin-orders-filter-item admin-orders-filter-actions">
+            <Space size={8} wrap>
+              <Button type="primary" htmlType="submit">查询</Button>
+              <Button
+                type="link"
+                icon={filtersCollapsed ? <DownOutlined /> : <UpOutlined />}
+                onClick={() => {
+                  setFiltersCollapsed((prev) => {
+                    const next = !prev;
+                    try {
+                      localStorage.setItem(FILTERS_COLLAPSED_KEY, next ? '1' : '0');
+                    } catch {
+                      /* ignore */
+                    }
+                    return next;
+                  });
+                }}
+              >
+                {filtersCollapsed ? '展开' : '收起'}
+              </Button>
+            </Space>
+          </Form.Item>
+        </div>
+
+        {!filtersCollapsed ? (
+          <>
+            <div className="admin-orders-filter-row">
+              <Form.Item label="下单日期" className="admin-orders-filter-item admin-orders-filter-item--date">
                <Space size={8} wrap>
+                  <Form.Item name="dateRange" noStyle>
+                    <DatePicker.RangePicker allowClear className="admin-orders-date-picker" />
+                  </Form.Item>
                  {DATE_PRESETS.map((preset) => (
                    <Button
                      key={preset.key}
@@ -797,98 +1019,60 @@ export default function OrdersPage() {
                    </Button>
                  ))}
                </Space>
-              </Space>
-            </Form.Item>
-          </Col>
-          <Col xs={24} sm={12} md={8} lg={6}>
-            <Form.Item name="status" label="状态" style={{ marginBottom: 12 }}>
-              <Select
-                mode="multiple"
-                allowClear
-                maxTagCount="responsive"
-                placeholder="全部"
-                options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
-              />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={6} md={5} lg={3}>
-            <Form.Item name="orderType" label="类型" style={{ marginBottom: 12 }}>
-              <Select allowClear placeholder="全部" options={ORDER_TYPE_OPTIONS} />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={6} md={5} lg={3}>
-            <Form.Item name="deliveryType" label="配送" style={{ marginBottom: 12 }}>
-              <Select allowClear placeholder="全部" options={DELIVERY_TYPE_OPTIONS} />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={6} md={5} lg={3}>
-            <Form.Item name="cityId" label="城市" style={{ marginBottom: 12 }}>
-              <Select
-                allowClear
-                showSearch
-                optionFilterProp="label"
-                placeholder="全部"
-                options={cities.map((c) => ({ value: c.id, label: c.name }))}
-              />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={8} md={6} lg={6}>
-            <Form.Item name="receiverPhone" label="收货手机" style={{ marginBottom: 12 }}>
-              <Input allowClear placeholder="手机号" />
-            </Form.Item>
-          </Col>
-          <Col xs={12} sm={8} md={8} lg={8}>
-            <Form.Item label=" " colon={false} style={{ marginBottom: 12 }}>
-              <Space size={16} wrap>
-                <Form.Item name="fulfillmentHold" valuePropName="checked" noStyle>
-                  <Checkbox>大单拦截</Checkbox>
-                </Form.Item>
-                <Form.Item name="excludeTest" valuePropName="checked" noStyle>
-                  <Checkbox>过滤测试</Checkbox>
-                </Form.Item>
-              </Space>
-            </Form.Item>
-          </Col>
-        </Row>
+              </Form.Item>
+            </div>

-        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '8px 0 16px', gap: 12, flexWrap: 'wrap' }}>
-          {canExportOrders ? (
-            <Space size={12} wrap>
-              <Radio.Group
-                optionType="button"
-                buttonStyle="solid"
-                value={exportFormat}
-                onChange={(e) => setExportFormat(e.target.value)}
-              >
-                <Radio.Button value="xlsx">Excel</Radio.Button>
-                <Radio.Button value="pdf">PDF</Radio.Button>
-              </Radio.Group>
-              <Button
-                disabled={!selectedRowKeys.length}
-                loading={exporting}
-                onClick={() => void submitExport('selected')}
-              >
-                导出已勾选{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
-              </Button>
-              <Button loading={exporting} onClick={() => void submitExport('filter')}>
-                导出全部筛选
-              </Button>
-            </Space>
-          ) : <span />}
-          <Space size={12} wrap>
-            <Button type="primary" htmlType="submit">查询</Button>
-            <Button onClick={() => { form.resetFields(); setPage(1); void load(); }}>重置</Button>
-            {canDeleteOrders ? (
-              <Button
-                danger
-                disabled={!selectedRowKeys.length}
-                onClick={() => setBatchDeleteOpen(true)}
-              >
-                批量删除{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
-              </Button>
-            ) : null}
-          </Space>
-        </div>
+            <div className="admin-orders-filter-row admin-orders-filter-row--tools">
+              {canExportOrders ? (
+                <Space size={12} wrap>
+                  <Radio.Group
+                    optionType="button"
+                    buttonStyle="solid"
+                    value={exportFormat}
+                    onChange={(e) => setExportFormat(e.target.value)}
+                  >
+                    <Radio.Button value="xlsx">Excel</Radio.Button>
+                    <Radio.Button value="pdf">PDF</Radio.Button>
+                  </Radio.Group>
+                  <Button
+                    disabled={!selectedRowKeys.length}
+                    loading={exporting}
+                    onClick={() => void submitExport('selected')}
+                  >
+                    导出已勾选{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
+                  </Button>
+                  <Button loading={exporting} onClick={() => void submitExport('filter')}>
+                    导出全部筛选
+                  </Button>
+                </Space>
+              ) : <span />}
+              <Space size={12} wrap>
+                <Form.Item name="fulfillmentHold" valuePropName="checked" noStyle>
+                  <Checkbox>履约拦截</Checkbox>
+                </Form.Item>
+                <Button
+                  onClick={() => {
+                    form.resetFields();
+                    setPage(1);
+                    if (initialPromoCodeId || initialOrderNo || initialStatuses.length) navigate('/orders');
+                    else void load();
+                  }}
+                >
+                  重置
+                </Button>
+                {canDeleteOrders ? (
+                  <Button
+                    danger
+                    disabled={!selectedRowKeys.length}
+                    onClick={() => setBatchDeleteOpen(true)}
+                  >
+                    批量删除{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
+                  </Button>
+                ) : null}
+              </Space>
+            </div>
+          </>
+        ) : null}
      </Form>

      <Table
@@ -974,7 +1158,7 @@ export default function OrdersPage() {
                  {detail.fulfillmentHold ? (
                    <Tag color="orange">
                      {FULFILLMENT_HOLD_REASON_LABELS[detail.fulfillmentHoldReason || ''] ||
-                        '大单待确认'}
+                        '履约待确认'}
                    </Tag>
                  ) : null}
                  {detail.orderType === 'PROXY' || detail.isProxyOrder ? (
@@ -987,7 +1171,33 @@ export default function OrdersPage() {
                  {[detail.proxyPartnerName, detail.proxyPartnerPhone].filter(Boolean).join(' / ') || '—'}
                </Descriptions.Item>
              ) : null}
-              <Descriptions.Item label="用户">{detail.user?.userNo} / {detail.user?.nickname}</Descriptions.Item>
+              <Descriptions.Item label="关联合伙人（本单佣金）">
+                {detail.assocPartnerAtPay
+                  ? `${formatAssocPartner(detail.assocPartnerAtPay)}${
+                      detail.assocPartnerAtPay.orderCommissionRate != null
+                        ? ` · 费率 ${(Number(detail.assocPartnerAtPay.orderCommissionRate) * 100).toFixed(2)}%`
+                        : ''
+                    }`
+                  : '—'}
+              </Descriptions.Item>
+              {detail.user?.assocPartner &&
+              detail.user.assocPartner.id !== detail.assocPartnerAtPay?.id ? (
+                <Descriptions.Item label="用户当前关联">
+                  {formatAssocPartner(detail.user.assocPartner)}
+                </Descriptions.Item>
+              ) : null}
+              <Descriptions.Item label="用户">
+                {detail.user?.id ? (
+                  <AdminPrimaryLink
+                    onClick={() => navigate(`/users?userId=${encodeURIComponent(String(detail.user!.id))}`)}
+                  >
+                    {formatUserWithRemark(detail.user)}
+                  </AdminPrimaryLink>
+                ) : (
+                  formatUserWithRemark(detail.user)
+                )}
+                {detail.user?.nickname ? ` / ${detail.user.nickname}` : ''}
+              </Descriptions.Item>
              <Descriptions.Item label="商品额">¥{detail.productAmount}</Descriptions.Item>
              <Descriptions.Item label="实付">¥{detail.payAmount}</Descriptions.Item>
              <Descriptions.Item label="好客权益">¥{detail.benefitAmount}</Descriptions.Item>
@@ -1345,10 +1555,16 @@ export default function OrdersPage() {
                type="warning"
                showIcon
                style={{ marginBottom: 12 }}
-                message="大单已拦截自动推小飞侠"
+                message={
+                  shipTarget.fulfillmentHoldReason === 'LARGE_ORDER_GE_10_BOXES'
+                    ? '大单已拦截自动推小飞侠'
+                    : shipTarget.fulfillmentHoldReason === 'COURIER_OUT_OF_SERVICE'
+                      ? '小飞侠超出服务区'
+                      : '自动推配送失败'
+                }
                description={
                  FULFILLMENT_HOLD_REASON_LABELS[shipTarget.fulfillmentHoldReason || ''] ||
-                  '≥10箱订单需总部确认：可选仓推小飞侠，或改用快递自配送。'
+                  '请确认后：可选仓重推小飞侠，或改用快递自配送。'
                }
              />
            ) : null}
@@ -9,6 +9,7 @@ import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, ORDER_STATUS_LABELS, PARTNER_BILL_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
+import PartnerAssocPanel from '../components/PartnerAssocPanel';


 type PartnerOption = { id: string; companyName: string };
@@ -413,6 +414,13 @@ export default function PartnerAccountsPage() {
                  dataSource={detail.orders ?? []} pagination={false} scroll={{ x: 'max-content' }} />
              ),
            },
+            ...(!detail.parentAccountId
+              ? [{
+                  key: 'assoc',
+                  label: '关联码',
+                  children: <PartnerAssocPanel partnerId={detail.id} />,
+                }]
+              : []),
          ]} />
        )}
      </Drawer>
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
  Button,
  Card,
@@ -12,7 +13,9 @@ import {
  Space,
  Statistic,
  Table,
+  Tabs,
  Tag,
+  Tooltip,
  Typography,
  message,
 } from 'antd';
@@ -21,12 +24,26 @@ 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';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';


+type BillItemRow = {
+  id: string;
+  kind: 'ORDER' | 'REDEEM';
+  refId: string;
+  refNo: string;
+  title?: string | null;
+  extra?: string | null;
+  baseAmount: number;
+  rate: number;
+  commission: number;
+  occurredAt: string;
+};
+
 type Row = {
  id: string;
  billNo: string;
@@ -34,13 +51,17 @@ type Row = {
  redeemCommission: number;
  totalAmount: number;
  status: string;
+  billDate: string;
  periodStart: string;
  periodEnd: string;
  rejectReason?: string | null;
  paymentRef?: string | null;
  paidAt?: string | null;
+  orderItems?: BillItemRow[];
+  redeemItems?: BillItemRow[];
  partner?: {
    companyName?: string;
+    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -48,6 +69,7 @@ type Row = {
  };
  partnerAccount?: {
    companyName?: string;
+    name?: string;
    phone?: string;
    bankAccountName?: string | null;
    bankAccountNo?: string | null;
@@ -55,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: '待审核',
@@ -73,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[]>([]);
@@ -83,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.month) qs.set('month', filters.month);
+      if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd);
      return qs;
    },
    [filters],
@@ -106,19 +145,18 @@ export default function PartnerBillsPage() {
      .catch(() => {});
  }, []);

-  async function generateBill(values: { partnerId?: string; month: Dayjs }) {
-    const year = values.month.year();
-    const month = values.month.month() + 1;
+  async function generateBill(values: { partnerId?: string; week: Dayjs }) {
+    const weekStartYmd = weekMonday(values.week).format('YYYY-MM-DD');
    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('账单已生成（待审核）');
    }
@@ -229,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.month) qs.set('month', filters.month);
+      if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd);
+      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 {
@@ -241,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) => (
@@ -259,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,
-      render: (v) => `¥${Number(v).toFixed(2)}`,
+      width: 130,
+      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) => (
@@ -320,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>
@@ -345,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>
@@ -353,7 +414,7 @@ export default function PartnerBillsPage() {
      <AdminListHeader
        title="合伙人账单"
        settings={settingsButton}
-        description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
+        description="每周一 8:00 自动生成上周账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款。零元账单不同步给合伙人。"
      />

      {summary && (
@@ -371,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()) : '',
-            month: v.month ? String(v.month.month() + 1) : '',
+            weekStartYmd: v.week ? weekMonday(v.week).format('YYYY-MM-DD') : '',
          });
          setPage(1);
        }}
@@ -390,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="账期月">
-          <DatePicker picker="month" />
+        <Form.Item name="week" label="账期周">
+          <DatePicker picker="week" />
        </Form.Item>
        <Form.Item name="status" label="状态">
          <Select
@@ -473,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 }]}>
-            <DatePicker picker="month" style={{ width: '100%' }} />
+          <Form.Item name="week" label="账单周（选任意一天，按周一起算）" rules={[{ required: true }]}>
+            <DatePicker picker="week" style={{ width: '100%' }} />
          </Form.Item>
          <Form.Item name="partnerId" label="指定合伙人（留空则全部主合伙人）">
            <Select
@@ -487,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>
@@ -531,13 +591,14 @@ export default function PartnerBillsPage() {
        title="合伙人账单明细"
        open={drawerOpen}
        onClose={() => setDrawerOpen(false)}
-        width={560}
+        width={720}
      >
        {detail && (
          <>
            <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>
@@ -562,6 +623,98 @@ export default function PartnerBillsPage() {
                {detail.paymentRef ? String(detail.paymentRef) : '—'}
              </Descriptions.Item>
            </Descriptions>
+            <Tabs
+              style={{ marginTop: 16 }}
+              items={[
+                {
+                  key: 'orders',
+                  label: `酒订单 (${detail.orderItems?.length ?? 0})`,
+                  children: (
+                    <>
+                      <Table
+                        rowKey="id"
+                        size="small"
+                        pagination={false}
+                        dataSource={detail.orderItems ?? []}
+                        columns={[
+                          {
+                            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 },
+                          {
+                            title: '实付',
+                            dataIndex: 'baseAmount',
+                            render: (v: number) => `¥${Number(v).toFixed(2)}`,
+                          },
+                          {
+                            title: '费率',
+                            dataIndex: 'rate',
+                            render: (v: number) => `${(Number(v) * 100).toFixed(2)}%`,
+                          },
+                          {
+                            title: '佣金',
+                            dataIndex: 'commission',
+                            render: (v: number) => `¥${Number(v).toFixed(2)}`,
+                          },
+                        ]}
+                      />
+                      <Typography.Paragraph style={{ textAlign: 'right', marginTop: 8 }}>
+                        酒单佣金 ¥{Number(detail.orderCommission).toFixed(2)}
+                      </Typography.Paragraph>
+                    </>
+                  ),
+                },
+                {
+                  key: 'redeems',
+                  label: `核销订单 (${detail.redeemItems?.length ?? 0})`,
+                  children: (
+                    <>
+                      <Table
+                        rowKey="id"
+                        size="small"
+                        pagination={false}
+                        dataSource={detail.redeemItems ?? []}
+                        columns={[
+                          { title: '核销单号', dataIndex: 'refNo', width: 160 },
+                          { title: '门店', dataIndex: 'title' },
+                          {
+                            title: '核销额',
+                            dataIndex: 'baseAmount',
+                            render: (v: number) => `¥${Number(v).toFixed(2)}`,
+                          },
+                          {
+                            title: '费率',
+                            dataIndex: 'rate',
+                            render: (v: number) => `${(Number(v) * 100).toFixed(2)}%`,
+                          },
+                          {
+                            title: '佣金',
+                            dataIndex: 'commission',
+                            render: (v: number) => `¥${Number(v).toFixed(2)}`,
+                          },
+                        ]}
+                      />
+                      <Typography.Paragraph style={{ textAlign: 'right', marginTop: 8 }}>
+                        核销佣金 ¥{Number(detail.redeemCommission).toFixed(2)}
+                      </Typography.Paragraph>
+                    </>
+                  ),
+                },
+              ]}
+            />
            <Typography.Title level={5} style={{ marginTop: 16 }}>
              收款账户
            </Typography.Title>
@@ -23,6 +23,7 @@ import {
  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';
 import { useAdminList } from '../lib/useAdminList';
@@ -30,6 +31,7 @@ import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
+import PartnerAssocPanel from '../components/PartnerAssocPanel';


 type Row = {
@@ -162,7 +164,7 @@ export default function PartnersPage() {
    try {
      const v = await editForm.validateFields();
      const body = {
-        ...v,
+        ...omitNullFields(v),
        orderCommissionRate: Number(v.orderCommissionRate ?? 0) / 100,
        redeemCommissionRate: Number(v.redeemCommissionRate ?? 3) / 100,
        districtCodes: editScopeType === CityPartnerScopeType.DISTRICT ? flattenDistrictCodes(v.districtCodes) : undefined,
@@ -320,6 +322,11 @@ export default function PartnersPage() {
                  </>
                ),
              },
+              {
+                key: 'assoc',
+                label: '关联码',
+                children: <PartnerAssocPanel partnerId={detail.id} />,
+              },
            ]}
          />
        )}
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
-  Button, Form, Input, Modal, Select, Space, Table, Tag, Typography, message,
+  Button, Form, Input, Modal, Select, Space, Table, Tag, Tooltip, Typography, message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
@@ -23,21 +23,6 @@ type Row = PromoCodeItem;

 type SceneOption = { value: PromoCodeScene; label: string };

-async function downloadQrcode(url: string, filename: string) {
-  try {
-    const res = await fetch(url);
-    const blob = await res.blob();
-    const objectUrl = URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = objectUrl;
-    a.download = filename;
-    a.click();
-    URL.revokeObjectURL(objectUrl);
-  } catch {
-    window.open(url, '_blank');
-  }
-}
-
 export default function PromoCodesPage() {
  const navigate = useNavigate();
  const [filterForm] = Form.useForm();
@@ -104,8 +89,26 @@ export default function PromoCodesPage() {
        </Tag>
      ),
    },
-    { title: '扫码', dataIndex: 'scanCount', width: 70 },
-    { title: '订单', dataIndex: 'orderCount', width: 70 },
+    {
+      title: '扫码',
+      dataIndex: 'scanCount',
+      width: 70,
+      render: (v: number, row) => (
+        <AdminPrimaryLink onClick={() => navigate(`/promo-codes/${row.id}?eventType=SCAN`)}>
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
+    {
+      title: <Tooltip title="仅统计已完成订单">订单</Tooltip>,
+      dataIndex: 'orderCount',
+      width: 70,
+      render: (v: number, row) => (
+        <AdminPrimaryLink onClick={() => navigate(`/orders?promoCodeId=${row.id}&status=COMPLETED`)}>
+          {v}
+        </AdminPrimaryLink>
+      ),
+    },
    {
      title: '转化率',
      width: 90,
@@ -119,24 +122,13 @@ export default function PromoCodesPage() {
    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '操作',
-      width: 220,
+      width: 140,
      fixed: 'right',
      render: (_, row) => (
        <Space size="small" wrap>
          <Button type="link" size="small" onClick={() => navigate(`/promo-codes/${row.id}`)}>
            详情
          </Button>
-          <Button
-            type="link"
-            size="small"
-            disabled={!row.qrcodeUrl}
-            onClick={() => {
-              if (!row.qrcodeUrl) return;
-              void downloadQrcode(row.qrcodeUrl, `${row.code}-wxacode.png`);
-            }}
-          >
-            下载小程序码
-          </Button>
          <Button type="link" size="small" onClick={() => navigate(`/promo-codes/${row.id}/users`)}>
            关联用户
          </Button>
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Button, Checkbox, Drawer, Form, Input, Select, Table, Tag, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { REDEEM_CHANNEL_LABELS, type RedeemChannel } from '@dukang/shared-types';
@@ -20,17 +20,28 @@ type Row = {
  channel?: RedeemChannel;
  createdAt: string;
  isTest?: boolean;
-  user?: { userNo: string; phone: string | null; nickname?: string | null };
+  user?: {
+    id?: string;
+    userNo: string;
+    phone: string | null;
+    nickname?: string | null;
+    hqRemark?: string | null;
+  };
  store?: { name: string; cityName: string };
-  coupon?: { couponNo: string };
+  coupon?: { id?: string; couponNo: string };
 };

-function maskPhone(phone: string | null | undefined) {
-  if (!phone || phone.length < 7) return phone ?? '—';
-  return `${phone.slice(0, 3)}****${phone.slice(-4)}`;
+function formatNicknameWithRemark(user?: {
+  nickname?: string | null;
+  hqRemark?: string | null;
+} | null) {
+  const name = user?.nickname?.trim() || '—';
+  const remark = user?.hqRemark?.trim();
+  return remark ? `${name}（${remark}）` : name;
 }

 export default function RedeemRecordsPage() {
+  const navigate = useNavigate();
  const [searchParams] = useSearchParams();
  const initialRedeemNo = searchParams.get('redeemNo')?.trim() || '';
  const [form] = Form.useForm();
@@ -108,23 +119,60 @@ export default function RedeemRecordsPage() {
        );
      },
    },
-    { title: '用户编号', dataIndex: ['user', 'userNo'], width: 110 },
+    { title: '用户编号', dataIndex: ['user', 'userNo'], width: 110, render: (v: string | undefined, row) =>
+      row.user?.id ? (
+        <AdminPrimaryLink
+          onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}
+        >
+          {v || '—'}
+        </AdminPrimaryLink>
+      ) : (
+        v || '—'
+      ),
+    },
    {
      title: '用户昵称',
      dataIndex: ['user', 'nickname'],
-      width: 100,
-      render: (v: string | null | undefined) => v || '—',
+      width: 160,
+      render: (_: string | null | undefined, row) =>
+        row.user?.id ? (
+          <AdminPrimaryLink
+            onClick={() => navigate('/users', { state: { openUserId: String(row.user!.id) } })}
+          >
+            {formatNicknameWithRemark(row.user)}
+          </AdminPrimaryLink>
+        ) : (
+          formatNicknameWithRemark(row.user)
+        ),
    },
    {
      title: '用户手机',
      dataIndex: ['user', 'phone'],
      width: 120,
-      render: (v: string | null | undefined) => maskPhone(v),
+      render: (v: string | null | undefined) => v || '—',
    },
    { title: '门店', dataIndex: ['store', 'name'] },
    { title: '核销额', dataIndex: 'amount', width: 90, render: (v) => `¥${v}` },
    { title: '结算额', dataIndex: 'settleAmount', width: 90, render: (v) => `¥${v}` },
-    { title: '券号', dataIndex: ['coupon', 'couponNo'], width: 160 },
+    {
+      title: '券号',
+      dataIndex: ['coupon', 'couponNo'],
+      width: 160,
+      render: (v: string | undefined, row) =>
+        v ? (
+          <AdminPrimaryLink
+            onClick={() =>
+              navigate(`/benefit/coupons?couponNo=${encodeURIComponent(v)}`, {
+                state: row.coupon?.id ? { openCouponId: String(row.coupon.id) } : undefined,
+              })
+            }
+          >
+            {v}
+          </AdminPrimaryLink>
+        ) : (
+          '—'
+        ),
+    },
    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '操作',
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams, useNavigate } from 'react-router-dom';
 import {
  Button,
  Card,
@@ -14,9 +14,11 @@ import {
  Statistic,
  Table,
  Tag,
+  Tooltip,
  Typography,
  message,
 } from 'antd';
+import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof';
 import type { ColumnsType } from 'antd/es/table';
 import type { Dayjs } from 'dayjs';
 import {
@@ -29,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';
@@ -42,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;
@@ -75,6 +80,7 @@ const KIND_COLORS: Record<StoreSettlementKind, string> = {
 };

 export default function StoreBillsPage() {
+  const navigate = useNavigate();
  const [searchParams] = useSearchParams();
  const initialKind = searchParams.get('kind') === 'WITHDRAW' ? 'WITHDRAW' : '';
  const initialStoreId = searchParams.get('storeId') || '';
@@ -111,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({
@@ -132,77 +145,11 @@ export default function StoreBillsPage() {
  }, []);

  function confirmPay(ids: string[], amountHint?: number) {
-    let paymentRef = '';
-    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();
-      },
-    });
+    setPayModal({ ids, amountHint });
  }

  function approveWithdraw(id: string) {
-    let paymentRef = '';
-    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(() => {});
-      },
-    });
+    setWithdrawApproveId(id);
  }

  function rejectWithdraw(id: string) {
@@ -254,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 账单`);
@@ -274,6 +222,7 @@ export default function StoreBillsPage() {
  const baseColumns: ColumnsType<Row> = [
    {
      title: '类型',
+      key: '类型',
      dataIndex: 'kind',
      width: 100,
      render: (k: StoreSettlementKind) => (
@@ -284,6 +233,7 @@ export default function StoreBillsPage() {
    },
    {
      title: '单号',
+      key: '账单号',
      dataIndex: 'billNo',
      width: 180,
      render: (v, row) => (
@@ -294,40 +244,63 @@ export default function StoreBillsPage() {
      ),
    },
    {
-      title: '日期',
+      title: (
+        <Tooltip title="T+1 为出账日（昨日 00:00–今日 00:00 窗口中的今天，不是该账单里最后一笔核销时间）；手动提现为申请时间">
+          出账日
+        </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: '城市', dataIndex: ['store', 'cityName'], width: 90 },
+    {
+      title: (
+        <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) => (
@@ -377,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>
@@ -389,6 +362,7 @@ export default function StoreBillsPage() {
          <>
            含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
            「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
+            T+1「出账日」是任务跑的那天（昨日 00:00–今日 00:00 窗口中的今天），不是最后一笔核销时间。
            {overdueSummary && overdueSummary.overdueCount > 0 ? (
              <div>
                <Typography.Text type="danger">
@@ -469,7 +443,7 @@ export default function StoreBillsPage() {
            }))}
          />
        </Form.Item>
-        <Form.Item name="range" label="日期">
+        <Form.Item name="range" label="出账日">
          <DatePicker.RangePicker />
        </Form.Item>
        <Form.Item>
@@ -543,9 +517,14 @@ export default function StoreBillsPage() {
          <>
            <Descriptions column={1} size="small" bordered>
              <Descriptions.Item label="账单号">{String(detail.billNo)}</Descriptions.Item>
-              <Descriptions.Item label="账单日">
+              <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>
@@ -558,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;
@@ -592,8 +574,22 @@ export default function StoreBillsPage() {
              columns={[
                {
                  title: '核销单号',
-                  render: (_, r) =>
-                    String((r.redeemRecord as { redeemNo?: string })?.redeemNo || '—'),
+                  render: (_, r) => {
+                    const redeemNo = String(
+                      (r.redeemRecord as { redeemNo?: string } | undefined)?.redeemNo || '',
+                    );
+                    return redeemNo ? (
+                      <AdminPrimaryLink
+                        onClick={() =>
+                          navigate(`/redeem-records?redeemNo=${encodeURIComponent(redeemNo)}`)
+                        }
+                      >
+                        {redeemNo}
+                      </AdminPrimaryLink>
+                    ) : (
+                      '—'
+                    );
+                  },
                },
                {
                  title: '金额',
@@ -628,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 ? (
              <>
@@ -662,7 +661,18 @@ export default function StoreBillsPage() {
                    const payout = r.storePayout as
                      | { redeemRecord?: { redeemNo?: string }; payoutAmount?: number }
                      | undefined;
-                    return String(payout?.redeemRecord?.redeemNo || '—');
+                    const redeemNo = payout?.redeemRecord?.redeemNo || '';
+                    return redeemNo ? (
+                      <AdminPrimaryLink
+                        onClick={() =>
+                          navigate(`/redeem-records?redeemNo=${encodeURIComponent(redeemNo)}`)
+                        }
+                      >
+                        {redeemNo}
+                      </AdminPrimaryLink>
+                    ) : (
+                      '—'
+                    );
                  },
                },
                {
@@ -687,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>
  );
 }
@@ -13,6 +13,7 @@ type Row = {
  id: string;
  serviceScore: number;
  envScore: number;
+  comment?: string | null;
  createdAt: string;
  redeemNo: string;
  redeemAmount: number;
@@ -62,6 +63,12 @@ export default function StoreRatingsPage() {
    { title: '核销额', dataIndex: 'redeemAmount', width: 90, render: (v) => `¥${v}` },
    { title: '服务分', dataIndex: 'serviceScore', width: 80 },
    { title: '环境分', dataIndex: 'envScore', width: 80 },
+    {
+      title: '评语',
+      dataIndex: 'comment',
+      ellipsis: true,
+      render: (v: string | null) => v || '—',
+    },
    { title: '评价时间', dataIndex: 'createdAt', width: 170, render: fmtTime },
  ];

@@ -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 = '';
-    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(() => {});
-      },
-    });
+    setApproveId(id);
  }

  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 editCategoryParentId = Form.useWatch('categoryParentId', editForm);
+  const categoryLeafOptions = useMemo(() => {
+    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(
-    () =>
-      categoryTree
-        .filter((n) => n.status !== 'INACTIVE')
-        .map((n) => ({ value: n.id, label: n.name })),
-    [categoryTree],
-  );
-  const categoryChildOptions = useMemo(() => {
-    const parent = categoryTree.find((n) => n.id === selectedCategoryParentId);
-    return (parent?.children ?? [])
-      .filter((n) => n.status !== 'INACTIVE')
-      .map((n) => ({ value: n.id, label: n.name }));
-  }, [categoryTree, selectedCategoryParentId]);
-
-  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 deleteStore(id: string) {
+    setDeleting(true);
+    try {
+      await request(`/admin/stores/${id}`, { method: 'DELETE' });
+      message.success('门店及门店账号已删除');
+      if (detail && String(detail.id) === id) {
+        setDrawerOpen(false);
+        setDetail(null);
+      }
+      void reload();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    } finally {
+      setDeleting(false);
+    }
+  }

  async function openStoreDetail(row: StoreRow, opts?: { tab?: string }) {
    const [d, cats] = await Promise.all([
@@ -395,20 +403,14 @@ export default function StoresPage() {
          bankBranch?: string | null;
        })
      : null;
-    const categoryId = category?.id != null ? String(category.id) : undefined;
-    let parentId = category?.parentId != null ? String(category.parentId) : undefined;
-    if (!parentId && categoryId) {
-      for (const parent of cats) {
-        if (parent.id === categoryId) {
-          parentId = parent.id;
-          break;
-        }
-        if ((parent.children ?? []).some((c) => c.id === categoryId)) {
-          parentId = parent.id;
-          break;
-        }
-      }
-    }
+    const categories = Array.isArray(d.categories)
+      ? (d.categories as { id?: string }[])
+      : [];
+    const categoryIds = categories.length
+      ? categories.map((c) => String(c.id)).filter(Boolean)
+      : category?.id != null
+        ? [String(category.id)]
+        : [];
    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,
-      categoryId,
+      categoryIds,
      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',
-          'categoryId',
+          'categoryIds',
          '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,
-      render: (_, row) => row.category?.name || '—',
+      width: 140,
+      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"
-                        label="门店分类（大类）"
-                        rules={[{ required: true, message: '请选择门店大类' }]}
+                        name="categoryIds"
+                        label="门店分类（细类，可多选）"
+                        rules={[{ required: true, message: '请至少选择一个门店细类' }]}
                      >
                        <Select
+                          mode="multiple"
                          showSearch
                          loading={optionsLoading}
                          optionFilterProp="label"
-                          options={categoryParentOptions}
-                          onChange={() => editForm.setFieldValue('categoryId', undefined)}
-                        />
-                      </Form.Item>
-                      <Form.Item
-                        name="categoryId"
-                        label="门店分类（细类）"
-                        rules={[{ required: true, message: '请选择门店细类' }]}
-                      >
-                        <Select
-                          showSearch
-                          optionFilterProp="label"
-                          placeholder={editCategoryParentId ? '选择细类' : '请先选大类'}
-                          disabled={!editCategoryParentId}
-                          options={editCategoryChildOptions}
+                          placeholder="选择细类，可多选"
+                          options={categoryLeafOptions}
                        />
                      </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"
-                label="门店分类（大类）"
-                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: '请选择门店细类' }]}
+                name="categoryIds"
+                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 ? '选择细类' : '请先选大类'}
-                  disabled={!selectedCategoryParentId}
-                  options={categoryChildOptions}
+                  placeholder={optionsLoading ? '加载中…' : '选择细类，可多选'}
+                  options={categoryLeafOptions}
                />
              </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,
@@ -47,6 +49,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';


@@ -88,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[]>([]);
@@ -161,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);
@@ -560,50 +570,43 @@ export default function SupportTicketsPage() {
  return (
    <div>
      {settingsModal}
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-          marginBottom: 16,
-        }}
-      >
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          技术支持
-        </Typography.Title>
-          {settingsButton}
-        <Space>
-          {isSuperAdmin ? (
-            <>
-              <Button
-                disabled={!selectedRowKeys.length}
-                loading={batchCreateSaving}
-                onClick={() => void submitBatchCreateTasks()}
-              >
-                一键创建任务
-              </Button>
-              <Button disabled={!selectedRowKeys.length} onClick={openBatchPublish}>
-                一键发布
-              </Button>
-              <Button disabled={!selectedRowKeys.length} loading={acting} onClick={() => void startBatchPreview()}>
-                批量审核
-              </Button>
-              <Button
-                disabled={!selectedRowKeys.length}
-                onClick={() => {
-                  batchStatusForm.setFieldsValue({ status: 'TESTING', rejectReason: '', note: '' });
-                  setBatchStatusOpen(true);
-                }}
-              >
-                批量改状态
-              </Button>
-            </>
-          ) : null}
-          <Button type="primary" onClick={() => setCreateOpen(true)}>
-            创建工单
-          </Button>
-        </Space>
-      </div>
+      <AdminListHeader
+        title="技术支持"
+        settings={settingsButton}
+        actions={
+          <>
+            {isSuperAdmin ? (
+              <>
+                <Button
+                  disabled={!selectedRowKeys.length}
+                  loading={batchCreateSaving}
+                  onClick={() => void submitBatchCreateTasks()}
+                >
+                  一键创建任务
+                </Button>
+                <Button disabled={!selectedRowKeys.length} onClick={openBatchPublish}>
+                  一键发布
+                </Button>
+                <Button disabled={!selectedRowKeys.length} loading={acting} onClick={() => void startBatchPreview()}>
+                  批量审核
+                </Button>
+                <Button
+                  disabled={!selectedRowKeys.length}
+                  onClick={() => {
+                    batchStatusForm.setFieldsValue({ status: 'TESTING', rejectReason: '', note: '' });
+                    setBatchStatusOpen(true);
+                  }}
+                >
+                  批量改状态
+                </Button>
+              </>
+            ) : null}
+            <Button type="primary" onClick={() => setCreateOpen(true)}>
+              创建工单
+            </Button>
+          </>
+        }
+      />

      <Form
        layout="inline"
@@ -920,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,5 +1,5 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { Link, useLocation, useNavigate } from 'react-router-dom';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Link, useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import {
  Alert,
  Button,
@@ -17,12 +17,13 @@ import {
  message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
+import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { USER_SOURCE_TYPE_LABELS, type UserSourceType } from '@dukang/shared-types';
 import { request, type AdminUserRow, type HqProfile, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
 import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
-import { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
+import { ADMIN_OPTIONS_PAGE_SIZE, ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 import { clientAppLabel, eventNameLabel, userEventCategoryLabel } from '../lib/display-labels';

 type UserOrderRow = {
@@ -120,6 +121,24 @@ type UserBehaviorLog = {
  extraJson?: Record<string, unknown> | null;
 };

+type AssocPartnerBrief = {
+  id: string;
+  name: string;
+  companyName?: string | null;
+  phone?: string | null;
+};
+
+type PartnerOption = { id: string; companyName?: string | null; name?: string; phone?: string };
+
+const FILTERS_COLLAPSED_KEY = 'admin-users-filters-collapsed';
+const ASSOC_UNBOUND = 'none';
+
+function formatAssocPartner(p?: AssocPartnerBrief | PartnerOption | null) {
+  if (!p) return '—';
+  const title = p.companyName || p.name || p.id;
+  return [title, p.phone].filter(Boolean).join(' / ') || '—';
+}
+
 type UserDetail = AdminUserRow & {
  wxUnionId?: string | null;
  cityPref?: Record<string, unknown> | null;
@@ -128,6 +147,8 @@ type UserDetail = AdminUserRow & {
  orders?: UserOrderRow[];
  mergedFromCount?: number;
  addressCount?: number;
+  assocPartner?: AssocPartnerBrief | null;
+  assocBoundAt?: string | null;
 };

 type BatchDeletePreviewItem = {
@@ -155,6 +176,7 @@ type BatchDeletePreview = {
 export default function UsersPage() {
  const navigate = useNavigate();
  const location = useLocation();
+  const [searchParams, setSearchParams] = useSearchParams();
  const [form] = Form.useForm();
  const [profile, setProfile] = useState<HqProfile | null>(null);
  const [data, setData] = useState<Paginated<AdminUserRow> | null>(null);
@@ -175,44 +197,88 @@ export default function UsersPage() {
  const [batchDeleting, setBatchDeleting] = useState(false);
  const [batchRiskAck, setBatchRiskAck] = useState(false);
  const canDeleteUsers = (profile?.permissionKeys ?? []).includes('users_delete');
+  const canEditAssoc = (profile?.permissionKeys ?? []).includes('users_partner_assoc');
+  const [partners, setPartners] = useState<PartnerOption[]>([]);
+  const [assocPartnerId, setAssocPartnerId] = useState<string | undefined>();
+  const [savingAssoc, setSavingAssoc] = useState(false);
+  const [filtersCollapsed, setFiltersCollapsed] = useState(() => {
+    try {
+      return localStorage.getItem(FILTERS_COLLAPSED_KEY) === '1';
+    } catch {
+      return false;
+    }
+  });
+
+  const partnerOptions = useMemo(() => {
+    const map = new Map(partners.map((p) => [p.id, p]));
+    if (detail?.assocPartner && !map.has(detail.assocPartner.id)) {
+      map.set(detail.assocPartner.id, detail.assocPartner);
+    }
+    return [...map.values()];
+  }, [partners, detail?.assocPartner]);

  useEffect(() => {
    request<HqProfile>('/admin/auth/me').then(setProfile).catch(() => {});
  }, []);

+  useEffect(() => {
+    void request<Paginated<PartnerOption>>(`/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setPartners(res.items ?? []))
+      .catch(() => setPartners([]));
+  }, []);
+
  const load = useCallback(async () => {
    setLoading(true);
    try {
      const values = form.getFieldsValue();
      const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
+      const userId = String(values.userId || '').trim();
+      if (userId) qs.set('userId', userId);
      if (values.phone) qs.set('phone', values.phone);
      if (values.userNo) qs.set('userNo', values.userNo);
-      if (values.deviceKey) qs.set('deviceKey', values.deviceKey);
      if (values.phoneVerified !== undefined && values.phoneVerified !== '') {
        qs.set('phoneVerified', values.phoneVerified);
      }
      if (values.status !== undefined && values.status !== '') {
        qs.set('status', String(values.status));
      }
-      if (values.excludeTest) qs.set('excludeTest', 'true');
+      const keyword = String(values.keyword || '').trim();
+      if (keyword) qs.set('keyword', keyword);
+      const assocPartnerAccountId = String(
+        values.assocPartnerAccountId || searchParams.get('assocPartnerAccountId') || '',
+      ).trim();
+      if (assocPartnerAccountId) qs.set('assocPartnerAccountId', assocPartnerAccountId);
      const res = await request<Paginated<AdminUserRow>>(`/admin/users?${qs}`);
      setData(res);
    } finally {
      setLoading(false);
    }
-  }, [form, page, pageSize]);
+  }, [form, page, pageSize, searchParams]);
+
+  useEffect(() => {
+    const userId = searchParams.get('userId');
+    const assocPartnerAccountId = searchParams.get('assocPartnerAccountId');
+    form.setFieldsValue({
+      ...(userId ? { userId } : {}),
+      ...(assocPartnerAccountId ? { assocPartnerAccountId } : {}),
+    });
+  }, [searchParams, form]);

  useEffect(() => {
    void load();
-  }, [load]);
+  }, [load, searchParams]);

  useEffect(() => {
    const openUserId = (location.state as { openUserId?: string } | null)?.openUserId;
-    if (openUserId) {
-      void openDetail(openUserId);
-      navigate(location.pathname, { replace: true, state: null });
-    }
-  }, [location.state, location.pathname, navigate]);
+    if (!openUserId) return;
+    form.setFieldsValue({ userId: openUserId });
+    setPage(1);
+    void openDetail(openUserId);
+    navigate(`${location.pathname}?userId=${encodeURIComponent(openUserId)}`, {
+      replace: true,
+      state: null,
+    });
+  }, [location.state, location.pathname, navigate, form]);

  async function openDetail(id: string) {
    const [res, logs] = await Promise.all([
@@ -222,10 +288,29 @@ export default function UsersPage() {
      ),
    ]);
    setDetail(res);
+    setAssocPartnerId(res.assocPartner?.id);
    setBehaviorLogs(logs.items ?? []);
    setDrawerOpen(true);
  }

+  async function saveAssoc() {
+    if (!detail) return;
+    setSavingAssoc(true);
+    try {
+      await request(`/admin/users/${detail.id}/assoc`, {
+        method: 'PUT',
+        body: JSON.stringify({ partnerAccountId: assocPartnerId || null }),
+      });
+      message.success(assocPartnerId ? '已更新关联合伙人' : '已解除关联');
+      await openDetail(detail.id);
+      void load();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSavingAssoc(false);
+    }
+  }
+
  function openDeleteModal() {
    setDeleteConfirm('');
    setDeleteOpen(true);
@@ -408,6 +493,12 @@ export default function UsersPage() {
      width: 120,
      render: (v) => v || '—',
    },
+    {
+      title: '关联合伙人',
+      dataIndex: 'assocPartner',
+      width: 180,
+      render: (p: AdminUserRow['assocPartner']) => formatAssocPartner(p),
+    },
    {
      title: 'deviceKey',
      dataIndex: 'deviceKey',
@@ -498,37 +589,108 @@ export default function UsersPage() {
          ) : null
        }
      />
-      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
-        <Form.Item name="phone" label="手机号">
-          <Input placeholder="模糊搜索" allowClear />
-        </Form.Item>
-        <Form.Item name="userNo" label="用户编号">
-          <Input placeholder="DK..." allowClear />
-        </Form.Item>
-        <Form.Item name="deviceKey" label="deviceKey">
-          <Input placeholder="UUID" allowClear style={{ width: 200 }} />
-        </Form.Item>
-        <Form.Item name="phoneVerified" label="验手机">
-          <Select allowClear style={{ width: 100 }} options={[
-            { value: '1', label: '已验证' },
-            { value: '0', label: '访客' },
-          ]} />
-        </Form.Item>
-        <Form.Item name="status" label="状态">
-          <Select allowClear style={{ width: 90 }} options={[
-            { value: 1, label: '正常' },
-            { value: 0, label: '停用' },
-          ]} />
-        </Form.Item>
-        <Form.Item name="excludeTest" valuePropName="checked">
-          <Checkbox>过滤测试账号</Checkbox>
-        </Form.Item>
-        <Form.Item>
-          <Space>
-            <Button type="primary" htmlType="submit">查询</Button>
-            <Button onClick={() => { form.resetFields(); setPage(1); void load(); }}>重置</Button>
-          </Space>
-        </Form.Item>
+      <Form
+        form={form}
+        layout="vertical"
+        onFinish={() => {
+          setPage(1);
+          const next = new URLSearchParams();
+          const userId = String(form.getFieldValue('userId') || '').trim();
+          const assoc = String(form.getFieldValue('assocPartnerAccountId') || '').trim();
+          if (userId) next.set('userId', userId);
+          if (assoc) next.set('assocPartnerAccountId', assoc);
+          if (next.toString() !== searchParams.toString()) {
+            setSearchParams(next, { replace: true });
+          }
+          void load();
+        }}
+      >
+        <div className="admin-orders-filter-row">
+          <Form.Item name="keyword" label="搜索" className="admin-orders-filter-item admin-users-filter-item--keyword">
+            <Input allowClear placeholder="编号/昵称/备注/手机" />
+          </Form.Item>
+          <Form.Item
+            name="assocPartnerAccountId"
+            label="关联合伙人"
+            className="admin-orders-filter-item admin-orders-filter-item--status"
+          >
+            <Select
+              allowClear
+              showSearch
+              optionFilterProp="label"
+              placeholder="全部"
+              options={[
+                { value: 'any', label: '已关联（全部）' },
+                { value: ASSOC_UNBOUND, label: '未关联' },
+                ...partners.map((p) => ({
+                  value: p.id,
+                  label: formatAssocPartner(p),
+                })),
+              ]}
+            />
+          </Form.Item>
+          <Form.Item label=" " colon={false} className="admin-orders-filter-item admin-orders-filter-actions">
+            <Space size={8} wrap>
+              <Button type="primary" htmlType="submit">查询</Button>
+              <Button
+                onClick={() => {
+                  form.resetFields();
+                  setPage(1);
+                  if (searchParams.toString()) {
+                    setSearchParams({}, { replace: true });
+                  } else {
+                    void load();
+                  }
+                }}
+              >
+                重置
+              </Button>
+              <Button
+                type="link"
+                icon={filtersCollapsed ? <DownOutlined /> : <UpOutlined />}
+                onClick={() => {
+                  setFiltersCollapsed((prev) => {
+                    const next = !prev;
+                    try {
+                      localStorage.setItem(FILTERS_COLLAPSED_KEY, next ? '1' : '0');
+                    } catch {
+                      /* ignore */
+                    }
+                    return next;
+                  });
+                }}
+              >
+                {filtersCollapsed ? '展开' : '收起'}
+              </Button>
+            </Space>
+          </Form.Item>
+        </div>
+
+        {!filtersCollapsed ? (
+          <div className="admin-orders-filter-row">
+            <Form.Item name="phone" label="手机号" className="admin-orders-filter-item admin-orders-filter-item--md">
+              <Input placeholder="模糊搜索" allowClear />
+            </Form.Item>
+            <Form.Item name="userNo" label="用户编号" className="admin-orders-filter-item admin-orders-filter-item--md">
+              <Input placeholder="DK..." allowClear />
+            </Form.Item>
+            <Form.Item name="userId" label="用户ID" className="admin-orders-filter-item admin-orders-filter-item--sm">
+              <Input placeholder="精确匹配" allowClear />
+            </Form.Item>
+            <Form.Item name="phoneVerified" label="验手机" className="admin-orders-filter-item admin-orders-filter-item--sm">
+              <Select allowClear placeholder="全部" options={[
+                { value: '1', label: '已验证' },
+                { value: '0', label: '访客' },
+              ]} />
+            </Form.Item>
+            <Form.Item name="status" label="状态" className="admin-orders-filter-item admin-orders-filter-item--sm">
+              <Select allowClear placeholder="全部" options={[
+                { value: 1, label: '正常' },
+                { value: 0, label: '停用' },
+              ]} />
+            </Form.Item>
+          </div>
+        ) : null}
      </Form>

      <Table
@@ -570,7 +732,7 @@ export default function UsersPage() {
              <Descriptions.Item label="用户编号">{detail.userNo}</Descriptions.Item>
              <Descriptions.Item label="昵称">{detail.nickname || '—'}</Descriptions.Item>
              <Descriptions.Item label="备注">{detail.hqRemark || '—'}</Descriptions.Item>
-              <Descriptions.Item label="手机号">{maskPhone(detail.phone)}</Descriptions.Item>
+              <Descriptions.Item label="手机号">{detail.phone || '—'}</Descriptions.Item>
              <Descriptions.Item label="验手机时间">
                {detail.phoneVerifiedAt ? new Date(detail.phoneVerifiedAt).toLocaleString('zh-CN') : '未验证'}
              </Descriptions.Item>
@@ -592,6 +754,38 @@ export default function UsersPage() {
                ) : '—'}
              </Descriptions.Item>
              <Descriptions.Item label="来源标签">{detail.sourceLabel || '—'}</Descriptions.Item>
+              <Descriptions.Item label="关联合伙人">
+                {canEditAssoc ? (
+                  <Space wrap>
+                    <Select
+                      allowClear
+                      showSearch
+                      optionFilterProp="label"
+                      placeholder="未关联"
+                      style={{ minWidth: 260 }}
+                      value={assocPartnerId}
+                      onChange={setAssocPartnerId}
+                      options={partnerOptions.map((p) => ({
+                        value: p.id,
+                        label: `${p.companyName || p.name || p.id}${p.phone ? ` · ${p.phone}` : ''}`,
+                      }))}
+                    />
+                    <Button type="primary" size="small" loading={savingAssoc} onClick={() => void saveAssoc()}>
+                      保存关联
+                    </Button>
+                    <Typography.Text type="secondary">清空后保存即解绑；已支付订单佣金快照不变</Typography.Text>
+                  </Space>
+                ) : detail.assocPartner ? (
+                  `${detail.assocPartner.companyName || detail.assocPartner.name}${
+                    detail.assocPartner.phone ? ` / ${detail.assocPartner.phone}` : ''
+                  }`
+                ) : (
+                  '—'
+                )}
+              </Descriptions.Item>
+              <Descriptions.Item label="关联时间">
+                {detail.assocBoundAt ? fmtTime(detail.assocBoundAt) : '—'}
+              </Descriptions.Item>
              {detail.sourcePromo && (
                <Descriptions.Item label="推广码">
                  <Link to={`/promo-codes/${detail.sourcePromo.id}`}>
@@ -604,7 +798,7 @@ export default function UsersPage() {
              <Descriptions.Item label="deviceKey">{detail.deviceKey || '—'}</Descriptions.Item>
              <Descriptions.Item label="合并至">
                {detail.mergedInto
-                  ? `${detail.mergedInto.userNo} (${detail.mergedInto.phone ? maskPhone(detail.mergedInto.phone) : '无手机'})`
+                  ? `${detail.mergedInto.userNo} (${detail.mergedInto.phone || '无手机'})`
                  : '—'}
              </Descriptions.Item>
              <Descriptions.Item label="被合并访客数">{detail.mergedFromCount ?? 0}</Descriptions.Item>
@@ -0,0 +1,239 @@
+import { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Card,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  Select,
+  Space,
+  Switch,
+  Tabs,
+  TimePicker,
+  Typography,
+  message,
+} from 'antd';
+import dayjs, { type Dayjs } from 'dayjs';
+import {
+  WECOM_REPORT_KIND_LABELS,
+  WECOM_REPORT_KINDS,
+  WECOM_REPORT_WEEKDAY_OPTIONS,
+  type WecomReportKind,
+  type WecomReportPreviewDto,
+  type WecomReportPushDto,
+} from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+
+type FormValues = {
+  name: string;
+  webhookUrl: string;
+  enabled: boolean;
+  mentionWecomUserId?: string;
+  sendTime: Dayjs;
+  sendWeekday: number;
+  sendMonthDay: number;
+};
+
+function ReportKindPane({
+  kind,
+  row,
+  onSaved,
+}: {
+  kind: WecomReportKind;
+  row: WecomReportPushDto | undefined;
+  onSaved: () => void;
+}) {
+  const [form] = Form.useForm<FormValues>();
+  const [saving, setSaving] = useState(false);
+  const [previewing, setPreviewing] = useState(false);
+  const [sending, setSending] = useState(false);
+  const [preview, setPreview] = useState<WecomReportPreviewDto | null>(null);
+
+  useEffect(() => {
+    if (!row) return;
+    form.setFieldsValue({
+      name: row.name,
+      webhookUrl: row.webhookUrl,
+      enabled: row.enabled,
+      mentionWecomUserId: row.mentionWecomUserId ?? undefined,
+      sendTime: dayjs().hour(row.sendHour).minute(row.sendMinute).second(0),
+      sendWeekday: row.sendWeekday,
+      sendMonthDay: row.sendMonthDay,
+    });
+  }, [form, row]);
+
+  async function save() {
+    const values = await form.validateFields();
+    setSaving(true);
+    try {
+      await request(`/admin/wecom-reports/${kind}`, {
+        method: 'PUT',
+        body: JSON.stringify({
+          name: values.name,
+          webhookUrl: values.webhookUrl,
+          enabled: values.enabled,
+          mentionWecomUserId: values.mentionWecomUserId?.trim() || null,
+          sendHour: values.sendTime.hour(),
+          sendMinute: values.sendTime.minute(),
+          sendWeekday: values.sendWeekday,
+          sendMonthDay: values.sendMonthDay,
+        }),
+      });
+      message.success('已保存');
+      onSaved();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function openPreview() {
+    setPreviewing(true);
+    try {
+      const data = await request<WecomReportPreviewDto>(`/admin/wecom-reports/${kind}/preview`, {
+        method: 'POST',
+        body: '{}',
+      });
+      setPreview(data);
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '预览失败');
+    } finally {
+      setPreviewing(false);
+    }
+  }
+
+  async function sendNow() {
+    setSending(true);
+    try {
+      const res = await request<{ message: string }>(`/admin/wecom-reports/${kind}/send`, {
+        method: 'POST',
+        body: '{}',
+      });
+      message.success(res.message || '已发送');
+      onSaved();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '发送失败');
+    } finally {
+      setSending(false);
+    }
+  }
+
+  const label = WECOM_REPORT_KIND_LABELS[kind];
+
+  return (
+    <>
+      <Form form={form} layout="vertical" style={{ maxWidth: 640 }}>
+        <Form.Item name="enabled" label="启用定时推送" valuePropName="checked">
+          <Switch />
+        </Form.Item>
+        <Form.Item name="name" label="名称" rules={[{ required: true, message: '请填写名称' }]}>
+          <Input maxLength={64} />
+        </Form.Item>
+        <Form.Item
+          name="webhookUrl"
+          label="群机器人 Webhook"
+          extra="企业微信群「群机器人」Webhook，与「消息推送」分开配置。"
+          rules={[{ required: true, message: '请填写 Webhook' }]}
+        >
+          <Input.TextArea rows={2} />
+        </Form.Item>
+        <Form.Item name="mentionWecomUserId" label="@成员 userid">
+          <Input placeholder="可选，企业微信成员账号" />
+        </Form.Item>
+        <Form.Item
+          name="sendTime"
+          label="发送时刻"
+          extra={
+            kind === 'daily'
+              ? '按北京时间当天该时刻发送当日数据。'
+              : kind === 'weekly'
+                ? '按北京时间该星期该时刻发送上一自然周。'
+                : '按北京时间每月该日该时刻发送上一自然月。'
+          }
+          rules={[{ required: true, message: '请选择时刻' }]}
+        >
+          <TimePicker format="HH:mm" minuteStep={1} allowClear={false} />
+        </Form.Item>
+        {kind === 'weekly' ? (
+          <Form.Item name="sendWeekday" label="发送星期" rules={[{ required: true }]}>
+            <Select options={WECOM_REPORT_WEEKDAY_OPTIONS} />
+          </Form.Item>
+        ) : null}
+        {kind === 'monthly' ? (
+          <Form.Item name="sendMonthDay" label="每月几号" rules={[{ required: true }]}>
+            <InputNumber min={1} max={31} />
+          </Form.Item>
+        ) : null}
+        <Typography.Paragraph type="secondary">
+          {row?.lastSentAt
+            ? `上次发送：${fmtTime(row.lastSentAt)}（${row.lastSentPeriod ?? '—'}）`
+            : '尚未发送'}
+        </Typography.Paragraph>
+        <Space wrap>
+          <Button type="primary" loading={saving} onClick={() => void save()}>
+            保存
+          </Button>
+          <Button loading={previewing} onClick={() => void openPreview()}>
+            预览
+          </Button>
+          <Button loading={sending} onClick={() => void sendNow()}>
+            立即发送
+          </Button>
+        </Space>
+      </Form>
+      <Modal
+        title={`预览${label}`}
+        open={!!preview}
+        onCancel={() => setPreview(null)}
+        footer={<Button onClick={() => setPreview(null)}>关闭</Button>}
+        width={560}
+      >
+        <Typography.Paragraph type="secondary">
+          区间 {preview?.rangeLabel}
+        </Typography.Paragraph>
+        <pre style={{ whiteSpace: 'pre-wrap', margin: 0 }}>{preview?.markdown}</pre>
+      </Modal>
+    </>
+  );
+}
+
+export default function WecomReportsPage() {
+  const [rows, setRows] = useState<WecomReportPushDto[]>([]);
+  const [loading, setLoading] = useState(true);
+
+  const load = useCallback(() => {
+    setLoading(true);
+    return request<WecomReportPushDto[]>('/admin/wecom-reports')
+      .then(setRows)
+      .catch((e) => message.error(e instanceof Error ? e.message : '加载失败'))
+      .finally(() => setLoading(false));
+  }, []);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  const byKind = new Map(rows.map((r) => [r.kind, r]));
+
+  return (
+    <div>
+      <Typography.Title level={4}>企微机器人 · 报告</Typography.Title>
+      <Typography.Paragraph type="secondary">
+        日报 / 周报 / 月报走企微群机器人 Webhook，配置与「消息推送」相互独立。口径与概览一致：数量为期末存量，新增为区间内发生额；订单金额按已付
+        payAmount，核销按核销单。
+      </Typography.Paragraph>
+      <Card loading={loading}>
+        <Tabs
+          items={WECOM_REPORT_KINDS.map((kind) => ({
+            key: kind,
+            label: WECOM_REPORT_KIND_LABELS[kind],
+            children: <ReportKindPane kind={kind} row={byKind.get(kind)} onSaved={() => void load()} />,
+          }))}
+        />
+      </Card>
+    </div>
+  );
+}
@@ -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 ? (
-            <Button type="default" onClick={() => void openBankModal()}>
-              酒厂银行账户信息配置
+          <Space>
+            <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>
  );
 }
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import {
-  Alert, Button, Card, Col, Descriptions, Form, Input, InputNumber, Row, Select, Space,
+  Alert, Button, Card, Col, Descriptions, Form, Image, Input, InputNumber, Row, Select, Space,
  Tabs, Tag, Typography, message,
 } from 'antd';
 import { request } from '../lib/api';
@@ -53,6 +53,22 @@ const CREATE_DEFAULTS = {

 function ResultPanel({ result }: { result: ApiResult | null }) {
  if (!result) return <Typography.Text type="secondary">点击「调用接口」后在此显示响应</Typography.Text>;
+  const display = (() => {
+    if (!result.data || typeof result.data !== 'object') return result;
+    const data = result.data as { count?: number; data?: string[] };
+    if (!Array.isArray(data.data)) return result;
+    return {
+      ...result,
+      data: {
+        ...data,
+        data: data.data.map((item) =>
+          typeof item === 'string' && item.length > 120
+            ? `${item.slice(0, 80)}…(len=${item.length})`
+            : item,
+        ),
+      },
+    };
+  })();
  return (
    <div>
      <Space style={{ marginBottom: 8 }}>
@@ -64,7 +80,7 @@ function ResultPanel({ result }: { result: ApiResult | null }) {
        margin: 0, padding: 12, background: '#f5f5f5', borderRadius: 4,
        maxHeight: 360, overflow: 'auto', fontSize: 12,
      }}>
-        {JSON.stringify(result, null, 2)}
+        {JSON.stringify(display, null, 2)}
      </pre>
    </div>
  );
@@ -81,7 +97,9 @@ export default function XiaofeixiaTestPage() {
  const [queryForm] = Form.useForm();
  const [batchForm] = Form.useForm();
  const [trackForm] = Form.useForm();
+  const [signPhotoForm] = Form.useForm();
  const [cancelForm] = Form.useForm();
+  const [signPhotoPreview, setSignPhotoPreview] = useState<string[]>([]);

  useEffect(() => {
    void request<XfxConfig>('/admin/courier/xiaofeixia/config').then(setConfig);
@@ -99,12 +117,19 @@ export default function XiaofeixiaTestPage() {
        body: JSON.stringify(body),
      });
      setResult(res);
+      if (path.endsWith('/get-sign-photos')) {
+        const data = (res.data as { data?: string[] } | undefined)?.data;
+        setSignPhotoPreview(Array.isArray(data) ? data.filter((u) => typeof u === 'string') : []);
+      } else {
+        setSignPhotoPreview([]);
+      }
      if (res.ok) message.success('调用成功');
      else message.warning(res.error || '调用失败');
    } catch (e) {
      const err = e instanceof Error ? e.message : String(e);
      message.error(err);
      setResult({ ok: false, elapsedMs: 0, error: err });
+      setSignPhotoPreview([]);
    } finally {
      setLoading(false);
    }
@@ -118,7 +143,7 @@ export default function XiaofeixiaTestPage() {
    <div>
      <Typography.Title level={4}>小飞侠接口联调</Typography.Title>
      <Typography.Paragraph type="secondary">
-        通过 HQ 后台直接调用后端封装的小飞侠 API（cmd 100101~100301）。凭证请在
+        通过 HQ 后台直接调用后端封装的小飞侠 API（cmd 100101~100301，含签收图片 100108）。凭证请在
        <Link to="/fulfillment-providers">仓配管理</Link>
        中配置；联调会优先使用仓配管理里启用的小飞侠承运商。
      </Typography.Paragraph>
@@ -273,6 +298,25 @@ export default function XiaofeixiaTestPage() {
                  </Form>
                ),
              },
+              {
+                key: 'signPhotos',
+                label: '签收图片 (100108)',
+                children: (
+                  <Form
+                    form={signPhotoForm}
+                    layout="vertical"
+                    onFinish={(v) => void invoke('/admin/courier/xiaofeixia/get-sign-photos', v)}
+                  >
+                    <Form.Item name="trackingNumber" label="运单号 number">
+                      <Input placeholder="小飞侠运单号，与商家单号二选一" />
+                    </Form.Item>
+                    <Form.Item name="outNumber" label="商家单号 outNumber">
+                      <Input placeholder="外部单号，与运单号二选一" />
+                    </Form.Item>
+                    <Button type="primary" htmlType="submit" loading={loading}>调用接口</Button>
+                  </Form>
+                ),
+              },
              {
                key: 'cancel',
                label: '取消订单 (100103)',
@@ -290,6 +334,24 @@ export default function XiaofeixiaTestPage() {
        <Col xs={24} lg={10}>
          <Card title="响应结果" size="small">
            <ResultPanel result={result} />
+            {signPhotoPreview.length > 0 ? (
+              <div style={{ marginTop: 16 }}>
+                <Typography.Text strong>签收照片预览（{signPhotoPreview.length}）</Typography.Text>
+                <Image.PreviewGroup>
+                  <Space wrap style={{ marginTop: 8 }}>
+                    {signPhotoPreview.map((url, index) => (
+                      <Image
+                        key={`${index}-${url.slice(0, 32)}`}
+                        src={url}
+                        width={96}
+                        height={96}
+                        style={{ objectFit: 'cover', borderRadius: 6 }}
+                      />
+                    ))}
+                  </Space>
+                </Image.PreviewGroup>
+              </div>
+            ) : null}
          </Card>
        </Col>
      </Row>
@@ -1,5 +1,6 @@
 import { useState, type CSSProperties } from 'react';
-import { useOutletContext } from 'react-router-dom';
+import { useNavigate, useOutletContext } from 'react-router-dom';
+import { QuestionCircleOutlined } from '@ant-design/icons';
 import {
  Button,
  Card,
@@ -13,6 +14,7 @@ import {
  Select,
  Space,
  Statistic,
+  Tooltip,
  Typography,
  message,
 } from 'antd';
@@ -35,6 +37,9 @@ const descContentStyle: CSSProperties = {
  wordBreak: 'break-all',
 };

+const ATTRIBUTION_HINT =
+  '首次触达本推广码的用户。每人只归因一次、只归一个码：已登录用户扫码或带参进入时，若还没有归因记录，则记到本码；之后再扫其他码不会改。与「扫码注册」不同：注册只统计来源仍是自然量并被标记为本码的用户；已有其他来源（如分享）的用户仍可计入归因，但不计入扫码注册。';
+
 async function downloadQrcode(url: string, filename: string) {
  try {
    const res = await fetch(url);
@@ -51,6 +56,7 @@ async function downloadQrcode(url: string, filename: string) {
 }

 export default function PromoCodeDetailPage() {
+  const navigate = useNavigate();
  const { detail, reload } = useOutletContext<PromoCodeDetailContext>();
  const [editForm] = Form.useForm();
  const [editOpen, setEditOpen] = useState(false);
@@ -209,14 +215,26 @@ export default function PromoCodeDetailPage() {

      <Row gutter={16} style={{ marginTop: 16 }}>
        <Col xs={12} sm={6}>
-          <Card size="small">
+          <Card
+            size="small"
+            hoverable
+            style={{ cursor: 'pointer' }}
+            onClick={() => navigate(`/promo-codes/${detail.id}?eventType=SCAN`)}
+          >
            <Statistic title="扫码进入次数" value={stats?.scanCount ?? detail.scanCount} />
          </Card>
        </Col>
        <Col xs={12} sm={6}>
          <Card size="small">
            <Statistic
-              title="归因用户数"
+              title={
+                <span>
+                  归因用户数
+                  <Tooltip title={ATTRIBUTION_HINT} overlayInnerStyle={{ maxWidth: 360 }}>
+                    <QuestionCircleOutlined style={{ marginLeft: 6, color: 'rgba(0,0,0,0.45)' }} />
+                  </Tooltip>
+                </span>
+              }
              value={stats?.attributionCount ?? 0}
            />
          </Card>
@@ -230,8 +248,23 @@ export default function PromoCodeDetailPage() {
          </Card>
        </Col>
        <Col xs={12} sm={6}>
-          <Card size="small">
-            <Statistic title="订单数" value={stats?.orderCount ?? detail.orderCount} />
+          <Card
+            size="small"
+            hoverable
+            style={{ cursor: 'pointer' }}
+            onClick={() => navigate(`/orders?promoCodeId=${detail.id}&status=COMPLETED`)}
+          >
+            <Statistic
+              title={
+                <span>
+                  订单数
+                  <Tooltip title="仅统计已完成订单" overlayInnerStyle={{ maxWidth: 280 }}>
+                    <QuestionCircleOutlined style={{ marginLeft: 6, color: 'rgba(0,0,0,0.45)' }} />
+                  </Tooltip>
+                </span>
+              }
+              value={stats?.orderCount ?? detail.orderCount}
+            />
          </Card>
        </Col>
        <Col xs={12} sm={6}>
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
  Card,
  DatePicker,
@@ -21,6 +22,7 @@ import {
 } from '@dukang/shared-types';
 import { request, type Paginated } from '../../lib/api';
 import { fmtTime } from '../../lib/constants';
+import { AdminPrimaryLink } from '../../components/AdminPrimaryLink';

 type Props = {
  promoId: string;
@@ -57,11 +59,45 @@ function buildEventsQs(
  return `/admin/promo-codes/${promoId}/metrics/events?${qs.toString()}`;
 }

-function formatRefId(row: PromoMetricEventItem): string {
-  if (row.orderId) return `订单 ${row.orderId}`;
-  if (row.userId) return `用户 ${row.userId}`;
-  if (row.sessionId) return `会话 ${row.sessionId}`;
-  return '—';
+function parseEventType(raw: string | null): PromoMetricEventType | undefined {
+  if (raw === 'SCAN' || raw === 'ATTRIBUTION' || raw === 'REGISTER' || raw === 'ORDER') return raw;
+  return undefined;
+}
+
+function EventRefLinks({ row }: { row: PromoMetricEventItem }) {
+  const navigate = useNavigate();
+  const links = [];
+  if (row.orderId) {
+    links.push(
+      <AdminPrimaryLink
+        key="order"
+        onClick={() => {
+          if (row.orderNo) {
+            navigate(`/orders?orderNo=${encodeURIComponent(row.orderNo)}`);
+          } else {
+            navigate('/orders', { state: { openOrderId: String(row.orderId) } });
+          }
+        }}
+      >
+        订单 {row.orderNo || row.orderId}
+      </AdminPrimaryLink>,
+    );
+  }
+  if (row.userId) {
+    links.push(
+      <AdminPrimaryLink
+        key="user"
+        onClick={() => navigate('/users', { state: { openUserId: String(row.userId) } })}
+      >
+        用户 {row.userNo || row.userId}
+      </AdminPrimaryLink>,
+    );
+  }
+  if (links.length) {
+    return <Space size={12}>{links}</Space>;
+  }
+  if (row.sessionId) return <>会话 {row.sessionId}</>;
+  return <>—</>;
 }

 function formatLocation(row: PromoMetricEventItem): string {
@@ -71,15 +107,27 @@ function formatLocation(row: PromoMetricEventItem): string {
 }

 export default function PromoCodeMetricsPanel({ promoId }: Props) {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const urlEventType = parseEventType(searchParams.get('eventType'));
  const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs().subtract(6, 'day'), dayjs()]);
  const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
  const [timeline, setTimeline] = useState<PromoMetricTimelineDto | null>(null);
  const [timelineLoading, setTimelineLoading] = useState(false);
-  const [eventType, setEventType] = useState<PromoMetricEventType | undefined>();
+  const [eventType, setEventType] = useState<PromoMetricEventType | undefined>(urlEventType);
  const [eventsPage, setEventsPage] = useState(1);
  const [events, setEvents] = useState<Paginated<PromoMetricEventItem> | null>(null);
  const [eventsLoading, setEventsLoading] = useState(false);

+  useEffect(() => {
+    setEventType(urlEventType);
+    setEventsPage(1);
+    if (urlEventType) {
+      window.requestAnimationFrame(() => {
+        document.getElementById('promo-metric-events')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      });
+    }
+  }, [urlEventType]);
+
  const loadTimeline = useCallback(() => {
    setTimelineLoading(true);
    return request<PromoMetricTimelineDto>(buildTimelineQs(promoId, range, granularity))
@@ -164,7 +212,7 @@ export default function PromoCodeMetricsPanel({ promoId }: Props) {
    {
      title: 'ID',
      key: 'ref',
-      render: (_, row) => formatRefId(row),
+      render: (_, row) => <EventRefLinks row={row} />,
    },
    {
      title: 'IP',
@@ -220,7 +268,7 @@ export default function PromoCodeMetricsPanel({ promoId }: Props) {
        notMerge
      />

-      <Typography.Title level={5} style={{ marginTop: 24, marginBottom: 12 }}>
+      <Typography.Title id="promo-metric-events" level={5} style={{ marginTop: 24, marginBottom: 12 }}>
        事件日志
      </Typography.Title>
      <Space wrap style={{ marginBottom: 12 }}>
@@ -232,6 +280,10 @@ export default function PromoCodeMetricsPanel({ promoId }: Props) {
          onChange={(v) => {
            setEventType(v);
            setEventsPage(1);
+            const next = new URLSearchParams(searchParams);
+            if (v) next.set('eventType', v);
+            else next.delete('eventType');
+            setSearchParams(next, { replace: true });
          }}
          options={Object.entries(PROMO_METRIC_EVENT_LABELS).map(([value, label]) => ({
            value,
@@ -1,5 +1,5 @@
 import { useNavigate, useOutletContext, useParams } from 'react-router-dom';
-import { Button, Space, Table, Tag } from 'antd';
+import { Button, Space, Table, Tag, Tooltip } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
  USER_SOURCE_TYPE_LABELS,
@@ -66,7 +66,7 @@ export default function PromoCodeUsersPage() {
      width: 160,
      render: (v) => (v ? fmtTime(v) : '—'),
    },
-    { title: '订单数', dataIndex: 'orderCount', width: 80 },
+    { title: <Tooltip title="仅统计已完成订单">订单数</Tooltip>, dataIndex: 'orderCount', width: 80 },
    { title: '注册时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
    {
      title: '操作',
@@ -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: /
@@ -22,12 +22,18 @@ import ProxyOrderDetailPage from './pages/ProxyOrderDetailPage';
 import StaffListPage from './pages/StaffListPage';
 import StaffCreatePage from './pages/StaffCreatePage';
 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 (
    <Routes>
      <Route element={<TabLayout />}>
        <Route path="/" element={<HomePage />} />
+        <Route path="/users" element={<UsersManagePage />} />
        <Route path="/stores" element={<StoreListPage />} />
        <Route path="/center" element={<CenterPage />} />
      </Route>
@@ -37,6 +43,13 @@ 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 />} />
+      <Route path="/users/:userId/orders" element={<AssocOrdersPage />} />
+      <Route path="/center/commissions" element={<CommissionOrdersPage />} />
      <Route path="/center/proxy-orders" element={<ProxyOrderListPage />} />
      <Route path="/center/proxy-orders/:id" element={<ProxyOrderDetailPage />} />
      <Route path="/proxy-order" element={<ProxyOrderPage />} />
@@ -60,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 />} />
        ) : (
@@ -75,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;
@@ -3,6 +3,7 @@ import { isLoggedIn } from '../lib/api';

 const TABS = [
  { to: '/', end: true, icon: 'dashboard', label: '首页' },
+  { to: '/users', icon: 'group', label: '用户管理' },
  { to: '/stores', icon: 'store', label: '门店管理' },
  { to: '/center', icon: 'account_circle', 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 WAREHOUSE_STAFF_PREFIXES = ['/', '/orders', '/me', '/leaderboard', '/login'];
+const STORE_STAFF_PREFIXES = ['/', '/stores', '/users', '/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;
@@ -12,6 +12,7 @@ export type ProxyOrderDraft = {
  promoCodeId: string;
  deliveryMode: PartnerProxyDeliveryMode;
  autoReceive: boolean;
+  assocEnabled: boolean;
 };

 export function saveProxyOrderDraft(draft: ProxyOrderDraft) {
@@ -40,6 +41,7 @@ export function loadProxyOrderDraft(): ProxyOrderDraft | null {
      promoCodeId: typeof parsed.promoCodeId === 'string' ? parsed.promoCodeId : '',
      deliveryMode: parsed.deliveryMode === 'ON_SITE_PICKUP' ? 'ON_SITE_PICKUP' : 'ADDRESS',
      autoReceive: parsed.autoReceive === true,
+      assocEnabled: parsed.assocEnabled !== false,
    };
  } catch {
    return null;
@@ -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>
+  );
+}
@@ -0,0 +1,68 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import PageHeader from '@dukang/shared-ui/PageHeader';
+import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
+import type { PartnerAssocUserOrderItem } from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { toastError } from '../lib/toast';
+import { usePartnerPageView } from '../lib/usePageView';
+
+type ListRes = { items: PartnerAssocUserOrderItem[]; total: number };
+
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
+export default function AssocOrdersPage() {
+  const { userId } = useParams();
+  usePartnerPageView(userId ? 'partner_assoc_user_orders_view' : 'partner_assoc_orders_view');
+  const navigate = useNavigate();
+  const [items, setItems] = useState<PartnerAssocUserOrderItem[]>([]);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(true);
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      const path = userId
+        ? `/partner/assoc/users/${userId}/orders?page=1&pageSize=50`
+        : '/partner/assoc/orders?page=1&pageSize=50';
+      const res = await request<ListRes>('PARTNER_H5', path);
+      setItems(res.items ?? []);
+      setTotal(res.total ?? 0);
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '加载失败');
+      setItems([]);
+    } finally {
+      setLoading(false);
+    }
+  }, [userId]);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  return (
+    <PullToRefresh onRefresh={load}>
+      <PageHeader title={userId ? '用户订单' : '关联用户订单'} onBack={() => navigate(-1)} />
+      <div style={{ padding: '0 20px 24px' }}>
+        <p className="label-md text-muted" style={{ margin: '12px 0' }}>
+          {loading ? '加载中…' : `共 ${total} 笔已付购酒单`}
+        </p>
+        {!loading && items.length === 0 && <div className="empty">暂无订单</div>}
+        {items.map((o) => (
+          <div key={o.id} className="partner-store-card" style={{ marginBottom: 12 }}>
+            <div className="partner-store-card-header" style={{ marginBottom: 0 }}>
+              <div>
+                <p className="body-md">{o.productName}</p>
+                <p className="label-md text-muted">{o.orderNo} · ×{o.quantity}</p>
+                <p className="label-md text-muted">{o.paidAt ? o.paidAt.slice(0, 16).replace('T', ' ') : ''}</p>
+              </div>
+              <span className="amount-lg" style={{ fontSize: 18 }}>¥{fmtMoney(o.payAmount)}</span>
+            </div>
+          </div>
+        ))}
+      </div>
+    </PullToRefresh>
+  );
+}
@@ -0,0 +1,92 @@
+import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+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';
+
+export default function AssocQrcodePage() {
+  usePartnerPageView('partner_assoc_qrcode_view');
+  const navigate = useNavigate();
+  const [summary, setSummary] = useState<PartnerAssocSummary | null>(null);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    request<PartnerAssocSummary>('PARTNER_H5', '/partner/assoc')
+      .then(setSummary)
+      .catch((e) => toastError(e instanceof Error ? e.message : '加载失败'))
+      .finally(() => setLoading(false));
+  }, []);
+
+  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', {
+        headers: {
+          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);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = `partner-assoc-${summary?.partnerId || 'qr'}.png`;
+      a.click();
+      URL.revokeObjectURL(url);
+      toastSuccess('已开始下载');
+    } catch (e) {
+      if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
+        await previewSaveableImage(publicUrl);
+        return;
+      }
+      toastError(e instanceof Error ? e.message : '下载失败');
+    }
+  }
+
+  return (
+    <div>
+      <PageHeader title="关联码" onBack={() => navigate(-1)} />
+      {loading && <div className="empty">加载中…</div>}
+      {!loading && (
+        <section className="partner-bill-card" style={{ margin: 16 }}>
+          <div style={{ padding: 24, textAlign: 'center' }}>
+            <p className="body-md text-muted" style={{ marginBottom: 16 }}>
+              用户扫码后首次锁定本合伙人，后续酒单按订单佣金结算
+            </p>
+            {summary?.qrcodeUrl ? (
+              <img
+                className="partner-longpress-img"
+                src={summary.qrcodeUrl}
+                alt="关联码"
+                style={{ width: 220, height: 220, background: '#fff' }}
+              />
+            ) : (
+              <p className="body-md text-muted">关联码尚未生成，请稍后重试或联系总部补发</p>
+            )}
+            <p className="label-md text-muted" style={{ marginTop: 12 }}>
+              已关联 {summary?.userCount ?? 0} 人
+            </p>
+            <button type="button" className="partner-btn-primary" style={{ marginTop: 20 }} onClick={() => void downloadQr()}>
+              下载二维码
+            </button>
+            {isWechatEnv() && summary?.qrcodeUrl ? (
+              <p className="label-md text-muted" style={{ marginTop: 12 }}>
+                微信内请点「下载二维码」后长按保存
+              </p>
+            ) : null}
+          </div>
+        </section>
+      )}
+    </div>
+  );
+}
@@ -0,0 +1,60 @@
+import { useEffect, 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 { PartnerAssocUserItem } from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { toastError } from '../lib/toast';
+import { usePartnerPageView } from '../lib/usePageView';
+
+type ListRes = { items: PartnerAssocUserItem[]; total: number; page: number; pageSize: number };
+
+export default function AssocUsersPage() {
+  usePartnerPageView('partner_assoc_users_view');
+  const navigate = useNavigate();
+  const [items, setItems] = useState<PartnerAssocUserItem[]>([]);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(true);
+
+  async function load() {
+    setLoading(true);
+    try {
+      const res = await request<ListRes>('PARTNER_H5', '/partner/assoc/users?page=1&pageSize=50');
+      setItems(res.items ?? []);
+      setTotal(res.total ?? 0);
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '加载失败');
+      setItems([]);
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    void load();
+  }, []);
+
+  return (
+    <PullToRefresh onRefresh={load}>
+      <PageHeader title="关联用户" onBack={() => navigate(-1)} />
+      <div style={{ padding: '0 20px 24px' }}>
+        <p className="label-md text-muted" style={{ margin: '12px 0' }}>
+          {loading ? '加载中…' : `共 ${total} 人`}
+        </p>
+        {!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: 0 }}>
+              <div>
+                <p className="body-md">{u.nickname || u.userNo}</p>
+                <p className="label-md text-muted">{u.phone || '未绑定手机'}</p>
+                <p className="label-md text-muted">{u.boundAt ? u.boundAt.slice(0, 16).replace('T', ' ') : ''}</p>
+              </div>
+              <span className="label-md">{u.orderCount} 单</span>
+            </div>
+          </div>
+        ))}
+      </div>
+    </PullToRefresh>
+  );
+}
@@ -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>
+  );
+}
@@ -2,8 +2,9 @@ import { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } 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 { 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';

@@ -34,6 +35,7 @@ export default function BillsPage() {
  const [submitting, setSubmitting] = useState(false);
  const [loading, setLoading] = useState(true);
  const [selectedIds, setSelectedIds] = useState<string[]>([]);
+  const [detail, setDetail] = useState<PartnerBillDetailDto | null>(null);

  async function loadBills() {
    setLoading(true);
@@ -67,6 +69,44 @@ export default function BillsPage() {
  const isRejected = status === 'REJECTED';
  const isPaid = status === 'PAID';

+  useEffect(() => {
+    if (!bill?.id) {
+      setDetail(null);
+      return;
+    }
+    request<PartnerBillDetailDto>('PARTNER_H5', `/partner/settlement/bills/${bill.id}`)
+      .then(setDetail)
+      .catch(() => setDetail(null));
+  }, [bill?.id]);
+
+  function renderItemList(title: string, items: PartnerBillItemDto[] | undefined, subtotal: number) {
+    const list = items ?? [];
+    return (
+      <div style={{ marginTop: 16 }}>
+        <div className="partner-info-row" style={{ marginBottom: 8 }}>
+          <span className="body-md" style={{ fontWeight: 700 }}>{title}</span>
+          <span className="body-md" style={{ fontWeight: 700 }}>¥ {fmtMoney(subtotal)}</span>
+        </div>
+        {list.length === 0 ? (
+          <p className="label-md text-muted">本账期无明细</p>
+        ) : (
+          list.map((it) => (
+            <div key={it.id} className="partner-info-row" style={{ alignItems: 'flex-start' }}>
+              <div>
+                <p className="body-md">{it.title || it.refNo}</p>
+                <p className="label-md text-muted">
+                  {it.refNo}
+                  {it.extra ? ` ${it.extra}` : ''} · {((it.rate ?? 0) * 100).toFixed(2)}%
+                </p>
+              </div>
+              <span className="body-md">¥ {fmtMoney(it.commission)}</span>
+            </div>
+          ))
+        )}
+      </div>
+    );
+  }
+
  function askConfirm(ids: string[]) {
    if (!window.confirm(`确认 ${ids.length} 笔账单无误并提交？确认后状态将变为「未打款」，等待总部打款。`)) {
      return;
@@ -149,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)}
@@ -183,16 +224,8 @@ export default function BillsPage() {
              </div>
            </div>

-            <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
-              <div className="partner-info-row">
-                <span className="text-variant body-md">订单分佣收入</span>
-                <span className="body-md" style={{ fontWeight: 700 }}>¥ {fmtMoney(Number(bill.orderCommission || 0))}</span>
-              </div>
-              <div className="partner-info-row">
-                <span className="text-variant body-md">核销权益分佣</span>
-                <span className="body-md" style={{ fontWeight: 700 }}>¥ {fmtMoney(Number(bill.redeemCommission || 0))}</span>
-              </div>
-            </div>
+            {renderItemList('酒订单', detail?.orderItems, Number(detail?.orderCommission ?? bill.orderCommission ?? 0))}
+            {renderItemList('核销订单', detail?.redeemItems, Number(detail?.redeemCommission ?? bill.redeemCommission ?? 0))}
          </div>
        </section>
      )}
@@ -240,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,49 @@ 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">
+                    <span className="material-symbols-outlined">group</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>用户管理</span>
+                </div>
+                <span className="material-symbols-outlined text-muted">chevron_right</span>
+              </Link>
+              <Link to="/center/commissions" className="partner-menu-item">
+                <div className="partner-menu-item-left">
+                  <div className="partner-menu-icon">
+                    <span className="material-symbols-outlined">payments</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>订单佣金</span>
+                </div>
+                <span className="material-symbols-outlined text-muted">chevron_right</span>
+              </Link>
              <Link to="/center/proxy-orders" className="partner-menu-item">
                <div className="partner-menu-item-left">
                  <div className="partner-menu-icon">
@@ -0,0 +1,67 @@
+import { useEffect, 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 { PartnerCommissionOrderItem } from '@dukang/shared-types';
+import { request } from '../lib/api';
+import { toastError } from '../lib/toast';
+import { usePartnerPageView } from '../lib/usePageView';
+
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
+type ListRes = { items: PartnerCommissionOrderItem[]; total: number };
+
+export default function CommissionOrdersPage() {
+  usePartnerPageView('partner_commission_orders_view');
+  const navigate = useNavigate();
+  const [items, setItems] = useState<PartnerCommissionOrderItem[]>([]);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(true);
+
+  async function load() {
+    setLoading(true);
+    try {
+      const res = await request<ListRes>('PARTNER_H5', '/partner/commissions/orders?page=1&pageSize=50');
+      setItems(res.items ?? []);
+      setTotal(res.total ?? 0);
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '加载失败');
+      setItems([]);
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    void load();
+  }, []);
+
+  return (
+    <PullToRefresh onRefresh={load}>
+      <PageHeader title="订单佣金" onBack={() => navigate(-1)} />
+      <div style={{ padding: '0 20px 24px' }}>
+        <p className="label-md text-muted" style={{ margin: '12px 0' }}>
+          {loading ? '加载中…' : `共 ${total} 笔关联酒单`}
+        </p>
+        {!loading && items.length === 0 && <div className="empty">暂无订单佣金</div>}
+        {items.map((o) => (
+          <div key={o.id} className="partner-store-card" style={{ marginBottom: 12 }}>
+            <div className="partner-store-card-header">
+              <div>
+                <p className="body-md">{o.productName}</p>
+                <p className="label-md text-muted">{o.orderNo} · ×{o.quantity}</p>
+                <p className="label-md text-muted">{o.paidAt ? o.paidAt.slice(0, 16).replace('T', ' ') : ''}</p>
+              </div>
+              <span className="amount-lg" style={{ fontSize: 18 }}>¥{fmtMoney(o.commission)}</span>
+            </div>
+            <p className="label-md text-muted">
+              实付 ¥{fmtMoney(o.payAmount)} × {((o.rate ?? 0) * 100).toFixed(2)}%
+            </p>
+          </div>
+        ))}
+      </div>
+    </PullToRefresh>
+  );
+}
@@ -1,10 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
-import type { 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,
@@ -153,6 +154,8 @@ export default function HomePage() {
  const [stores, setStores] = useState<Array<Record<string, unknown>>>([]);
  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 = '工作台';
@@ -197,6 +200,20 @@ export default function HomePage() {
      setStores([]);
    }

+    if (isPrimary) {
+      tasks.push(
+        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(
      fetchPartnerLeaderboard('month')
        .then((data) => {
@@ -208,7 +225,7 @@ export default function HomePage() {
    );

    return Promise.all(tasks).then(() => undefined);
-  }, [navigate, account, canOrders, canDashboard, canStores]);
+  }, [navigate, account, canOrders, canDashboard, canStores, isPrimary]);

  useEffect(() => {
    void loadHome();
@@ -234,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">
-                实时营业额 (CNY)
-                <span className="material-symbols-outlined" style={{ fontSize: 14 }}>info</span>
+              <p className="partner-revenue-label">预付款金额 (CNY)</p>
+              <div className="partner-revenue-amount">{fmtMoney(preview?.prepaymentAmount ?? 0)}</div>
+              <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">
@@ -287,6 +297,51 @@ export default function HomePage() {
          </>
        )}

+        {isPrimary && (
+          <>
+            <Link to="/users" className="partner-bento-card" style={{ display: 'block', marginBottom: 16, color: 'inherit', textDecoration: 'none' }}>
+              <div className="partner-bento-header">
+                <h2 className="headline-md">关联用户</h2>
+                <span className="amount-lg" style={{ fontSize: 24 }}>{assocStats?.userTotal ?? 0}</span>
+              </div>
+              <div className="partner-store-stats">
+                <div className="partner-store-stat">
+                  <div>
+                    <p className="label-md text-muted">本日</p>
+                    <p className="headline-md">{assocStats?.userToday ?? 0}</p>
+                  </div>
+                </div>
+                <div className="partner-store-stat">
+                  <div>
+                    <p className="label-md text-muted">本月</p>
+                    <p className="headline-md">{assocStats?.userMonth ?? 0}</p>
+                  </div>
+                </div>
+              </div>
+            </Link>
+            <Link to="/users/orders" className="partner-bento-card" style={{ display: 'block', marginBottom: 16, color: 'inherit', textDecoration: 'none' }}>
+              <div className="partner-bento-header">
+                <h2 className="headline-md">关联用户订单</h2>
+                <span className="amount-lg" style={{ fontSize: 24 }}>{assocStats?.orderTotal ?? 0}</span>
+              </div>
+              <div className="partner-store-stats">
+                <div className="partner-store-stat">
+                  <div>
+                    <p className="label-md text-muted">本日</p>
+                    <p className="headline-md">{assocStats?.orderToday ?? 0}</p>
+                  </div>
+                </div>
+                <div className="partner-store-stat">
+                  <div>
+                    <p className="label-md text-muted">本月</p>
+                    <p className="headline-md">{assocStats?.orderMonth ?? 0}</p>
+                  </div>
+                </div>
+              </div>
+            </Link>
+          </>
+        )}
+
        {isWarehouse && (
          <p className="headline-md" style={{ marginBottom: 8 }}>订单管理</p>
        )}
@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import QRCode from 'qrcode';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import { invokeWechatPay } from '@dukang/weixin-sdk';
+import { validateShippingAddress } from '@dukang/domain';
 import ChinaRegionPicker from '../components/ChinaRegionPicker';
 import { getToken, request } from '../lib/api';
 import { formatRegionLabel, parseRegionCodes } from '../lib/china-region';
@@ -42,6 +43,7 @@ function initialDraft(): ProxyOrderDraft {
      promoCodeId: '',
      deliveryMode: 'ADDRESS',
      autoReceive: false,
+      assocEnabled: true,
    }
  );
 }
@@ -63,6 +65,7 @@ export default function ProxyOrderPage() {
  const [promoCodeId, setPromoCodeId] = useState(draft0.promoCodeId);
  const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>(draft0.deliveryMode);
  const [autoReceive, setAutoReceive] = useState(draft0.autoReceive);
+  const [assocEnabled, setAssocEnabled] = useState(draft0.assocEnabled !== false);
  const [preview, setPreview] = useState<PartnerProxyOrderPreviewResult | null>(null);
  const [previewLoading, setPreviewLoading] = useState(false);
  const [submitting, setSubmitting] = useState(false);
@@ -108,6 +111,7 @@ export default function ProxyOrderPage() {
      promoCodeId,
      deliveryMode,
      autoReceive,
+      assocEnabled,
      ...overrides,
    });
  }
@@ -154,6 +158,7 @@ export default function ProxyOrderPage() {
    promoCodeId,
    deliveryMode,
    autoReceive,
+    assocEnabled,
  ]);

  const selectedProduct = options?.products.find((p) => p.id === productId);
@@ -239,6 +244,13 @@ export default function ProxyOrderPage() {
      if (!allowOnline) return '该商品不支持线上购买';
      if (!region?.province || !region?.city || !region?.district) return '请选择省市区';
      if (!addressDetail.trim()) return '请填写详细地址';
+      const shipping = validateShippingAddress({
+        province: region.province,
+        city: region.city,
+        district: region.district,
+        detail: addressDetail,
+      });
+      if (!shipping.ok) return shipping.message || '请完善收货地址';
      if (!autoReceive) return '配送到址须勾选同意自动收货';
    } else if (!allowOnSite) {
      return '该商品不支持现场提货';
@@ -390,6 +402,9 @@ export default function ProxyOrderPage() {
      quantity,
      promoCodeId: promoCodeId || undefined,
      skuId: skuId || undefined,
+      assocPartnerAccountId: assocEnabled
+        ? options?.partners?.[0]?.id || undefined
+        : undefined,
    };

    setSubmitting(true);
@@ -595,6 +610,17 @@ export default function ProxyOrderPage() {
              </div>
            </section>

+            <section className="partner-form-section">
+              <label className="partner-checkbox-row">
+                <input
+                  type="checkbox"
+                  checked={assocEnabled}
+                  onChange={(e) => setAssocEnabled(e.target.checked)}
+                />
+                <span>关联合伙人（本单计订单佣金；取消则本单不计）</span>
+              </label>
+            </section>
+
            {(options?.promoCodes.length ?? 0) > 0 && (
              <section className="partner-form-section">
                <label className="partner-form-label">绑定推广码（选填）</label>
@@ -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) {
-  const d = new Date(periodStart);
-  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}月`;
+function billPeriodLabel(bill: PartnerBillDto) {
+  return formatBillPeriod(bill.periodStart, bill.periodEnd);
 }

 export default function SettlementPage() {
  const navigate = useNavigate();
  const [bills, setBills] = useState<PartnerBillDto[]>([]);
-  const now = new Date();
-  const [month, setMonth] = useState({ year: now.getFullYear(), month: now.getMonth() + 1 });
+  const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
  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]);
-
-  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]);
+  }, [bills, statusFilter]);

  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
-            className="partner-settlement-month"
-            value={`${month.year}-${month.month}`}
-            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>
+          <p className="label-md text-muted" style={{ margin: 0, lineHeight: 1.5 }}>
+            账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)}
+          </p>
        </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>
-
-              <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>
+              <label>店铺类型 <span className="text-primary">*</span> <span className="label-md text-muted">（可多选）</span></label>

+              <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>
@@ -0,0 +1,349 @@
+import { useCallback, useEffect, useState } from 'react';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import PullToRefresh from '@dukang/shared-ui/PullToRefresh';
+import type {
+  PartnerAssocSummary,
+  PartnerAssocUserItem,
+  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 };
+
+const SORTS: { key: PartnerAssocUserSort; label: string }[] = [
+  { key: 'boundAt', label: '关联时间' },
+  { key: 'createdAt', label: '注册时间' },
+  { key: 'orderCount', label: '订单数' },
+];
+
+function formatUserLabel(u: PartnerAssocUserItem) {
+  const name = u.nickname?.trim() || u.userNo || '—';
+  const remark = u.partnerRemark?.trim();
+  return remark ? `${name}（${remark}）` : name;
+}
+
+function fmtTime(iso?: string | null) {
+  if (!iso) return '—';
+  return iso.slice(0, 16).replace('T', ' ');
+}
+
+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);
+  const [keyword, setKeyword] = useState('');
+  const [appliedKeyword, setAppliedKeyword] = useState('');
+  const [sort, setSort] = useState<PartnerAssocUserSort>('boundAt');
+  const [editing, setEditing] = useState<PartnerAssocUserItem | null>(null);
+  const [remarkDraft, setRemarkDraft] = useState('');
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    document.title = '用户管理';
+  }, []);
+
+  useEffect(() => () => {
+    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);
+  }, []);
+
+  const loadUsers = useCallback(async () => {
+    const qs = new URLSearchParams({ page: '1', pageSize: '50', sort });
+    const q = appliedKeyword.trim();
+    if (q) qs.set('keyword', q);
+    const res = await request<ListRes>('PARTNER_H5', `/partner/assoc/users?${qs}`);
+    setItems(res.items ?? []);
+    setTotal(res.total ?? 0);
+  }, [appliedKeyword, sort]);
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      await Promise.all([loadSummary(), loadUsers()]);
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '加载失败');
+    } finally {
+      setLoading(false);
+    }
+  }, [loadSummary, loadUsers]);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  useEffect(() => {
+    const t = window.setTimeout(() => setAppliedKeyword(keyword.trim()), 400);
+    return () => window.clearTimeout(t);
+  }, [keyword]);
+
+  useEffect(() => {
+    const uid = searchParams.get('userId');
+    if (uid) navigate(`/users/${uid}/orders`, { replace: true });
+  }, [searchParams, navigate]);
+
+  async function downloadMainImage() {
+    const posterId = hidePoster ? null : summary?.activityPosterId;
+    try {
+      if (isWechatEnv() && !posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
+        await previewSaveableImage(summary.qrcodeUrl);
+        return;
+      }
+      const blob = posterId
+        ? await fetchActivityPosterImage(posterId)
+        : await fetchAssocQrcodeImage();
+      if (isWechatEnv()) {
+        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 (!posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
+        if (isWechatEnv()) {
+          await previewSaveableImage(summary.qrcodeUrl);
+          return;
+        }
+        setPreviewUrl(summary.qrcodeUrl);
+        toastSuccess('请长按图片保存到相册');
+        return;
+      }
+      toastError(e instanceof Error ? e.message : '下载失败');
+    }
+  }
+
+  async function saveRemark() {
+    if (!editing) return;
+    setSaving(true);
+    try {
+      await request(`PARTNER_H5`, `/partner/assoc/users/${editing.id}/remark`, {
+        method: 'PUT',
+        body: JSON.stringify({ remark: remarkDraft }),
+      });
+      toastSuccess(remarkDraft.trim() ? '备注已保存' : '已清除备注');
+      setEditing(null);
+      await loadUsers();
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '保存失败');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  return (
+    <PullToRefresh onRefresh={load} className="page partner-users-page">
+      <div style={{ padding: '16px 20px 24px' }}>
+        <h1 className="headline-lg" style={{ marginBottom: 16 }}>用户管理</h1>
+
+        <section className="partner-bill-card" style={{ marginBottom: 20, textAlign: 'center', padding: 20 }}>
+          <p className="body-md text-muted" style={{ marginBottom: 12 }}>
+            用户扫码后首次锁定，后续购酒计入关联订单
+          </p>
+          {summary?.activityPosterId && !hidePoster && (previewUrl || heroUrl) ? (
+            <img
+              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>
+          )}
+          {(() => {
+            const scanCount = summary?.scanCount ?? 0;
+            const userCount = summary?.userCount ?? total;
+            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>
+          {isWechatEnv() && (previewUrl || summary?.qrcodeUrl) ? (
+            <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>
+          <input
+            value={keyword}
+            placeholder="搜索昵称 / 手机 / 备注 / 编号"
+            onChange={(e) => setKeyword(e.target.value)}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') void loadUsers();
+            }}
+          />
+        </div>
+        <div className="partner-filter-row" style={{ marginBottom: 12, paddingLeft: 0, paddingRight: 0 }}>
+          {SORTS.map((s) => (
+            <button
+              key={s.key}
+              type="button"
+              className={`partner-filter-tab${sort === s.key ? ' active' : ''}`}
+              onClick={() => setSort(s.key)}
+            >
+              {s.label}
+            </button>
+          ))}
+        </div>
+        <p className="label-md text-muted" style={{ marginBottom: 12 }}>
+          {loading ? '加载中…' : `共 ${total} 人`}
+        </p>
+        {!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: 4 }}>
+              <p className="body-md">{formatUserLabel(u)}</p>
+              <button
+                type="button"
+                className="label-md text-primary"
+                style={{ background: 'none', border: 0, padding: 0, flexShrink: 0 }}
+                onClick={() => navigate(`/users/${u.id}/orders`)}
+              >
+                {u.orderCount} 单
+              </button>
+            </div>
+            <p className="label-md text-muted">{u.phone || '未绑定手机'}</p>
+            <div
+              style={{
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center',
+                gap: 12,
+                marginTop: 4,
+              }}
+            >
+              <p className="label-md text-muted">注册 {fmtTime(u.createdAt)}</p>
+              <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>
+
+      {editing && (
+        <div className="partner-remark-mask" onClick={() => setEditing(null)}>
+          <div className="partner-remark-sheet" onClick={(e) => e.stopPropagation()}>
+            <p className="headline-md" style={{ marginBottom: 8 }}>用户备注</p>
+            <p className="label-md text-muted" style={{ marginBottom: 12 }}>仅自己可见，总部看不到</p>
+            <textarea
+              value={remarkDraft}
+              maxLength={128}
+              rows={3}
+              placeholder="最多 128 字"
+              style={{ width: '100%', padding: 12, borderRadius: 8, border: '1px solid #eee' }}
+              onChange={(e) => setRemarkDraft(e.target.value)}
+            />
+            <div className="partner-ship-actions">
+              <button type="button" className="partner-btn-secondary" onClick={() => setEditing(null)}>
+                取消
+              </button>
+              <button
+                type="button"
+                className="partner-btn-primary"
+                disabled={saving}
+                onClick={() => void saveRemark()}
+              >
+                保存
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </PullToRefresh>
+  );
+}
@@ -278,6 +278,22 @@ html {

 .partner-btn-primary:active { transform: scale(0.98); }

+.partner-btn-secondary {
+  width: 100%;
+  padding: 16px;
+  border: 1px solid var(--color-outline-variant);
+  border-radius: var(--radius-md);
+  background: var(--color-surface-container-low);
+  color: var(--color-on-surface);
+  font-family: var(--font-headline);
+  font-size: 18px;
+  font-weight: 600;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .partner-btn-ghost {
  width: 100%;
  padding: 12px;
@@ -1344,7 +1360,7 @@ nav.app-tabbar {
 nav.app-tabbar .app-tabbar-item {
  flex: 1 1 0;
  min-width: 0;
-  max-width: 33.333%;
+  max-width: 25%;
  height: 56px;
  padding: 6px 0 4px;
  border-radius: 0;
@@ -3932,3 +3948,150 @@ header:has(> .app-page-title:only-child),
  margin-left: var(--space-page);
  margin-right: var(--space-page);
 }
+
+.partner-users-page {
+  padding-bottom: 96px;
+}
+
+.partner-remark-mask {
+  position: fixed;
+  inset: 0;
+  z-index: 200;
+  background: rgba(0, 0, 0, 0.45);
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+
+.partner-remark-sheet {
+  width: 100%;
+  max-width: 480px;
+  background: var(--color-card, #fff);
+  border-radius: 16px 16px 0 0;
+  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.10",
+  "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'] },
@@ -26,6 +27,7 @@ export default defineAppConfig({
    { root: 'pages/login', pages: ['index'] },
    { root: 'pages/user-agreement', pages: ['index'] },
    { root: 'pages/privacy-policy', pages: ['index'] },
+    { root: 'pages/benefit-rules', pages: ['index'] },
    { root: 'pages/invoice-titles', pages: ['index'] },
    { root: 'pages/invoice-apply', pages: ['index'] },
  ],
@@ -75,7 +77,7 @@ export default defineAppConfig({
        pagePath: 'pages/benefit/index',
        text: '好客权益',
        iconPath: 'assets/tabbar/benefit.png',
-        selectedIconPath: 'assets/tabbar/benefit-active.png',
+        selectedIconPath: 'assets/icons/store-benefit-y.png',
      },
      {
        pagePath: 'pages/mine/index',
@@ -6,6 +6,8 @@
@import './styles/benefit.css';
@import './styles/mine.css';
@import './styles/address.css';
+@import './styles/benefit-promo.css';
+@import './components/HomeSplash.css';

 page,
 body {
@@ -4,12 +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 { prefetchHomeSplashAssets } from './lib/home-splash';
 import { capturePromoSceneAndTouchScan } from './lib/promo';
 import { initClientVersionChecks } from './lib/client-version';
 import './app.css';

 installClientErrorReporting();
 prefetchShareBrandAssets();
+prefetchHomeSplashAssets();

 function App({ children }: PropsWithChildren) {
  const handlingRef = useRef(false);
@@ -1,5 +1,5 @@
 import { Image, Text, View } from '@tarojs/components';
-import iconStoreBenefit from '../assets/icons/store-benefit.png';
+import iconStoreBenefit from '../assets/icons/store-benefit-y.png';

 type BenefitFigureSize = 'sm' | 'md' | 'lg' | 'xl';

@@ -0,0 +1,53 @@
+import { View, Text } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import {
+  BENEFIT_INTRO,
+  BENEFIT_INTRO_EMPHASIS,
+  BENEFIT_RULES_PATH,
+  BENEFIT_SLOGAN,
+} from '../lib/benefit-copy';
+
+type BenefitIntroCardProps = {
+  showLink?: boolean;
+  className?: string;
+  /** 左侧金色粗条（门店详情等强调卡） */
+  accent?: boolean;
+};
+
+export default function BenefitIntroCard({
+  showLink = false,
+  className,
+  accent = false,
+}: BenefitIntroCardProps) {
+  const prefix = BENEFIT_INTRO.endsWith(BENEFIT_INTRO_EMPHASIS)
+    ? BENEFIT_INTRO.slice(0, -BENEFIT_INTRO_EMPHASIS.length)
+    : BENEFIT_INTRO;
+
+  function goRules() {
+    Taro.navigateTo({ url: BENEFIT_RULES_PATH });
+  }
+
+  const inner = (
+    <>
+      <Text className="benefit-intro-card-title">{BENEFIT_SLOGAN}</Text>
+      <Text className="benefit-intro-card-body">
+        {prefix}
+        <Text className="benefit-intro-card-em">{BENEFIT_INTRO_EMPHASIS}</Text>
+      </Text>
+      {showLink ? (
+        <Text className="benefit-intro-card-link" onClick={goRules}>
+          查看完整说明 ›
+        </Text>
+      ) : null}
+    </>
+  );
+
+  return (
+    <View
+      className={`benefit-intro-card${accent ? ' benefit-intro-card--accent' : ''}${className ? ` ${className}` : ''}`}
+    >
+      {accent ? <View className="benefit-intro-card-bar" /> : null}
+      {accent ? <View className="benefit-intro-card-main">{inner}</View> : inner}
+    </View>
+  );
+}
@@ -0,0 +1,15 @@
+import { View, Text } from '@tarojs/components';
+import { BENEFIT_SLOGAN } from '../lib/benefit-copy';
+
+type BenefitSloganBarProps = {
+  className?: string;
+};
+
+export default function BenefitSloganBar({ className }: BenefitSloganBarProps) {
+  return (
+    <View className={`benefit-slogan-bar${className ? ` ${className}` : ''}`}>
+      <View className="benefit-slogan-bar-accent" />
+      <Text className="benefit-slogan-bar-text">{BENEFIT_SLOGAN}</Text>
+    </View>
+  );
+}
@@ -24,7 +24,7 @@ export const EMPTY_CATEGORY: CategorySelection = {
 export function formatCategoryLabel(sel: CategorySelection): string {
  if (sel.childName) return sel.childName;
  if (sel.parentName) return sel.parentName;
-  return '全部分类';
+  return '全部菜系';
 }

 type CategoryPickerProps = {
@@ -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>
+  );
+}
@@ -0,0 +1,63 @@
+import { useEffect, useState } from 'react';
+import { View, Text, Input } from '@tarojs/components';
+
+type OrderQtyControlsProps = {
+  value: number;
+  unitLabel: string;
+  onChange: (next: number) => void;
+};
+
+const MAX_QTY = 999;
+
+function parseQty(raw: string): number | null {
+  const n = parseInt(String(raw).replace(/\D/g, ''), 10);
+  if (!Number.isFinite(n)) return null;
+  return Math.min(MAX_QTY, Math.max(1, n));
+}
+
+/** 下单数量：加减 + 手动输入，旁注单位（瓶/箱） */
+export default function OrderQtyControls({ value, unitLabel, onChange }: OrderQtyControlsProps) {
+  const [draft, setDraft] = useState(String(value));
+
+  useEffect(() => {
+    setDraft(String(value));
+  }, [value]);
+
+  function current(): number {
+    return parseQty(draft) ?? value;
+  }
+
+  function commit() {
+    const next = parseQty(draft);
+    if (next == null) {
+      setDraft(String(value));
+      return;
+    }
+    setDraft(String(next));
+    if (next !== value) onChange(next);
+  }
+
+  return (
+    <View className="order-qty-row">
+      <Text>购买数量</Text>
+      <View className="order-qty-controls">
+        <View className="order-qty-btn" onClick={() => onChange(Math.max(1, current() - 1))}>
+          <Text>−</Text>
+        </View>
+        <Input
+          className="order-qty-input"
+          type="number"
+          maxlength={3}
+          value={draft}
+          onInput={(e) => setDraft(String(e.detail.value ?? ''))}
+          onBlur={commit}
+          onConfirm={commit}
+        />
+        <View className="order-qty-btn" onClick={() => onChange(Math.min(MAX_QTY, current() + 1))}>
+          <Text>＋</Text>
+        </View>
+        <Text className="order-qty-unit">{unitLabel}</Text>
+      </View>
+    </View>
+  );
+}
@@ -6,8 +6,10 @@ import {
  getCitiesForPicker,
  getDistricts,
  getDistrictsForPicker,
+  getDistrictsForShippingPicker,
  getProvincesForPicker,
  normalizeRegionSelection,
+  normalizeShippingRegionSelection,
  toCityLevelRegion,
  type RegionSelection,
 } from '../lib/region-data';
@@ -18,6 +20,8 @@ type RegionPickerProps = {
  onClose: () => void;
  onConfirm: (region: RegionSelection) => void;
  levels?: 2 | 3;
+  /** filter：门店筛选可「全市」；shipping：收货地址禁止伪区县 */
+  mode?: 'filter' | 'shipping';
 };

 type PickerLevel = 'province' | 'city' | 'district';
@@ -28,8 +32,13 @@ const ALL_TABS: Array<{ key: PickerLevel; label: string }> = [
  { key: 'district', label: '区县' },
 ];

-function initialTab(value: RegionSelection, levels: 2 | 3): PickerLevel {
-  const normalized = levels === 2 ? toCityLevelRegion(value) : normalizeRegionSelection(value);
+function initialTab(value: RegionSelection, levels: 2 | 3, mode: 'filter' | 'shipping'): PickerLevel {
+  const normalized =
+    levels === 2
+      ? toCityLevelRegion(value)
+      : mode === 'shipping'
+        ? normalizeShippingRegionSelection(value)
+        : normalizeRegionSelection(value);
  if (levels === 2) {
    return normalized.province && normalized.province !== REGION_ALL ? 'city' : 'province';
  }
@@ -54,24 +63,35 @@ export default function RegionPicker({
  onClose,
  onConfirm,
  levels = 3,
+  mode = 'filter',
 }: RegionPickerProps) {
  const [draft, setDraft] = useState<RegionSelection>(value);
  const [activeTab, setActiveTab] = useState<PickerLevel>('province');

  const tabs = levels === 2 ? ALL_TABS.slice(0, 2) : ALL_TABS;
+  const shipping = mode === 'shipping';

  useEffect(() => {
    if (!open) return;
-    const normalized = levels === 2 ? toCityLevelRegion(value) : normalizeRegionSelection(value);
+    const normalized =
+      levels === 2
+        ? toCityLevelRegion(value)
+        : shipping
+          ? normalizeShippingRegionSelection(value)
+          : normalizeRegionSelection(value);
    setDraft(normalized);
-    setActiveTab(initialTab(value, levels));
-  }, [open, value, levels]);
+    setActiveTab(initialTab(value, levels, mode));
+  }, [open, value, levels, mode, shipping]);

  const listItems = useMemo(() => {
    if (activeTab === 'province') return getProvincesForPicker();
-    if (activeTab === 'city') return getCitiesForPicker(draft.province);
+    if (activeTab === 'city') {
+      if (shipping) return getCities(draft.province);
+      return getCitiesForPicker(draft.province);
+    }
+    if (shipping) return getDistrictsForShippingPicker(draft.province, draft.city);
    return getDistrictsForPicker(draft.province, draft.city);
-  }, [activeTab, draft.province, draft.city]);
+  }, [activeTab, draft.province, draft.city, shipping]);

  const selectedValue =
    activeTab === 'province' ? draft.province : activeTab === 'city' ? draft.city : draft.district;
@@ -79,12 +99,19 @@ export default function RegionPicker({
  const canConfirm =
    levels === 2
      ? Boolean(draft.province && draft.city)
-      : Boolean(draft.province && draft.city && draft.district);
+      : shipping
+        ? Boolean(
+            draft.province &&
+              draft.city &&
+              draft.district &&
+              draft.district !== REGION_ALL,
+          )
+        : Boolean(draft.province && draft.city && draft.district);

  if (!open) return null;

  function selectProvince(province: string) {
-    if (province === REGION_ALL) {
+    if (!shipping && province === REGION_ALL) {
      setDraft({ province: REGION_ALL, city: REGION_ALL, district: REGION_ALL });
      setActiveTab('city');
      return;
@@ -97,12 +124,16 @@ export default function RegionPicker({
      return;
    }
    const nextDistricts = getDistricts(province, city);
-    setDraft({ province, city, district: nextDistricts[0] ?? '' });
+    setDraft({
+      province,
+      city,
+      district: shipping ? '' : (nextDistricts[0] ?? ''),
+    });
    setActiveTab('city');
  }

  function selectCity(city: string) {
-    if (city === REGION_ALL) {
+    if (!shipping && city === REGION_ALL) {
      setDraft({ ...draft, city: REGION_ALL, district: REGION_ALL });
      if (levels === 3) setActiveTab('district');
      return;
@@ -112,11 +143,16 @@ export default function RegionPicker({
      return;
    }
    const nextDistricts = getDistricts(draft.province, city);
-    setDraft({ ...draft, city, district: nextDistricts[0] ?? '' });
+    setDraft({
+      ...draft,
+      city,
+      district: shipping ? '' : (nextDistricts[0] ?? ''),
+    });
    setActiveTab('district');
  }

  function selectDistrict(district: string) {
+    if (shipping && district === REGION_ALL) return;
    setDraft({ ...draft, district });
  }

@@ -134,7 +170,13 @@ export default function RegionPicker({

  function handleConfirm() {
    if (!canConfirm) return;
-    const next = levels === 2 ? toCityLevelRegion(draft) : normalizeRegionSelection(draft);
+    const next =
+      levels === 2
+        ? toCityLevelRegion(draft)
+        : shipping
+          ? normalizeShippingRegionSelection(draft)
+          : normalizeRegionSelection(draft);
+    if (shipping && (!next.district || next.district === REGION_ALL)) return;
    onConfirm(next);
    onClose();
  }
@@ -1,215 +1,67 @@
-import { useEffect, useMemo, useRef, useState, type CSSProperties } from 'react';
-import { View, Text } from '@tarojs/components';
-import Taro from '@tarojs/taro';
+import { useMemo } from 'react';
+import { View, Text, Swiper, SwiperItem } from '@tarojs/components';

-type StoreRedeemMarqueeProps = {
-  lines: string[];
+export type StoreRedeemMarqueeItem = {
+  userLabel: string;
+  amount: string;
 };

-const FLY_SPEED = 56;
-const MIN_FLY_MS = 2400;
-const PAUSE_MIN_MS = 1000;
-const PAUSE_MAX_MS = 5000;
-const TICK_MS = 16;
-/** 全文滚出视口后，再向左多走 10px */
-const EXTRA_AFTER_EXIT_PX = 10;
+type StoreRedeemMarqueeProps = {
+  items: StoreRedeemMarqueeItem[];
+};

-function estimateTextWidth(text: string): number {
-  let w = 0;
-  for (const ch of text) {
-    w += /[^\x00-\xff]/.test(ch) ? 12 : 7;
-  }
-  return Math.max(Math.ceil(w), 80);
-}
-
-function randomPauseMs() {
-  return PAUSE_MIN_MS + Math.floor(Math.random() * (PAUSE_MAX_MS - PAUSE_MIN_MS + 1));
-}
-
-/** 容器宽兜底（不依赖 DOM 测量，小程序首帧即可用） */
-function getBoxWidthFallback(): number {
-  try {
-    const sys = Taro.getSystemInfoSync();
-    const screenW = Number(sys.windowWidth || sys.screenWidth || 375);
-    // 与 section 同宽：左右 var(--space-page)
-    return Math.max(220, Math.floor(screenW - 32));
-  } catch {
-    return 300;
-  }
-}
-
-function measureBoxWidth(selector: string, fallback: number): Promise<number> {
-  return new Promise((resolve) => {
-    Taro.nextTick(() => {
-      try {
-        const page = Taro.getCurrentInstance().page;
-        const query = page ? Taro.createSelectorQuery().in(page) : Taro.createSelectorQuery();
-        query
-          .select(selector)
-          .boundingClientRect()
-          .exec((res) => {
-            const w = Number(res?.[0]?.width || 0);
-            resolve(w > 8 ? Math.ceil(w) : fallback);
-          });
-      } catch {
-        resolve(fallback);
-      }
-    });
-  });
-}
-
-function measureTextWidth(selector: string, text: string): Promise<number> {
-  const fallback = estimateTextWidth(text);
-  return new Promise((resolve) => {
-    Taro.nextTick(() => {
-      try {
-        const page = Taro.getCurrentInstance().page;
-        const query = page ? Taro.createSelectorQuery().in(page) : Taro.createSelectorQuery();
-        query
-          .select(selector)
-          .boundingClientRect()
-          .exec((res) => {
-            const w = Number(res?.[0]?.width || 0);
-            if (w > 8 && w < fallback * 3) resolve(Math.ceil(w));
-            else resolve(fallback);
-          });
-      } catch {
-        resolve(fallback);
-      }
-    });
-  });
-}
-
-/**
- * 核销走马灯：单条从右向左位移飞出，间隔 1～5 秒随机再播下一条。
- *
- * 小程序注意：
- * - 不用 useReady（子组件内不触发 → opacity 永远 0）
- * - 不用 Text + transform（支持差），改用 View + left
- * - 字宽用估算，避免屏外元素测宽失败
- */
-export default function StoreRedeemMarquee({ lines }: StoreRedeemMarqueeProps) {
-  const items = useMemo(
-    () =>
-      lines
-        .map((s) => String(s || '').trim())
-        .filter(Boolean),
-    [lines],
-  );
-
-  const rootIdRef = useRef(`smr${Math.random().toString(36).slice(2, 10)}`);
-  const textIdRef = useRef(`smt${Math.random().toString(36).slice(2, 10)}`);
-  const indexRef = useRef(0);
-  const boxWidthRef = useRef(getBoxWidthFallback());
-  const itemsKey = items.join('\n');
-
-  const [displayIndex, setDisplayIndex] = useState(0);
-  const [leftPx, setLeftPx] = useState(() => boxWidthRef.current);
-
-  useEffect(() => {
-    if (!items.length) return;
-
-    let cancelled = false;
-    const waiters = new Set<ReturnType<typeof setTimeout>>();
-    let tickTimer: ReturnType<typeof setInterval> | undefined;
-
-    const sleep = (ms: number) =>
-      new Promise<void>((resolve) => {
-        const id = setTimeout(() => {
-          waiters.delete(id);
-          resolve();
-        }, ms);
-        waiters.add(id);
-      });
-
-    const clearTick = () => {
-      if (tickTimer) {
-        clearInterval(tickTimer);
-        tickTimer = undefined;
-      }
-    };
-
-    const fly = (from: number, to: number, durationMs: number) =>
-      new Promise<void>((resolve) => {
-        const began = Date.now();
-        setLeftPx(from);
-        clearTick();
-        tickTimer = setInterval(() => {
-          if (cancelled) {
-            clearTick();
-            resolve();
-            return;
-          }
-          const t = Math.min(1, (Date.now() - began) / durationMs);
-          setLeftPx(from + (to - from) * t);
-          if (t >= 1) {
-            clearTick();
-            resolve();
-          }
-        }, TICK_MS);
-      });
-
-    const loop = async () => {
-      indexRef.current = 0;
-      setDisplayIndex(0);
-
-      const measured = await measureBoxWidth(`#${rootIdRef.current}`, boxWidthRef.current);
-      boxWidthRef.current = measured;
-      if (cancelled) return;
-
-      while (!cancelled && items.length) {
-        const idx = indexRef.current % items.length;
-        const text = items[idx];
-        const box = boxWidthRef.current;
-
-        setDisplayIndex(idx);
-
-        const from = box;
-        setLeftPx(from);
-        await sleep(48);
-        if (cancelled) break;
-
-        const textW = await measureTextWidth(`#${textIdRef.current}`, text);
-        // 全文 left 边缘移出容器左边界后再走 10px
-        const to = -(textW + EXTRA_AFTER_EXIT_PX);
-        const distance = from - to;
-        const durationMs = Math.max(MIN_FLY_MS, Math.round((distance / FLY_SPEED) * 1000));
-
-        await sleep(32);
-        if (cancelled) break;
-
-        await fly(from, to, durationMs);
-        if (cancelled) break;
-
-        await sleep(randomPauseMs());
-        if (cancelled) break;
-
-        indexRef.current = (idx + 1) % items.length;
-      }
-    };
-
-    void loop();
-
-    return () => {
-      cancelled = true;
-      clearTick();
-      waiters.forEach(clearTimeout);
-      waiters.clear();
-    };
-  }, [itemsKey, items]);
-
-  if (!items.length) return null;
-
-  const current = items[displayIndex] || items[0];
-  const innerStyle: CSSProperties = { left: `${leftPx}px` };
+const STAY_MS = 20000;

+function MarqueeRow({ item }: { item: StoreRedeemMarqueeItem }) {
  return (
-    <View id={rootIdRef.current} className="store-detail-marquee">
-      <View className="store-detail-marquee-inner" style={innerStyle}>
-        <Text id={textIdRef.current} className="store-detail-marquee-text">
-          {current}
-        </Text>
-      </View>
+    <View className="store-detail-marquee-inner">
+      <View className="store-detail-marquee-dot" />
+      <Text className="store-detail-marquee-text">{item.userLabel} 刚刚到店核销</Text>
+      <Text className="store-detail-marquee-amount">{item.amount}</Text>
+    </View>
+  );
+}
+
+/** 核销记录：单条静止；多条竖向循环，每条停留 20 秒 */
+export default function StoreRedeemMarquee({ items }: StoreRedeemMarqueeProps) {
+  const list = useMemo(
+    () =>
+      items
+        .map((row) => ({
+          userLabel: String(row.userLabel || '用户***').trim() || '用户***',
+          amount: String(row.amount || '').trim(),
+        }))
+        .filter((row) => row.amount),
+    [items],
+  );
+
+  if (!list.length) return null;
+
+  if (list.length === 1) {
+    return (
+      <View className="store-detail-marquee">
+        <MarqueeRow item={list[0]} />
+      </View>
+    );
+  }
+
+  return (
+    <View className="store-detail-marquee">
+      <Swiper
+        className="store-detail-marquee-swiper"
+        vertical
+        circular
+        autoplay
+        interval={STAY_MS}
+        duration={400}
+        indicatorDots={false}
+      >
+        {list.map((row, index) => (
+          <SwiperItem key={`${row.userLabel}|${row.amount}|${index}`}>
+            <MarqueeRow item={row} />
+          </SwiperItem>
+        ))}
+      </Swiper>
    </View>
  );
 }
@@ -7,7 +7,7 @@ import iconHomeActive from '../assets/tabbar/home-active.png';
 import iconStore from '../assets/tabbar/store.png';
 import iconStoreActive from '../assets/tabbar/store-active.png';
 import iconBenefit from '../assets/tabbar/benefit.png';
-import iconBenefitActive from '../assets/tabbar/benefit-active.png';
+import iconBenefitActive from '../assets/icons/store-benefit-y.png';
 import iconMine from '../assets/tabbar/mine.png';
 import iconMineActive from '../assets/tabbar/mine-active.png';

@@ -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 = {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jacy	42c1b65632	Merge pull request 'Dev' (#67 ) from dev into main CI / verify (push) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/67	2026-09-02 21:13:16 +08:00
jacy	de7bd34aa8	Merge pull request 'v4.0.14概览和日报' (#66 ) from dev_jacy into dev CI / verify (pull_request) Waiting to run Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/66	2026-09-02 21:13:02 +08:00
jacy	68a4b7f984	v4.0.14概览和日报 CI / verify (pull_request) Waiting to run Details	2026-09-02 21:11:58 +08:00
jacy	e5fe8b903a	feat(courier): 小飞侠签收照联调与 OSS 失败回退 CI / verify (push) Waiting to run Details 补齐 admin 100108 联调入口；track 优先用缓存签收照，上传失败回退 dataURI，日志截断大图。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-09-02 17:57:10 +08:00
jacy	c6b01def4c	feat(trade): v4.0.13 收货禁全市与小飞侠拒单可感知 CI / verify (push) Waiting to run Details 拦截伪区县写入与下单；推单失败挂 fulfillmentHold，HQ 可见超区/推单失败。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-09-02 17:20:40 +08:00
jacy	63fcf33416	v4.0.10版本更新要求门店支持多个分类；小程序C端“瓶”位置调整；商品单元“立即购买”直接跳转到“确认订单”页；	2026-09-02 16:25:59 +08:00
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
jacy	58010feed8	Merge branch 'main' of git.yqidian.com:jacy/dukang into dev CI / verify (push) Has been cancelled Details	2026-08-30 14:40:56 +08:00
jacy	9f14c59f22	merge(dev_jacy): v4.0.1 partner assoc and H5 user management	2026-08-30 14:35:56 +08:00
jacy	9c8d5f2cad	feat(assoc): v4.0.1 合伙人关联码、分佣账单与 H5 用户管理订单佣金只认关联用户；合伙人备注写入独立表；H5 增加用户管理与首页统计。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-30 14:35:39 +08:00
jacy	870494563d	merge(dev): store bill issue date to today CI / verify (push) Has been cancelled Details	2026-08-28 14:14:39 +08:00
jacy	4c9b3f72bc	merge(dev_jacy): store bill issue date to today	2026-08-28 14:13:28 +08:00
jacy	3b669f7e38	fix(settlement): 门店 T+1 出账日改为窗口中的今天 HQ 门店账单列名改为出账日；billDate 记今日（昨日 00:00–今日 00:00 右端），启动时把旧数据从核销自然日对齐过来。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-28 14:12:35 +08:00
jacy	14c5c8c3f3	merge(dev): v3.5.18 HQ 明文手机、任务版本与核销快链 CI / verify (push) Has been cancelled Details	2026-08-28 13:58:57 +08:00
jacy	a7f3283ae5	merge(dev_jacy): v3.5.18 HQ 明文手机、任务版本与核销快链	2026-08-28 13:58:37 +08:00
jacy	da19c39965	feat(admin): v3.5.18 用户详情明文手机、任务关联版本与核销快链 HQ 后台：用户/核销记录展示完整手机号；任务列表与编辑可关联版本；账单核销单号与券号/用户可快链；门店账单日标明为出账自然日；技术支持操作按钮右对齐。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-28 13:58:08 +08:00
jacy	c06251f0a4	merge(dev): HQ 订单筛选改版与用户商品模糊搜索 CI / verify (push) Has been cancelled Details	2026-08-28 13:12:52 +08:00
jacy	faa1830bde	merge(dev_jacy): HQ 订单筛选改版与用户商品模糊搜索	2026-08-28 13:11:17 +08:00
jacy	b226af2adc	feat(admin): 订单页筛选改版并支持用户与商品模糊搜索收起次要筛选项，去掉过滤测试；列表可按用户编号/昵称/备注/手机与商品名称/规格查询。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-28 13:10:36 +08:00
jacy	2b5f42acdf	merge(dev): HQ 推广码订单只计已完成并补快链 CI / verify (push) Has been cancelled Details	2026-08-28 12:57:03 +08:00
jacy	71149044ca	merge(dev_jacy): HQ 推广码订单只计已完成并补快链	2026-08-28 12:56:02 +08:00
jacy	fccfd7abbe	feat(promo): HQ 推广码订单只计已完成并补扫码订单快链列表与详情的订单数/转化率按 COMPLETED 实时统计；扫码、订单、事件 ID 可跳到对应页。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-28 12:55:19 +08:00
jacy	1ecc6a11df	merge(dev): 企微结算账单明细与成交播报用户明文 CI / verify (push) Has been cancelled Details	2026-08-27 11:46:12 +08:00
jacy	cfd42dfc32	merge(dev_jacy): 企微结算账单明细与成交播报用户明文	2026-08-27 11:45:59 +08:00
jacy	737efb89a3	feat(wecom): 结算账单明细与成交播报用户明文支付/核销补 HQ 备注且手机号不脱敏；结算通知按城市、合伙人、笔数和累计金额分块推送。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-27 11:45:08 +08:00