merge(dev): 补承运商删除操作常量

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

apps/admin-web/src/admin.css

@@ -74,6 +74,50 @@ body.admin-col-resizing * {
   user-select: none !important;
 }
 
+/* 列表页顶栏：标题左、主操作右、列设置最右 */
+.admin-list-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 16px;
+}
+
+.admin-list-header-left {
+  min-width: 0;
+}
+
+.admin-list-header-desc {
+  margin-top: 4px;
+  color: rgba(0, 0, 0, 0.45);
+  line-height: 1.5;
+}
+
+.admin-list-header-right {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8px;
+  flex-shrink: 0;
+  margin-left: auto;
+}
+
+.admin-list-settings-slot {
+  display: inline-flex;
+  margin-left: auto;
+  order: 99;
+  flex-shrink: 0;
+}
+
+.admin-list-settings-btn.ant-btn {
+  color: rgba(0, 0, 0, 0.55);
+  padding-inline: 8px;
+}
+
+.admin-list-settings-btn.ant-btn:hover {
+  color: rgba(0, 0, 0, 0.88);
+}
+
 /* 操作列保持可见 */
 .admin-layout .ant-table-cell:has(.ant-btn),
 .ant-drawer .ant-table-cell:has(.ant-btn),

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

@@ -0,0 +1,36 @@
+import type { ReactNode } from 'react';
+import { Space, Typography } from 'antd';
+
+/** 列表页顶栏：标题在左，主操作在右，列设置永远最右 */
+export function AdminListHeader({
+  title,
+  description,
+  actions,
+  settings,
+}: {
+  title?: ReactNode;
+  description?: ReactNode;
+  actions?: ReactNode;
+  settings?: ReactNode;
+}) {
+  return (
+    <div className="admin-list-header">
+      <div className="admin-list-header-left">
+        {title == null || title === '' ? null : typeof title === 'string' || typeof title === 'number' ? (
+          <Typography.Title level={4} style={{ margin: 0 }}>
+            {title}
+          </Typography.Title>
+        ) : (
+          title
+        )}
+        {description ? (
+          <div className="admin-list-header-desc">{description}</div>
+        ) : null}
+      </div>
+      <div className="admin-list-header-right">
+        {actions ? <Space wrap>{actions}</Space> : null}
+        {settings}
+      </div>
+    </div>
+  );
+}

apps/admin-web/src/lib/useAdminListColumns.tsx

