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

- HQ stores: partner column uses companyName/name/phone via partnerOptionLabel

- Dev plan: version RELEASED auto-marks tasks RELEASED and tickets PUBLISHED with releasedVersionNo

- mini-user/h5-shop/h5-partner v3.4.13 UX fixes (store UI, iOS scan OAuth, partner login guard)

- Docs: v3.4.13 dev doc + status audit updates

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

apps/admin-web/package.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -376,7 +376,7 @@ type StoreRow = {
   visibilityWhitelistEnabled?: boolean;
   visibilityPhones?: string[];
   cityRef?: { name: string; code: string };
-  partner?: { companyName: string };
+  partner?: { id?: string; companyName?: string | null; name?: string | null; phone?: string | null };
   account?: {
     phone: string;
     name: string;
@@ -394,13 +394,14 @@ type StoreRow = {
   category?: { id: string; name: string; parentId?: string | null } | null;
 };
 
-type PartnerOption = { id: string; companyName: string; name?: string };
+type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string | null };
 
 function partnerOptionLabel(p: PartnerOption): string {
   const company = (p.companyName || '').trim();
   const person = (p.name || '').trim();
+  const phone = (p.phone || '').trim();
   if (company && person) return `${company}-${person}`;
-  return company || person || p.id;
+  return company || person || phone || p.id;
 }
 type CityOption = {
   id: string;
@@ -867,7 +868,13 @@ export default function StoresPage() {
         );
       },
     },
-    { title: '开城合伙人', dataIndex: ['partner', 'companyName'], width: 120 },
+    {
+      title: '开城合伙人',
+      dataIndex: 'partner',
+      width: 140,
+      render: (partner: StoreRow['partner']) =>
+        partner ? partnerOptionLabel({ id: partner.id ?? '', ...partner }) : '—',
+    },
     {
       title: '可见',
       dataIndex: 'visibilityWhitelistEnabled',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,33 @@
+import { isIosDevice } from '@dukang/weixin-sdk';
+
+/** 扫码前发起 OAuth 时标记，回跳后在首页续扫 */
+export const SHOP_PENDING_SCAN_KEY = 'shop_pending_scan';
+
+export function markPendingScanAfterAuth(): void {
+  try {
+    sessionStorage.setItem(SHOP_PENDING_SCAN_KEY, '1');
+  } catch {
+    /* ignore */
+  }
+}
+
+export function peekPendingScanAfterAuth(): boolean {
+  try {
+    return sessionStorage.getItem(SHOP_PENDING_SCAN_KEY) === '1';
+  } catch {
+    return false;
+  }
+}
+
+export function clearPendingScanAfterAuth(): void {
+  try {
+    sessionStorage.removeItem(SHOP_PENDING_SCAN_KEY);
+  } catch {
+    /* ignore */
+  }
+}
+
+/** OAuth 回跳后延迟再调 scanQRCode（iOS JSSDK 离线校验更慢） */
+export function getPostAuthScanDelayMs(): number {
+  return isIosDevice() ? 1200 : 600;
+}

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

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

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

@@ -138,6 +138,20 @@ export async function handleShopWechatCallback(): Promise<WechatLoginResult | nu
   return weixinSdk.handleOAuthCallback();
 }
 
+let oauthCallbackInflight: Promise<WechatLoginResult | null> | null = null;
+
+/** 全局单例：避免 Context 与页面 effect 重复消费 OAuth code */
+export async function handleShopWechatCallbackOnce(): Promise<WechatLoginResult | null> {
+  if (!isWechatEnv()) return null;
+  const params = new URLSearchParams(window.location.search);
+  if (!params.get('code')) return null;
+  if (oauthCallbackInflight) return oauthCallbackInflight;
+  oauthCallbackInflight = handleShopWechatCallback().finally(() => {
+    oauthCallbackInflight = null;
+  });
+  return oauthCallbackInflight;
+}
+
 /**
  * 微信一键登录（已绑定微信的门店账号免验证码）。
  * 返回 session = 已登录；void = 已跳转授权页等待回调。

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

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

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

@@ -18,7 +18,7 @@ import {
   consumeShopWechatLoginHint,
   fetchClientConfig,
   formatShopWechatError,
-  handleShopWechatCallback,
+  handleShopWechatCallbackOnce,
   handleShopWechatLoginResult,
   loginShopWithWechat,
 } from '../lib/wechat-auth';
@@ -88,7 +88,7 @@ export default function LoginPage() {
 
   useEffect(() => {
     if (!isWechatEnv() || !wxAuthorize || !params.get('code')) return;
-    void handleShopWechatCallback()
+    void handleShopWechatCallbackOnce()
       .then((result) => {
         if (!result) return;
         const session = handleShopWechatLoginResult(result);
@@ -140,12 +140,22 @@ export default function LoginPage() {
 
   async function login() {
     if (!ensureAgreed()) return;
+    const trimmedPhone = phone.trim();
+    const trimmedCode = code.trim();
+    if (!trimmedPhone) {
+      setMsg('phone should not be empty');
+      return;
+    }
+    if (!trimmedCode) {
+      setMsg('code should not be empty');
+      return;
+    }
     setLoading(true);
     setMsg('');
     try {
       const data = await request<ShopSessionPayload>('SHOP_H5', '/shop/auth/login/sms', {
         method: 'POST',
-        body: JSON.stringify({ phone, code }),
+        body: JSON.stringify({ phone: trimmedPhone, code: trimmedCode }),
       });
       saveRememberedSession(data);
       applySession(data);

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

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

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

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

apps/mini-user/package.json

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

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

@@ -11,6 +11,7 @@ export default defineAppConfig({
     'pages/pay/index',
     'pages/orders/index',
     'pages/order-detail/index',
+    'pages/order-logistics/index',
     'pages/pickup-receive/index',
     'pages/addresses/index',
     'pages/address-edit/index',

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

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

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

@@ -20,6 +20,7 @@ export default function ProductCarousel({
   const [activeIndex, setActiveIndex] = useState(0);
   const prefix =
     variant === 'store' ? 'store-detail-carousel' : variant === 'home' ? 'home-carousel' : 'detail-carousel';
+  const imageMode = 'aspectFill';
 
   function previewAt(index: number) {
     const urls = slides.filter(Boolean);
@@ -41,7 +42,7 @@ export default function ProductCarousel({
               <Image
                 className={`${prefix}-image`}
                 src={src}
-                mode="aspectFill"
+                mode={imageMode}
                 alt={alt}
                 onClick={previewable ? () => previewAt(index) : undefined}
               />

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,6 +23,7 @@ import {
 } from '../../lib/mini-wechat-profile';
 import { isLoggedIn, logout, request, toast, type UserProfile } from '../../lib/api';
 import { isWechatEnv } from '../../lib/weixin';
+import { APP_VERSION_LABEL } from '../../lib/client-version';
 import { maskPhone } from '../../lib/phone';
 import {
   DEFAULT_SHARE_DESC,
@@ -499,7 +500,7 @@ export default function MinePage() {
         </View>
 
         <View className="mine-footer">
-          <Text className="mine-version">杜康好客</Text>
+          <Text className="mine-version">杜康好客 {APP_VERSION_LABEL}</Text>
           <Text className="mine-logout" onClick={() => logout()}>
             退出登录
           </Text>

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

@@ -141,6 +141,14 @@ export default function OrderConfirmPickupPage() {
     const ready = await ensurePayReady(returnPath);
     if (!ready) return;
 
+    const { confirm } = await Taro.showModal({
+      title: '确认提交订单',
+      content: `确认提交现场提货订单？共 ${quantity} 瓶，应付 ¥${Number(preview?.payAmount ?? 0).toFixed(2)}。`,
+      confirmText: '确认提交',
+      cancelText: '再想想',
+    });
+    if (!confirm) return;
+
     setLoading(true);
     setMsg('');
     try {

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

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

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

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

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

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

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

@@ -11,7 +11,6 @@ import type { ProductDetailContentDto } from '@dukang/shared-types';
 import PageShell from '../../components/PageShell';
 import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
-import ShareNavButton from '../../components/ShareNavButton';
 import WechatShareReady from '../../components/WechatShareReady';
 import { goLogin } from '../../lib/auth-nav';
 import { ensurePayReady } from '../../lib/pay-ready';
@@ -167,12 +166,11 @@ export default function ProductDetailPage() {
         solid={headerSolid}
         titleVisible={headerSolid}
         onBack={goBack}
-        right={<ShareNavButton payload={sharePayload} />}
       />
 
       <View className="product-detail-main">
         <View className="product-detail-hero full-bleed">
-          <ProductCarousel images={carouselImages} alt={product.name} variant="detail" />
+          <ProductCarousel images={carouselImages} alt={product.name} variant="detail" previewable />
         </View>
 
         <View className="product-detail-info">

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

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text, Image, ScrollView } from '@tarojs/components';
 import Taro, {
   useDidShow,
   useLoad,
@@ -15,6 +15,8 @@ import ShareNavButton from '../../components/ShareNavButton';
 import StoreRedeemMarquee from '../../components/StoreRedeemMarquee';
 import WechatShareReady from '../../components/WechatShareReady';
 import { request, toast } from '../../lib/api';
+import { maskPhone } from '../../lib/phone';
+import { track } from '../../lib/analytics';
 import { formatShanghaiDateTime } from '../../lib/datetime';
 import {
   DEFAULT_SHARE_DESC,
@@ -154,9 +156,14 @@ export default function StoreDetailPage() {
   const [loading, setLoading] = useState(true);
   const [loadError, setLoadError] = useState('');
   const [headerSolid, setHeaderSolid] = useState(false);
+  const [activePackageIndex, setActivePackageIndex] = useState(0);
   const storeRef = useRef<Store | null>(null);
   storeRef.current = store;
 
+  useEffect(() => {
+    setActivePackageIndex(0);
+  }, [store?.id]);
+
   usePageScroll(({ scrollTop }) => {
     setHeaderSolid(scrollTop > 100);
   });
@@ -271,6 +278,7 @@ export default function StoreDetailPage() {
       toast('暂无门店电话');
       return;
     }
+    track('store_phone_call', { storeId: store.id });
     Taro.makePhoneCall({ phoneNumber: store.phone }).catch(() => toast('无法拨打电话'));
   }
 
@@ -317,6 +325,8 @@ export default function StoreDetailPage() {
 
   const envPhotos = envPhotoUrls(store);
   const heroImages = uniqueUrls([store.coverUrl, ...(store.carouselUrls || [])]);
+  const packages = store.packages ?? [];
+  const activePackage = packages[activePackageIndex] ?? packages[0];
 
   const intro = store.intro?.trim() || '';
   const benefitRuleRaw = store.benefitUsageRule?.trim() || '';
@@ -374,7 +384,9 @@ export default function StoreDetailPage() {
 
         {store.phone ? (
           <View className="store-detail-row">
-            <Text className="store-detail-meta store-detail-meta--flex">电话: {store.phone}</Text>
+            <Text className="store-detail-meta store-detail-meta--flex">
+              电话: {maskPhone(store.phone)}
+            </Text>
             <Text className="store-detail-action" onClick={callStore}>
               拨打
             </Text>
@@ -396,26 +408,49 @@ export default function StoreDetailPage() {
         </View>
       ) : null}
 
-      {store.packages && store.packages.length > 0 ? (
-        <View className="store-detail-section">
+      {packages.length > 0 && activePackage ? (
+        <View className="store-detail-section store-detail-section--packages">
           <Text className="store-detail-section-title">门店套餐</Text>
-          {store.packages.map((pkg, index) => (
-            <View key={`${pkg.name}-${index}`} className="store-detail-package-card">
-              {pkg.imageUrl ? (
-                <Image className="store-detail-package-img" src={pkg.imageUrl} mode="aspectFill" />
+          {packages.length > 1 ? (
+            <ScrollView className="store-detail-package-tabs" scrollX showScrollbar={false} enhanced>
+              <View className="store-detail-package-tabs-inner">
+                {packages.map((pkg, index) => (
+                  <View
+                    key={`${pkg.name}-${index}`}
+                    className={`store-detail-package-tab${
+                      index === activePackageIndex ? ' store-detail-package-tab--active' : ''
+                    }`}
+                    onClick={() => setActivePackageIndex(index)}
+                  >
+                    <Text className="store-detail-package-tab-text">{pkg.name}</Text>
+                  </View>
+                ))}
+              </View>
+            </ScrollView>
+          ) : null}
+          <View className="store-detail-package-panel">
+            {activePackage.imageUrl ? (
+              <Image
+                className="store-detail-package-thumb"
+                src={activePackage.imageUrl}
+                mode="aspectFill"
+              />
+            ) : null}
+            <View className="store-detail-package-panel-body">
+              {packages.length === 1 ? (
+                <Text className="store-detail-package-name">{activePackage.name}</Text>
               ) : null}
-              <Text className="store-detail-package-name">{pkg.name}</Text>
               <Text className="store-detail-package-body">
-                {formatRedeemAmountYuan(pkg.price)} 元 · {pkg.dishes}
+                {formatRedeemAmountYuan(activePackage.price)} 元 · {activePackage.dishes}
               </Text>
-              {pkg.usableTime ? (
-                <Text className="store-detail-package-meta">使用时间：{pkg.usableTime}</Text>
+              {activePackage.usableTime ? (
+                <Text className="store-detail-package-meta">使用时间：{activePackage.usableTime}</Text>
               ) : null}
-              {pkg.otherNotes ? (
-                <Text className="store-detail-package-meta">说明：{pkg.otherNotes}</Text>
+              {activePackage.otherNotes ? (
+                <Text className="store-detail-package-meta">说明：{activePackage.otherNotes}</Text>
               ) : null}
             </View>
-          ))}
+          </View>
         </View>
       ) : null}
 

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

@@ -343,11 +343,10 @@ export default function StoresPage() {
   }
 
   function formatHours(store: Store) {
-    // 列表只展示第一段营业时间，避免挤占一行
-    if (store.openTime && store.closeTime) {
-      return `营业时间: ${store.openTime}-${store.closeTime}`;
-    }
-    return '营业时间: 10:00-22:00';
+    const parts: string[] = [];
+    if (store.openTime && store.closeTime) parts.push(`${store.openTime}-${store.closeTime}`);
+    if (store.openTime2 && store.closeTime2) parts.push(`${store.openTime2}-${store.closeTime2}`);
+    return parts.length ? `营业时间: ${parts.join('，')}` : '营业时间: 10:00-22:00';
   }
 
   function formatStatus(store: Store) {
@@ -447,12 +446,10 @@ export default function StoresPage() {
                     {formatDistanceMeters(s.distanceMeters)}
                   </Text>
                 </View>
-                {/* 第2行：状态 + 营业时间（仅第一段） */}
+                {/* 第2行：状态 + 营业时间（含第二段） */}
                 <View className="store-card-row store-card-row--meta">
                   <Text className="store-card-status">{formatStatus(s)}</Text>