@@ -153,9 +153,11 @@ export function useAdminListColumns<T>(
   }, [configured, serialCol, pref?.widths, localWidths, persistWidth]);
 
   const settingsButton = (
-    <Button icon={<SettingOutlined />} onClick={() => setOpen(true)}>
+    <span className="admin-list-settings-slot">
+      <Button type="text" icon={<SettingOutlined />} className="admin-list-settings-btn" onClick={() => setOpen(true)}>
         列设置
       </Button>
+    </span>
   );
 
   const settingsModal = (

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

@@ -23,6 +23,7 @@ import { COUPON_STATUS_LABELS, DELIVERY_TYPE_LABELS, fmtTime } from '../lib/cons
 import RedeemRecordDetailDescriptions from '../components/RedeemRecordDetailDescriptions';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 type CouponOrder = {
@@ -248,17 +249,15 @@ export default function BenefitCouponsPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="好客权益券"
-          好客权益券
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-        <Space>
-          {settingsButton}
           <Button type="primary" onClick={() => setGrantOpen(true)}>
             手动发放
           </Button>
-        </Space>
+        }
-      </div>
+      />
 
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="couponNo" label="券号">

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

@@ -4,6 +4,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { LEDGER_TYPE_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type Row = {
@@ -41,8 +42,7 @@ export default function BenefitLedgersPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>权益流水</Typography.Title>
+      <AdminListHeader title="权益流水" settings={settingsButton} />
-          {settingsButton}
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="userId" label="用户ID"><Input allowClear /></Form.Item>
         <Form.Item name="couponId" label="券ID"><Input allowClear /></Form.Item>

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

@@ -25,6 +25,7 @@ import { useAdminList } from '../lib/useAdminList';
 import CityPartnersPanel from '../components/CityPartnersPanel';
 import ChinaProvinceCityCascader from '../components/ChinaProvinceCityCascader';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -326,11 +327,11 @@ export default function CitiesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>城市</Typography.Title>
+        title="城市"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={openCreateModal}>新建城市</Button>
+        actions={<Button type="primary" onClick={openCreateModal}>新建城市</Button>}
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="城市"><Input allowClear /></Form.Item>
         <Form.Item name="code" label="编码"><Input allowClear /></Form.Item>

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

@@ -37,6 +37,7 @@ import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import PartnerSubAccountList, { type PartnerSubAccountRow } from '../components/PartnerSubAccountList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -350,11 +351,10 @@ export default function CityPartnersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="城市合伙人"
-          城市合伙人
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-          {settingsButton}
           <Button
             type="primary"
             onClick={() => {
@@ -372,7 +372,8 @@ export default function CityPartnersPage() {
           >
             新建合伙人
           </Button>
-      </Space>
+        }
+      />
 
       <Alert
         type="info"

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

@@ -14,7 +14,6 @@ import {
   Switch,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -31,6 +30,7 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -316,9 +316,10 @@ export default function CityWarehousesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>仓库</Typography.Title>
+        title="仓库"
-          {settingsButton}
+        settings={settingsButton}
+        actions={
           <Button
             type="primary"
             onClick={() => {
@@ -336,7 +337,8 @@ export default function CityWarehousesPage() {
           >
             新增仓库
           </Button>
-      </Space>
+        }
+      />
 
       <Alert
         type="info"

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

@@ -8,6 +8,7 @@ import { request } from '../lib/api';
 import { ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -18,6 +19,8 @@ type Row = {
   trackingNo: string | null;
   providerOrderNo: string | null;
   updatedAt: string;
+  /** 当次应付物流费 */
+  logisticsFee?: number | null;
   order?: {
     id: string;
     orderNo: string;
@@ -82,6 +85,12 @@ export default function DeliveriesPage() {
     },
     { title: 'provider', dataIndex: 'provider', width: 90 },
     { title: '运单号', dataIndex: 'trackingNo', width: 140, render: (v) => v || '—' },
+    {
+      title: '运费',
+      dataIndex: 'logisticsFee',
+      width: 90,
+      render: (v: number | null | undefined) => (v == null ? '—' : `¥${Number(v).toFixed(2)}`),
+    },
     { title: '第三方单号', dataIndex: 'providerOrderNo', width: 140, render: (v) => v || '—' },
     { title: '订单状态', dataIndex: ['order', 'status'], width: 100, render: (s) => ORDER_STATUS_LABELS[s] || s },
     { title: '收货人', dataIndex: ['order', 'receiverName'], width: 90 },
@@ -107,8 +116,7 @@ export default function DeliveriesPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>快递/配送单</Typography.Title>
+      <AdminListHeader title="快递/配送单" settings={settingsButton} />
-          {settingsButton}
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="orderNo" label="订单号"><Input allowClear /></Form.Item>
         <Form.Item name="provider" label="provider"><Input allowClear placeholder="MOCK" /></Form.Item>
@@ -136,6 +144,9 @@ export default function DeliveriesPage() {
             <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
               <Descriptions.Item label="订单">{detail.order?.orderNo}</Descriptions.Item>
               <Descriptions.Item label="收货">{detail.order?.receiverName} {detail.order?.receiverPhone}</Descriptions.Item>
+              <Descriptions.Item label="运费">
+                {detail.logisticsFee == null ? '—' : `¥${Number(detail.logisticsFee).toFixed(2)}`}
+              </Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
               <Form.Item name="provider" label="provider" rules={[{ required: true }]}><Input /></Form.Item>

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

@@ -31,6 +31,7 @@ import { downloadBase64File } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -309,12 +310,11 @@ export default function DevPlanTasksPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="开发计划 · 任务列表"
-          开发计划 · 任务列表
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-          {settingsButton}
+          <>
-        <Space wrap>
             <Select
               value={exportFormat}
               style={{ width: 120 }}
@@ -341,8 +341,9 @@ export default function DevPlanTasksPage() {
             <Button type="primary" onClick={openCreate}>
               新建任务
             </Button>
-        </Space>
+          </>
-      </div>
+        }
+      />
 
       <Form
         layout="inline"

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

@@ -9,7 +9,6 @@ import {
   Space,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -23,6 +22,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -168,15 +168,15 @@ export default function DevPlanVersionsPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="开发计划 · 版本列表"
-          开发计划 · 版本列表
+        settings={settingsButton}
-        </Typography.Title>
+        actions={
-          {settingsButton}
           <Button type="primary" onClick={openCreate}>
             新建版本
           </Button>
-      </div>
+        }
+      />
 
       <Form
         layout="inline"

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

@@ -7,11 +7,11 @@ import {
   Input,
   InputNumber,
   Modal,
+  Popconfirm,
   Select,
   Space,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
@@ -29,6 +29,7 @@ import {
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -68,7 +69,10 @@ export default function FulfillmentProvidersPage() {
     setLoading(true);
     try {
       const res = await request<FulfillmentProviderDto[]>('/admin/fulfillment-providers');
-      setRows(res);
+      setRows(Array.isArray(res) ? res : []);
+    } catch (e) {
+      setRows([]);
+      message.error(e instanceof Error ? e.message : '加载承运商失败');
     } finally {
       setLoading(false);
     }
@@ -94,6 +98,7 @@ export default function FulfillmentProvidersPage() {
       extraBottleFee: DEFAULT_XFX_LOGISTICS_PRICING.extraBottleFee,
       boxBottles: DEFAULT_XFX_LOGISTICS_PRICING.boxBottles,
       boxFee: DEFAULT_XFX_LOGISTICS_PRICING.boxFee,
+      deliveryHintHtml: '',
     });
     setOpen(true);
   }
@@ -122,6 +127,7 @@ export default function FulfillmentProvidersPage() {
       extraBottleFee: pricing?.extraBottleFee ?? DEFAULT_XFX_LOGISTICS_PRICING.extraBottleFee,
       boxBottles: pricing?.boxBottles ?? DEFAULT_XFX_LOGISTICS_PRICING.boxBottles,
       boxFee: pricing?.boxFee ?? DEFAULT_XFX_LOGISTICS_PRICING.boxFee,
+      deliveryHintHtml: row.deliveryHintHtml || '',
     });
     setOpen(true);
   }
@@ -144,6 +150,7 @@ export default function FulfillmentProvidersPage() {
         boxBottles: v.boxBottles != null ? Number(v.boxBottles) : undefined,
         boxFee: v.boxFee != null ? Number(v.boxFee) : undefined,
       },
+      deliveryHintHtml: v.deliveryHintHtml?.trim() || null,
     };
 
     if (isXfxProviderCode(String(v.code)) && v.type === FulfillmentProviderType.API) {
@@ -176,6 +183,16 @@ export default function FulfillmentProvidersPage() {
     void load();
   }
 
+  async function remove(row: FulfillmentProviderDto) {
+    try {
+      await request(`/admin/fulfillment-providers/${row.id}`, { method: 'DELETE' });
+      message.success('已删除');
+      void load();
+    } catch (e) {
+      message.error(e instanceof Error ? e.message : '删除失败');
+    }
+  }
+
   const baseColumns: ColumnsType<FulfillmentProviderDto> = [
     { title: '编码', dataIndex: 'code', width: 100 },
     {
@@ -230,11 +247,23 @@ export default function FulfillmentProvidersPage() {
     { title: '更新时间', dataIndex: 'updatedAt', width: 170, render: fmtTime },
     {
       title: '操作',
-      width: 80,
+      width: 140,
       render: (_, row) => (
+        <Space size={0}>
           <Button type="link" size="small" onClick={() => openEdit(row)}>
             编辑
           </Button>
+          <Popconfirm
+            title={`确认删除承运商「${row.name}」？`}
+            okText="删除"
+            okButtonProps={{ danger: true }}
+            onConfirm={() => void remove(row)}
+          >
+            <Button type="link" size="small" danger>
+              删除
+            </Button>
+          </Popconfirm>
+        </Space>
       ),
     },
   ];
@@ -247,20 +276,16 @@ export default function FulfillmentProvidersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <div>
+        title="仓配管理"
-          <Typography.Title level={4} style={{ margin: 0 }}>
+        description="注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准"
-            仓配管理
+        settings={settingsButton}
-          </Typography.Title>
+        actions={
-          {settingsButton}
-          <Typography.Text type="secondary">
-            注册承运商接口凭证，并配置物流对账用的银行账户、结算方式与计价标准
-          </Typography.Text>
-        </div>
           <Button type="primary" onClick={openCreate}>
             注册承运商
           </Button>
-      </Space>
+        }
+      />
 
       <Alert
         type="info"
@@ -292,6 +317,17 @@ export default function FulfillmentProvidersPage() {
           <Form.Item name="status" label="状态" rules={[{ required: true }]}>
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
+          <Form.Item
+            name="deliveryHintHtml"
+            label="配送信息提示"
+            extra="C 端同城送展示。支持 HTML：span/p/br/b/strong/i/em/font，style 可用 color、font-weight、font-size、font-style。回车换行会原样显示。空则回退「同城配送，预计24小时内送到」。"
+          >
+            <Input.TextArea
+              rows={3}
+              maxLength={2000}
+              placeholder='<span style="color:#A61D24;font-weight:700;font-size:13px">同城配送，预计24小时内送到</span>'
+            />
+          </Form.Item>
 
           <Divider orientation="left">物流对账</Divider>
           <Form.Item name="settlementMethod" label="结算方式" rules={[{ required: true }]}>

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

@@ -8,6 +8,7 @@ import { request, type HqProfile, type Paginated } from '../lib/api';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -145,10 +146,11 @@ export default function HqAccountsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>HQ 账户</Typography.Title>
+        title="HQ 账户"
-          {settingsButton}
+        settings={settingsButton}
-        {isSuperAdmin && (
+        actions={
+          isSuperAdmin ? (
             <Button
               type="primary"
               onClick={() => {
@@ -159,8 +161,9 @@ export default function HqAccountsPage() {
             >
               新建账户
             </Button>
-        )}
+          ) : null
-      </Space>
+        }
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="phone" label="手机"><Input allowClear /></Form.Item>
         <Form.Item name="adminRole" label="角色">

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

@@ -10,6 +10,7 @@ import { fmtTime } from '../lib/constants';
 import { HQ_OPERATION_ACTION_OPTIONS, resolveHqOperationLabel } from '../lib/hq-log';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -109,11 +110,11 @@ export default function HqLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>HQ 操作日志</Typography.Title>
+      <AdminListHeader
-          {settingsButton}
+        title="HQ 操作日志"
-      <Typography.Paragraph type="secondary">
+        settings={settingsButton}
-        记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。
+        description="记录总部后台写操作（开城、订单、用户、权限、合伙人等），仅追加不删除。"
-      </Typography.Paragraph>
+      />
 
       <Form
         form={form}

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

@@ -11,7 +11,6 @@ import {
   Space,
   Table,
   Tag,
-  Typography,
   Upload,
   message,
 } from 'antd';
@@ -31,6 +30,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -241,18 +241,10 @@ export default function InvoicesPage() {
   return (
     <div>
       {settingsModal}
-      <div
+      <AdminListHeader
-        style={{
+        title="发票管理"
-          display: 'flex',
+        settings={settingsButton}
-          justifyContent: 'space-between',
+        actions={
-          alignItems: 'center',
-          marginBottom: 16,
-        }}
-      >
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          发票管理
-        </Typography.Title>
-          {settingsButton}
           <Button
             type="primary"
             onClick={() => {
@@ -266,7 +258,8 @@ export default function InvoicesPage() {
           >
             创建发票申请
           </Button>
-      </div>
+        }
+      />
       <Form
         form={filterForm}
         layout="inline"

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

@@ -26,6 +26,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { uploadFileToOss } from '../lib/upload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -264,15 +265,11 @@ export default function KnowledgeBasesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16 }} wrap>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="知识库"
-          知识库
+        settings={settingsButton}
-        </Typography.Title>
+        description="支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索"
-          {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          支持粘贴文本或上传 .txt/.md；可绑定到企微机器人供 AI 检索
-        </Typography.Text>
-      </Space>
 
       <Form
         form={filterForm}

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

@@ -26,6 +26,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -271,15 +272,11 @@ export default function LlmConfigsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16 }} wrap>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="语言模型配置"
-          语言模型配置
+        settings={settingsButton}
-        </Typography.Title>
+        description="非超管仅可见自己创建的配置，且创建后只能改是否生效"
-          {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          非超管仅可见自己创建的配置，且创建后只能改是否生效
-        </Typography.Text>
-      </Space>
 
       <Form
         form={filterForm}

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

@@ -30,6 +30,7 @@ import { downloadExcelCsv } from '../lib/exportExcel';
 import { request } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 type BillRow = {
@@ -405,15 +406,11 @@ export default function LogisticsBillsPage() {
   return (
     <div>
       {settingsModal}
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="物流对账"
-          物流对账
+        settings={settingsButton}
-        </Typography.Title>
+        description="按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。"
-        {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          按快递承运商汇总月度物流费；计价与银行账户在「仓配管理」配置。前期充值扣款，后期可切挂账月结。
-        </Typography.Text>
-      </Space>
 
       <Tabs
         items={[

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

@@ -27,6 +27,7 @@ import dayjs, { type Dayjs } from 'dayjs';
 import { ORDER_TYPE_LABELS } from '@dukang/shared-types';
 import { request, type AdminOrderItem, type AdminOrderRow, type HqProfile, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { downloadBase64File } from '../lib/exportExcel';
 import {
@@ -144,7 +145,7 @@ type OrderExportFormat = 'xlsx' | 'pdf';
 
 type OrderExportFilters = {
   orderNo?: string;
-  status?: string;
+  status?: string | string[];
   orderType?: string;
   cityId?: string;
   receiverPhone?: string;
@@ -219,6 +220,12 @@ function formatBenefitBrief(row: AdminOrderRow) {
   return '—';
 }
 
+function selectedStatuses(status: unknown): string[] {
+  if (Array.isArray(status)) return status.filter((s): s is string => Boolean(s));
+  if (typeof status === 'string' && status) return [status];
+  return [];
+}
+
 function buildExportPayload(
   scope: OrderExportScope,
   format: OrderExportFormat,
@@ -231,7 +238,8 @@ function buildExportPayload(
     return payload;
   }
   if (filters.orderNo) payload.orderNo = filters.orderNo;
-  if (filters.status) payload.status = filters.status;
+  const statuses = selectedStatuses(filters.status);
+  if (statuses.length) payload.status = statuses;
   if (filters.orderType) payload.orderType = filters.orderType;
   if (filters.cityId) payload.cityId = filters.cityId;
   if (filters.receiverPhone) payload.receiverPhone = filters.receiverPhone;
@@ -357,7 +365,7 @@ export default function OrdersPage() {
       const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
       if (initialOrderNo) qs.set('orderNo', initialOrderNo);
       if (values.orderNo) qs.set('orderNo', values.orderNo);
-      if (values.status) qs.set('status', values.status);
+      for (const status of selectedStatuses(values.status)) qs.append('status', status);
       if (values.orderType) qs.set('orderType', values.orderType);
       if (values.cityId) qs.set('cityId', values.cityId);
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
@@ -733,18 +741,20 @@ export default function OrdersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>订单监控</Typography.Title>
+        title="订单监控"
-        <Space size={12}>
+        settings={settingsButton}
-          {settingsButton}
+        actions={
+          <>
             <Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}>大屏</Button>
             {canProxyOrder ? (
               <Button type="primary" onClick={() => setProxyOpen(true)}>
                 代下单
               </Button>
             ) : null}
-        </Space>
+          </>
-      </Space>
+        }
+      />
 
       {!canDeleteOrders && profile ? (
         <Alert
@@ -782,10 +792,12 @@ export default function OrdersPage() {
               </Space>
             </Form.Item>
           </Col>
-          <Col xs={12} sm={6} md={5} lg={3}>
+          <Col xs={24} sm={12} md={8} lg={6}>
             <Form.Item name="status" label="状态" style={{ marginBottom: 12 }}>
               <Select
+                mode="multiple"
                 allowClear
+                maxTagCount="responsive"
                 placeholder="全部"
                 options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
               />

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

@@ -8,6 +8,7 @@ import { request, type Paginated } from '../lib/api';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, ORDER_STATUS_LABELS, PARTNER_BILL_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type PartnerOption = { id: string; companyName: string };
@@ -261,15 +262,11 @@ export default function PartnerAccountsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <div>
+        title="合伙人子账号"
-          <Typography.Title level={4} style={{ margin: 0 }}>合伙人子账号</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        description="主账号在「开城合伙人」创建；此处仅管理子账号树与权限"
-          <Typography.Text type="secondary">
+      />
-            主账号在「开城合伙人」创建；此处仅管理子账号树与权限
-          </Typography.Text>
-        </div>
-      </Space>
       <Form
         form={form}
         layout="inline"

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

@@ -23,6 +23,7 @@ import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -349,15 +350,11 @@ export default function PartnerBillsPage() {
   return (
     <div>
       {settingsModal}
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="合伙人账单"
-          合伙人账单
+        settings={settingsButton}
-        </Typography.Title>
+        description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
-          {settingsButton}
+      />
-        <Typography.Text type="secondary">
-          每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款
-        </Typography.Text>
-      </Space>
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>

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

@@ -15,6 +15,7 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -156,10 +157,7 @@ export default function PartnerLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginBottom: 16 }}>
+      <AdminListHeader title="合伙人日志" settings={settingsButton} />
-        合伙人日志
-      </Typography.Title>
-          {settingsButton}
       <Segmented
         options={PARTNER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
         value={category}

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

@@ -28,6 +28,7 @@ import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -218,13 +219,15 @@ export default function PartnersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>开城合伙人</Typography.Title>
+        title="开城合伙人"
-          {settingsButton}
+        settings={settingsButton}
+        actions={
           <Button type="primary" onClick={() => { setCreateOpen(true); createForm.resetFields(); setCreateScopeType(CityPartnerScopeType.CITY_WIDE); }}>
             新建城市合伙人
           </Button>
-      </Space>
+        }
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="companyName" label="公司"><Input allowClear /></Form.Item>
         <Form.Item name="contactPhone" label="电话"><Input allowClear /></Form.Item>

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

@@ -24,6 +24,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -146,8 +147,7 @@ export default function PendingRedeemPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>待处理核销（弱网兜底）</Typography.Title>
+      <AdminListHeader title="待处理核销（弱网兜底）" settings={settingsButton} />
-          {settingsButton}
       <Form
         form={form}
         layout="inline"

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

@@ -15,6 +15,7 @@ import ProductDetailTemplatePicker from '../components/ProductDetailTemplatePick
 import ProductSpecsEditor from '../components/ProductSpecsEditor';
 import type { FormInstance } from 'antd/es/form';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -510,11 +511,11 @@ export default function ProductsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>商品管理</Typography.Title>
+        title="商品管理"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>}
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="名称">
           <Input allowClear placeholder="名称 / SKU / 69 码" style={{ width: 200 }} />

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

@@ -15,6 +15,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -175,11 +176,11 @@ export default function PromoCodesPage() {
   return (
     <div>
       {settingsModal}
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>推广码管理</Typography.Title>
+        title="推广码管理"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>创建推广码</Button>}
-      </div>
+      />
 
       <Form
         form={filterForm}

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

@@ -8,6 +8,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -141,8 +142,7 @@ export default function RedeemRecordsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>核销记录</Typography.Title>
+      <AdminListHeader title="核销记录" settings={settingsButton} />
-          {settingsButton}
       <Form
         form={form}
         layout="inline"

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

@@ -13,6 +13,7 @@ import {
 } from '../lib/constants';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type Row = {
@@ -121,15 +122,11 @@ export default function ResourcesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="OSS 资源库"
-          OSS 资源库
+        settings={settingsButton}
-        </Typography.Title>
+        actions={<Button type="primary" onClick={() => setCreateOpen(true)}>登记资源</Button>}
-          {settingsButton}
+      />
-        <Button type="primary" onClick={() => setCreateOpen(true)}>
-          登记资源
-        </Button>
-      </Space>
       <Form
         form={form}
         layout="inline"

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

@@ -7,6 +7,7 @@ import { request, type Paginated } from '../lib/api';
 import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, STORE_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -153,14 +154,11 @@ export default function StoreAccountsPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Space direction="vertical" size={0}>
+        title="门店账户"
-          <Typography.Title level={4} style={{ margin: 0 }}>门店账户</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        description="主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店"
-          <Typography.Text type="secondary">
+        actions={
-            主账号可绑定多家门店；收款信息挂在主账号；「新建账户」用于补录无主账号门店
-          </Typography.Text>
-        </Space>
           <Button
             type="primary"
             onClick={() => {
@@ -170,7 +168,8 @@ export default function StoreAccountsPage() {
           >
             新建账户
           </Button>
-      </Space>
+        }
+      />
       <Form
         form={form}
         layout="inline"

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

@@ -31,6 +31,7 @@ import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { downloadExcelCsv } from '../lib/exportExcel';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -381,21 +382,23 @@ export default function StoreBillsPage() {
   return (
     <div>
       {settingsModal}
-      <Space direction="vertical" size={0} style={{ marginBottom: 16 }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>
+        title="门店账单"
-          门店账单
+        settings={settingsButton}
-        </Typography.Title>
+        description={
-          {settingsButton}
+          <>
-        <Typography.Text type="secondary">
             含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
             「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
-        </Typography.Text>
             {overdueSummary && overdueSummary.overdueCount > 0 ? (
+              <div>
                 <Typography.Text type="danger">
                   手动提现超时未审 {overdueSummary.overdueCount} 笔（待审共 {overdueSummary.pendingCount}）
                 </Typography.Text>
+              </div>
             ) : null}
-      </Space>
+          </>
+        }
+      />
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>

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

@@ -5,6 +5,7 @@ import {
 import type { ColumnsType } from 'antd/es/table';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -179,13 +180,12 @@ export default function StoreCategoriesPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Space direction="vertical" size={0}>
+        title="门店分类"
-          <Typography.Title level={4} style={{ margin: 0 }}>门店分类</Typography.Title>
+        settings={settingsButton}
-          {settingsButton}
+        description="两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择"
-          <Typography.Text type="secondary">两级分类：一级（餐饮/住宿/娱乐）→ 二级业态，供合伙人开店选择</Typography.Text>
+        actions={
-        </Space>
+          <>
-        <Space>
             {canDelete ? (
               <Button
                 onClick={async () => {
@@ -198,8 +198,9 @@ export default function StoreCategoriesPage() {
               </Button>
             ) : null}
             <Button type="primary" onClick={() => openCreate()}>新增一级</Button>
-        </Space>
+          </>
-      </Space>
+        }
+      />
 
       <Table
         rowKey="id"

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

@@ -13,6 +13,7 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -151,11 +152,11 @@ export default function StoreLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>商户日志</Typography.Title>
+      <AdminListHeader
-          {settingsButton}
+        title="商户日志"
-      <Typography.Paragraph type="secondary" style={{ marginTop: -8 }}>
+        settings={settingsButton}
-        门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。
+        description="门店登录、微信授权、核销、打款与营业状态等操作记录；历史核销/打款数据来自业务表归档。"
-      </Typography.Paragraph>
+      />
       <Segmented
         style={{ marginBottom: 16 }}
         options={STORE_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}

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

@@ -8,6 +8,7 @@ import { ADMIN_OPTIONS_PAGE_SIZE, MEDIA_TYPE_LABELS, fmtTime } from '../lib/cons
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -96,11 +97,11 @@ export default function StoreMediaPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>门店资源</Typography.Title>
+        title="门店资源"
-          {settingsButton}
+        settings={settingsButton}
-        <Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>
+        actions={<Button type="primary" onClick={() => { void loadStores(); setCreateOpen(true); }}>新增资源</Button>}
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="storeId" label="门店ID"><Input allowClear /></Form.Item>
         <Form.Item name="mediaType" label="类型">

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

@@ -33,6 +33,7 @@ import { notifyPackageAuditChanged } from '../lib/admin-events';
 import { fmtTime } from '../lib/constants';
 import StorePackageAuditPanel from '../components/StorePackageAuditPanel';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const HQ_PACKAGE_STATUS_LABELS: Record<StorePackageChangeStatus, string> = {
@@ -545,8 +546,7 @@ export default function StorePackageAuditsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>审核通知</Typography.Title>
+      <AdminListHeader title="审核通知" settings={settingsButton} />
-      {settingsButton}
       <Tabs
         activeKey={activeTab}
         onChange={setActiveTab}

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

@@ -6,6 +6,7 @@ import { fmtTime, ADMIN_OPTIONS_PAGE_SIZE } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { request, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 
 
 type Row = {
@@ -69,10 +70,7 @@ export default function StoreRatingsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
+      <AdminListHeader title="门店评价" settings={settingsButton} />
-        门店评价
-      </Typography.Title>
-          {settingsButton}
       <Form
         form={form}
         layout="inline"

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

@@ -21,6 +21,7 @@ import { request, type Paginated } from '../lib/api';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -237,10 +238,7 @@ export default function StoreWithdrawalsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
+      <AdminListHeader title="门店提现审" settings={settingsButton} />
-        门店提现审
-      </Typography.Title>
-          {settingsButton}
       {overdueSummary ? (
         <Typography.Paragraph type="secondary">
           待审 {overdueSummary.pendingCount} 笔

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

@@ -40,6 +40,7 @@ import {
 } from '../lib/storeCreate';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { resolveRegionBinding } from '../lib/china-region';
 import ChinaRegionCascader from '../components/ChinaRegionCascader';
@@ -873,16 +874,14 @@ export default function StoresPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Space direction="vertical" size={0}>
+        title="门店"
-          <Typography.Title level={4} style={{ margin: 0 }}>门店</Typography.Title>
+        settings={settingsButton}
-          <Typography.Text type="secondary">共 {data?.total ?? 0} 家门店（含合伙人录入）</Typography.Text>
+        description={`共 ${data?.total ?? 0} 家门店（含合伙人录入）`}
-        </Space>
+        actions={
-        <Space>
-          {settingsButton}
           <Button type="primary" onClick={openCreateModal}>新建门店</Button>
-        </Space>
+        }
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
         <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
         <Form.Item name="phone" label="电话"><Input allowClear /></Form.Item>

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

@@ -21,6 +21,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { request, type Paginated } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 const MOCK_KEYS = ['MOCK_SMS', 'MOCK_WECHAT', 'MOCK_PAY'] as const;
@@ -410,10 +411,7 @@ export default function TestWhitelistPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4} style={{ marginTop: 0 }}>
+      <AdminListHeader title="白名单管理" settings={settingsButton} />
-        白名单管理
-      </Typography.Title>
-      {settingsButton}
 
       <Card size="small" loading={mockLoading} style={{ marginBottom: 16 }}>
         <Typography.Text type="secondary" style={{ display: 'block', marginBottom: 12 }}>

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

@@ -5,6 +5,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -137,8 +138,7 @@ export default function ThirdPartyLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>第三方日志</Typography.Title>
+      <AdminListHeader title="第三方日志" settings={settingsButton} />
-          {settingsButton}
       <Form
         layout="inline"
         style={{ marginBottom: 16 }}

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

@@ -8,6 +8,7 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -120,8 +121,7 @@ export default function UserLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>用户日志</Typography.Title>
+      <AdminListHeader title="用户日志" settings={settingsButton} />
-          {settingsButton}
       <Segmented
         style={{ marginBottom: 16 }}
         options={USER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}

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

@@ -20,6 +20,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { USER_SOURCE_TYPE_LABELS, resolveUserLogCategory, type UserSourceType } from '@dukang/shared-types';
 import { request, type AdminUserRow, type HqProfile, type Paginated } from '../lib/api';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 import { ORDER_STATUS_LABELS, fmtTime, maskPhone } from '../lib/constants';
 
@@ -481,11 +482,11 @@ export default function UsersPage() {
   return (
     <div>
       {settingsModal}
-      <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
+      <AdminListHeader
-        <Typography.Title level={4} style={{ margin: 0 }}>用户监控</Typography.Title>
+        title="用户监控"
-        <Space>
+        settings={settingsButton}
-          {settingsButton}
+        actions={
-        {canDeleteUsers ? (
+          canDeleteUsers ? (
             <Button
               danger
               disabled={!selectedRowKeys.length}
@@ -493,9 +494,9 @@ export default function UsersPage() {
             >
               批量删除{selectedRowKeys.length ? ` (${selectedRowKeys.length})` : ''}
             </Button>
-        ) : null}
+          ) : null
-        </Space>
+        }
-      </Space>
+      />
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={() => { setPage(1); void load(); }}>
         <Form.Item name="phone" label="手机号">
           <Input placeholder="模糊搜索" allowClear />

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

@@ -8,6 +8,7 @@ import { AdminCellLine } from '../components/AdminCellLine';
 import { fmtTime, maskPhone } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -210,11 +211,11 @@ export default function WechatBindingsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>微信绑定总览</Typography.Title>
+      <AdminListHeader
-          {settingsButton}
+        title="微信绑定总览"
-      <Typography.Paragraph type="secondary">
+        settings={settingsButton}
-        按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。
+        description="按 unionId 聚合展示已绑定微信的 C 端用户、门店账号、合伙人账号与 HQ 账号；无 unionId 时按单账号分组。"
-      </Typography.Paragraph>
+      />
 
       <Form
         form={form}

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

@@ -6,6 +6,7 @@ import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
 import type { WecomBotLogDto } from '@dukang/shared-types';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -64,11 +65,11 @@ export default function WecomBotLogsPage() {
   return (
     <div>
       {settingsModal}
-      <Typography.Title level={4}>企微机器人日志</Typography.Title>
+      <AdminListHeader
-          {settingsButton}
+        title="企微机器人日志"
-      <Typography.Paragraph type="secondary">
+        settings={settingsButton}
-        记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。
+        description="记录机器人在企微内的查询与审批操作，含权限点、耗时与成败。"
-      </Typography.Paragraph>
+      />
 
       <Form
         form={form}

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

@@ -35,6 +35,7 @@ import { fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -272,9 +273,15 @@ function PushRoutesTab() {
   return (
     <>
       {settingsModal}
-      <Typography.Paragraph type="secondary">
+      <AdminListHeader
-        配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。
+        settings={settingsButton}
-      </Typography.Paragraph>
+        description="配置群机器人 Webhook：按推送条件订阅业务通知 / 告警。运行时不再读取 .env 中的 Webhook URL。"
+        actions={
+          <Button type="primary" onClick={openCreate}>
+            新建推送
+          </Button>
+        }
+      />
 
       <Form
         form={filterForm}
@@ -309,10 +316,6 @@ function PushRoutesTab() {
             >
               重置
             </Button>
-            <Button type="primary" onClick={openCreate}>
-              新建推送
-            </Button>
-            {settingsButton}
           </Space>
         </Form.Item>
       </Form>

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

@@ -27,6 +27,7 @@ import { downloadExcelCsv } from '../lib/exportExcel';
 import { request, type HqProfile } from '../lib/api';
 import { useAdminList } from '../lib/useAdminList';
 import { useAdminListColumns } from '../lib/useAdminListColumns';
+import { AdminListHeader } from '../components/AdminListHeader';
 import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
 
 
@@ -305,31 +306,18 @@ export default function WineryBillsPage() {
   return (
     <div>
       {settingsModal}
-      <div
+      <AdminListHeader
-        style={{
+        title="酒厂对账单"
-          display: 'flex',
+        settings={settingsButton}
-          justifyContent: 'space-between',
+        description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
-          alignItems: 'flex-start',
+        actions={
-          marginBottom: 16,
+          canEditWineryBank ? (
-          gap: 16,
-        }}
-      >
-        <Space direction="vertical" size={0}>
-          <Typography.Title level={4} style={{ margin: 0 }}>
-            酒厂对账单
-          </Typography.Title>
-          {settingsButton}
-          <Typography.Text type="secondary">
-            T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × {ratePct}%）；未打款红色、已打款绿色、应付为 0
-            无需打款（灰），可展开订单明细
-          </Typography.Text>
-        </Space>
-        {canEditWineryBank ? (
             <Button type="default" onClick={() => void openBankModal()}>
               酒厂银行账户信息配置
             </Button>
-        ) : null}
+          ) : null
-      </div>
+        }
+      />
 
       {summary && (
         <Card size="small" style={{ marginBottom: 16 }}>

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

@@ -11,6 +11,7 @@ import { useAdminList } from '../../lib/useAdminList';
 import type { PromoCodeDetailContext } from './PromoCodeDetailLayout';
 import { useAdminListColumns } from '../../lib/useAdminListColumns';
 import { AdminPrimaryLink } from '../../components/AdminPrimaryLink';
+import { AdminListHeader } from '../../components/AdminListHeader';
 
 
 export default function PromoCodeUsersPage() {
@@ -84,6 +85,9 @@ export default function PromoCodeUsersPage() {
   const { columns, settingsButton, settingsModal } = useAdminListColumns('promo-code-users', baseColumns, { page, pageSize });
 
   return (
+    <>
+      {settingsModal}
+      <AdminListHeader settings={settingsButton} />
       <Table
         rowKey="id"
         className="admin-table-nowrap"
@@ -99,5 +103,6 @@ export default function PromoCodeUsersPage() {
           onChange: (p, ps) => { setPage(p); setPageSize(ps); },
         }}
       />
+    </>
   );
 }

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

@@ -1,5 +1,9 @@
+import { useEffect, useState } from 'react';
 import { Button, Text } from '@tarojs/components';
 import type { ReactNode } from 'react';
+import { toast } from '../lib/api';
+import { getBrandAssetsSync, loadBrandAssets } from '../lib/brand-assets';
+import { openWecomCustomerServiceChat } from '../lib/wecom-cs';
 
 export type ContactCsSessionContext = {
   orderId?: string;
@@ -16,7 +20,7 @@ type ContactCsButtonProps = {
 
 const isWeapp = process.env.TARO_ENV === 'weapp';
 
-/** 组装 session-from（微信限制约 1000 字符） */
+/** 组装 session-from（微信限制约 1000 字符；原生小程序客服兜底用） */
 export function buildCsSessionFrom(session?: ContactCsSessionContext): string {
   if (!session) return 'dukang|from=mini-user';
   const parts = ['dukang'];
@@ -26,16 +30,59 @@ export function buildCsSessionFrom(session?: ContactCsSessionContext): string {
   return parts.join('|');
 }
 
+function canOpenWecom(url: string, corpId: string) {
+  return !!url.trim() && !!corpId.trim();
+}
+
 /**
- * 微信小程序客服入口（open-type=contact）。
+ * C 端在线客服：
- * 非 weapp 环境不渲染，由调用方走电话等兜底。
+ * - weapp 且已配置 CorpID + kfid：调起企业微信「微信客服」
+ * - weapp 未配 CorpID：回退 open-type=contact
+ * - H5：有 kfid 则打开企微客服链接
  */
 export default function ContactCsButton({
   className = '',
   children = '联系在线客服',
   session,
 }: ContactCsButtonProps) {
-  if (!isWeapp) return null;
+  const [cs, setCs] = useState(() => getBrandAssetsSync());
+
+  useEffect(() => {
+    void loadBrandAssets().then(setCs);
+  }, []);
+
+  const wecomChatReady = canOpenWecom(cs.customerServiceWecomUrl, cs.wecomCorpId);
+  const wecomWebReady = !!cs.customerServiceWecomUrl.trim();
+
+  if (!isWeapp && !wecomWebReady) return null;
+
+  async function openWecom() {
+    try {
+      if (isWeapp && wecomChatReady) {
+        await openWecomCustomerServiceChat({
+          url: cs.customerServiceWecomUrl,
+          corpId: cs.wecomCorpId,
+          session,
+        });
+        return;
+      }
+      if (typeof window !== 'undefined' && cs.customerServiceWecomUrl) {
+        window.location.href = cs.customerServiceWecomUrl;
+        return;
+      }
+      toast('请在微信内打开后联系客服');
+    } catch (e) {
+      toast(e instanceof Error ? e.message : '无法打开客服');
+    }
+  }
+
+  if (wecomChatReady || (!isWeapp && wecomWebReady)) {
+    return (
+      <Button className={className} hoverClass="none" onClick={() => void openWecom()}>
+        {typeof children === 'string' ? <Text>{children}</Text> : children}
+      </Button>
+    );
+  }
 
   return (
     <Button

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

@@ -0,0 +1,22 @@
+import { RichText, Text } from '@tarojs/components';
+import { deliveryHintHtmlToRichNodes } from '@dukang/shared-types';
+import { DEFAULT_LOCAL_DELIVERY_HINT } from '../lib/local-delivery';
+
+type DeliveryHintHtmlProps = {
+  html?: string | null;
+  className?: string;
+};
+
+/** 承运商配送提示：HTML 用 RichText；textarea 里的换行转成 br */
+export default function DeliveryHintHtml({
+  html,
+  className = '',
+}: DeliveryHintHtmlProps) {
+  const raw = (html || '').trim() || DEFAULT_LOCAL_DELIVERY_HINT;
+  const nodes = deliveryHintHtmlToRichNodes(raw);
+  const looksHtml = /<[a-z][\s\S]*>/i.test(nodes);
+  if (!looksHtml) {
+    return <Text className={className}>{nodes}</Text>;
+  }
+  return <RichText className={className} nodes={nodes} />;
+}

apps/mini-user/src/lib/local-delivery.ts

@@ -0,0 +1,57 @@
+import type { LocalDeliveryDto } from '@dukang/shared-types';
+import { DEFAULT_LOCAL_DELIVERY_HINT } from '@dukang/shared-types';
+import { request } from './api';
+
+export { DEFAULT_LOCAL_DELIVERY_HINT };
+
+const CACHE_TTL_MS = 60_000;
+let cached: LocalDeliveryDto[] | null = null;
+let cachedAt = 0;
+let inflight: Promise<LocalDeliveryDto[]> | null = null;
+
+function cityAliases(name: string): string[] {
+  const raw = name.trim();
+  if (!raw) return [];
+  const noSuffix = raw.replace(/市$/, '');
+  const withSuffix = raw.endsWith('市') ? raw : `${raw}市`;
+  return [raw, noSuffix, withSuffix];
+}
+
+export async function loadLocalDeliveries(force = false): Promise<LocalDeliveryDto[]> {
+  if (!force && cached && Date.now() - cachedAt < CACHE_TTL_MS) return cached;
+  if (!force && inflight) return inflight;
+  inflight = request<LocalDeliveryDto[]>('/catalog/local-deliveries')
+    .then((list) => {
+      cached = Array.isArray(list) ? list : [];
+      cachedAt = Date.now();
+      return cached;
+    })
+    .catch(() => {
+      cached = cached ?? [];
+      return cached;
+    })
+    .finally(() => {
+      inflight = null;
+    });
+  return inflight;
+}
+
+export function matchLocalDelivery(
+  list: LocalDeliveryDto[],
+  opts: { cityCode?: string | null; cityName?: string | null },
+): LocalDeliveryDto | null {
+  const code = String(opts.cityCode || '').trim();
+  if (code) {
+    const byCode = list.find((row) => row.city.code === code);
+    if (byCode) return byCode;
+  }
+  const names = new Set(cityAliases(String(opts.cityName || '')));
+  if (!names.size) return null;
+  return list.find((row) => cityAliases(row.city.name).some((n) => names.has(n))) ?? null;
+}
+
+export function resolveLocalDeliveryHintHtml(row: LocalDeliveryDto | null): string {
+  const html = row?.hintHtml?.trim();
+  if (html) return html;
+  return DEFAULT_LOCAL_DELIVERY_HINT;
+}

apps/mini-user/src/lib/product-fulfillment.ts

@@ -1,3 +1,8 @@
+import { DEFAULT_LOCAL_DELIVERY_HINT } from '@dukang/shared-types';
+
+/** @deprecated 使用 DEFAULT_LOCAL_DELIVERY_HINT；空配置回退 */
+export const LOCAL_DELIVERY_ETA_HINT = DEFAULT_LOCAL_DELIVERY_HINT;
+
 /** 商品履约能力（与 HQ / 交易硬闸一致） */
 
 export type FulfillmentFlags = {

apps/mini-user/src/lib/wecom-cs.ts

@@ -0,0 +1,85 @@
+import Taro from '@tarojs/taro';
+
+export type WecomCsSessionContext = {
+  orderId?: string;
+  orderNo?: string;
+  from?: string;
+};
+
+type OpenCsChatOption = {
+  extInfo: { url: string };
+  corpId: string;
+  showMessageCard?: boolean;
+  sendMessageTitle?: string;
+  sendMessagePath?: string;
+};
+
+type OpenCsChatFn = (option: OpenCsChatOption) => Promise<unknown>;
+
+function getTaroOpenCsChat(): OpenCsChatFn | null {
+  const api = (Taro as unknown as { openCustomerServiceChat?: OpenCsChatFn }).openCustomerServiceChat;
+  return typeof api === 'function' ? api : null;
+}
+
+function getWxOpenCsChat(): ((option: OpenCsChatOption & {
+  success?: () => void;
+  fail?: (err: { errMsg?: string }) => void;
+}) => void) | null {
+  const wxApi = (
+    globalThis as {
+      wx?: {
+        openCustomerServiceChat?: (option: OpenCsChatOption & {
+          success?: () => void;
+          fail?: (err: { errMsg?: string }) => void;
+        }) => void;
+      };
+    }
+  ).wx?.openCustomerServiceChat;
+  return typeof wxApi === 'function' ? wxApi : null;
+}
+
+/** 小程序调起企业微信「微信客服」会话 */
+export async function openWecomCustomerServiceChat(params: {
+  url: string;
+  corpId: string;
+  session?: WecomCsSessionContext;
+}): Promise<void> {
+  const url = params.url.trim();
+  const corpId = params.corpId.trim();
+  if (!url || !corpId) {
+    throw new Error('企微客服未配置');
+  }
+
+  const option: OpenCsChatOption = {
+    extInfo: { url },
+    corpId,
+  };
+  if (params.session?.orderNo || params.session?.orderId) {
+    option.showMessageCard = true;
+    option.sendMessageTitle = params.session.orderNo
+      ? `订单 ${params.session.orderNo}`
+      : '订单咨询';
+    if (params.session.orderId) {
+      option.sendMessagePath = `pages/order-detail/index?id=${params.session.orderId}`;
+    }
+  }
+
+  const taroApi = getTaroOpenCsChat();
+  if (taroApi) {
+    await taroApi(option);
+    return;
+  }
+
+  const wxApi = getWxOpenCsChat();
+  if (!wxApi) {
+    throw new Error('当前微信版本不支持企业微信客服');
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    wxApi({
+      ...option,
+      success: () => resolve(),
+      fail: (err) => reject(new Error(err?.errMsg || '无法打开企业微信客服')),
+    });
+  });
+}

apps/mini-user/src/pages/customer-service/index.tsx

@@ -16,35 +16,43 @@ function dialPhone(phone: string) {
 }
 
 export default function CustomerServicePage() {
-  const [phone, setPhone] = useState(() => getBrandAssetsSync().customerServicePhone);
+  const [brand, setBrand] = useState(() => getBrandAssetsSync());
 
   useEffect(() => {
-    void loadBrandAssets().then((b) => setPhone(b.customerServicePhone));
+    void loadBrandAssets().then(setBrand);
   }, []);
 
+  const phone = brand.customerServicePhone;
+  const wecomReady = !!brand.customerServiceWecomUrl.trim() && !!brand.wecomCorpId.trim();
+  const wecomUrlReady = !!brand.customerServiceWecomUrl.trim();
+
+  const hint = isWeapp
+    ? wecomReady
+      ? '点击下方按钮，进入企业微信客服会话'
+      : '点击下方按钮，进入在线客服会话'
+    : wecomUrlReady
+      ? '点击下方按钮进入企业微信客服，或拨打客服电话'
+      : '请在微信小程序内打开以使用在线客服，或拨打客服电话';
+
   return (
     <PageShell variant="sub" className="cs-page">
       <SubPageHeader title="联系客服" />
       <View className="sub-page-body inset-page cs-body">
         <Text className="cs-brand">杜康好客客服</Text>
-        <Text className="cs-hint">
+        <Text className="cs-hint">{hint}</Text>
-          {isWeapp
-            ? '点击下方按钮，进入小程序在线客服会话'
-            : '请在微信小程序内打开以使用在线客服，或拨打客服电话'}
-        </Text>
         <Text className="cs-hours">工作时间：9:00 - 21:00</Text>
 
-        {isWeapp ? (
+        {isWeapp || wecomUrlReady ? (
           <ContactCsButton className="cs-online-btn" session={{ from: 'customer-service' }} />
         ) : null}
 
-        <View className={isWeapp ? 'cs-phone-link' : 'cs-call-btn'} onClick={() => dialPhone(phone)}>
+        <View className={isWeapp || wecomUrlReady ? 'cs-phone-link' : 'cs-call-btn'} onClick={() => dialPhone(phone)}>
           <Text>
-            {isWeapp ? `或拨打客服电话 ${phone}` : '拨打客服电话'}
+            {isWeapp || wecomUrlReady ? `或拨打客服电话 ${phone}` : '拨打客服电话'}
           </Text>
         </View>
 
-        {!isWeapp ? (
+        {!isWeapp && !wecomUrlReady ? (
           <Text className="cs-phone-display">{phone}</Text>
         ) : null}
       </View>

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

@@ -11,7 +11,9 @@ import { maskPhone } from '../../lib/phone';
 import { ensurePayReady } from '../../lib/pay-ready';
 import { fetchUserProfile } from '../../lib/pay-wechat';
 import { request, toast } from '../../lib/api';
+import DeliveryHintHtml from '../../components/DeliveryHintHtml';
 import { canCrossCity, isCrossCityAddress } from '../../lib/product-fulfillment';
+import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
 import { getProductMainImage } from '../../lib/product-images';
 import BenefitFigure from '../../components/BenefitFigure';
 
@@ -75,6 +77,7 @@ export default function OrderConfirmPage() {
   const [addresses, setAddresses] = useState<Address[]>([]);
   const [addressId, setAddressId] = useState(checkoutCtx.addressId || '');
   const [preview, setPreview] = useState<OrderPreview | null>(null);
+  const [localHintHtml, setLocalHintHtml] = useState('');
   const [previewLoading, setPreviewLoading] = useState(false);
   const [loading, setLoading] = useState(false);
   const [msg, setMsg] = useState('');
@@ -151,6 +154,18 @@ export default function OrderConfirmPage() {
     [addresses, addressId],
   );
 
+  useEffect(() => {
+    const cityName = selectedAddress?.city;
+    if (!cityName) {
+      setLocalHintHtml('');
+      return;
+    }
+    void loadLocalDeliveries().then((list) => {
+      const row = matchLocalDelivery(list, { cityName });
+      setLocalHintHtml(row ? resolveLocalDeliveryHintHtml(row) : '');
+    });
+  }, [selectedAddress?.city]);
+
   const allowCross =
     preview?.allowCrossCityDelivery !== undefined
       ? canCrossCity({ allowCrossCityDelivery: preview.allowCrossCityDelivery })
@@ -339,6 +354,12 @@ export default function OrderConfirmPage() {
           </View>
         ) : null}
 
+        {!isCross && addressOk && addressId && localHintHtml ? (
+          <View className="order-card">
+            <DeliveryHintHtml className="u-muted" html={localHintHtml} />
+          </View>
+        ) : null}
+
         {preview ? (
           <>
             <View className="order-card">

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

@@ -10,6 +10,8 @@ import ContactCsButton from '../../components/ContactCsButton';
 import LogisticsRichText from '../../components/LogisticsRichText';
 import { request, toast } from '../../lib/api';
 import { buildPayUrl } from '../../lib/checkout-nav';
+import DeliveryHintHtml from '../../components/DeliveryHintHtml';
+import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
 import {
   formatEstimatedArrival,
   isLogisticsNotArrived,
@@ -83,6 +85,22 @@ const STATUS_LABELS: Record<string, string> = {
   REFUNDED: '已退款',
 };
 
+function applyLocalDeliveryHint(
+  data: OrderDetail,
+  setLocalHintHtml: (html: string) => void,
+) {
+  if (data.deliveryType !== 'LOCAL') {
+    setLocalHintHtml('');
+    return;
+  }
+  void loadLocalDeliveries().then((list) => {
+    const row = data.receiverCity
+      ? matchLocalDelivery(list, { cityName: data.receiverCity })
+      : null;
+    setLocalHintHtml(resolveLocalDeliveryHintHtml(row));
+  });
+}
+
 function fullReceiverAddress(order: OrderDetail) {
   const detail = (order.receiverAddress || '').trim();
   const region = [order.receiverProvince, order.receiverCity, order.receiverDistrict]
@@ -102,6 +120,7 @@ export default function OrderDetailPage() {
   const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
   const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
   const [trackLoading, setTrackLoading] = useState(false);
+  const [localHintHtml, setLocalHintHtml] = useState('');
 
   async function loadOrderTrack(delivery: OrderDetail['delivery'], orderStatus?: string) {
     if (!orderId || !shouldLoadOrderTrack(delivery)) {
@@ -133,6 +152,7 @@ export default function OrderDetailPage() {
       .then((data) => {
         setOrder(data);
         void loadOrderTrack(data.delivery, data.status);
+        applyLocalDeliveryHint(data, setLocalHintHtml);
       })
       .catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
   }, [orderId]);
@@ -144,6 +164,7 @@ export default function OrderDetailPage() {
       .then((data) => {
         setOrder(data);
         void loadOrderTrack(data.delivery, data.status);
+        applyLocalDeliveryHint(data, setLocalHintHtml);
       })
       .catch(() => {});
   });
@@ -361,6 +382,12 @@ export default function OrderDetailPage() {
                   {order.createdAt ? String(order.createdAt).slice(0, 19).replace('T', ' ') : '-'}
                 </Text>
               </View>
+              {order.deliveryType === 'LOCAL' && localHintHtml ? (
+                <View className="order-row">
+                  <Text className="order-row-label">配送时效</Text>
+                  <DeliveryHintHtml className="order-row-value" html={localHintHtml} />
+                </View>
+              ) : null}
             </View>
           </>
         )}

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

@@ -14,6 +14,7 @@ import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
 import WechatShareReady from '../../components/WechatShareReady';
 import BenefitFigure from '../../components/BenefitFigure';
+import DeliveryHintHtml from '../../components/DeliveryHintHtml';
 import { goLogin } from '../../lib/auth-nav';
 import { ensurePayReady } from '../../lib/pay-ready';
 import { isLoggedIn, request, toast } from '../../lib/api';
@@ -28,6 +29,8 @@ import {
   canPickupOnSite,
   normalizeFulfillmentFlags,
 } from '../../lib/product-fulfillment';
+import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
+import { getCityCodeForCatalog, resolveUserCity } from '../../lib/user-location';
 import {
   buildSceneSharePayload,
   toWeappShareMessage,
@@ -90,6 +93,7 @@ export default function ProductDetailPage() {
   const [product, setProduct] = useState<Product | null>(null);
   const [headerSolid, setHeaderSolid] = useState(false);
   const [selected, setSelected] = useState<Record<string, string>>({});
+  const [localHintHtml, setLocalHintHtml] = useState('');
 
   usePageScroll(({ scrollTop }) => {
     setHeaderSolid(scrollTop > 100);
@@ -136,6 +140,17 @@ export default function ProductDetailPage() {
 
   useDidShow(() => {
     loadProduct();
+    void resolveUserCity()
+      .then((city) =>
+        loadLocalDeliveries().then((list) => {
+          const row = matchLocalDelivery(list, {
+            cityCode: getCityCodeForCatalog(city),
+            cityName: city.cityName || city.displayCity || city.city,
+          });
+          setLocalHintHtml(resolveLocalDeliveryHintHtml(row));
+        }),
+      )
+      .catch(() => setLocalHintHtml(resolveLocalDeliveryHintHtml(null)));
   });
 
   const attrs = product?.specAttrs ?? [];
@@ -317,6 +332,10 @@ export default function ProductDetailPage() {
             </View>
           ) : null}
 
+          {allowOnline && localHintHtml ? (
+            <DeliveryHintHtml className="product-detail-fulfillment" html={localHintHtml} />
+          ) : null}
+
           <View className="product-detail-promo">
             <View className="product-detail-promo-glow" />
             <View className="product-detail-promo-head">

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

@@ -12,7 +12,6 @@ import Taro, {
 import PageShell from '../../components/PageShell';
 import PageNavBar from '../../components/PageNavBar';
 import ProductCarousel from '../../components/ProductCarousel';
-import ShareNavButton from '../../components/ShareNavButton';
 import StoreRedeemMarquee from '../../components/StoreRedeemMarquee';
 import WechatShareReady from '../../components/WechatShareReady';
 import { request, toast } from '../../lib/api';
@@ -356,7 +355,6 @@ export default function StoreDetailPage() {
         solid={headerSolid}
         titleVisible={headerSolid}
         onBack={goBack}
-        right={<ShareNavButton payload={sharePayload} />}
       />
 
       <View className="store-detail-hero full-bleed">

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

@@ -128,6 +128,14 @@
   margin-bottom: 24px;
 }
 
+.product-detail-fulfillment {
+  display: block;
+  margin: 0 0 16px;
+  font-size: 13px;
+  line-height: 20px;
+  color: var(--color-on-surface-variant);
+}
+
 .product-detail-promo {
   position: relative;
   margin-top: 8px;

docs/杜康好客-v3-PRD.md

@@ -29,6 +29,7 @@
 | 3.5.7 | 08-23 | 门店端核销记录时间显示秒；首页「今日核销金额」文案 | [`v3.5.7`](./杜康好客-v3.5.7-开发文档.md) |
 | 3.5.8 | 08-24 | HQ 单账号追加/撤销权限；运营改客服修复；城市门店服务+城市范围 | [`v3.5.8`](./杜康好客-v3.5.8-开发文档.md) |
 | 3.5.9 | 08-25 | 门店累计核销好客权益；HQ 表格去省略号；序号列 + 列设置 + 拖表头改列宽；用户备注 / 手机号不脱敏 | [`v3.5.9`](./杜康好客-v3.5.9-开发文档.md) |
+| 3.5.10 | 08-25 | C 端门店详情去掉分享按钮；同城送提示改承运商 HTML；小程序客服接通企微微信客服 | [`v3.5.10`](./杜康好客-v3.5.10-开发文档.md) |
 
 ---
 
@@ -84,7 +85,7 @@
 
 **HQ 订单导出**（`admin-web` 订单监控）：
 
-- 支持按筛选（下单日期、状态、类型、城市、配送、收货手机等）或勾选订单导出
+- 支持按筛选（下单日期、状态可多选、类型、城市、配送、收货手机等）或勾选订单导出
 - 格式：Excel（`.xlsx`）/ PDF（`.pdf`）
 - 单次上限 5000 条；按筛选且未指定日期时默认近 30 天
 - 权限：`orders`；操作审计 `ORDER_EXPORT`

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

@@ -64,10 +64,12 @@
 | 3.5.7 | [`门店核销记录时间秒 + 今日核销金额文案`](./杜康好客-v3.5.7-开发文档.md) | 🔶 开发完成 |
 | 3.5.8 | [`HQ 追加/撤销权限 + 运营改客服 + 城市门店服务`](./杜康好客-v3.5.8-开发文档.md) | 🔶 开发完成 |
 | 3.5.9 | [`门店累计核销 + HQ 去截断 + 列设置`](./杜康好客-v3.5.9-开发文档.md) | 🔶 开发完成 |
+| 3.5.10 | [`门店详情去分享按钮 + 同城提示改承运商 HTML + 小程序客服接企微`](./杜康好客-v3.5.10-开发文档.md) | 🔶 开发完成 |
 
 | 日期 | 说明 |
 |------|------|
-| 2026-08-25 | v3.5.9：门店列表累计核销好客权益；HQ 表格去省略号；主列表序号 + 列设置/列宽存 HQ 账号；用户列表备注（不改昵称）、手机号不脱敏 |
+| 2026-08-25 | v3.5.10：门店详情去掉分享按钮；同城送提示改承运商 HTML（`GET /catalog/local-deliveries`）；小程序客服接通企微（需填 CorpID） |
+| 2026-08-25 | v3.5.9：门店列表累计核销好客权益；HQ 表格去省略号；主列表序号 + 列设置/列宽存 HQ 账号；用户列表备注（不改昵称）、手机号不脱敏；订单列表状态可多选 |
 | 2026-08-24 | v3.5.8：HQ 单账号追加/撤销权限；运营改客服；城市门店服务与城市范围；分类删除权限与概览按权限/城市裁剪 |
 | 2026-08-23 | v3.5.7：门店核销记录时间显示秒；首页「今日到账金额」→「今日核销金额」 |
 | 2026-08-23 | v3.5.6：开发计划任务导出；核销/财务银行信息与打款凭证；工单图片入任务；运营去调试；门店审核全屏 |

docs/杜康好客-v3.5.10-开发文档.md

@@ -0,0 +1,121 @@
+# 杜康好客 · v3.5.10 开发文档
+
+> **2026-08-25** · mini-user / API  
+> **主题**：门店详情去掉分享按钮；同城配送提示 24 小时内送到；小程序客服接通企业微信
+
+---
+
+## 1. 版本目标
+
+| # | 任务 | 类型 | 交付 |
+|---|------|------|------|
+| 1 | DPT-20260824-896 | BUG | C 端门店详情去掉顶栏「分享」按钮 |
+| 2 | DPT-20260824-601 | 优化 | 同城送提示改承运商「配送信息提示」（HTML）；C 端 `GET /catalog/local-deliveries` |
+| 3 | DPT-20260822-651 | 需求 | 小程序在线客服调起企业微信「微信客服」 |
+
+**不做**：改配送规则 / 改 SLA 计算；合伙人/门店端客服；禁用微信右上角「···」分享菜单。
+
+---
+
+## 2. 门店详情去掉分享按钮
+
+`pages/store-detail` 顶栏不再渲染 `ShareNavButton`。
+
+右上角微信原生菜单仍可分享（`enableShareAppMessage` / `WechatShareReady` 保留）。只要去掉页面上的分享按钮。
+
+---
+
+## 3. 同城送提示（承运商 HTML）
+
+不再写死文案。以用户**收货地址城市**为准：该市 `common_city.status=ACTIVE`（已开城）→ 同城，展示对应仓配承运商的「配送信息提示」；未开城 → 跨城，只展示「总部物流、运费到付」。
+
+```
+收货市 → 开城仓库（ACTIVE，优先 API_AUTO 且已绑承运商）→ 承运商.delivery_hint_html
+```
+
+空字段时 C 端回退纯文本 `同城配送，预计24小时内送到`。不改下单 / 推单 / 起购。
+
+### 3.1 承运商字段
+
+`common_fulfillment_provider.delivery_hint_html` TEXT NULL。允许 `span/p/br/b/strong/i/em/font`，style 仅 `color` / `font-weight` / `font-size` / `font-style`。保存与下发前消毒。HQ 文本框里的回车在 C 端转成换行（不必手写 `<br/>`）。
+
+HQ「仓配管理 → 承运商」多行输入，例如：
+
+```html
+<span style="color:#A61D24;font-weight:700;font-size:13px">同城配送，预计24小时内送到</span>
+```
+
+### 3.2 API
+
+`GET /catalog/local-deliveries`（公开）。可选 `cityCode` / `cityName`。
+
+每项：`city` · `warehouse` · `provider` · `hintHtml`。未开城 / 无仓 / 无承运商返回空列表或 `hintHtml=null`，不报错。
+
+### 3.3 C 端
+
+| 页面 | 何时展示 |
+|------|----------|
+| 商品详情 | 可线上购；用当前选城预览 |
+| 确认订单 | 收货市已开城且地址校验通过；`RichText` |
+| 订单详情 | `deliveryType === LOCAL`；按收货市匹配 |
+
+---
+
+---
+
+## 4. 小程序客服接通企业微信
+
+原先 `open-type=contact` 进入**小程序原生客服**。本版在已配置企微参数时改为 `wx.openCustomerServiceChat`，进入企业微信「微信客服」（与 H5 kfid 同一套）。
+
+### 配置（HQ → 系统设置 → 微信小程序配置）
+
+| 键 | 说明 |
+|----|------|
+| `CUSTOMER_SERVICE_WECOM_URL` | 微信客服 kfid 链接；缺省用代码常量 |
+| `WECOM_CORP_ID` | 企业 ID（`ww` 开头）。企微「我的企业」可查 |
+
+`GET /common/client-config` 下发 `customerServiceWecomUrl`、`wecomCorpId`。
+
+### 行为
+
+| 环境 | 条件 | 行为 |
+|------|------|------|
+| 小程序 | 链接 + CorpID 都有 | `openCustomerServiceChat`；订单详情可带订单卡片 |
+| 小程序 | 未填 CorpID | 回退 `open-type=contact` |
+| H5 | 有 kfid 链接 | 打开企微客服网页 |
+
+### 企微侧前置（运营）
+
+1. 开通企业微信「微信客服」，拿到 kfid 链接。  
+2. 把 C 端小程序关联到该企业的微信客服。  
+3. 把 CorpID 填进系统设置。未填则用户仍走小程序原生客服。
+
+---
+
+## 4.1 Prisma
+
+`common_fulfillment_provider.delivery_hint_html` TEXT NULL。脚本：[`migrate-fulfillment-delivery-hint-v3510.sql`](../server/dukang-api/prisma/migrate-fulfillment-delivery-hint-v3510.sql)。
+
+## 5. 验收清单
+
+- [ ] 门店详情顶栏没有分享按钮；返回/导航/拨打不受影响
+- [ ] HQ 承运商可编辑「配送信息提示」HTML（颜色/粗细/字号）；非法标签被去掉
+- [ ] `GET /catalog/local-deliveries` 按开城列出仓库+承运商+hintHtml；`cityName` 可筛收货市
+- [ ] 商品详情（可线上购）按当前选城展示承运商提示（空则回退「同城配送，预计24小时内送到」）
+- [ ] 确认订单：收货市已开城显示 HTML 提示；未开城只显示「总部物流、运费到付」
+- [ ] 同城订单详情「配送时效」为该市承运商提示
+- [ ] 系统设置可改客服链接与 CorpID；保存后 `client-config` 立即带出
+- [ ] 小程序已填 CorpID：联系客服进入企微微信客服（非小程序原生客服后台）
+- [ ] 未填 CorpID：小程序仍能打开原生客服，不白屏
+
+---
+
+## 6. 关键路径
+
+| 域 | 路径 |
+|----|------|
+| 门店详情 | `apps/mini-user/src/pages/store-detail/index.tsx` |
+| 同城提示 | `fulfillment-provider.service.ts` · `GET /catalog/local-deliveries` · `DeliveryHintHtml` |
+| 客服按钮 | `apps/mini-user/src/components/ContactCsButton.tsx` · `lib/wecom-cs.ts` |
+| 下发 | `client-config.controller.ts` · `packages/shared-types` `config.ts` / `wechat.ts` |
+| HQ 配置 | `system-config.registry.ts` |

docs/杜康好客-v3.5.9-开发文档.md

@@ -120,6 +120,7 @@
 - [ ] 用户列表昵称只读；双击「备注」可改，离开编辑后 `user_user.hq_remark` 已更新；C 端看不到该字段
 - [ ] 用户列表手机号完整可见（详情仍脱敏）
 - [ ] 权益券列表：用户编号、订单号可点进对应用户/订单详情；来源含商品名、规格、数量、配送方式、实付金额
+- [ ] 订单列表「状态」可多选；导出按所选状态过滤；不选即全部
 
 ---
 
@@ -128,3 +129,9 @@
 - **用户**、**订单**列（及券详情）用主列下划线，分别打开用户详情抽屉、订单详情抽屉。
 - **来源**：关联订单时拼 `商品名 / 规格 / 数量(瓶或箱) / 配送方式 / ¥实付`；无订单仍用 `sourceProduct`（如总部手动发放）。
 - 列表接口 `order` 增补 `productName`、`productSpec`、`quantity`、`saleUnit`、`deliveryType`、`payAmount`。
+
+---
+
+## 11. 订单列表状态多选
+
+`GET /admin/orders` 与 `POST /admin/orders/export` 的 `status` 支持多值（重复 query、逗号串、JSON 数组均可）。列表筛选为多选；空 = 全部。单值旧链接仍可用。

docs/杜康好客-v3编码手册.md

@@ -45,6 +45,8 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
 
 **HQ 列表（v3.5.9）**：主表不省略号、可横滑；最左序号；列设置（显隐/顺序）与列宽（拖表头）存 `hq_account.list_column_prefs`。主展示列下划线，点击进编辑或详情。门店列表「累计核销好客权益」= 该店 `RedeemRecord.amount` 合计。用户列表昵称只读（点击进详情）；双击「备注」离开即保存（`hq_remark`）；列表手机号不脱敏。
 
+**C 端（v3.5.10）**：门店详情无顶栏分享按钮。同城送提示取开城仓库绑定承运商的 `delivery_hint_html`（`GET /catalog/local-deliveries`，按收货市是否开城）；空则回退「同城配送，预计24小时内送到」。在线客服优先 `wx.openCustomerServiceChat`（`CUSTOMER_SERVICE_WECOM_URL` + `WECOM_CORP_ID`）；未配 CorpID 回退小程序原生客服。
+
 ## 5. 验收用例（必过）
 
 **主链路 15 项**：登录、4 SKU、起购、支付+权益、双通道核销、payout、关店不可见、拓店审核、配送完成、退款、T+1/T+30…  

docs/杜康好客-知识库.md

@@ -22,10 +22,11 @@
 
 - 四 Tab：首页/权益/门店/我的；微信登录+7天会话
 - 下单：选城→商品→地址→起购校验→微信支付→权益1:1
-- 权益：直接核销(≤总余额) / 单据核销(≤单据)；出码3分钟
+- 权益：直接核销(≤总余额) / 单据核销(≤单据)；出码3分钟。二维码内容为门店 H5 URL（`{SHOP_H5_URL}/redeem?token=`），微信扫一扫直达核销确认页
 - 门店：仅 OPEN；详情含套餐/电话(脱敏可拨打)/两段营业时间
 - 订单 Tab：待付款/已付款/已完成；物流详情(签收照/拨号/ETA)
-- 售后：客服入口；发票/四类型工单按 PRD Wave 进度
+- 售后：客服入口（小程序优先企微微信客服，未配 CorpID 回退原生客服）；发票/四类型工单按 PRD Wave 进度
+- 同城送：收货市已开城则展示承运商「配送信息提示」（HTML）；未开城走跨城到付；门店详情无顶栏分享按钮
 - 版本：`minClientVersion` 过低强制更新或退出
 - 「我的」头像昵称：`chooseAvatar` + `input type=nickname`（见下「踩坑」）
 
@@ -47,7 +48,7 @@
 
 ## 3. 门店端（h5-shop）
 
-- 登录绑定门店；首页扫码核销(微信 JSSDK)
+- 登录绑定门店；首页扫码核销(微信 JSSDK)；也可微信扫一扫用户核销码直达确认页（仍需点「确认核销」）
 - 核销记录；今日汇总；到账金额×60%展示
 - 营业状态开关；Mine 门店信息
 - 套餐：列表编辑→提交 HQ 审核（v3.4.10）
@@ -68,6 +69,7 @@
 | 规则 | 说明 |
 |------|------|
 | iOS 登录/选店后 | 用 `location.replace(path)`（`hardNavigateInWechat`），禁止仅 React Router navigate |
+| 微信扫一扫落地核销页 | 成功后须 `hardNavigateInWechat('/')` 回首页，否则入场 URL 仍是 `/redeem?token=`，下次首页扫码验签失败 |
 | iOS 签名 URL | `getJssdkSignUrl()` = 入场 URL，**保留** OAuth `code/state`；后端 `jssdk-config` 勿剔除 |
 | 已绑定微信 | 短信登录后**不要**再强制 OAuth（避免反复重置入场 URL） |
 | 扫码仍失败 | 弹窗引导「刷新页面」/「重新授权微信」，勿只提示再点一次 |
@@ -150,6 +152,7 @@ HQ 账号/角色(`hq-permissions`，生效=(角色∪追加)−撤销；可绑
 | 智能机器人 | `/wecom/bots` 长连接指令 |
 | 消息推送 | `/wecom/pushes` Webhook+eventKey |
 | 日志 | `/logs/wecom-bots` |
+| C 端微信客服 | 系统设置 `CUSTOMER_SERVICE_WECOM_URL` + `WECOM_CORP_ID`；小程序须已关联该企业微信客服 |
 
 eventKey：`alert.ops` · `support_ticket.created` · `dev_plan.task_dispatch` · 支付/核销/结算告警。
 

packages/shared-types/src/config.ts

@@ -30,11 +30,16 @@ export interface AppConfig {
   tencentLbsSecretKey: string;
   /** C 端 H5 落地页（推广码二维码链接前缀） */
   userH5Url: string;
+  /** 门店 H5 落地页（用户核销码二维码链接前缀） */
+  shopH5Url: string;
 }
 
 /** 推广码 / C 端 H5 默认落地页（系统设置 USER_H5_URL 未配时回退；HQ 可改） */
 export const DEFAULT_USER_H5_URL = 'https://user.runxian.top/user';
 
+/** 门店 H5 默认落地页（系统设置 SHOP_H5_URL 未配时回退；HQ 可改） */
+export const DEFAULT_SHOP_H5_URL = 'https://shop.dukanghaoke.com';
+
 /** 品牌 Logo OSS 根路径（默认；系统设置 BRAND_LOGO_OSS_BASE 可覆盖） */
 export const BRAND_LOGO_OSS_BASE = 'https://dukang-dev.oss-cn-beijing.aliyuncs.com/logo/';
 
@@ -58,12 +63,15 @@ export const QUALIFICATION_DISCLOSURE_URL = `${MINI_USER_STATIC_OSS_BASE}qualifi
 export const CUSTOMER_SERVICE_PHONE = '13203801799';
 
 /**
- * 企业微信「微信客服」链接（C 端「在线客服」；微信内网页点击后进入原生客服会话）
+ * 企业微信「微信客服」链接（C 端「在线客服」；微信内网页 / 小程序 openCustomerServiceChat）
- * 可在 h5-user 用 VITE_CS_WECOM_URL 覆盖
+ * 可在系统设置 CUSTOMER_SERVICE_WECOM_URL 覆盖
  */
 export const CUSTOMER_SERVICE_WECOM_URL =
   'https://work.weixin.qq.com/kfid/kfc8b88659a1dffa8cd';
 
+/** 企业微信 CorpID（小程序 wx.openCustomerServiceChat 必填；系统设置 WECOM_CORP_ID） */
+export const WECOM_CORP_ID = '';
+
 /** 从 env / 系统设置解析的 C 端品牌与客服展示配置（缺省回退常量） */
 export type ClientBrandRuntime = {
   userH5Url: string;
@@ -74,6 +82,8 @@ export type ClientBrandRuntime = {
   miniUserStaticOssBase: string;
   qualificationDisclosureUrl: string;
   customerServicePhone: string;
+  customerServiceWecomUrl: string;
+  wecomCorpId: string;
 };
 
 export function resolveClientBrandRuntime(
@@ -95,6 +105,8 @@ export function resolveClientBrandRuntime(
       (e.QUALIFICATION_DISCLOSURE_URL || '').trim() ||
       `${staticBase}qualification-disclosure.png`,
     customerServicePhone: (e.CUSTOMER_SERVICE_PHONE || CUSTOMER_SERVICE_PHONE).trim(),
+    customerServiceWecomUrl: (e.CUSTOMER_SERVICE_WECOM_URL || CUSTOMER_SERVICE_WECOM_URL).trim(),
+    wecomCorpId: (e.WECOM_CORP_ID || WECOM_CORP_ID).trim(),
   };
 }
 
@@ -265,6 +277,7 @@ export function loadAppConfig(env?: Record<string, string | undefined>): AppConf
     tencentLbsKey: e.TENCENT_LBS_KEY ?? '',
     tencentLbsSecretKey: e.TENCENT_LBS_SECRET_KEY ?? '',
     userH5Url: (e.USER_H5_URL || DEFAULT_USER_H5_URL).replace(/\/$/, ''),
+    shopH5Url: (e.SHOP_H5_URL || DEFAULT_SHOP_H5_URL).replace(/\/$/, ''),
   };
   return {
     ...base,

packages/shared-types/src/fulfillment-provider.ts

@@ -55,6 +55,8 @@ export interface FulfillmentProviderDto {
   settlementMethod: LogisticsSettlementMethod;
   pricingRules?: LogisticsPricingRuleDto | null;
   prepaidBalance: number;
+  /** C 端同城配送提示（已消毒 HTML） */
+  deliveryHintHtml?: string | null;
   createdAt: string;
   updatedAt: string;
 }
@@ -74,6 +76,7 @@ export interface CreateFulfillmentProviderInput {
   bankAccountNo?: string | null;
   settlementMethod?: LogisticsSettlementMethod;
   pricingRules?: LogisticsPricingRuleDto | null;
+  deliveryHintHtml?: string | null;
 }
 
 export interface UpdateFulfillmentProviderInput {
@@ -89,6 +92,7 @@ export interface UpdateFulfillmentProviderInput {
   bankAccountNo?: string | null;
   settlementMethod?: LogisticsSettlementMethod;
   pricingRules?: LogisticsPricingRuleDto | null;
+  deliveryHintHtml?: string | null;
 }
 
 export { DEFAULT_XFX_LOGISTICS_PRICING };
@@ -113,3 +117,83 @@ export const XFX_PROVIDER_CODES = ['XFX', 'XIAOFEIXIA'] as const;
 export function isXfxProviderCode(code: string): boolean {
   return (XFX_PROVIDER_CODES as readonly string[]).includes(code.trim().toUpperCase());
 }
+
+/** 承运商未配置提示时 C 端回退文案 */
+export const DEFAULT_LOCAL_DELIVERY_HINT = '同城配送，预计24小时内送到';
+
+export const LOCAL_DELIVERY_HINT_MAX_LEN = 2000;
+
+const HINT_ALLOWED_TAGS = new Set(['span', 'p', 'br', 'b', 'strong', 'i', 'em', 'font']);
+const HINT_ALLOWED_STYLES = new Set(['color', 'font-weight', 'font-size', 'font-style']);
+
+export type LocalDeliveryDto = {
+  city: { id: string; code: string; name: string };
+  warehouse: { id: string; name: string; fulfillmentMode: string } | null;
+  provider: { id: string; code: string; name: string } | null;
+  hintHtml: string | null;
+};
+
+function sanitizeHintStyle(raw: string): string {
+  return raw
+    .split(';')
+    .map((part) => part.trim())
+    .filter(Boolean)
+    .map((part) => {
+      const idx = part.indexOf(':');
+      if (idx <= 0) return '';
+      const key = part.slice(0, idx).trim().toLowerCase();
+      const value = part.slice(idx + 1).trim();
+      if (!HINT_ALLOWED_STYLES.has(key)) return '';
+      if (/url\s*\(|expression\s*\(|javascript\s*:/i.test(value)) return '';
+      return `${key}:${value}`;
+    })
+    .filter(Boolean)
+    .join(';');
+}
+
+/** 文本换行转成 br，供 C 端 RichText 使用（不改 HQ 存盘原文） */
+export function deliveryHintHtmlToRichNodes(html: string): string {
+  return html
+    .replace(/\r\n|\r|\n/g, '<br/>')
+    .replace(/(?:<br\s*\/?>){3,}/gi, '<br/><br/>');
+}
+
+/** 承运商配送提示 HTML：去掉脚本/事件，只保留字号颜色粗细 */
+export function sanitizeDeliveryHintHtml(raw?: string | null): string | null {
+  if (raw == null) return null;
+  let html = String(raw).trim();
+  if (!html) return null;
+  if (html.length > LOCAL_DELIVERY_HINT_MAX_LEN) {
+    html = html.slice(0, LOCAL_DELIVERY_HINT_MAX_LEN);
+  }
+  html = html.replace(/<script[\s\S]*?>[\s\S]*?<\/script>/gi, '');
+  html = html.replace(/on[a-z]+\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/gi, '');
+  html = html.replace(/javascript\s*:/gi, '');
+  html = html.replace(/<\/?([a-zA-Z][a-zA-Z0-9]*)\b([^>]*)>/g, (_full, tag: string, attrs: string) => {
+    const name = String(tag).toLowerCase();
+    const closing = String(_full).startsWith('</');
+    if (!HINT_ALLOWED_TAGS.has(name)) return '';
+    if (name === 'br') return closing ? '' : '<br/>';
+    if (closing) return `</${name}>`;
+    let style = '';
+    const styleMatch = String(attrs).match(/\sstyle\s*=\s*("([^"]*)"|'([^']*)')/i);
+    if (styleMatch) {
+      style = sanitizeHintStyle(styleMatch[2] ?? styleMatch[3] ?? '');
+    }
+    let color = '';
+    let size = '';
+    if (name === 'font') {
+      const colorMatch = String(attrs).match(/\scolor\s*=\s*("([^"]*)"|'([^']*)'|([^\s>]+))/i);
+      if (colorMatch) color = (colorMatch[2] ?? colorMatch[3] ?? colorMatch[4] ?? '').trim();
+      const sizeMatch = String(attrs).match(/\ssize\s*=\s*("([^"]*)"|'([^']*)'|([^\s>]+))/i);
+      if (sizeMatch) size = (sizeMatch[2] ?? sizeMatch[3] ?? sizeMatch[4] ?? '').trim();
+    }
+    const extra: string[] = [];
+    if (style) extra.push(`style="${style}"`);
+    if (color) extra.push(`color="${color.replace(/"/g, '')}"`);
+    if (size) extra.push(`size="${size.replace(/"/g, '')}"`);
+    return extra.length ? `<${name} ${extra.join(' ')}>` : `<${name}>`;
+  });
+  const cleaned = html.replace(/&nbsp;/g, ' ').trim();
+  return cleaned || null;
+}

packages/shared-types/src/ops.ts

@@ -3,6 +3,21 @@ export interface AdminListQuery {
   pageSize?: number;
 }
 
+/** HQ 订单列表 / 导出筛选。`status` 可多选（单值仍兼容） */
+export interface AdminOrdersListQuery extends AdminListQuery {
+  orderNo?: string;
+  status?: string | string[];
+  orderType?: string;
+  userId?: string;
+  cityId?: string;
+  receiverPhone?: string;
+  fulfillmentHold?: string | boolean;
+  createdFrom?: string;
+  createdTo?: string;
+  excludeTest?: boolean;
+  deliveryType?: string;
+}
+
 export interface UpdateAdminUserRequest {
   hqRemark: string;
 }

packages/shared-types/src/wechat.ts

@@ -64,6 +64,10 @@ export type ClientRuntimeConfig = {
   qualificationDisclosureUrl?: string;
   /** 总部客服电话 */
   customerServicePhone?: string;
+  /** 企业微信「微信客服」链接（kfid） */
+  customerServiceWecomUrl?: string;
+  /** 企业微信 CorpID（小程序调起企微客服） */
+  wecomCorpId?: string;
   /** 合伙人入驻：企微客服二维码图片 URL */
   partnerOnboardCsQrUrl?: string | null;
   /** 合伙人入驻：企微客服提示文案 */

server/dukang-api/prisma/migrate-fulfillment-delivery-hint-v3510.sql

@@ -0,0 +1,3 @@
+-- v3.5.10：承运商「配送信息提示」（C 端同城送 HTML）
+ALTER TABLE `common_fulfillment_provider`
+  ADD COLUMN `delivery_hint_html` TEXT NULL AFTER `prepaid_balance`;

server/dukang-api/prisma/schema.prisma

@@ -1057,6 +1057,8 @@ model FulfillmentProvider {
   settlementMethod LogisticsSettlementMethod  @default(PREPAID) @map("settlement_method")
   pricingRulesJson String?                    @map("pricing_rules_json") @db.Text
   prepaidBalance   Decimal                    @default(0) @map("prepaid_balance") @db.Decimal(12, 2)
+  /// C 端同城配送提示（HTML，消毒后下发）
+  deliveryHintHtml String?                    @map("delivery_hint_html") @db.Text
   createdAt        DateTime                   @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt        DateTime                   @updatedAt @map("updated_at") @db.DateTime(3)
 

server/dukang-api/src/common/hq-operation/hq-operation.constants.ts

@@ -77,6 +77,7 @@ export const HqOperationAction = {
   LOGISTICS_BILL_CONFIRM: 'LOGISTICS_BILL_CONFIRM',
   LOGISTICS_BILL_BATCH_CONFIRM: 'LOGISTICS_BILL_BATCH_CONFIRM',
   LOGISTICS_PROVIDER_RECHARGE: 'LOGISTICS_PROVIDER_RECHARGE',
+  LOGISTICS_PROVIDER_DELETE: 'LOGISTICS_PROVIDER_DELETE',
   REDEEM_DEBUG_CREATE_TOKEN: 'REDEEM_DEBUG_CREATE_TOKEN',
   REDEEM_DEBUG_CONFIRM: 'REDEEM_DEBUG_CONFIRM',
   PROMO_CODE_CREATE: 'PROMO_CODE_CREATE',
@@ -202,6 +203,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
   [HqOperationAction.LOGISTICS_BILL_CONFIRM]: '物流对账单确认结算',
   [HqOperationAction.LOGISTICS_BILL_BATCH_CONFIRM]: '批量物流对账单结算',
   [HqOperationAction.LOGISTICS_PROVIDER_RECHARGE]: '物流承运商充值',
+  [HqOperationAction.LOGISTICS_PROVIDER_DELETE]: '删除物流承运商',
   [HqOperationAction.REDEEM_DEBUG_CREATE_TOKEN]: '核销调试-生成码',
   [HqOperationAction.REDEEM_DEBUG_CONFIRM]: '核销调试-确认核销',
   [HqOperationAction.PROMO_CODE_CREATE]: '创建推广码',

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

@@ -5,6 +5,7 @@ import {
   BRAND_LOGO_URL,
   BRAND_LOGO_WIDE_URL,
   CUSTOMER_SERVICE_PHONE,
+  CUSTOMER_SERVICE_WECOM_URL,
   DEFAULT_SHARE_BENEFIT_TITLE,
   DEFAULT_SHARE_DESC,
   DEFAULT_SHARE_HINT,
@@ -12,6 +13,7 @@ import {
   DEFAULT_SHARE_ORDER_TITLE,
   DEFAULT_SHARE_STORES_TITLE,
   DEFAULT_SHARE_TITLE,
+  DEFAULT_SHOP_H5_URL,
   DEFAULT_USER_H5_URL,
   MINI_USER_STATIC_OSS_BASE,
   MOCK_SMS_FIXED_CODE,
@@ -154,6 +156,15 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
     placeholder: 'https://user.example.com/user',
     description: '推广码二维码 / 未配置时的默认落地页前缀（无末尾斜杠）',
   },
+  {
+    key: 'SHOP_H5_URL',
+    label: '门店 H5 落地页',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: 'https://shop.dukanghaoke.com',
+    description: '用户核销码二维码链接前缀；扫码直达门店核销确认页（无末尾斜杠）',
+  },
   {
     key: 'BRAND_LOGO_OSS_BASE',
     label: '品牌 Logo OSS 根路径',
@@ -213,6 +224,24 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
     placeholder: '13203801799',
     description: 'C 端联系客服拨号号码',
   },
+  {
+    key: 'CUSTOMER_SERVICE_WECOM_URL',
+    label: '企微微信客服链接',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: 'https://work.weixin.qq.com/kfid/kfc…',
+    description: 'C 端在线客服 kfid 链接；小程序需同时配置下方企业 ID',
+  },
+  {
+    key: 'WECOM_CORP_ID',
+    label: '企微企业 ID（CorpID）',
+    group: G.wechat_mini,
+    type: 'string',
+    requiresRestart: false,
+    placeholder: 'wwxxxxxxxxxxxx',
+    description: '企业微信「我的企业」企业 ID。小程序须已关联该企业的微信客服；未填则回退小程序原生客服',
+  },
   {
     key: 'PARTNER_ONBOARD_CS_QR_URL',
     label: '合伙人入驻 · 企微客服二维码',
@@ -584,6 +613,7 @@ export const SYSTEM_CONFIG_KEY_SET = new Set(SYSTEM_CONFIG_FIELDS.map((f) => f.k
 /** 表单空值时展示 / 启动补种的默认值（与 shared-types 常量对齐） */
 export const SYSTEM_CONFIG_DEFAULTS: Record<string, string> = {
   USER_H5_URL: DEFAULT_USER_H5_URL.replace(/\/$/, ''),
+  SHOP_H5_URL: DEFAULT_SHOP_H5_URL.replace(/\/$/, ''),
   BRAND_LOGO_OSS_BASE: BRAND_LOGO_OSS_BASE,
   BRAND_LOGO_URL: BRAND_LOGO_URL,
   BRAND_LOGO_WIDE_URL: BRAND_LOGO_WIDE_URL,
@@ -591,6 +621,7 @@ export const SYSTEM_CONFIG_DEFAULTS: Record<string, string> = {
   MINI_USER_STATIC_OSS_BASE: MINI_USER_STATIC_OSS_BASE,
   QUALIFICATION_DISCLOSURE_URL: QUALIFICATION_DISCLOSURE_URL,
   CUSTOMER_SERVICE_PHONE: CUSTOMER_SERVICE_PHONE,
+  CUSTOMER_SERVICE_WECOM_URL: CUSTOMER_SERVICE_WECOM_URL,
   MOCK_SMS_FIXED_CODE: MOCK_SMS_FIXED_CODE,
   SHARE_HINT: DEFAULT_SHARE_HINT,
   SHARE_DEFAULT_TITLE: DEFAULT_SHARE_TITLE,

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

@@ -37,6 +37,8 @@ export class ClientConfigController {
       brandLogoMarkUrl: brand.brandLogoMarkUrl,
       qualificationDisclosureUrl: brand.qualificationDisclosureUrl,
       customerServicePhone: brand.customerServicePhone,
+      customerServiceWecomUrl: brand.customerServiceWecomUrl || null,
+      wecomCorpId: brand.wecomCorpId || null,
       partnerOnboardCsQrUrl: (env.PARTNER_ONBOARD_CS_QR_URL ?? '').trim() || null,
       partnerOnboardCsHint:
         (env.PARTNER_ONBOARD_CS_HINT ?? '').trim() ||

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

@@ -8,6 +8,7 @@ import {
 import {
   DEFAULT_XFX_LOGISTICS_PRICING,
   isXfxProviderCode,
+  sanitizeDeliveryHintHtml,
   type LogisticsPricingRuleDto,
   type XiaofeixiaProviderConfig,
   type XiaofeixiaProviderConfigPublic,
@@ -30,6 +31,7 @@ export type CreateFulfillmentProviderInput = {
   bankAccountNo?: string | null;
   settlementMethod?: LogisticsSettlementMethod | string;
   pricingRules?: LogisticsPricingRuleDto | null;
+  deliveryHintHtml?: string | null;
 };
 
 export type UpdateFulfillmentProviderInput = Partial<CreateFulfillmentProviderInput>;
@@ -149,6 +151,7 @@ export class FulfillmentProviderService {
         bankAccountNo: this.normOptional(input.bankAccountNo),
         settlementMethod,
         pricingRulesJson,
+        deliveryHintHtml: sanitizeDeliveryHintHtml(input.deliveryHintHtml),
       },
     });
     return this.toDto(row);
@@ -195,11 +198,43 @@ export class FulfillmentProviderService {
           ? { settlementMethod: this.parseSettlementMethod(input.settlementMethod)! }
           : {}),
         ...(pricingRulesJson !== undefined ? { pricingRulesJson } : {}),
+        ...(input.deliveryHintHtml !== undefined
+          ? { deliveryHintHtml: sanitizeDeliveryHintHtml(input.deliveryHintHtml) }
+          : {}),
       },
     });
     return this.toDto(row);
   }
 
+  async remove(id: bigint) {
+    const current = await this.prisma.fulfillmentProvider.findUnique({ where: { id } });
+    if (!current) throw new NotFoundException('仓配承运商不存在');
+
+    const [billCount, ledgerCount] = await Promise.all([
+      this.prisma.logisticsBill.count({ where: { fulfillmentProviderId: id } }),
+      this.prisma.logisticsPrepaidLedger.count({ where: { fulfillmentProviderId: id } }),
+    ]);
+    if (billCount > 0) {
+      throw new BadRequestException(`该承运商已有 ${billCount} 笔物流对账单，不能删除`);
+    }
+    if (ledgerCount > 0) {
+      throw new BadRequestException('该承运商已有充值/扣款流水，不能删除');
+    }
+
+    await this.prisma.$transaction(async (tx) => {
+      await tx.cityWarehouse.updateMany({
+        where: { fulfillmentProviderId: id },
+        data: { fulfillmentProviderId: null, fulfillmentMode: 'MANUAL' },
+      });
+      await tx.orderDelivery.updateMany({
+        where: { fulfillmentProviderId: id },
+        data: { fulfillmentProviderId: null },
+      });
+      await tx.fulfillmentProvider.delete({ where: { id } });
+    });
+    return { ok: true, id: id.toString() };
+  }
+
   /** 充值（结算模块可复用） */
   async rechargePrepaid(providerId: bigint, amount: number, remark?: string) {
     if (!(amount > 0)) throw new BadRequestException('充值金额须大于 0');
@@ -413,6 +448,7 @@ export class FulfillmentProviderService {
     settlementMethod?: string;
     pricingRulesJson?: string | null;
     prepaidBalance?: Prisma.Decimal | number;
+    deliveryHintHtml?: string | null;
     createdAt: Date;
     updatedAt: Date;
   }) {
@@ -434,8 +470,61 @@ export class FulfillmentProviderService {
       settlementMethod: row.settlementMethod ?? 'PREPAID',
       pricingRules: this.parsePricingRules(row.pricingRulesJson ?? null),
       prepaidBalance: Number(row.prepaidBalance ?? 0),
+      deliveryHintHtml: sanitizeDeliveryHintHtml(row.deliveryHintHtml ?? null),
       createdAt: row.createdAt.toISOString(),
       updatedAt: row.updatedAt.toISOString(),
     });
   }
+
+  async listLocalDeliveries(filter?: { cityCode?: string; cityName?: string }) {
+    const cityCode = filter?.cityCode?.trim() || '';
+    const cityName = filter?.cityName?.trim() || '';
+    const cities = await this.prisma.commonCity.findMany({
+      where: {
+        status: 'ACTIVE',
+        ...(cityCode ? { code: cityCode } : {}),
+        ...(cityName && !cityCode
+          ? { name: { in: this.cityNameAliases(cityName) } }
+          : {}),
+      },
+      include: {
+        warehouses: {
+          where: { status: 'ACTIVE' },
+          include: { fulfillmentProvider: true },
+          orderBy: { createdAt: 'asc' },
+        },
+      },
+      orderBy: { name: 'asc' },
+    });
+
+    return cities.map((city) => {
+      const preferred =
+        city.warehouses.find((w) => w.fulfillmentMode === 'API_AUTO' && w.fulfillmentProviderId) ??
+        city.warehouses.find((w) => w.fulfillmentProviderId) ??
+        null;
+      const provider = preferred?.fulfillmentProvider ?? null;
+      return {
+        city: { id: city.id.toString(), code: city.code, name: city.name },
+        warehouse: preferred
+          ? {
+              id: preferred.id.toString(),
+              name: preferred.name,
+              fulfillmentMode: preferred.fulfillmentMode,
+            }
+          : null,
+        provider: provider
+          ? { id: provider.id.toString(), code: provider.code, name: provider.name }
+          : null,
+        hintHtml: sanitizeDeliveryHintHtml(provider?.deliveryHintHtml ?? null),
+      };
+    });
+  }
+
+  private cityNameAliases(name: string): string[] {
+    const raw = name.trim();
+    if (!raw) return [];
+    const noSuffix = raw.replace(/市$/, '');
+    const withSuffix = raw.endsWith('市') ? raw : `${raw}市`;
+    return Array.from(new Set([raw, noSuffix, withSuffix]));
+  }
 }

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

@@ -3,9 +3,11 @@ import { IntegrationsModule } from '../../integrations/integrations.module';
 import { TradeModule } from '../trade/trade.module';
 import { FulfillmentProviderService } from './fulfillment-provider.service';
 import { FulfillmentService } from './fulfillment.service';
+import { LocalDeliveriesController } from './local-deliveries.controller';
 
 @Module({
   imports: [IntegrationsModule, forwardRef(() => TradeModule)],
+  controllers: [LocalDeliveriesController],
   providers: [FulfillmentProviderService, FulfillmentService],
   exports: [FulfillmentProviderService, FulfillmentService],
 })

server/dukang-api/src/modules/fulfillment/local-deliveries.controller.ts

@@ -0,0 +1,12 @@
+import { Controller, Get, Query } from '@nestjs/common';
+import { FulfillmentProviderService } from './fulfillment-provider.service';
+
+@Controller('catalog')
+export class LocalDeliveriesController {
+  constructor(private readonly providers: FulfillmentProviderService) {}
+
+  @Get('local-deliveries')
+  list(@Query('cityCode') cityCode?: string, @Query('cityName') cityName?: string) {
+    return this.providers.listLocalDeliveries({ cityCode, cityName });
+  }
+}

server/dukang-api/src/modules/ops/admin-fulfillment-providers.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post, Put, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Put, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
@@ -47,6 +47,7 @@ export class AdminFulfillmentProvidersController {
       bankAccountNo: dto.bankAccountNo,
       settlementMethod: dto.settlementMethod,
       pricingRules: dto.pricingRules,
+      deliveryHintHtml: dto.deliveryHintHtml,
     });
   }
 
@@ -76,6 +77,7 @@ export class AdminFulfillmentProvidersController {
       bankAccountNo: dto.bankAccountNo,
       settlementMethod: dto.settlementMethod,
       pricingRules: dto.pricingRules,
+      deliveryHintHtml: dto.deliveryHintHtml,
     });
   }
 
@@ -89,4 +91,14 @@ export class AdminFulfillmentProvidersController {
   recharge(@Param('id') id: string, @Body() dto: RechargeFulfillmentProviderDto) {
     return this.service.rechargePrepaid(BigInt(id), Number(dto.amount), dto.remark);
   }
+
+  @Delete(':id')
+  @HqOperation({
+    action: HqOperationAction.LOGISTICS_PROVIDER_DELETE,
+    refType: 'FULFILLMENT_PROVIDER',
+    refIdParam: 'id',
+  })
+  remove(@Param('id') id: string) {
+    return this.service.remove(BigInt(id));
+  }
 }

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

@@ -155,7 +155,9 @@ export class AdminOrdersService {
     const where: Prisma.OrderWhereInput = {};
 
     if (query.orderNo) where.orderNo = { contains: query.orderNo };
-    if (query.status) where.status = query.status as Prisma.EnumOrderStatusFilter['equals'];
+    if (query.status?.length) {
+      where.status = { in: query.status as Prisma.EnumOrderStatusFilter['in'] };
+    }
     if (query.orderType) where.orderType = query.orderType as Prisma.EnumOrderTypeFilter['equals'];
     if (query.userId) where.userId = BigInt(query.userId);
     if (query.cityId) where.cityId = BigInt(query.cityId);

server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts

@@ -797,6 +797,11 @@ export class CreateFulfillmentProviderDto {
     boxBottles?: number;
     boxFee?: number;
   } | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(2000)
+  deliveryHintHtml?: string | null;
 }
 
 export class UpdateFulfillmentProviderDto {
@@ -859,6 +864,11 @@ export class UpdateFulfillmentProviderDto {
     boxBottles?: number;
     boxFee?: number;
   } | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(2000)
+  deliveryHintHtml?: string | null;
 }
 
 export class RechargeFulfillmentProviderDto {

server/dukang-api/src/modules/ops/dto/admin-query.dto.ts

@@ -1,6 +1,9 @@
+import { OrderStatus } from '@dukang/shared-types';
 import { Type, Transform } from 'class-transformer';
 import { IsArray, IsBoolean, IsIn, IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
 
+const ORDER_STATUS_VALUES = Object.values(OrderStatus);
+
 function toOptionalBoolean(value: unknown): boolean | undefined {
   if (value === undefined || value === null || value === '') return undefined;
   if (value === true || value === 'true' || value === '1' || value === 1) return true;
@@ -8,6 +11,19 @@ function toOptionalBoolean(value: unknown): boolean | undefined {
   return undefined;
 }
 
+/** Query/body：单值、逗号串、重复 key、数组均可 → string[] */
+function toOptionalStringList(value: unknown): string[] | undefined {
+  if (value === undefined || value === null || value === '') return undefined;
+  const raw = Array.isArray(value) ? value : [value];
+  const items = [...new Set(
+    raw
+      .flatMap((v) => String(v).split(','))
+      .map((s) => s.trim())
+      .filter(Boolean),
+  )];
+  return items.length ? items : undefined;
+}
+
 export class PaginationQueryDto {
   @IsOptional()
   @Type(() => Number)
@@ -57,9 +73,12 @@ export class AdminOrdersQueryDto extends PaginationQueryDto {
   @IsString()
   orderNo?: string;
 
+  /** 单值或多项：`?status=PENDING_PAY` / `?status=A&status=B` / `?status=A,B` */
   @IsOptional()
-  @IsString()
+  @Transform(({ value }) => toOptionalStringList(value))
-  status?: string;
+  @IsArray()
+  @IsIn(ORDER_STATUS_VALUES, { each: true })
+  status?: string[];
 
   @IsOptional()
   @IsIn(['NORMAL', 'PROXY'])
@@ -117,8 +136,10 @@ export class AdminOrdersExportDto {
   orderNo?: string;
 
   @IsOptional()
-  @IsString()
+  @Transform(({ value }) => toOptionalStringList(value))
-  status?: string;
+  @IsArray()
+  @IsIn(ORDER_STATUS_VALUES, { each: true })
+  status?: string[];
 
   @IsOptional()
   @IsIn(['NORMAL', 'PROXY', 'RESHIPMENT'])