-                  <Text className="store-card-hours" numberOfLines={1}>
-                    {formatHours(s)}
-                  </Text>
+                  <Text className="store-card-hours">{formatHours(s)}</Text>
                 </View>
                 {/* 第3行：地址 + 去核销 */}
                 <View className="store-card-row store-card-row--foot">

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

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

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

@@ -10,8 +10,9 @@
 .store-detail-carousel-wrap {
   position: relative;
   width: 100%;
-  height: 280px;
+  aspect-ratio: 4 / 3;
   overflow: hidden;
+  background: var(--color-surface-container);
 }
 
 .store-detail-carousel {
@@ -26,6 +27,11 @@
   height: 100%;
 }
 
+.store-detail-carousel-image {
+  object-fit: cover;
+  display: block;
+}
+
 .store-detail-carousel-placeholder {
   background: var(--color-surface-container);
 }
@@ -236,41 +242,102 @@
   margin-right: 0;
 }
 
-.store-detail-package-card {
-  padding: 12px 0;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+.store-detail-section--packages {
+  overflow: hidden;
 }
 
-.store-detail-package-img {
+.store-detail-package-tabs {
   width: 100%;
-  height: 160px;
-  border-radius: var(--radius-md, 8px);
-  margin-bottom: 8px;
-  display: block;
+  margin-bottom: 10px;
+  white-space: nowrap;
 }
 
-.store-detail-package-card:last-of-type {
-  border-bottom: none;
+.store-detail-package-tabs-inner {
+  display: inline-flex;
+  flex-wrap: nowrap;
+  gap: 8px;
+  padding: 2px 0;
+}
+
+.store-detail-package-tab {
+  display: inline-flex;
+  align-items: center;
+  flex-shrink: 0;
+  max-width: 132px;
+  padding: 6px 12px;
+  border-radius: 999px;
+  background: rgba(0, 0, 0, 0.04);
+  box-sizing: border-box;
+}
+
+.store-detail-package-tab--active {
+  background: rgba(166, 29, 36, 0.1);
+}
+
+.store-detail-package-tab-text {
+  font-size: 12px;
+  line-height: 18px;
+  color: var(--color-text-secondary, #666);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.store-detail-package-tab--active .store-detail-package-tab-text {
+  color: var(--color-heritage-red, #a61d24);
+  font-weight: 600;
+}
+
+.store-detail-package-panel {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+  padding: 10px;
+  border-radius: var(--radius-md, 8px);
+  background: var(--color-surface-container, #f7f7f7);
+  box-sizing: border-box;
+}
+
+.store-detail-package-thumb {
+  width: 72px;
+  height: 72px;
+  border-radius: 6px;
+  flex-shrink: 0;
+  background: rgba(0, 0, 0, 0.04);
+}
+
+.store-detail-package-panel-body {
+  flex: 1;
+  min-width: 0;
+}
+
+.store-detail-package-body,
+.store-detail-package-meta {
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
 }
 
 .store-detail-package-name {
   display: block;
-  font-size: 16px;
+  font-size: 15px;
   font-weight: 700;
   color: var(--color-text-primary, #1a1a1a);
-  margin-bottom: 6px;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .store-detail-package-body {
-  display: block;
-  font-size: 14px;
+  font-size: 13px;
   color: var(--color-text-secondary, #666);
-  line-height: 1.5;
+  line-height: 1.45;
 }
 
 .store-detail-package-meta {
-  display: block;
-  font-size: 13px;
+  font-size: 12px;
   color: var(--color-text-tertiary, #999);
   margin-top: 4px;
 }

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

@@ -218,15 +218,17 @@
   white-space: nowrap;
 }
 
-/* 第2行：营业状态 + 营业时间（单行） */
+/* 第2行：营业状态 + 营业时间（可含两段） */
 .store-card-row--meta {
   gap: 6px;
-  height: 20px;
+  min-height: 20px;
+  align-items: flex-start;
 }
 
 .store-card-status {
   flex-shrink: 0;
   padding: 0 6px;
+  margin-top: 1px;
   border-radius: 4px;
   background: rgba(45, 106, 79, 0.12);
   color: #2d6a4f;
@@ -241,11 +243,8 @@
   min-width: 0;
   font-size: 11px;
   font-weight: 400;
-  line-height: 20px;
+  line-height: 16px;
   color: #999;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 /* 第3行：地址（单行截断）+ 右对齐去核销 */

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

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

packages/domain/src/support-ticket.ts

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

packages/shared-types/src/promo.ts

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

packages/shared-types/src/settlement.ts

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

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

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

packages/shared-types/src/ticket.ts

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

packages/shared-types/src/trade.ts

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

packages/shared-types/src/wechat.ts

@@ -48,6 +48,8 @@ export type ClientRuntimeConfig = {
     banners: string[];
     footerUrl: string | null;
   };
+  /** 小程序最低兼容版本（semver，如 3.4.13）；客户端低于此值时提示更新 */
+  minClientVersion?: string | null;
 };
 
 /** 是否展示微信授权入口 */

packages/shared-ui/package.json

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

packages/shared-ui/src/compressImage.ts

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

packages/weixin-sdk/src/index.ts

@@ -1,4 +1,4 @@
-export { isWechatBrowser, isMiniProgram, getRuntimePlatform } from './env';
+export { isWechatBrowser, isMiniProgram, getRuntimePlatform, isIosDevice, isWechatDevTools } from './env';
 export { getRouterBasename, toAppPath, isOnAppPath } from './app-path';
 export {
   initWechatJssdk,
@@ -10,7 +10,7 @@ export {
   resetJssdkConfig,
   stripOAuthParamsFromLocation,
 } from './jssdk';
-export { formatScanFailMessage } from './scan';
+export { formatScanFailMessage, isScanPermissionWarmupError } from './scan';
 export {
   getWechatLocation,
   getWechatLocationDetailed,

packages/weixin-sdk/src/scan.ts

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

pnpm-lock.yaml

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

server/dukang-api/prisma/schema.prisma

@@ -107,6 +107,14 @@ enum SupportTicketStatus {
   DEVELOPING
   TESTING
   PASSED
+  PUBLISHED
+}
+
+enum SupportTicketPriority {
+  LOW
+  NORMAL
+  HIGH
+  URGENT
 }
 
 enum DevPlanTaskType {
@@ -174,6 +182,13 @@ enum PromoCodeScene {
   OTHER
 }
 
+enum PromoMetricEventType {
+  SCAN
+  ATTRIBUTION
+  REGISTER
+  ORDER
+}
+
 enum CityStatus {
   PENDING
   ACTIVE
@@ -646,6 +661,7 @@ model CommonSupportTicket {
   ticketNo     String               @unique @map("ticket_no") @db.VarChar(32)
   ticketType   SupportTicketType    @map("ticket_type")
   status       SupportTicketStatus  @default(PENDING_REVIEW)
+  priority     SupportTicketPriority @default(NORMAL) @map("priority")
   title        String               @db.VarChar(128)
   content      String?              @db.Text
   rejectReason String?              @map("reject_reason") @db.VarChar(512)
@@ -656,6 +672,8 @@ model CommonSupportTicket {
   reviewedAt   DateTime?            @map("reviewed_at") @db.DateTime(3)
   remark       String?              @db.VarChar(512)
   attachmentUrls Json?              @map("attachment_urls")
+  releasedVersionNo String?         @map("released_version_no") @db.VarChar(32)
+  publishedAt  DateTime?            @map("published_at") @db.DateTime(3)
   createdAt    DateTime             @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt    DateTime             @updatedAt @map("updated_at") @db.DateTime(3)
   completedAt  DateTime?            @map("completed_at") @db.DateTime(3)
@@ -663,6 +681,7 @@ model CommonSupportTicket {
   @@index([status, createdAt])
   @@index([ticketType, status])
   @@index([creatorId])
+  @@index([releasedVersionNo])
   @@map("common_support_ticket")
 
   devPlanTasks DevPlanTask[]
@@ -848,6 +867,7 @@ model CommonPromoCode {
   qrcodeResource CommonResource?        @relation("PromoQrcode", fields: [qrcodeResourceId], references: [id], onDelete: SetNull)
   attributions   UserPromoAttribution[]
   orders         Order[]
+  metricEvents   LogPromoEvent[]
 
   @@index([ownerUserId])
   @@index([scene, status])
@@ -1751,6 +1771,25 @@ model LogThirdParty {
   @@map("log_third_party")
 }
 
+model LogPromoEvent {
+  id          BigInt               @id @default(autoincrement()) @db.UnsignedBigInt
+  promoCodeId BigInt               @map("promo_code_id") @db.UnsignedBigInt
+  eventType   PromoMetricEventType @map("event_type")
+  userId      BigInt?              @map("user_id") @db.UnsignedBigInt
+  orderId     BigInt?              @map("order_id") @db.UnsignedBigInt
+  sessionId   String?              @map("session_id") @db.VarChar(64)
+  clientIp    String?              @map("client_ip") @db.VarChar(45)
+  ipProvince  String?              @map("ip_province") @db.VarChar(32)
+  ipCity      String?              @map("ip_city") @db.VarChar(32)
+  createdAt   DateTime             @default(now()) @map("created_at") @db.DateTime(3)
+
+  promoCode CommonPromoCode @relation(fields: [promoCodeId], references: [id], onDelete: Cascade)
+
+  @@index([promoCodeId, eventType, createdAt])
+  @@index([createdAt])
+  @@map("log_promo_event")
+}
+
 model LogUserAnalytics {
   id         BigInt     @id @default(autoincrement()) @db.UnsignedBigInt
   userId     BigInt?    @map("user_id") @db.UnsignedBigInt

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

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

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

@@ -0,0 +1,104 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaService } from '../common/prisma/prisma.module';
+import { CourierService } from '../integrations/courier/courier.service';
+import { XiaofeixiaProvider } from '../integrations/courier/xiaofeixia/xiaofeixia.provider';
+import { logCourierCall } from '../integrations/courier/courier-log.util';
+import { TradeService } from '../modules/trade/trade.service';
+
+const XFX_PROVIDER_ALIASES = new Set(['xfx', 'xiaofeixia']);
+
+@Injectable()
+export class DeliveryCallbackService {
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly courier: CourierService,
+    private readonly xiaofeixiaProvider: XiaofeixiaProvider,
+    private readonly tradeService: TradeService,
+  ) {}
+
+  async handleTrackCallback(providerKey: string, body: unknown, requestUrl: string) {
+    const normalized = providerKey.trim().toLowerCase();
+    const baseLog = {
+      scene: 'TRACK_CALLBACK',
+      requestUrl,
+      requestBody: (body && typeof body === 'object' ? body : { value: body }) as Record<
+        string,
+        unknown
+      >,
+    };
+
+    if (!XFX_PROVIDER_ALIASES.has(normalized) && normalized !== 'logistics') {
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        status: 'FAILED',
+        errorMessage: `不支持的承运商: ${providerKey}`,
+      });
+      return this.courier.buildTrackCallbackResponse(false);
+    }
+
+    if (normalized === 'logistics') {
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        status: 'SUCCESS',
+        errorMessage: '跨城物流回调暂未接入，已记录',
+      });
+      return this.courier.buildTrackCallbackResponse(true);
+    }
+
+    const payload = this.xiaofeixiaProvider.parseTrackCallback(body);
+    if (!payload) {
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        status: 'FAILED',
+        errorMessage: '回调体解析失败',
+      });
+      return this.courier.buildTrackCallbackResponse(false);
+    }
+
+    const order = payload.outNumber
+      ? await this.prisma.order.findUnique({ where: { orderNo: payload.outNumber } })
+      : payload.trackingNumber
+        ? await this.prisma.order.findFirst({
+            where: { delivery: { trackingNo: payload.trackingNumber } },
+          })
+        : null;
+
+    if (!order) {
+      await logCourierCall(this.prisma, {
+        ...baseLog,
+        status: 'FAILED',
+        errorMessage: '订单不存在',
+        externalNo: payload.outNumber || payload.trackingNumber,
+      });
+      return this.courier.buildTrackCallbackResponse(false);
+    }
+
+    const targetStatus = this.xiaofeixiaProvider.mapTrackStatus(
+      payload.status,
+      payload.statusName,
+    );
+    let applied = false;
+    if (targetStatus && targetStatus !== order.status) {
+      await this.tradeService.applyStatusTransition(
+        order.id,
+        order.status,
+        targetStatus,
+        'COURIER_TRACK_CALLBACK',
+        payload.trackInfo || payload.statusName,
+      );
+      applied = true;
+    }
+
+    const response = this.courier.buildTrackCallbackResponse(true);
+    await logCourierCall(this.prisma, {
+      ...baseLog,
+      responseBody: response,
+      status: 'SUCCESS',
+      externalNo: order.orderNo,
+      ref: { refType: 'ORDER', refId: order.id },
+      errorMessage: applied ? undefined : '状态未变更',
+    });
+
+    return response;
+  }
+}

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

@@ -1,71 +1,27 @@
-import { Body, Controller, Post } from '@nestjs/common';
-import { TradeService } from '../modules/trade/trade.service';
-import { CourierService } from '../integrations/courier/courier.service';
-import { PrismaService } from '../common/prisma/prisma.module';
-import { logCourierCall } from '../integrations/courier/courier-log.util';
+import { Body, Controller, Param, Post } from '@nestjs/common';
+import { DeliveryCallbackService } from './delivery-callback.service';
 
-@Controller('callbacks/delivery')
+@Controller('callbacks')
 export class DeliveryCallbackController {
-  constructor(
-    private readonly tradeService: TradeService,
-    private readonly courier: CourierService,
-    private readonly prisma: PrismaService,
-  ) {}
+  constructor(private readonly deliveryCallbackService: DeliveryCallbackService) {}
 
-  @Post('track')
-  async track(@Body() body: { orderNo?: string; orderId?: string; status?: string }) {
-    const baseLog = {
-      scene: 'TRACK_CALLBACK',
-      requestUrl: '/api/v1/callbacks/delivery/track',
-      requestBody: body as Record<string, unknown>,
-    };
+  /** 小飞侠/物流路由变化回调（适配器入口） */
+  @Post('courier/:provider/track')
+  trackByProvider(@Param('provider') provider: string, @Body() body: unknown) {
+    return this.deliveryCallbackService.handleTrackCallback(
+      provider,
+      body,
+      `/api/v1/callbacks/courier/${provider}/track`,
+    );
+  }
 
-    if (!body.orderId && !body.orderNo) {
-      await logCourierCall(this.prisma, {
-        ...baseLog,
-        status: 'FAILED',
-        errorMessage: '缺少 orderId / orderNo',
-      });
-      return this.courier.buildTrackCallbackResponse(false);
-    }
-
-    const order = body.orderId
-      ? await this.prisma.order.findUnique({ where: { id: BigInt(body.orderId) } })
-      : await this.prisma.order.findUnique({ where: { orderNo: body.orderNo! } });
-
-    if (!order) {
-      await logCourierCall(this.prisma, {
-        ...baseLog,
-        status: 'FAILED',
-        errorMessage: '订单不存在',
-        externalNo: body.orderNo,
-      });
-      return this.courier.buildTrackCallbackResponse(false);
-    }
-
-    const statusMap: Record<string, string> = {
-      SHIPPED: 'SHIPPING',
-      OUT_WAREHOUSE: 'OUT_WAREHOUSE',
-      DELIVERED: 'COMPLETED',
-      COMPLETED: 'COMPLETED',
-    };
-    const target = statusMap[body.status ?? ''] ?? body.status;
-    let applied = false;
-    if (target && target !== order.status) {
-      await this.tradeService.applyStatusTransition(order.id, order.status, target, 'DELIVERY_CALLBACK');
-      applied = true;
-    }
-
-    const response = this.courier.buildTrackCallbackResponse(true);
-    await logCourierCall(this.prisma, {
-      ...baseLog,
-      responseBody: response,
-      status: 'SUCCESS',
-      externalNo: order.orderNo,
-      ref: { refType: 'ORDER', refId: order.id },
-      errorMessage: applied ? undefined : '状态未变更',
-    });
-
-    return response;
+  /** 兼容旧路径，默认按小飞侠解析 */
+  @Post('delivery/track')
+  trackLegacy(@Body() body: unknown) {
+    return this.deliveryCallbackService.handleTrackCallback(
+      'xfx',
+      body,
+      '/api/v1/callbacks/delivery/track',
+    );
   }
 }

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

@@ -116,6 +116,15 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
     requiresRestart: false,
     description: '小程序商品首页底部 footer，建议比例 15:4；上传后需点击右上角「保存」',
   },
+  {
+    key: 'MINI_USER_MIN_VERSION',
+    label: '小程序最低版本',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: '3.4.13',
+    description: 'semver 格式；客户端低于此版本时提示更新',
+  },
 
   { key: 'OSS_ACCESS_KEY_ID', label: 'OSS AccessKey ID', group: G.oss, type: 'password', secret: true, requiresRestart: true },
   { key: 'OSS_ACCESS_KEY_SECRET', label: 'OSS AccessKey Secret', group: G.oss, type: 'password', secret: true, requiresRestart: true },

server/dukang-api/src/integrations/courier/courier-log.util.ts

@@ -9,6 +9,7 @@ const CMD_SCENE: Record<string, string> = {
   [XIAOFEIXIA_CMD.ESTIMATE_FREIGHT]: 'ESTIMATE_FREIGHT',
   [XIAOFEIXIA_CMD.BATCH_GET_ORDER]: 'BATCH_GET_SHIPMENT',
   [XIAOFEIXIA_CMD.DELIVERY_COVERAGE]: 'CHECK_COVERAGE',
+  [XIAOFEIXIA_CMD.SIGN_PHOTOS]: 'GET_SIGN_PHOTOS',
 };
 
 export type CourierLogRef = {

server/dukang-api/src/integrations/courier/courier.module.ts

@@ -29,6 +29,6 @@ import type { ICourierProvider } from './courier.types';
     },
     CourierService,
   ],
-  exports: [CourierService, CourierConfigService, COURIER_PROVIDER],
+  exports: [CourierService, CourierConfigService, COURIER_PROVIDER, XiaofeixiaProvider],
 })
 export class CourierModule {}

server/dukang-api/src/integrations/courier/courier.service.ts

@@ -12,6 +12,8 @@ import type {
   ShipmentQuery,
   TrackCallbackResponse,
   TrackNode,
+  TrackCallbackPayload,
+  CourierMappedOrderStatus,
 } from './courier.types';
 
 /**
@@ -45,6 +47,10 @@ export class CourierService {
     return this.provider.getTrack(query, options);
   }
 
+  getSignPhotos(query: ShipmentQuery, options?: CourierCallOptions): Promise<string[]> {
+    return this.provider.getSignPhotos(query, options);
+  }
+
   checkDeliveryCoverage(toAddress: string, options?: CourierCallOptions): Promise<DeliveryCoverageResult> {
     return this.provider.checkDeliveryCoverage(toAddress, options);
   }
@@ -56,4 +62,12 @@ export class CourierService {
   buildTrackCallbackResponse(success?: boolean): TrackCallbackResponse {
     return this.provider.buildTrackCallbackResponse(success);
   }
+
+  parseTrackCallback(body: unknown): TrackCallbackPayload | null {
+    return this.provider.parseTrackCallback(body);
+  }
+
+  mapTrackStatus(status: string, statusName?: string): CourierMappedOrderStatus | null {
+    return this.provider.mapTrackStatus(status, statusName);
+  }
 }

server/dukang-api/src/integrations/courier/courier.types.ts

@@ -109,6 +109,13 @@ export interface TrackCallbackResponse {
   message: string;
 }
 
+/** 承运商路由回调映射后的订单履约状态 */
+export type CourierMappedOrderStatus =
+  | 'OUT_WAREHOUSE'
+  | 'SHIPPING'
+  | 'PENDING_RECEIVE'
+  | 'COMPLETED';
+
 export interface ICourierProvider {
   readonly code: CourierProviderCode;
 
@@ -117,7 +124,10 @@ export interface ICourierProvider {
   getShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail>;
   batchGetShipments(query: BatchShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail[]>;
   getTrack(query: ShipmentQuery, options?: CourierCallOptions): Promise<TrackNode[]>;
+  getSignPhotos(query: ShipmentQuery, options?: CourierCallOptions): Promise<string[]>;
   checkDeliveryCoverage(toAddress: string, options?: CourierCallOptions): Promise<DeliveryCoverageResult>;
   estimateFreight(weight: number, options?: CourierCallOptions): Promise<FreightEstimateResult>;
+  parseTrackCallback(body: unknown): TrackCallbackPayload | null;
+  mapTrackStatus(status: string, statusName?: string): CourierMappedOrderStatus | null;
   buildTrackCallbackResponse(success?: boolean): TrackCallbackResponse;
 }

server/dukang-api/src/integrations/courier/xiaofeixia/xiaofeixia.constants.ts

@@ -6,6 +6,7 @@ export const XIAOFEIXIA_CMD = {
   GET_ORDER: '100104',
   ESTIMATE_FREIGHT: '100105',
   BATCH_GET_ORDER: '100106',
+  SIGN_PHOTOS: '100108',
   DELIVERY_COVERAGE: '100301',
 } as const;
 

server/dukang-api/src/integrations/courier/xiaofeixia/xiaofeixia.provider.ts

@@ -12,7 +12,9 @@ import type {
   ShipmentDetail,
   ShipmentQuery,
   TrackCallbackResponse,
+  TrackCallbackPayload,
   TrackNode,
+  CourierMappedOrderStatus,
 } from '../courier.types';
 import { XiaofeixiaClient } from './xiaofeixia.client';
 import { XIAOFEIXIA_CMD } from './xiaofeixia.constants';
@@ -121,6 +123,59 @@ export class XiaofeixiaProvider implements ICourierProvider {
     return data ?? [];
   }
 
+  async getSignPhotos(query: ShipmentQuery, options?: CourierCallOptions): Promise<string[]> {
+    this.assertShipmentQuery(query);
+    const data = await this.client.request<string[]>(
+      XIAOFEIXIA_CMD.SIGN_PHOTOS,
+      {
+        number: query.trackingNumber,
+        outNumber: query.outNumber,
+      },
+      options?.xiaofeixia,
+    );
+    return (data ?? []).filter((item) => typeof item === 'string' && item.trim().length > 0);
+  }
+
+  parseTrackCallback(body: unknown): TrackCallbackPayload | null {
+    if (!body || typeof body !== 'object') return null;
+    const raw = body as Record<string, unknown>;
+    const outNumber = String(raw.outNumber ?? '').trim();
+    const trackingNumber = String(raw.number ?? raw.trackingNumber ?? '').trim();
+    const status = String(raw.status ?? '').trim();
+    const statusName = String(raw.statusName ?? '').trim();
+    const trackInfo = String(raw.trackInfo ?? '').trim();
+    const createTime = String(raw.createTime ?? '').trim();
+    if (!outNumber && !trackingNumber) return null;
+    if (!status && !trackInfo) return null;
+    return {
+      outNumber,
+      trackingNumber,
+      status,
+      statusName,
+      trackInfo,
+      createTime,
+    };
+  }
+
+  mapTrackStatus(status: string, statusName?: string): CourierMappedOrderStatus | null {
+    const name = (statusName || '').trim();
+    if (status === '5' || /签收/.test(name)) {
+      return 'COMPLETED';
+    }
+    switch (String(status).trim()) {
+      case '1':
+        return 'OUT_WAREHOUSE';
+      case '2':
+      case '3':
+      case '4':
+        return 'SHIPPING';
+      case '7':
+        return null;
+      default:
+        return null;
+    }
+  }
+
   async checkDeliveryCoverage(toAddress: string, options?: CourierCallOptions): Promise<DeliveryCoverageResult> {
     const data = await this.client.request<XiaofeixiaDeliveryCoverageData>(
       XIAOFEIXIA_CMD.DELIVERY_COVERAGE,

server/dukang-api/src/jobs/settlement.scheduler.ts

@@ -5,7 +5,7 @@ import { AlertService } from '../common/alert/alert.service';
 
 /**
  * 财务对账单定时任务（Asia/Shanghai）
- * - 每日 08:00：酒厂日账单 + 门店日账单（统计昨日 00:00～今日 00:00）
+ * - 每日 08:00：酒厂日账单（T+3：3 天前已完成订单）+ 门店日账单（昨日核销）
  * - 每月 1 日 08:00：合伙人上一自然月账单 + 物流承运商上一自然月对账
  * - 工作日 18:05：门店提现 T+0 审完预警（FIN-003）
  */

server/dukang-api/src/modules/analytics/analytics.controller.ts

@@ -1,6 +1,8 @@
-import { BadRequestException, Body, Controller, Post, UseGuards } from '@nestjs/common';
+import { BadRequestException, Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
+import type { Request } from 'express';
 import { AnalyticsService } from './analytics.service';
 import { PromoCodeService } from '../promo/promo-code.service';
+import { extractClientIp } from '../../common/geo/client-ip.util';
 import { JwtAuthGuard, AuthUser } from '../../common/guards/jwt-auth.guard';
 import { OptionalJwtAuthGuard } from '../../common/guards/optional-jwt-auth.guard';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
@@ -66,8 +68,13 @@ export class PromoController {
 
   @Post('touch')
   @UseGuards(OptionalJwtAuthGuard)
-  async touch(@CurrentUser() user: AuthUser | undefined, @Body() dto: PromoTouchDto) {
+  async touch(
+    @CurrentUser() user: AuthUser | undefined,
+    @Body() dto: PromoTouchDto,
+    @Req() req: Request,
+  ) {
     const userId = user?.actorType === ActorType.USER ? user.actorId : undefined;
+    const clientIp = extractClientIp(req) ?? undefined;
     const result = await this.promoCodeService.touch(
       {
         promoCode: dto.promoCode,
@@ -76,6 +83,7 @@ export class PromoController {
         countScan: dto.countScan,
       },
       userId,
+      { clientIp, sessionId: dto.sessionId },
     );
 
     void this.analyticsService.trackBatchOptional(

server/dukang-api/src/modules/common/client-config.controller.ts

@@ -11,6 +11,7 @@ export class ClientConfigController {
     const cfg = this.systemConfig.getAppConfig();
     const env = this.systemConfig.getMergedEnv();
     const footer = (env.MINI_HOME_FOOTER_URL ?? '').trim();
+    const minClientVersion = (env.MINI_USER_MIN_VERSION ?? '').trim() || null;
     return {
       mockPay: cfg.mockPay,
       wechatPayEnabled: cfg.wechatPayEnabled,
@@ -19,6 +20,7 @@ export class ClientConfigController {
       wxAuthorize: cfg.wxAuthorize,
       /** 可选暴露；选点已改为服务端 /common/lbs，前端可不依赖此字段 */
       tencentLbsKey: cfg.tencentLbsKey || undefined,
+      minClientVersion,
       miniHome: {
         banners: parseMiniHomeBanners(env.MINI_HOME_BANNERS),
         footerUrl: footer || null,

server/dukang-api/src/modules/common/dto/support-ticket.dto.ts

@@ -11,6 +11,10 @@ export class SupportTicketListQueryDto {
   @IsIn(['PENDING_REVIEW', 'REJECTED', 'DEVELOPING', 'TESTING', 'PASSED'])
   status?: string;
 
+  @IsOptional()
+  @IsIn(['LOW', 'NORMAL', 'HIGH', 'URGENT'])
+  priority?: string;
+
   @IsOptional()
   @Type(() => Number)
   @IsInt()
@@ -46,6 +50,10 @@ export class CreateSupportTicketDto {
   @IsArray()
   @IsString({ each: true })
   attachmentUrls?: string[];
+
+  @IsOptional()
+  @IsIn(['LOW', 'NORMAL', 'HIGH', 'URGENT'])
+  priority?: string;
 }
 
 export class UpdateSupportTicketDto {
@@ -72,6 +80,10 @@ export class UpdateSupportTicketDto {
   @IsArray()
   @IsString({ each: true })
   attachmentUrls?: string[];
+
+  @IsOptional()
+  @IsIn(['LOW', 'NORMAL', 'HIGH', 'URGENT'])
+  priority?: string;
 }
 
 export class BatchUpdateSupportTicketStatusDto {

server/dukang-api/src/modules/common/support-ticket.service.ts

@@ -3,7 +3,7 @@ import {
   Injectable,
   NotFoundException,
 } from '@nestjs/common';
-import type { SupportTicketStatus, SupportTicketType } from '@prisma/client';
+import type { SupportTicketStatus, SupportTicketType, SupportTicketPriority } from '@prisma/client';
 import { Prisma } from '@prisma/client';
 import type { CreateDevPlanTaskFromTicketInput } from '@dukang/shared-types';
 import { mapSupportTicketTypeToDevPlanTask } from '@dukang/shared-types';
@@ -68,6 +68,7 @@ export class SupportTicketService {
         title: dto.title.trim(),
         content: dto.content?.trim() || null,
         remark: dto.remark?.trim() || null,
+        priority: (dto.priority as SupportTicketPriority | undefined) ?? 'NORMAL',
         attachmentUrls: dto.attachmentUrls?.length
           ? (dto.attachmentUrls.map((u) => u.trim()).filter(Boolean) as unknown as Prisma.InputJsonValue)
           : undefined,
@@ -178,6 +179,7 @@ export class SupportTicketService {
       const urls = dto.attachmentUrls.map((u) => u.trim()).filter(Boolean);
       data.attachmentUrls = urls.length ? (urls as unknown as Prisma.InputJsonValue) : Prisma.JsonNull;
     }
+    if (dto.priority != null) data.priority = dto.priority as SupportTicketPriority;
     const updated = await this.prisma.commonSupportTicket.update({ where: { id }, data });
     return serializeBigInt(mapSupportTicketRow(updated));
   }
@@ -247,6 +249,9 @@ export class SupportTicketService {
     if (query.status) {
       where.status = query.status as SupportTicketStatus;
     }
+    if (query.priority) {
+      where.priority = query.priority as SupportTicketPriority;
+    }
 
     const [items, total] = await Promise.all([
       this.prisma.commonSupportTicket.findMany({

server/dukang-api/src/modules/dev-plan/dev-plan.service.ts

@@ -671,6 +671,10 @@ export class DevPlanService {
 
     }
 
+    if (status === 'RELEASED') {
+      await this.cascadeVersionReleased(row.id, row.versionNo);
+    }
+
     return this.getVersion(row.id);
 
   }
@@ -739,6 +743,14 @@ export class DevPlanService {
 
     await this.prisma.devPlanVersion.update({ where: { id }, data });
 
+    if (
+      dto.status === 'RELEASED' &&
+      existing.status !== 'RELEASED'
+    ) {
+      const versionNo = (dto.versionNo ?? existing.versionNo).trim();
+      await this.cascadeVersionReleased(id, versionNo);
+    }
+
     if (dto.taskIds != null) await this.replaceVersionTasks(id, dto.taskIds);
 
     return this.getVersion(id);
@@ -775,6 +787,46 @@ export class DevPlanService {
 
   }
 
+  private async cascadeVersionReleased(versionId: bigint, versionNo: string) {
+    const links = await this.prisma.devPlanVersionTask.findMany({
+      where: { versionId },
+      select: { taskId: true },
+    });
+    if (!links.length) return;
+
+    const taskIds = links.map((l) => l.taskId);
+    const now = new Date();
+
+    await this.prisma.$transaction(async (tx) => {
+      await tx.devPlanTask.updateMany({
+        where: { id: { in: taskIds }, status: { not: 'RELEASED' } },
+        data: { status: 'RELEASED', completedAt: now },
+      });
+
+      const tasks = await tx.devPlanTask.findMany({
+        where: { id: { in: taskIds }, supportTicketId: { not: null } },
+        select: { supportTicketId: true },
+      });
+      const ticketIds = [
+        ...new Set(
+          tasks
+            .map((t) => t.supportTicketId)
+            .filter((id): id is bigint => id != null),
+        ),
+      ];
+      if (!ticketIds.length) return;
+
+      await tx.commonSupportTicket.updateMany({
+        where: { id: { in: ticketIds }, status: { not: 'REJECTED' } },
+        data: {
+          status: 'PUBLISHED',
+          releasedVersionNo: versionNo,
+          publishedAt: now,
+        },
+      });
+    });
+  }
+
   private async addVersionTasks(versionId: bigint, taskIds: string[]) {
 
     if (!taskIds.length) return;

server/dukang-api/src/modules/fulfillment/fulfillment.service.ts

@@ -9,8 +9,10 @@ import {
 } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { CourierService } from '../../integrations/courier/courier.service';
-import { CourierPayMode } from '../../integrations/courier/courier.types';
+import { CourierPayMode, type TrackNode } from '../../integrations/courier/courier.types';
 import type { XiaofeixiaConfig } from '../../integrations/courier/courier.config';
+import { OSS_PROVIDER } from '../../integrations/integrations.constants';
+import type { IOssProvider } from '../../integrations/oss/oss.interface';
 import { TradeService } from '../trade/trade.service';
 import { FulfillmentProviderService } from './fulfillment-provider.service';
 
@@ -32,6 +34,7 @@ export class FulfillmentService {
     private readonly prisma: PrismaService,
     private readonly courier: CourierService,
     private readonly fulfillmentProviderService: FulfillmentProviderService,
+    @Inject(OSS_PROVIDER) private readonly oss: IOssProvider,
     @Inject(forwardRef(() => TradeService))
     private readonly tradeService: TradeService,
   ) {}
@@ -246,13 +249,30 @@ export class FulfillmentService {
   async getOrderTrack(orderId: bigint) {
     const order = await this.prisma.order.findUnique({
       where: { id: orderId },
-      include: { delivery: true },
+      include: {
+        delivery: {
+          include: { signPhotoResource: true },
+        },
+      },
     });
+    const base = {
+      nodes: [] as TrackNode[],
+      signPhotoUrls: [] as string[],
+      estimatedArrival: null as { arriveTime: string; siteName?: string } | null,
+      manualQueryUrl: order?.delivery?.manualQueryUrl ?? null,
+      provider: order?.delivery?.provider,
+      trackingNo: order?.delivery?.trackingNo ?? null,
+      logisticsCompany: order?.delivery?.logisticsCompany ?? null,
+    };
     if (!order?.delivery) {
-      return { nodes: [], manualQueryUrl: null };
+      return base;
     }
 
-    if (order.delivery.provider === 'XFX' && (order.delivery.trackingNo || order.orderNo)) {
+    const isXfx =
+      order.delivery.provider === 'XFX' || isXfxProviderCode(String(order.delivery.provider || ''));
+    const canQueryCourier = isXfx && (order.delivery.trackingNo || order.orderNo);
+
+    if (canQueryCourier) {
       try {
         const options = order.delivery.fulfillmentProviderId
           ? {
@@ -261,27 +281,44 @@ export class FulfillmentService {
               ),
             }
           : undefined;
-        const nodes = await this.courier.getTrack(
-          {
-            trackingNumber: order.delivery.trackingNo ?? undefined,
-            outNumber: order.orderNo,
-          },
-          options,
-        );
-        return {
-          nodes,
-          manualQueryUrl: order.delivery.manualQueryUrl,
-          provider: order.delivery.provider,
-          trackingNo: order.delivery.trackingNo,
-          logisticsCompany: order.delivery.logisticsCompany,
+        const shipmentQuery = {
+          trackingNumber: order.delivery.trackingNo ?? undefined,
+          outNumber: order.orderNo,
         };
+
+        const [nodes, signPhotoDataUris] = await Promise.all([
+          this.courier.getTrack(shipmentQuery, options).catch(() => [] as TrackNode[]),
+          this.courier.getSignPhotos(shipmentQuery, options).catch(() => [] as string[]),
+        ]);
+
+        base.nodes = this.sortTrackNodesOldestFirst(nodes);
+        base.signPhotoUrls = await this.resolveSignPhotoUrls(order, signPhotoDataUris);
+
+        if (this.shouldFetchEstimatedArrival(order.status, base.nodes)) {
+          const toAddress = this.buildReceiverAddress(order);
+          if (toAddress) {
+            try {
+              const coverage = await this.courier.checkDeliveryCoverage(toAddress, options);
+              base.estimatedArrival = {
+                arriveTime: coverage.arriveTime,
+                siteName: coverage.siteName,
+              };
+            } catch {
+              // 预估送达失败不阻断
+            }
+          }
+        }
       } catch {
         // fall through
       }
     }
 
+    if (base.signPhotoUrls.length === 0 && order.delivery.signPhotoResource?.url) {
+      base.signPhotoUrls = [order.delivery.signPhotoResource.url];
+    }
+
     return {
-      nodes: [],
+      ...base,
       manualQueryUrl: order.delivery.manualQueryUrl,
       provider: order.delivery.provider,
       trackingNo: order.delivery.trackingNo,
@@ -289,6 +326,119 @@ export class FulfillmentService {
     };
   }
 
+  private sortTrackNodesOldestFirst(nodes: TrackNode[]): TrackNode[] {
+    return [...nodes].sort((a, b) => {
+      const ta = new Date(a.createTime).getTime();
+      const tb = new Date(b.createTime).getTime();
+      if (Number.isNaN(ta) && Number.isNaN(tb)) return 0;
+      if (Number.isNaN(ta)) return 1;
+      if (Number.isNaN(tb)) return -1;
+      return ta - tb;
+    });
+  }
+
+  private buildReceiverAddress(order: {
+    receiverProvince?: string | null;
+    receiverCity?: string | null;
+    receiverDistrict?: string | null;
+    receiverAddress?: string | null;
+  }) {
+    const region = [order.receiverProvince, order.receiverCity, order.receiverDistrict]
+      .filter(Boolean)
+      .join('');
+    const detail = (order.receiverAddress || '').trim();
+    if (!region && !detail) return '';
+    if (region && detail.startsWith(region)) return detail;
+    return `${region}${detail}`;
+  }
+
+  private shouldFetchEstimatedArrival(status: string, nodes: TrackNode[]) {
+    if (!['OUT_WAREHOUSE', 'SHIPPING', 'SHIPPED'].includes(status)) return false;
+    if (nodes.length === 0) return true;
+    return !nodes.some(
+      (node) =>
+        node.statusName?.includes('签收') ||
+        node.trackInfo?.includes('签收') ||
+        node.statusName?.includes('派件'),
+    );
+  }
+
+  private async resolveSignPhotoUrls(
+    order: {
+      id: bigint;
+      delivery: {
+        id: bigint;
+        signPhotoResourceId: bigint | null;
+        signPhotoResource: { url: string } | null;
+      } | null;
+    },
+    dataUris: string[],
+  ): Promise<string[]> {
+    if (!order.delivery || dataUris.length === 0) {
+      return order.delivery?.signPhotoResource?.url ? [order.delivery.signPhotoResource.url] : [];
+    }
+
+    const urls: string[] = [];
+    let firstResourceId: bigint | null = order.delivery.signPhotoResourceId;
+
+    for (let i = 0; i < dataUris.length; i += 1) {
+      const parsed = this.parseDataUri(dataUris[i]);
+      if (!parsed) continue;
+
+      const result = await this.oss.putObject({
+        bizType: 'SIGN_PHOTO',
+        mediaType: 'IMAGE',
+        fileName: `sign-${order.id}-${i + 1}.${parsed.ext}`,
+        buffer: parsed.buffer,
+        mimeType: parsed.mimeType,
+      });
+      urls.push(result.url);
+
+      if (!firstResourceId) {
+        const resource = await this.prisma.commonResource.create({
+          data: {
+            ownerType: 'ORDER',
+            ownerId: order.id,
+            bizType: 'SIGN_PHOTO',
+            mediaType: 'IMAGE',
+            ossBucket: result.bucket,
+            ossKey: result.ossKey,
+            url: result.url,
+            fileName: `sign-${order.id}-${i + 1}.${parsed.ext}`,
+            fileSize: BigInt(parsed.buffer.length),
+            mimeType: parsed.mimeType,
+            status: 'ACTIVE',
+          },
+        });
+        firstResourceId = resource.id;
+      }
+    }
+
+    if (firstResourceId && firstResourceId !== order.delivery.signPhotoResourceId) {
+      await this.prisma.orderDelivery.update({
+        where: { id: order.delivery.id },
+        data: { signPhotoResourceId: firstResourceId },
+      });
+    }
+
+    return urls;
+  }
+
+  private parseDataUri(dataUri: string): { buffer: Buffer; mimeType: string; ext: string } | null {
+    const trimmed = dataUri.trim();
+    const match = /^data:([^;]+);base64,(.+)$/i.exec(trimmed);
+    const base64 = match ? match[2] : trimmed;
+    const mimeType = match?.[1] || 'image/png';
+    try {
+      const buffer = Buffer.from(base64, 'base64');
+      if (!buffer.length) return null;
+      const ext = mimeType.includes('jpeg') || mimeType.includes('jpg') ? 'jpg' : 'png';
+      return { buffer, mimeType, ext };
+    } catch {
+      return null;
+    }
+  }
+
   private async applyManualShip(
     order: Order & { delivery: { trackingNo: string | null } | null },
     input: ManualShipInput & { operator: string; provider?: 'MANUAL' | 'LOGISTICS' },

server/dukang-api/src/modules/iam/auth.service.ts

@@ -1692,6 +1692,10 @@ export class AuthService {
       throw new BadRequestException('首次登录请使用手机验证码，登录后将自动关联微信');
     }
 
+    if (account.status !== 'ACTIVE') {
+      throw new BadRequestException('合伙人账号已停用');
+    }
+
     account = await this.prisma.partnerAccount.update({
       where: { id: account.id },
       data: {

server/dukang-api/src/modules/ops/admin-stores.service.ts

@@ -74,7 +74,7 @@ export class AdminStoresService {
         take: pageSize,
         include: {
           cityRef: { select: { id: true, name: true, code: true } },
-          partnerAccount: { select: { id: true, companyName: true } },
+          partnerAccount: { select: { id: true, companyName: true, name: true, phone: true } },
           category: { select: { id: true, name: true, parentId: true } },
           bindings: {
             where: { storeAccount: { isPrimary: 1 } },

server/dukang-api/src/modules/promo/admin-promo-code.controller.ts

@@ -6,6 +6,8 @@ import { PromoCodeService } from './promo-code.service';
 import {
   CreatePromoCodeDto,
   PromoCodeListQueryDto,
+  PromoMetricEventsQueryDto,
+  PromoMetricTimelineQueryDto,
   UpdatePromoCodeDto,
   UpdatePromoCodeStatusDto,
 } from './dto/promo-code.dto';
@@ -39,6 +41,16 @@ export class AdminPromoCodeController {
     return this.service.stats(BigInt(id));
   }
 
+  @Get(':id/metrics/timeline')
+  metricsTimeline(@Param('id') id: string, @Query() query: PromoMetricTimelineQueryDto) {
+    return this.service.getMetricsTimeline(BigInt(id), query);
+  }
+
+  @Get(':id/metrics/events')
+  metricsEvents(@Param('id') id: string, @Query() query: PromoMetricEventsQueryDto) {
+    return this.service.listMetricEvents(BigInt(id), query);
+  }
+
   @Get(':id/qrcode')
   qrcode(@Param('id') id: string) {
     return this.service.getQrcodeUrl(BigInt(id));

server/dukang-api/src/modules/promo/dto/promo-code.dto.ts

@@ -87,3 +87,37 @@ export class UpdatePromoCodeStatusDto {
   @IsIn(['ACTIVE', 'DISABLED'])
   status: PromoCodeStatus;
 }
+
+export class PromoMetricTimelineQueryDto {
+  @IsString()
+  dateFrom: string;
+
+  @IsString()
+  dateTo: string;
+
+  @IsOptional()
+  @IsIn(['day', 'hour'])
+  granularity?: 'day' | 'hour';
+}
+
+export class PromoMetricEventsQueryDto {
+  @IsOptional()
+  @Type(() => Number)
+  page?: number;
+
+  @IsOptional()
+  @Type(() => Number)
+  pageSize?: number;
+
+  @IsOptional()
+  @IsIn(['SCAN', 'ATTRIBUTION', 'REGISTER', 'ORDER'])
+  eventType?: 'SCAN' | 'ATTRIBUTION' | 'REGISTER' | 'ORDER';
+
+  @IsOptional()
+  @IsString()
+  dateFrom?: string;
+
+  @IsOptional()
+  @IsString()
+  dateTo?: string;
+}

server/dukang-api/src/modules/promo/promo-code.service.ts

@@ -8,6 +8,7 @@ import { randomBytes } from 'crypto';
 import {
   PROMO_CODE_SCENE_LABELS,
   PromoCodeScene,
+  PromoMetricEventType,
   buildPromoLandingUrl,
   loadAppConfig,
 } from '@dukang/shared-types';
@@ -16,12 +17,30 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
 import { OSS_PROVIDER, WECHAT_PROVIDER } from '../../integrations/integrations.constants';
 import type { IOssProvider } from '../../integrations/oss/oss.interface';
 import type { IWechatProvider } from '../../integrations/wechat/wechat.interface';
+import { PromoMetricLogService } from './promo-metric-log.service';
+import {
+  computePromoMetricPeak,
+  eachPromoMetricDay,
+  eachPromoMetricHour,
+  endOfDay,
+  parsePromoMetricYmd,
+  promoMetricBucketKey,
+  promoMetricEventField,
+  startOfDay,
+} from './promo-metric.util';
 import type {
   CreatePromoCodeDto,
   PromoCodeListQueryDto,
+  PromoMetricEventsQueryDto,
+  PromoMetricTimelineQueryDto,
   UpdatePromoCodeDto,
 } from './dto/promo-code.dto';
 
+type PromoTouchMeta = {
+  clientIp?: string;
+  sessionId?: string;
+};
+
 type PromoRow = {
   id: bigint;
   code: string;
@@ -69,6 +88,7 @@ function maskPhone(phone: string | null | undefined) {
 export class PromoCodeService {
   constructor(
     private readonly prisma: PrismaService,
+    private readonly promoMetricLog: PromoMetricLogService,
     @Inject(OSS_PROVIDER) private readonly oss: IOssProvider,
     @Inject(WECHAT_PROVIDER) private readonly wechat: IWechatProvider,
   ) {}
@@ -88,7 +108,11 @@ export class PromoCodeService {
   }
 
   /** 代下单绑定推广码：归因 + 用户来源（若可写） */
-  async attributeUserToPromo(userId: bigint, promoId: bigint) {
+  async attributeUserToPromo(
+    userId: bigint,
+    promoId: bigint,
+    meta?: PromoTouchMeta,
+  ) {
     const promo = await this.prisma.commonPromoCode.findUnique({
       where: { id: promoId },
       select: { id: true, name: true, status: true },
@@ -108,9 +132,13 @@ export class PromoCodeService {
           firstTouchAt: new Date(),
         },
       });
+      this.logPromoMetric(promo.id, 'ATTRIBUTION', meta, { userId });
     }
-    await this.applyPromoSourceToUser(userId, promo);
-    return promo;
+    const sourceApplied = await this.applyPromoSourceToUser(userId, promo, meta);
+    if (sourceApplied) {
+      this.logPromoMetric(promo.id, 'REGISTER', meta, { userId });
+    }
+    return { promo, sourceApplied };
   }
 
   private mapOwnerUser(user: PromoRow['ownerUser']) {
@@ -393,6 +421,7 @@ export class PromoCodeService {
       countScan?: boolean;
     },
     userId?: bigint,
+    meta?: PromoTouchMeta,
   ) {
     const promoCode = input.promoCode?.trim().toUpperCase();
     const qrcodeId = input.qrcodeId?.trim();
@@ -433,7 +462,17 @@ export class PromoCodeService {
         attributed = true;
       }
 
-      sourceApplied = await this.applyPromoSourceToUser(userId, promo);
+      sourceApplied = await this.applyPromoSourceToUser(userId, promo, meta);
+    }
+
+    if (shouldCountScan) {
+      this.logPromoMetric(promo.id, 'SCAN', meta, { userId });
+    }
+    if (attributed) {
+      this.logPromoMetric(promo.id, 'ATTRIBUTION', meta, { userId });
+    }
+    if (sourceApplied) {
+      this.logPromoMetric(promo.id, 'REGISTER', meta, { userId });
     }
 
     return serializeBigInt({
@@ -450,6 +489,7 @@ export class PromoCodeService {
   async applyPromoSourceToUser(
     userId: bigint,
     promo: { id: bigint; name: string },
+    meta?: PromoTouchMeta,
   ): Promise<boolean> {
     const user = await this.prisma.user.findUnique({
       where: { id: userId },
@@ -470,6 +510,132 @@ export class PromoCodeService {
     return true;
   }
 
+  logPromoOrderEvent(
+    promoCodeId: bigint,
+    orderId: bigint,
+    userId: bigint,
+    clientIp?: string,
+  ): void {
+    this.logPromoMetric(promoCodeId, 'ORDER', { clientIp }, { userId, orderId });
+  }
+
+  private logPromoMetric(
+    promoCodeId: bigint,
+    eventType: PromoMetricEventType,
+    meta: PromoTouchMeta | undefined,
+    ids: { userId?: bigint; orderId?: bigint },
+  ): void {
+    this.promoMetricLog.logEvent({
+      promoCodeId,
+      eventType,
+      userId: ids.userId,
+      orderId: ids.orderId,
+      sessionId: meta?.sessionId,
+      clientIp: meta?.clientIp,
+    });
+  }
+
+  async getMetricsTimeline(promoId: bigint, query: PromoMetricTimelineQueryDto) {
+    await this.ensurePromoExists(promoId);
+
+    const granularity = query.granularity === 'hour' ? 'hour' : 'day';
+    const from = parsePromoMetricYmd(query.dateFrom) ?? startOfDay(new Date());
+    const toParsed = parsePromoMetricYmd(query.dateTo);
+    const to = toParsed ? endOfDay(toParsed) : endOfDay(new Date());
+
+    const keys =
+      granularity === 'hour'
+        ? eachPromoMetricHour(from, to)
+        : eachPromoMetricDay(from, to);
+
+    const bucketMap = new Map(
+      keys.map((key) => [key, { key, scan: 0, attribution: 0, register: 0, order: 0 }]),
+    );
+
+    const rows = await this.prisma.logPromoEvent.findMany({
+      where: {
+        promoCodeId: promoId,
+        createdAt: { gte: from, lte: to },
+      },
+      select: { eventType: true, createdAt: true },
+    });
+
+    for (const row of rows) {
+      const key = promoMetricBucketKey(row.createdAt, granularity);
+      const bucket = bucketMap.get(key);
+      if (!bucket) continue;
+      bucket[promoMetricEventField(row.eventType)] += 1;
+    }
+
+    const buckets = keys.map((key) => bucketMap.get(key)!);
+    return serializeBigInt({
+      granularity,
+      dateFrom: query.dateFrom,
+      dateTo: query.dateTo,
+      buckets,
+      peak: computePromoMetricPeak(buckets),
+    });
+  }
+
+  async listMetricEvents(promoId: bigint, query: PromoMetricEventsQueryDto) {
+    await this.ensurePromoExists(promoId);
+
+    const page = query.page && query.page > 0 ? query.page : 1;
+    const pageSize = query.pageSize && query.pageSize > 0 ? Math.min(query.pageSize, 100) : 20;
+
+    const from = query.dateFrom ? parsePromoMetricYmd(query.dateFrom) : undefined;
+    const toParsed = query.dateTo ? parsePromoMetricYmd(query.dateTo) : undefined;
+    const to = toParsed ? endOfDay(toParsed) : undefined;
+
+    const where = {
+      promoCodeId: promoId,
+      ...(query.eventType ? { eventType: query.eventType } : {}),
+      ...(from || to
+        ? {
+            createdAt: {
+              ...(from ? { gte: from } : {}),
+              ...(to ? { lte: to } : {}),
+            },
+          }
+        : {}),
+    };
+
+    const [items, total] = await Promise.all([
+      this.prisma.logPromoEvent.findMany({
+        where,
+        orderBy: { createdAt: 'desc' },
+        skip: (page - 1) * pageSize,
+        take: pageSize,
+      }),
+      this.prisma.logPromoEvent.count({ where }),
+    ]);
+
+    return serializeBigInt({
+      items: items.map((row) => ({
+        id: row.id,
+        eventType: row.eventType,
+        userId: row.userId,
+        orderId: row.orderId,
+        sessionId: row.sessionId,
+        clientIp: row.clientIp,
+        ipProvince: row.ipProvince,
+        ipCity: row.ipCity,
+        createdAt: row.createdAt,
+      })),
+      total,
+      page,
+      pageSize,
+    });
+  }
+
+  private async ensurePromoExists(promoId: bigint) {
+    const promo = await this.prisma.commonPromoCode.findUnique({
+      where: { id: promoId },
+      select: { id: true },
+    });
+    if (!promo) throw new NotFoundException('推广码不存在');
+  }
+
   private async statsFromRow(row: { id: bigint; scanCount: number; orderCount: number }) {
     const scanCount = row.scanCount;
     const orderCount = row.orderCount;

server/dukang-api/src/modules/promo/promo-metric-log.service.ts

@@ -0,0 +1,49 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { PromoMetricEventType } from '@dukang/shared-types';
+import { PrismaService } from '../../common/prisma/prisma.module';
+import { IpGeoService } from '../../common/geo/ip-geo.service';
+
+export type PromoMetricLogInput = {
+  promoCodeId: bigint;
+  eventType: PromoMetricEventType;
+  userId?: bigint;
+  orderId?: bigint;
+  sessionId?: string;
+  clientIp?: string;
+};
+
+@Injectable()
+export class PromoMetricLogService {
+  private readonly logger = new Logger(PromoMetricLogService.name);
+
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly ipGeoService: IpGeoService,
+  ) {}
+
+  logEvent(input: PromoMetricLogInput): void {
+    void this.writeEvent(input).catch((err) => {
+      this.logger.debug(
+        `promo metric log failed: ${err instanceof Error ? err.message : err}`,
+      );
+    });
+  }
+
+  private async writeEvent(input: PromoMetricLogInput): Promise<void> {
+    const clientIp = input.clientIp?.trim() || null;
+    const geo = clientIp ? this.ipGeoService.resolve(clientIp) : { province: null, city: null };
+
+    await this.prisma.logPromoEvent.create({
+      data: {
+        promoCodeId: input.promoCodeId,
+        eventType: input.eventType,
+        userId: input.userId ?? null,
+        orderId: input.orderId ?? null,
+        sessionId: input.sessionId?.trim() || null,
+        clientIp,
+        ipProvince: geo.province,
+        ipCity: geo.city,
+      },
+    });
+  }
+}

server/dukang-api/src/modules/promo/promo-metric.util.ts

@@ -0,0 +1,106 @@
+import type { PromoMetricEventType, PromoMetricTimelinePeak } from '@dukang/shared-types';
+
+function startOfDay(d: Date) {
+  return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0, 0);
+}
+
+function endOfDay(d: Date) {
+  return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59, 59, 999);
+}
+
+export function parsePromoMetricYmd(s: string): Date | null {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return null;
+  const d = new Date(`${s}T00:00:00`);
+  return Number.isNaN(d.getTime()) ? null : d;
+}
+
+export function formatPromoMetricYmd(d: Date): string {
+  const y = d.getFullYear();
+  const m = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  return `${y}-${m}-${day}`;
+}
+
+export function formatPromoMetricHour(d: Date): string {
+  const ymd = formatPromoMetricYmd(d);
+  const h = String(d.getHours()).padStart(2, '0');
+  return `${ymd} ${h}:00`;
+}
+
+export function eachPromoMetricDay(from: Date, to: Date): string[] {
+  const out: string[] = [];
+  const cur = startOfDay(from);
+  const end = startOfDay(to);
+  while (cur <= end) {
+    out.push(formatPromoMetricYmd(cur));
+    cur.setDate(cur.getDate() + 1);
+  }
+  return out;
+}
+
+export function eachPromoMetricHour(from: Date, to: Date): string[] {
+  const out: string[] = [];
+  const cur = new Date(from);
+  cur.setMinutes(0, 0, 0);
+  const end = endOfDay(to);
+  while (cur <= end) {
+    out.push(formatPromoMetricHour(cur));
+    cur.setHours(cur.getHours() + 1);
+  }
+  return out;
+}
+
+export function promoMetricBucketKey(
+  createdAt: Date,
+  granularity: 'day' | 'hour',
+): string {
+  return granularity === 'day'
+    ? formatPromoMetricYmd(createdAt)
+    : formatPromoMetricHour(createdAt);
+}
+
+export function promoMetricEventField(
+  eventType: PromoMetricEventType,
+): 'scan' | 'attribution' | 'register' | 'order' {
+  switch (eventType) {
+    case 'SCAN':
+      return 'scan';
+    case 'ATTRIBUTION':
+      return 'attribution';
+    case 'REGISTER':
+      return 'register';
+    case 'ORDER':
+      return 'order';
+    default:
+      return 'scan';
+  }
+}
+
+export function computePromoMetricPeak(
+  buckets: Array<{
+    key: string;
+    scan: number;
+    attribution: number;
+    register: number;
+    order: number;
+  }>,
+): PromoMetricTimelinePeak {
+  const pick = (field: 'scan' | 'attribution' | 'register' | 'order') => {
+    let best: { key: string; count: number } | null = null;
+    for (const b of buckets) {
+      const count = b[field];
+      if (!best || count > best.count) {
+        best = { key: b.key, count };
+      }
+    }
+    return best && best.count > 0 ? best : null;
+  };
+  return {
+    scan: pick('scan'),
+    attribution: pick('attribution'),
+    register: pick('register'),
+    order: pick('order'),
+  };
+}
+
+export { startOfDay, endOfDay };

server/dukang-api/src/modules/promo/promo.module.ts

@@ -1,13 +1,16 @@
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
+import { GeoModule } from '../../common/geo/geo.module';
 import { IntegrationsModule } from '../../integrations/integrations.module';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import { AdminPromoCodeController } from './admin-promo-code.controller';
 import { PromoCodeService } from './promo-code.service';
+import { PromoMetricLogService } from './promo-metric-log.service';
 
 @Module({
   imports: [
+    GeoModule,
     IntegrationsModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET || 'dukang-prev1-dev-secret',
@@ -15,7 +18,7 @@ import { PromoCodeService } from './promo-code.service';
     }),
   ],
   controllers: [AdminPromoCodeController],
-  providers: [PromoCodeService, JwtAuthGuard, HqAuthGuard],
+  providers: [PromoCodeService, PromoMetricLogService, JwtAuthGuard, HqAuthGuard],
   exports: [PromoCodeService],
 })
 export class PromoModule {}

server/dukang-api/src/modules/settlement/settlement.service.ts

@@ -1581,13 +1581,15 @@ export class SettlementService {
       return { billDate: billDate.toISOString().slice(0, 10), skipped: true, reason: '已打款' };
     }
 
+    // T+3：纳入「账单日」当天完成的同城/跨城订单（完成日 = 今天 − lagDays）
     const orders = await this.prisma.order.findMany({
       where: {
+        status: 'COMPLETED',
         payStatus: 'PAID',
         deliveryType: { in: ['LOCAL', 'CROSS_CITY'] },
-        paidAt: { gte: start, lt: end },
+        completedAt: { gte: start, lt: end },
       },
-      orderBy: { paidAt: 'asc' },
+      orderBy: { completedAt: 'asc' },
     });
 
     if (orders.length === 0 && !existing) {
@@ -1633,7 +1635,8 @@ export class SettlementService {
             deliveryType: o.deliveryType,
             payAmount: o.payAmount,
             wineryAmount: round2(Number(o.payAmount) * rate),
-            paidAt: o.paidAt!,
+            // 明细仍保留支付时间；账期窗口按 completedAt 归属
+            paidAt: o.paidAt ?? o.completedAt!,
           })),
         });
       }

server/dukang-api/src/modules/trade/trade.service.ts

@@ -272,6 +272,15 @@ export class TradeService {
       return created;
     });
 
+    if (promoCodeId) {
+      this.promoCodeService.logPromoOrderEvent(
+        promoCodeId,
+        order.id,
+        userId,
+        location.clientIp ?? undefined,
+      );
+    }
+
     this.analyticsService.trackOneSafe(userId, 'USER_H5', {
       eventName: 'order_submit',
       refType: 'ORDER',
@@ -1571,12 +1580,6 @@ export class TradeService {
 
     const paySnapshot = await this.partnerCityService.resolveForOrder(city.id, commissionDistrict);
 
-    let promoCodeId: bigint | undefined;
-    if (body.promoCodeId?.trim()) {
-      promoCodeId = BigInt(body.promoCodeId.trim());
-      await this.promoCodeService.attributeUserToPromo(user.id, promoCodeId);
-    }
-
     const orderNo = generateOrderNo();
     const payExpireAt = new Date(Date.now() + 30 * 60 * 1000);
     const location = buildOrderClientLocationSnapshot(
@@ -1585,6 +1588,14 @@ export class TradeService {
       undefined,
     );
 
+    let promoCodeId: bigint | undefined;
+    if (body.promoCodeId?.trim()) {
+      promoCodeId = BigInt(body.promoCodeId.trim());
+      await this.promoCodeService.attributeUserToPromo(user.id, promoCodeId, {
+        clientIp: location.clientIp ?? undefined,
+      });
+    }
+
     const order = await this.prisma.$transaction(async (tx) => {
       const created = await tx.order.create({
         data: {
@@ -1651,6 +1662,15 @@ export class TradeService {
       return created;
     });
 
+    if (promoCodeId) {
+      this.promoCodeService.logPromoOrderEvent(
+        promoCodeId,
+        order.id,
+        user.id,
+        location.clientIp ?? undefined,
+      );
+    }
+
     this.analyticsService.trackPartnerOneSafe(partnerAccountId, 'PARTNER_H5', {
       partnerAccountId: primary.id,
       eventName: 'partner_proxy_order_create',
@@ -1905,12 +1925,6 @@ export class TradeService {
 
     const paySnapshot = await this.partnerCityService.resolveForOrder(city.id, commissionDistrict);
 
-    let promoCodeId: bigint | undefined;
-    if (body.promoCodeId?.trim()) {
-      promoCodeId = BigInt(body.promoCodeId.trim());
-      await this.promoCodeService.attributeUserToPromo(user.id, promoCodeId);
-    }
-
     const orderNo = generateOrderNo();
     const payExpireAt = new Date(Date.now() + 30 * 60 * 1000);
     const location = buildOrderClientLocationSnapshot(
@@ -1919,6 +1933,14 @@ export class TradeService {
       undefined,
     );
 
+    let promoCodeId: bigint | undefined;
+    if (body.promoCodeId?.trim()) {
+      promoCodeId = BigInt(body.promoCodeId.trim());
+      await this.promoCodeService.attributeUserToPromo(user.id, promoCodeId, {
+        clientIp: location.clientIp ?? undefined,
+      });
+    }
+
     const order = await this.prisma.$transaction(async (tx) => {
       const created = await tx.order.create({
         data: {
@@ -1985,6 +2007,15 @@ export class TradeService {
       return created;
     });
 
+    if (promoCodeId) {
+      this.promoCodeService.logPromoOrderEvent(
+        promoCodeId,
+        order.id,
+        user.id,
+        location.clientIp ?? undefined,
+      );
+    }
+
     return {
       id: order.id.toString(),
       orderNo: order.orderNo,

杜康好客-v3-PRD.md

@@ -44,6 +44,12 @@
 |------|------|------|
 | **3.4.12** | 2026-08-04 | 售后退款回滚、mini-user 门店详情、酒厂 T+3、门店多笔提现、开发计划批量编辑/审批企微派发、技术支持编辑/附件/批量改状态、套餐 imageUrl；开发设计见 [`杜康好客-v3.4.12-工单迭代开发文档.md`](./杜康好客-v3.4.12-工单迭代开发文档.md) |
 
+### 0.5 变更：3.4.13 体验优化
+
+| 版本 | 日期 | 说明 |
+|------|------|------|
+| **3.4.13** | 2026-08-05 | 推广码归因统计 + **指标事件日志/高峰趋势**、核销用户信息 + **权益券详情加宽/核销详情增强**、技术支持工单优先级、mini-user **我的页版本号/低于 min 强制退出**、门店/商品/提货/**物流增强（签收照/拨号/ETA/路由回调签收→已完成）**、H5 登录校验、合伙人微信暂停禁登、**OSS 图片超 10MB 客户端压缩**；开发设计见 [`杜康好客-v3.4.13-体验优化开发文档.md`](./杜康好客-v3.4.13-体验优化开发文档.md) |
+
 ---
 
 ## 1. 背景与目标

杜康好客-v3-现状对照.md

@@ -330,10 +330,28 @@ C2~C7、C14 见 §1.3。
 
 ---
 
-## 10. 变更记录
+## 10. v3.4.13 体验优化（2026-08-05）
+
+| 项 | 状态 | 说明 |
+|----|------|------|
+| 推广码 attributionCount | ✅ | HQ 详情统计卡 + **log_promo_event 事件日志 + metrics/timeline ECharts** |
+| 核销用户信息 | ✅ | RedeemRecordsPage 列表+详情 |
+| 技术支持优先级 | ✅ | Prisma + shared-types + HQ UI |
+| 合伙人微信暂停禁登 | ✅ | loginPartnerWechat |
+| H5 登录前端校验 | ✅ | partner/shop LoginPage |
+| mini-user 门店体验 | ✅ | 电话脱敏/埋点、**列表两段营业时间**、门头 aspectFill 铺满、**套餐页签切换** |
+| mini-user 商品/提货 | ✅ | 去分享、首图 preview、提货确认弹框 |
+| mini-user 版本/物流 | ✅ | 摘要 + 签收照 + 拨号 + 时间线 + ETA；回调签收→**COMPLETED** |
+| OSS 大图压缩 | ✅ | shared-ui compressImage；四端 upload + mini 头像 |
+| 文档 | ✅ | PRD §0.5 + v3.4.13 开发文档 |
+
+---
+
+## 11. 变更记录
 
 | 日期 | 说明 |
 |------|------|
+| 2026-08-05 | v3.4.13 体验优化（20 条 ST） |
 | 2026-08-04 | v3.4.12 工单迭代（退款/财务/C端/开发计划/技术支持/套餐） |
 | 2026-08-04 | v3.4.11 开发计划 + 企微智能机器人/消息推送 + 角色权限重构 |
 | 2026-07-12 | **P0 已执行**：C2~C7、C14 代码与文档对齐；§1 改为计划+状态表 |

杜康好客-v3.4.13-体验优化开发文档.md

@@ -0,0 +1,162 @@
+# 杜康好客 · v3.4.13 体验优化开发文档
+
+> 版本：**v3.4.13** · 日期：2026-08-05  
+> 需求源：20 条 ST 工单（体验优化 / Bug / 客户端验证）
+
+## 1. 范围
+
+| 模块 | 内容 |
+|------|------|
+| admin-web | 推广码 attributionCount + **指标事件日志/ECharts 趋势**；**权益券详情加宽**；**核销记录详情增强（对齐权益券内核销详情）**；技术支持工单优先级；**版本发布联动任务/工单已发布**；**大图上传前压缩** |
+| mini-user | 门店电话脱敏+拨打埋点；**门店列表展示两段营业时间**；**门店详情门头 aspectFill 铺满无留白**；**门店套餐页签切换**；商品去分享+首图 preview；提货确认弹框；**我的页版本号 v3.4.x**；**低于 minClientVersion 强制更新/点我知道了退出**；**物流增强（签收照/拨号/时间线/ETA）**；**头像超 10MB 压缩** |
+| h5-partner / h5-shop / h5-user | 登录 phone/code 前端校验；**门店端 iOS 首次扫码 OAuth 单例 + JSSDK 预热重试**；**OSS 图片超 10MB 自动 canvas 压缩后上传** |
+| 后端 | 工单 priority；**工单 PUBLISHED + releasedVersionNo**；**版本 RELEASED 联动任务/工单**；client-config minClientVersion；合伙人微信暂停禁登；**Courier 适配器**；**log_promo_event 推广码指标日志** |
+
+## 2. ST 映射
+
+| ST | 标题 | 状态 |
+|----|------|------|
+| ST1785925037781309 | 总部端-推广码数据跟踪优化 | ✅ attributionCount + **事件日志 + ECharts 趋势** |
+| ST1785924286682833 | 用户端-门店电话加密+拨打埋点 | ✅ maskPhone + store_phone_call |
+| ST1785921693982470 | 技术支持-工单优先级 | ✅ priority 枚举 + HQ UI |
+| ST1785921585900725 | 门店端扫一扫授权异常 | ✅ **OAuth 单例回调 + iOS JSSDK 预热/重试 + 授权后续扫** |
+| ST1785907536648201 | 版本不对提示更新 | ✅ 我的页 v3.4.x + UpdateManager + **低于 min 强制更新/退出** |
+| ST1785906800359657 | 合伙人暂停后禁登 | ✅ **发码前 phone/check + 微信/SMS 登录均拒 DISABLED** |
+| ST1785906592340255 | PARTNER_H5 login 校验 | ✅ 前端空字段拦截 |
+| ST1785906390321653 | 现场提货提交确认弹框 | ✅ showModal |
+| ST1785905773501871 | 核销记录用户信息 | ✅ 列表+详情；**详情含门店/合伙人/券分摊/结算/评价** |
+| ST1785904849234806 | 工单中心 | ✅ 已有 |
+| ST1785904076632841 | 门店列表开城合伙人 | ✅ **列表展示 companyName/name/phone（同 partnerOptionLabel）** |
+| ST1785902173093977 | 去掉商品详情分享按钮 | ✅ 移除 ShareNavButton |
+| ST1785902141731113 | 商品首图大图 | ✅ previewable |
+| ST1785901870913349 | 门店列表营业时间 | ✅ **列表展示两段营业时间** |
+| ST1785901838948572 | SHOP 未绑定门店 | ✅ 已有 |
+| ST1785901775231811 | 门店套餐遮挡 | ✅ **页签切换（可横滑）+ 紧凑内容区** |
+| ST1785901711627824 | SHOP login 校验 | ✅ 前端空字段拦截 |
+| ST1785901314893145 | 门头照裁剪 | ✅ aspectFill 铺满无留白 + preview |
+| ST1785939375449985 | 订单物流追踪页 | ✅ 签收照 + 拨号 + 时间线 + ETA + 路由回调 |
+| — | 上传图片超 10MB 先压缩 | ✅ `@dukang/shared-ui/compressImage` + 各端 upload |
+
+## 3. 后端 API / 配置
+
+| 方法 | 路径 / 配置 | 说明 |
+|------|-------------|------|
+| GET | `/common/client-config` | `minClientVersion`（`MINI_USER_MIN_VERSION`）；客户端 semver 比对，低于则强制更新或退出 |
+| — | `CommonSupportTicket.priority` | `LOW \| NORMAL \| HIGH \| URGENT`，默认 NORMAL |
+| — | `CommonSupportTicket.status` | 新增 `PUBLISHED`（已发布）；`releasedVersionNo` + `publishedAt` |
+| — | `DevPlanVersion` → `RELEASED` | 关联任务 → `RELEASED`；关联工单 → `PUBLISHED` 并写入版本号 |
+| — | `loginPartnerWechat` | 非 ACTIVE 账号抛出「合伙人账号已停用」 |
+| GET | `/trade/orders/:id/track` | 聚合：`nodes`（旧→新）、`signPhotoUrls`、`estimatedArrival`；经 `CourierService` 适配小飞侠 cmd 100102/100108/100301 |
+| POST | `/callbacks/courier/xfx/track` | 小飞侠路由变化回调（适配器入口） |
+| POST | `/callbacks/courier/logistics/track` | 跨城物流回调占位（记录日志，后续接入） |
+| POST | `/callbacks/delivery/track` | 兼容旧路径，等同 `xfx` |
+| GET | `/admin/promo-codes/:id/metrics/timeline` | 推广码四指标时间序列（按日/按时 + peak） |
+| GET | `/admin/promo-codes/:id/metrics/events` | 推广码指标事件分页日志（时间/ID/IP/地点） |
+
+### 3.1 推广码指标日志（ST1785925037781309）
+
+**表** `log_promo_event`
+
+| event_type | 统计卡 | 写入时机 | ID |
+|------------|--------|----------|-----|
+| `SCAN` | 扫码进入数 | `POST /promo/touch` 且 `countScan !== false` | userId / sessionId |
+| `ATTRIBUTION` | 归因用户数 | 首次写入 `user_promo_attribution` | userId |
+| `REGISTER` | 扫码注册用户数 | `applyPromoSourceToUser` 成功 | userId |
+| `ORDER` | 订单数 | 带推广码下单 `orderCount++` | orderId + userId |
+
+每条日志含 `created_at`、可选 ID、`client_ip`、`ip_province`/`ip_city`。仅统计**上线后**新事件；累计 Statistic 卡逻辑不变。
+
+**HQ UI**：推广码详情页 → 数据趋势 Card（DatePicker + 按日/按时 + ECharts 四曲线 + 事件 Table）
+
+### 3.2 mini-user 版本门控（ST1785907536648201）
+
+| 项 | 行为 |
+|----|------|
+| 我的页 | 左下角展示 `杜康好客 v3.4.x`（与 `APP_VERSION` / package.json 同步） |
+| 启动校验 | `GET /common/client-config` → `minClientVersion`；`APP_VERSION` 低于最低版本时拦截 |
+| 微信有新包 | `UpdateManager` 弹「立即更新」→ `applyUpdate()` |
+| 无新包 / 仍过低 | 弹「版本过低」→ 点「我知道了」→ `Taro.exitMiniProgram()` 退出小程序 |
+
+### 4. mini-user 物流（ST1785939375449985）
+
+| 页面 | 行为 |
+|------|------|
+| 订单详情 | **配送中**展示最新路由摘要 + 「物流详情」；物流未到时展示 **预估送达**（100301） |
+| 物流详情 | 物流信息；**签收照片**（有则展示，`previewImage` 放大）；**物流动态**旧→新、节点全红点亮、最新在底部 |
+| 电话拨号 | 物流文案中手机号可点击 `makePhoneCall` |
+| 接口 | `GET /trade/orders/:id/track`（`OrderTrackDto`）；C 端禁止直连小飞侠 |
+| 公共模块 | `order-logistics.ts` + `LogisticsRichText` 组件 |
+
+#### 4.1 对外回调 URL（提供给小飞侠）
+
+**生产**
+
+```
+POST https://api.dukanghaoke.com/api/v1/callbacks/courier/xfx/track
+Content-Type: application/json
+```
+
+**测试**
+
+```
+POST https://api-test.dukanghaoke.com/api/v1/callbacks/courier/xfx/track
+```
+
+请求体：
+
+| 字段 | 说明 |
+|------|------|
+| outNumber | 商户单号 |
+| number | 运单号 |
+| status | 1下单 2取件 3中转 4派件 5签收 7取消 |
+| statusName | 中文状态 |
+| trackInfo | 路由描述 |
+| createTime | 路由时间 |
+
+成功响应：`{"code":"100000","message":"success"}`
+
+#### 4.2 Courier 适配器（`integrations/courier`）
+
+| cmd | 能力 | Provider 方法 |
+|-----|------|---------------|
+| 100102 | 路由查询 | `getTrack` |
+| 100108 | 签收照片 | `getSignPhotos` → OSS → `signPhotoUrls` |
+| 100301 | 预估送达 | `checkDeliveryCoverage` → `estimatedArrival` |
+| 回调 | 路由推送 | `parseTrackCallback` + `mapTrackStatus`（**status=5 / statusName 含「签收」→ 订单 `COMPLETED`**） |
+
+**路由回调状态映射（小飞侠）**
+
+| 小飞侠 status / statusName | 系统订单状态 |
+|---------------------------|--------------|
+| 1 下单 | `OUT_WAREHOUSE` |
+| 2 取件 / 3 中转 | `SHIPPING` |
+| 4 派件 | `SHIPPING` |
+| **5 签收** / statusName **已签收** | **`COMPLETED`（已完成）** |
+| 7 取消 | 仅记录日志，不改订单 |
+
+## 5. 数据表
+
+- `common_support_ticket.priority` ENUM，默认 `NORMAL`
+- `common_support_ticket.status` 新增 `PUBLISHED`；`released_version_no`、`published_at`
+- `log_promo_event`：推广码指标事件（`promo_code_id`, `event_type`, `user_id`, `order_id`, `session_id`, `client_ip`, 地点, `created_at`）
+
+## 6. HQ 开发计划
+
+在 admin-web **开发计划 → 版本列表** 创建 `v3.4.13`（状态 `IN_PROGRESS`），审批 ST 后关联 `dev_plan_task`。**版本标记为「已发布」后**，该版本下任务自动 `RELEASED`，关联技术支持工单自动 `PUBLISHED` 并写入 `releasedVersionNo`。
+
+## 7. 验收 ACC
+
+- [ ] 推广码详情展示 attributionCount；**四指标事件日志 + ECharts 按日/按时趋势 + 高峰标注**
+- [ ] 推广码 SCAN/ATTRIBUTION/REGISTER/ORDER 事件含 time + IP；幂等（重复 touch 不计 SCAN）
+- [ ] 核销记录含 userNo/nickname/phone；**详情抽屉展示门店/地址/合伙人/权益券号/关联订单/券分摊/结算单/评价**
+- [ ] **权益券详情抽屉加宽（980px），内嵌核销列表无横向滚动条**
+- [ ] 技术支持可创建/筛选/编辑优先级；**版本 RELEASED 后关联工单为「已发布」并带版本号**
+- [ ] **门店列表「开城合伙人」列展示 companyName / name / phone（与下拉选项一致）**
+- [ ] 合伙人/门店登录空字段前端提示；**暂停合伙人发码前即拦截，短信/微信登录均禁止**
+- [ ] mini-user：我的页左下角显示 `杜康好客 v3.4.x`；低于 `minClientVersion` 时强制更新，无新包则点「我知道了」退出小程序
+- [ ] mini-user：电话脱敏、拨打埋点、提货确认、无分享按钮、首图 preview、**门店列表两段营业时间**、**门店详情门头铺满无留白**、**门店套餐页签切换**
+- [ ] mini-user：配送中物流摘要 + 签收照预览 + 电话拨号 + 时间线旧→新全点亮 + 预估送达
+- [ ] 小飞侠路由回调 `POST /callbacks/courier/xfx/track`：status=5 或 statusName 已签收 → 订单 **COMPLETED**；重复回调幂等
+- [ ] 各端上传 >10MB 图片自动压缩后可上传；仍超限有明确报错
+- [ ] **门店 H5（iPhone 微信）**：首次扫码 OAuth 后自动续扫；offline verifying 时提示再点一次扫码
+- [ ] `pnpm lint` 无新增错误