权限管理新增人员支持「自定义」角色：选中后可见页逐页勾选，保存到本人

角色下拉末尾加「自定义」,选中时「可见页面」从只读矩阵切成可勾选(复用 PermEditor),
提交带 pages_override;编辑自定义用户回填已勾选页;列表里 custom 显示「自定义」,
列表内切到自定义会转去编辑页勾选(避免空可见页)。AdminInfo 加 pages_override 字段。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

src/app/(main)/ad-revenue-report/UserAdRevenueDrawer.tsx

@@ -0,0 +1,84 @@
+'use client';
+
+// 点收益报表里的用户手机号 → 半屏抽屉展示该用户的广告收益详情(统计卡 + 金币记录)。
+// 复用「提现详情」里的 UserRewardPanel(数据走 /users/{id}/reward-stats + /coin-records);
+// 用户基本信息(昵称/注册时间/钱包)取自 /users/{id} 概览。抽屉样式(width 50% 半屏)与提现详情一致。
+import { useEffect, useState } from 'react';
+import { Drawer } from 'antd';
+import { api } from '@/lib/api';
+import type { WithdrawUserSnapshot } from '@/lib/types';
+import UserRewardPanel from '../withdraws/UserRewardPanel';
+
+// GET /admin/api/users/{id} 概览里我们要用到的子集(前端未单独定义 AdminUserOverview 类型)。
+interface UserOverviewResp {
+  user: {
+    id: number;
+    phone: string;
+    nickname: string | null;
+    status: string;
+    wechat_nickname: string | null;
+    created_at: string;
+    last_login_at: string;
+  };
+  cash_balance_cents: number;
+  withdraw_total: number;
+  withdraw_success_cents: number;
+}
+
+interface Props {
+  open: boolean;
+  onClose: () => void;
+  userId: number | null;
+  phone: string | null; // 报表行已有的手机号:概览拉取失败时兜底展示
+}
+
+export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: Props) {
+  // UserRewardPanel 的 user 快照:它只读 phone/nickname/wechat_nickname/created_at,其余按 snapshot 形状补齐。
+  const [user, setUser] = useState<WithdrawUserSnapshot | null>(null);
+
+  useEffect(() => {
+    if (!open || userId == null) return;
+    let alive = true;
+    setUser(null);
+    api
+      .get<UserOverviewResp>(`/admin/api/users/${userId}`)
+      .then((r) => {
+        if (!alive) return;
+        const o = r.data;
+        setUser({
+          id: o.user.id,
+          phone: o.user.phone,
+          nickname: o.user.nickname,
+          status: o.user.status,
+          wechat_nickname: o.user.wechat_nickname, // 概览接口已返回微信昵称
+          wechat_avatar_url: null,
+          created_at: o.user.created_at,
+          last_login_at: o.user.last_login_at,
+          cash_balance_cents: o.cash_balance_cents,
+          withdraw_total: o.withdraw_total,
+          withdraw_success_cents: o.withdraw_success_cents,
+        });
+      })
+      .catch(() => {
+        // 概览失败:退回只带手机号,昵称/注册天数显示「-」,不阻塞统计/金币记录(它们由 userId 独立拉)
+        if (alive) setUser(phone ? ({ phone } as WithdrawUserSnapshot) : null);
+      });
+    return () => {
+      alive = false;
+    };
+  }, [open, userId, phone]);
+
+  return (
+    <Drawer
+      title={`用户广告收益详情${phone ? ` · ${phone}` : ''}`}
+      width="50%"
+      open={open}
+      onClose={onClose}
+      destroyOnHidden
+    >
+      {/* userId 就绪即渲染;UserRewardPanel 内部按 userId 自行拉统计与金币记录,user 基本信息随后补上。
+          statsVariant="ad":统计区只显示 6 项看广告统计(累计提现/现金余额/激励视频观看数+eCPM/draw观看数+eCPM) */}
+      {userId != null && <UserRewardPanel userId={userId} user={user} statsVariant="ad" />}
+    </Drawer>
+  );
+}

src/app/(main)/ad-revenue-report/page.tsx

@@ -40,13 +40,15 @@ import type {
   AdRevenueRow,
   AdRevenueTypeStat,
 } from '@/lib/types';
+import UserAdRevenueDrawer from './UserAdRevenueDrawer';
 
 const { RangePicker } = DatePicker;
 
 // 广告类型标签
 const TYPE_TAG: Record<string, { color: string; label: string }> = {
   reward_video: { color: 'blue', label: '激励视频' },
-  feed: { color: 'purple', label: '信息流' },
+  // 历史误标 feed(领券/比价广告修 adType 之前上报)一律按 Draw 信息流显示——业务已全切 Draw
+  feed: { color: 'geekblue', label: 'Draw 信息流' },
   draw: { color: 'geekblue', label: 'Draw 信息流' },
   withdrawal_video: { color: 'gold', label: '提现激励视频' },
 };
@@ -131,26 +133,23 @@ const DETAIL_COLUMNS: ColumnsType<AdRevenueRecord> = [
   },
   { title: '应发金币', dataIndex: 'expected_coin', width: 100, render: (v: number) => <b>{v}</b> },
   { title: '实发金币', dataIndex: 'actual_coin', width: 100 },
-  {
-    title: '一致',
-    dataIndex: 'matched',
-    width: 80,
-    render: (m: boolean) => (m ? <Tag color="green">✓</Tag> : <Tag color="red">✗ 不符</Tag>),
-  },
 ];
 
-// 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),线=预估收益元(右轴)。x 轴按传入点序。
+// 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),橙线=客户端预估收益元(右轴),
+// 绿线=穿山甲后台预估收益元(右轴,仅按天且有数据时出现)。x 轴按传入点序。
 const CHART_BAR = '#69b1ff';
 const CHART_LINE = '#fa8c16';
+const CHART_LINE2 = '#52c41a'; // 穿山甲后台收益线
 
 interface TrendPoint {
   label: string; // x 轴刻度文案(小时数 / MM-DD)
   tip: string; // hover 原生 tooltip 全文
   impressions: number;
   revenue: number;
+  pangleRevenue: number | null; // 穿山甲后台预估收益(元);无则 null(不画绿线点)
 }
 
-// 按小时聚合(0–23),数据源是 hourly(后端全量聚合,不受分页影响)
+// 按小时聚合(0–23),数据源是 hourly(后端全量聚合,不受分页影响)。穿山甲为天级,小时视图无该线。
 function aggregateHourly(rows: AdRevenueHourly[]): TrendPoint[] {
   const byHour = Array.from({ length: 24 }, (_, h) => ({ hour: h, impressions: 0, revenue: 0 }));
   for (const r of rows) {
@@ -163,10 +162,12 @@ function aggregateHourly(rows: AdRevenueHourly[]): TrendPoint[] {
     tip: `${String(b.hour).padStart(2, '0')}:00　展示 ${b.impressions} 条 · 预估收益 ${b.revenue.toFixed(4)} 元`,
     impressions: b.impressions,
     revenue: b.revenue,
+    pangleRevenue: null,
   }));
 }
 
-// 按天聚合,数据源是 daily(全量,不受 limit 影响);用 from..to 补齐空缺日为 0,轴连续
+// 按天聚合,数据源是 daily(全量,不受 limit 影响);用 from..to 补齐空缺日为 0,轴连续。
+// 穿山甲收益(pangle_revenue_yuan)为 null 时该日不画绿线点(T+1 未出/非全量视图)。
 function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[]): TrendPoint[] {
   const map = new Map(daily.map((d) => [d.date, d]));
   const out: TrendPoint[] = [];
@@ -177,11 +178,14 @@ function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[
     const d = map.get(ds);
     const impressions = d?.impressions ?? 0;
     const revenue = d?.revenue_yuan ?? 0;
+    const pangleRevenue = d?.pangle_revenue_yuan ?? null;
+    const pangleTip = pangleRevenue != null ? ` · 穿山甲收益 ${pangleRevenue.toFixed(4)} 元` : '';
     out.push({
       label: ds.slice(5),
-      tip: `${ds}　展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)} 元`,
+      tip: `${ds}　展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)} 元${pangleTip}`,
       impressions,
       revenue,
+      pangleRevenue,
     });
     cur = cur.add(1, 'day');
     guard += 1;
@@ -192,7 +196,11 @@ function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[
 function TrendChart({ points }: { points: TrendPoint[] }) {
   const n = points.length;
   const maxImp = Math.max(1, ...points.map((p) => p.impressions));
-  const maxRev = Math.max(1e-9, ...points.map((p) => p.revenue));
+  const maxRev = Math.max(
+    1e-9,
+    ...points.map((p) => p.revenue),
+    ...points.map((p) => p.pangleRevenue ?? 0),
+  );
 
   const W = 960;
   const H = 280;
@@ -248,6 +256,24 @@ function TrendChart({ points }: { points: TrendPoint[] }) {
           <title>{p.tip}</title>
         </circle>
       ))}
+      {/* 穿山甲后台收益线(绿,仅非 null 的天画;按天且已同步 T+1 数据时出现) */}
+      {(() => {
+        const pp = points
+          .map((p, i) => ({ i, v: p.pangleRevenue, tip: p.tip }))
+          .filter((x): x is { i: number; v: number; tip: string } => x.v != null);
+        if (pp.length === 0) return null;
+        const pangleLine = pp.map((x) => `${cx(x.i)},${revY(x.v)}`).join(' ');
+        return (
+          <g>
+            <polyline points={pangleLine} fill="none" stroke={CHART_LINE2} strokeWidth={2} />
+            {pp.map((x) => (
+              <circle key={`p-${x.i}`} cx={cx(x.i)} cy={revY(x.v)} r={2.5} fill={CHART_LINE2}>
+                <title>{x.tip}</title>
+              </circle>
+            ))}
+          </g>
+        );
+      })()}
       {points.map((p, i) =>
         i % labelEvery === 0 || i === n - 1 ? (
           <text key={i} x={cx(i)} y={H - 14} textAnchor="middle" fontSize={11} fill="#999">
@@ -279,6 +305,8 @@ export default function AdRevenueReportPage() {
   const [queriedLimit, setQueriedLimit] = useState<number>(500);
   const [loading, setLoading] = useState(false);
   const [formulaOpen, setFormulaOpen] = useState(false);
+  // 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
+  const [userDrawer, setUserDrawer] = useState<{ userId: number; phone: string | null } | null>(null);
 
   // 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
   const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
@@ -334,25 +362,39 @@ export default function AdRevenueReportPage() {
       title: '用户',
       dataIndex: 'user_phone',
       width: 150,
-      render: (phone: string | null, r: AdRevenueRow) =>
+      render: (phone: string | null, r: AdRevenueRow) => (
-        phone ? (
+        // 点手机号/用户 → 打开该用户「广告收益详情」半屏抽屉(统计卡 + 金币记录)
-          <span>
+        <a onClick={() => setUserDrawer({ userId: r.user_id, phone })}>
-            {phone}
+          {phone ? (
-            <Typography.Text type="secondary" style={{ fontSize: 11, marginLeft: 6 }}>
+            <span>
-              #{r.user_id}
+              {phone}
-            </Typography.Text>
+              <Typography.Text type="secondary" style={{ fontSize: 11, marginLeft: 6 }}>
-          </span>
+                #{r.user_id}
-        ) : (
+              </Typography.Text>
-          <Typography.Text type="secondary">#{r.user_id}（无手机号）</Typography.Text>
+            </span>
-        ),
+          ) : (
+            <span>#{r.user_id}（无手机号）</span>
+          )}
+        </a>
+      ),
     },
     {
       title: '广告类型',
       dataIndex: 'ad_type',
-      width: 110,
+      width: 130,
-      render: (s: string) => {
+      render: (s: string, r: AdRevenueRow) => {
         const t = TYPE_TAG[s] ?? { color: 'default', label: s };
-        return <Tag color={t.color}>{t.label}</Tag>;
+        return (
+          <span>
+            <Tag color={t.color}>{t.label}</Tag>
+            {/* 一次比价/领券聚合了多条广告时标出条数,点「+」展开看逐条 */}
+            {r.sub_count && r.sub_count > 1 ? (
+              <Typography.Text type="secondary" style={{ fontSize: 11 }}>
+                {r.sub_count} 条
+              </Typography.Text>
+            ) : null}
+          </span>
+        );
       },
     },
     {
@@ -398,7 +440,11 @@ export default function AdRevenueReportPage() {
       dataIndex: 'revenue_yuan',
       width: 110,
       align: 'right',
-      render: (v: number, r: AdRevenueRow) => (r.has_impression ? v.toFixed(4) : '-'),
+      // 一次比价/领券聚合行用 row_revenue_yuan(该次发奖广告 eCPM 折算之和),其它行用展示侧 revenue_yuan
+      render: (v: number, r: AdRevenueRow) => {
+        const rev = r.row_revenue_yuan ?? v;
+        return r.has_impression || rev > 0 ? rev.toFixed(4) : '-';
+      },
     },
     {
       title: '发奖状态',
@@ -426,18 +472,6 @@ export default function AdRevenueReportPage() {
       render: (v: number, r: AdRevenueRow) =>
         r.has_reward ? v : <Typography.Text type="secondary">-</Typography.Text>,
     },
-    {
-      title: '一致',
-      dataIndex: 'matched',
-      width: 70,
-      align: 'center',
-      render: (m: boolean, r: AdRevenueRow) =>
-        r.has_reward ? (
-          m ? <Tag color="green">✓</Tag> : <Tag color="red">✗ 不符</Tag>
-        ) : (
-          <Typography.Text type="secondary">-</Typography.Text>
-        ),
-    },
     {
       title: '广告位ID',
       dataIndex: 'our_code_id',
@@ -456,7 +490,7 @@ export default function AdRevenueReportPage() {
 
   // 派生指标(全部基于全量 total_* 字段,不受分页影响,准):
   // 发奖成本(元)= 实发金币÷汇率;预估毛利 = 收益−发奖成本;发奖占收益比 = 发奖成本÷收益;
-  // 应发实发差额(金币)= 应发−实发(正=少发/负=多发);ARPU = 预估收益÷今日DAU(仅今日)。
+  // 应发实发差额(金币)= 应发−实发(正=少发/负=多发);ARPU = 区间预估收益÷区间活跃用户(见 dau)。
   const derived = data
     ? {
         payoutYuan: data.total_actual_coin / COIN_PER_YUAN,
@@ -466,11 +500,23 @@ export default function AdRevenueReportPage() {
             ? (data.total_actual_coin / COIN_PER_YUAN / data.total_revenue_yuan) * 100
             : null,
         coinGap: data.total_expected_coin - data.total_actual_coin,
-        // ARPU(今日)= 预估广告收益 ÷ 今日 DAU;dau 为 null(历史/多天)或 0 时不可算 → null,前端显示「-」。
+        // ARPU = 区间预估广告收益 ÷ 区间去重活跃用户(dau,口径同数据大盘);dau 为 0 时不可算 → null,显示「-」。
         arpu: data.dau && data.dau > 0 ? data.total_revenue_yuan / data.dau : null,
       }
     : null;
 
+  // DAU / ARPU 的统计区间 = 本次查询的 date_from~date_to(后端 period_active_dau 同口径按此区间算);
+  // 今日单天特殊标注「今日」,便于「今日 / 近 7 天 / 近 30 天」三个时段分别看 ARPU。
+  const dauRangeIsToday =
+    !!data && data.date_from === data.date_to && data.date_to === dayjs().format('YYYY-MM-DD');
+  const dauRangeLabel = !data
+    ? ''
+    : data.date_from === data.date_to
+      ? dauRangeIsToday
+        ? '今日'
+        : data.date_from
+      : `${data.date_from} ~ ${data.date_to}`;
+
   // 第二行大盘「分广告类型」:draw / 激励视频 各自 收益 / eCPM / 展示条数;eCPM = 收益÷展示×1000。
   const drawStat = data?.type_stats?.draw;
   const rvStat = data?.type_stats?.reward_video;
@@ -497,9 +543,18 @@ export default function AdRevenueReportPage() {
           title="收益口径说明"
           content={
             <div style={{ maxWidth: 360, fontSize: 13, lineHeight: 1.7 }}>
+              <b>主表每行 = 一次广告行为</b>(激励视频一次观看 / 一次比价 / 一次领券);比价·领券的 Draw
+              逐条展示不单独占行(其展示数 / eCPM / 预估收益已计入上方合计与大盘),点行左侧「+」展开看该次金币复算。
+              <br />
+              <br />
               「预估收益」为客户端在广告展示(onAdShow)时上报 eCPM 折算的预估值(每千次展示 ÷1000
               累加),<b>只要广告展示就计入、不论是否看完发奖</b>;穿山甲会过滤无效/过短曝光,故预估值可能偏高,
               <b>实际收益一律以穿山甲后台结算为准</b>。测试应用多为 0。「广告位ID / 来源应用」为本期新增,历史记录留空。
+              <br />
+              <br />
+              核心指标里的<b>「穿山甲后台收益(T+1)」</b>来自穿山甲 GroMore 数据 API(后台结算口径,次日出数):
+              <b>穿山甲预估收益</b>=接口 revenue、<b>收益API</b>=各 ADN 回传更接近结算。穿山甲不提供分用户/类型/场景维度,
+              故仅在<b>全量视图</b>(未按用户/类型/场景筛选)展示;逐条事件行仍是客户端预估,不受其影响。
             </div>
           }
         >
@@ -543,7 +598,6 @@ export default function AdRevenueReportPage() {
               style={{ width: 150 }}
               options={[
                 { value: 'reward_video', label: '激励视频' },
-                { value: 'feed', label: '信息流' },
                 { value: 'draw', label: 'Draw 信息流' },
                 { value: 'withdrawal_video', label: '提现激励视频' },
               ]}
@@ -615,7 +669,7 @@ export default function AdRevenueReportPage() {
         <Card size="small" style={{ marginBottom: 16 }}>
           <Divider orientation="left" plain style={{ marginTop: 0, marginBottom: 16 }}>
             <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-              核心指标
+              核心指标{dauRangeLabel ? ` · 统计区间 ${dauRangeLabel}` : ''}
             </Typography.Text>
           </Divider>
           <Row gutter={[16, 12]}>
@@ -625,9 +679,11 @@ export default function AdRevenueReportPage() {
             <Col flex="1 1 0">
               <Statistic
                 title={
-                  <Tooltip title="每活跃用户广告预估收入 = 预估收益 ÷ 今日 DAU;DAU 仅今日口径,历史/多天显示 -">
+                  <Tooltip
+                    title={`每活跃用户广告预估收入 = 区间预估收益 ÷ 区间去重活跃用户(口径同数据大盘)。统计区间:${dauRangeLabel || '—'}`}
+                  >
                     <span>
-                      ARPU(今日)
+                      {dauRangeIsToday ? 'ARPU(今日)' : 'ARPU'}
                       <InfoCircleOutlined style={{ marginLeft: 4 }} />
                     </span>
                   </Tooltip>
@@ -639,9 +695,11 @@ export default function AdRevenueReportPage() {
             <Col flex="1 1 0">
               <Statistic
                 title={
-                  <Tooltip title="今日活跃用户(复用大盘口径 last_login_at = 今日登录过);仅查询=今日时有值,历史/多天显示 -">
+                  <Tooltip
+                    title={`区间去重活跃用户,口径同数据大盘:登录 + 开始比价 + 开始领券,按用户去重。全局口径,不随用户/类型/场景/应用筛选变化。统计区间:${dauRangeLabel || '—'}`}
+                  >
                     <span>
-                      今日活跃 DAU
+                      {dauRangeIsToday ? '今日活跃 DAU' : '活跃用户'}
                       <InfoCircleOutlined style={{ marginLeft: 4 }} />
                     </span>
                   </Tooltip>
@@ -666,6 +724,69 @@ export default function AdRevenueReportPage() {
               </Typography.Text>
             </Col>
           </Row>
+          <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
+            <Tooltip title="来自穿山甲 GroMore 数据 API(后台结算口径,T+1 次日出数)。穿山甲不提供分用户/类型/场景维度,故仅在「全量视图」(未按用户/类型/场景筛选)展示;按代码位×应用×日期汇总。revenue=预估收益、收益API=各 ADN 回传更接近结算。">
+              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                穿山甲后台收益(T+1)
+                <InfoCircleOutlined style={{ marginLeft: 4 }} />
+              </Typography.Text>
+            </Tooltip>
+          </Divider>
+          {data.pangle_revenue_available ? (
+            <Row gutter={[16, 12]}>
+              <Col flex="1 1 0">
+                <Statistic
+                  title="穿山甲预估收益(元)"
+                  value={data.total_pangle_revenue_yuan ?? 0}
+                  precision={4}
+                />
+              </Col>
+              <Col flex="1 1 0">
+                <Statistic
+                  title="穿山甲收益API(元)"
+                  value={data.total_pangle_api_revenue_yuan ?? '-'}
+                  precision={data.total_pangle_api_revenue_yuan == null ? undefined : 4}
+                />
+                {data.total_pangle_api_revenue_yuan == null && (
+                  <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                    未配 Reporting / 当天无
+                  </Typography.Text>
+                )}
+              </Col>
+              <Col flex="1 1 0">
+                <Statistic
+                  title={
+                    <Tooltip title="客户端预估相对穿山甲预估的高估幅度 =(客户端预估 − 穿山甲预估)÷ 穿山甲预估;客户端按 onAdShow 计、不滤无效曝光,通常偏高">
+                      <span>
+                        客户端预估偏差
+                        <InfoCircleOutlined style={{ marginLeft: 4 }} />
+                      </span>
+                    </Tooltip>
+                  }
+                  value={
+                    data.total_pangle_revenue_yuan && data.total_pangle_revenue_yuan > 0
+                      ? ((data.total_revenue_yuan - data.total_pangle_revenue_yuan) /
+                          data.total_pangle_revenue_yuan) *
+                        100
+                      : '-'
+                  }
+                  precision={
+                    data.total_pangle_revenue_yuan && data.total_pangle_revenue_yuan > 0
+                      ? 1
+                      : undefined
+                  }
+                  suffix={
+                    data.total_pangle_revenue_yuan && data.total_pangle_revenue_yuan > 0 ? '%' : ''
+                  }
+                />
+              </Col>
+            </Row>
+          ) : (
+            <Typography.Text type="secondary" style={{ fontSize: 13 }}>
+              本视图无穿山甲后台收益:仅「全量视图」(未按用户/类型/场景筛选)且对应日期已同步到数据时展示。
+              穿山甲 T+1 出数,可由 <Typography.Text code>scripts/sync_pangle_revenue</Typography.Text> 每日拉取入库。
+            </Typography.Text>
+          )}
           <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
             <Typography.Text type="secondary" style={{ fontSize: 12 }}>
               分广告类型
@@ -694,22 +815,6 @@ export default function AdRevenueReportPage() {
         </Card>
       )}
 
-      {data && (
-        <Space direction="vertical" style={{ width: '100%', marginBottom: 12 }}>
-          {data.mismatch_count > 0 ? (
-            <Alert
-              type="error"
-              showIcon
-              message={`共 ${data.total} 条广告事件,其中 ${data.mismatch_count} 条应发≠实发(✗);应发−实发 合计 ${
-                derived && derived.coinGap >= 0 ? '+' : ''
-              }${derived?.coinGap ?? 0} 金币(正=少发/负=多发)——公式可能未生效或发奖有问题。定位到具体记录可用后端逐条审计接口。`}
-            />
-          ) : (
-            <Alert type="success" showIcon message={`共 ${data.total} 条广告事件,应发与实发全部一致。`} />
-          )}
-        </Space>
-      )}
-
       {data &&
         (queriedMultiDay
           ? (data.daily?.length ?? 0) > 0
@@ -743,8 +848,22 @@ export default function AdRevenueReportPage() {
                     verticalAlign: 'middle',
                   }}
                 />
-                预估收益(元)
+                客户端预估收益(元)
               </span>
+              {queriedMultiDay && (
+                <span style={{ fontSize: 12, color: '#666' }}>
+                  <span
+                    style={{
+                      display: 'inline-block',
+                      width: 14,
+                      borderTop: `2px solid ${CHART_LINE2}`,
+                      marginRight: 4,
+                      verticalAlign: 'middle',
+                    }}
+                  />
+                  穿山甲后台收益(元)
+                </span>
+              )}
             </Space>
           }
         >
@@ -772,12 +891,27 @@ export default function AdRevenueReportPage() {
         }}
         size="small"
         scroll={{ x: 1380 }}
-        rowClassName={(r) => (r.has_reward && !r.matched ? 'row-mismatch' : '')}
         expandable={{
           // 每行都可展开(左侧恒有 + 号):有发奖看「金币复算因子」;纯展示看「展示明细」。
           rowExpandable: () => true,
           expandedRowRender: (r) =>
-            r.reward_detail ? (
+            r.sub_rewards && r.sub_rewards.length > 0 ? (
+              <div>
+                <Typography.Text strong>本次广告逐条明细</Typography.Text>{' '}
+                <Typography.Text type="secondary">
+                  (共 {r.sub_count ?? r.sub_rewards.length} 条 · 应发 {r.expected_coin} / 实发 {r.actual_coin})
+                </Typography.Text>
+                <Table<AdRevenueRecord>
+                  style={{ marginTop: 8 }}
+                  rowKey="record_id"
+                  columns={DETAIL_COLUMNS}
+                  dataSource={r.sub_rewards}
+                  pagination={false}
+                  size="small"
+                  scroll={{ x: 900 }}
+                />
+              </div>
+            ) : r.reward_detail ? (
               <div>
                 <Typography.Text strong>金币复算明细</Typography.Text>{' '}
                 <Typography.Text type="secondary">
@@ -791,7 +925,6 @@ export default function AdRevenueReportPage() {
                   pagination={false}
                   size="small"
                   scroll={{ x: 900 }}
-                  rowClassName={(d) => (d.matched ? '' : 'row-mismatch')}
                 />
               </div>
             ) : (
@@ -867,11 +1000,12 @@ export default function AdRevenueReportPage() {
         </Typography.Paragraph>
       </Modal>
 
-      <style jsx global>{`
+      <UserAdRevenueDrawer
-        .row-mismatch > td {
+        open={!!userDrawer}
-          background: #fff1f0 !important;
+        userId={userDrawer?.userId ?? null}
-        }
+        phone={userDrawer?.phone ?? null}
-      `}</style>
+        onClose={() => setUserDrawer(null)}
+      />
     </div>
   );
 }

src/app/(main)/admins/page.tsx

@@ -1,81 +1,290 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
-import { App, Button, Form, Input, Modal, Select, Table, Tag } from 'antd';
+import {
+  App, Button, Card, Checkbox, Input, Select, Space, Table, Tag,
+} from 'antd';
 import { api, errMsg } from '@/lib/api';
 import { formatUtcTime } from '@/lib/format';
-import type { AdminInfo } from '@/lib/types';
+import { getAdmin } from '@/lib/auth';
+import type { AdminInfo, AdminRole, PermissionGroup } from '@/lib/types';
 
-const ROLES = [
-  { value: 'super_admin', label: 'super_admin' },
-  { value: 'finance', label: 'finance' },
-  { value: 'operator', label: 'operator' },
-];
-// last_login_at 为 UTC 口径(datetime.now(utc)),按北京显示(勿用 new Date().toLocaleString)
 const dt = (v: string | null) => (v ? formatUtcTime(v, 'YYYY-MM-DD HH:mm:ss') : '从未');
 
+// 随机初始密码(排除易混字符 0O1lI),客户端生成、转交本人,后端只存 hash
+function genPassword(len = 10): string {
+  const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789';
+  let s = '';
+  for (let i = 0; i < len; i += 1) s += chars[Math.floor(Math.random() * chars.length)];
+  return s;
+}
+
+type View = 'list' | 'person' | 'roles' | 'roleForm';
+
+// 「自定义」哨兵角色:不是共享角色,选它时可见页由本人逐页勾选(存 pages_override),与后端一致。
+const CUSTOM_ROLE = 'custom';
+const CUSTOM_LABEL = '自定义';
+
+// ===== 只读权限矩阵:角色详情 / 人员「可见页面」预览共用(深色=有,灰色=无)=====
+function PermMatrix({ catalog, pages }: { catalog: PermissionGroup[]; pages: string[] }) {
+  const has = useMemo(() => new Set(pages), [pages]);
+  return (
+    <div style={{ border: '1px solid #f0f0f0', borderRadius: 8, overflow: 'hidden' }}>
+      {catalog.map((g) => (
+        <div key={g.group} style={{ display: 'flex', borderBottom: '1px solid #f0f2f5' }}>
+          <div style={{ width: 150, flexShrink: 0, padding: '14px', fontWeight: 500, color: 'rgba(0,0,0,.85)' }}>
+            {g.group}
+          </div>
+          <div style={{ flex: 1, padding: '12px 16px', display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '14px 28px' }}>
+            {g.pages.map((p) => (
+              // 深色=可见,灰色(--ink-3)=不可见
+              <span key={p.key} style={{ fontSize: 13.5, color: has.has(p.key) ? 'rgba(0,0,0,.85)' : '#94a0b1' }}>
+                {p.label}
+              </span>
+            ))}
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+// ===== 可编辑权限矩阵:角色表单用(勾选框 + 分类全选/半选)=====
+function PermEditor({
+  catalog, value, onChange,
+}: { catalog: PermissionGroup[]; value: string[]; onChange: (next: string[]) => void }) {
+  const has = useMemo(() => new Set(value), [value]);
+  const setPages = (s: Set<string>) => onChange(Array.from(s));
+  const togglePage = (key: string) => {
+    const n = new Set(has);
+    if (n.has(key)) n.delete(key); else n.add(key);
+    setPages(n);
+  };
+  const toggleGroup = (g: PermissionGroup, on: boolean) => {
+    const n = new Set(has);
+    g.pages.forEach((p) => (on ? n.add(p.key) : n.delete(p.key)));
+    setPages(n);
+  };
+  return (
+    <div style={{ border: '1px solid #f0f0f0', borderRadius: 8, overflow: 'hidden' }}>
+      {catalog.map((g) => {
+        const cnt = g.pages.filter((p) => has.has(p.key)).length;
+        const all = cnt === g.pages.length && cnt > 0;
+        return (
+          <div key={g.group} style={{ display: 'flex', borderBottom: '1px solid #fafafa' }}>
+            <div style={{ width: 140, flexShrink: 0, padding: '14px', background: '#fafbfd' }}>
+              <Checkbox
+                checked={all}
+                indeterminate={cnt > 0 && !all}
+                onChange={(e) => toggleGroup(g, e.target.checked)}
+              >
+                {g.group}
+              </Checkbox>
+            </div>
+            <div style={{ flex: 1, padding: '12px 16px', display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '10px 24px' }}>
+              {g.pages.map((p) => (
+                <Checkbox key={p.key} checked={has.has(p.key)} onChange={() => togglePage(p.key)}>
+                  {p.label}
+                </Checkbox>
+              ))}
+            </div>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
 export default function AdminsPage() {
   const { message, modal } = App.useApp();
-  const [admins, setAdmins] = useState<AdminInfo[]>([]);
+  const me = getAdmin();
-  const [loading, setLoading] = useState(false);
+  const isSuper = me?.role === 'super_admin';
-  const [createOpen, setCreateOpen] = useState(false);
-  const [form] = Form.useForm();
 
-  const load = async () => {
+  const [view, setView] = useState<View>('list');
+  const [admins, setAdmins] = useState<AdminInfo[]>([]);
+  const [roles, setRoles] = useState<AdminRole[]>([]);
+  const [catalog, setCatalog] = useState<PermissionGroup[]>([]);
+  const [loading, setLoading] = useState(false);
+
+  const roleByName = useMemo(() => {
+    const m: Record<string, AdminRole> = {};
+    roles.forEach((r) => { m[r.name] = r; });
+    return m;
+  }, [roles]);
+  const roleOptions = roles.map((r) => ({ value: r.name, label: r.label }));
+  // 人员表单角色下拉:真实角色 + 末尾「自定义」。选「自定义」→ 下方可见页改为逐页勾选。
+  const personRoleOptions = [...roleOptions, { value: CUSTOM_ROLE, label: CUSTOM_LABEL }];
+  // 角色 key → 展示名(custom 显示「自定义」;查不到回退 key 原文)
+  const roleLabelOf = (name: string) =>
+    (name === CUSTOM_ROLE ? CUSTOM_LABEL : roleByName[name]?.label ?? name);
+
+  const loadAll = async () => {
     setLoading(true);
     try {
-      const { data } = await api.get<AdminInfo[]>('/admin/api/admins');
+      const [a, r, c] = await Promise.all([
-      setAdmins(data);
+        api.get<AdminInfo[]>('/admin/api/admins'),
+        api.get<AdminRole[]>('/admin/api/roles'),
+        api.get<PermissionGroup[]>('/admin/api/roles/catalog'),
+      ]);
+      setAdmins(a.data);
+      setRoles(r.data);
+      setCatalog(c.data);
+    } catch (e) {
+      message.error(errMsg(e));
     } finally {
       setLoading(false);
     }
   };
-  useEffect(() => {
+  useEffect(() => { loadAll(); }, []); // eslint-disable-line react-hooks/exhaustive-deps
-    load();
-  }, []);
 
-  const create = async () => {
+  // ===== 人员表单(新增 / 编辑)状态 =====
-    const v = await form.validateFields();
+  const [personEditing, setPersonEditing] = useState<AdminInfo | null>(null);
+  const [personName, setPersonName] = useState('');
+  const [personRole, setPersonRole] = useState('');
+  const [initPw, setInitPw] = useState('');
+  // 「自定义」角色时逐页勾选的可见页集(role==custom 才用到)
+  const [personPages, setPersonPages] = useState<string[]>([]);
+
+  const openCreatePerson = () => {
+    setPersonEditing(null);
+    setPersonName('');
+    setPersonRole(roles.find((r) => !r.is_builtin)?.name ?? roles[0]?.name ?? 'operator');
+    setPersonPages([]);
+    setInitPw(genPassword());
+    setView('person');
+  };
+  const openEditPerson = (a: AdminInfo) => {
+    setPersonEditing(a);
+    setPersonName(a.username);
+    setPersonRole(a.role);
+    // 编辑「自定义」用户时,回填其已勾选的可见页(供继续增删)
+    setPersonPages(a.role === CUSTOM_ROLE ? (a.pages_override ?? []) : []);
+    setInitPw(''); // 编辑态密码只读展示 a.password(已确定的登录密码),不用 initPw
+    setView('person');
+  };
+  const copyText = (v: string) => {
+    navigator.clipboard?.writeText(v);
+    message.success('已复制到剪贴板');
+  };
+  // 密码展示框(对齐原型 .pw-show:虚线灰框 + 大号等宽 + 复制)
+  const pwBox = (value: string) => (
+    <div style={{ display: 'flex', alignItems: 'center', gap: 12, background: '#f4f6fa', border: '1px dashed #cbd5e1', borderRadius: 8, padding: '12px 14px' }}>
+      <code style={{ flex: 1, fontFamily: '"DIN Alternate", "SF Mono", Consolas, monospace', fontSize: 22, fontWeight: 700, letterSpacing: 1, color: 'rgba(0,0,0,.85)' }}>{value}</code>
+      <Button onClick={() => copyText(value)}>复制</Button>
+    </div>
+  );
+  const isCustom = personRole === CUSTOM_ROLE;
+  const submitPerson = async () => {
+    if (isCustom && personPages.length === 0) { message.error('自定义角色请至少勾选一个可见页面'); return; }
     try {
-      await api.post('/admin/api/admins', v);
+      if (personEditing) {
-      message.success('已创建');
+        // 密码只读、不改;提交变更的角色 +(自定义时)勾选的可见页
-      setCreateOpen(false);
+        const roleChanged = personRole !== personEditing.role;
-      form.resetFields();
+        const pagesChanged = isCustom
-      load();
+          && JSON.stringify(personPages) !== JSON.stringify(personEditing.pages_override ?? []);
+        if (roleChanged || pagesChanged) {
+          const payload: Record<string, unknown> = {};
+          if (roleChanged) payload.role = personRole;
+          // 自定义:带上勾选集(切到 custom 或改现有 custom 勾选都要);切回普通角色不带,后端会清空 override
+          if (isCustom) payload.pages_override = personPages;
+          await api.patch(`/admin/api/admins/${personEditing.id}`, payload);
+        }
+        message.success('已保存');
+      } else {
+        if (personName.trim().length < 3) { message.error('用户名至少 3 位'); return; }
+        await api.post('/admin/api/admins', {
+          username: personName.trim(),
+          password: initPw,
+          role: personRole,
+          ...(isCustom ? { pages_override: personPages } : {}),
+        });
+        message.success('已创建,请把初始密码转交本人');
+      }
+      setView('list');
+      loadAll();
     } catch (e) {
       message.error(errMsg(e));
     }
   };
-
+  // ===== 列表操作 =====
   const changeRole = (a: AdminInfo, role: string) => {
     if (role === a.role) return;
+    // 改成「自定义」需要逐页勾选 → 转去编辑页(列表里没有页选择器,直接切会得到空可见页)
+    if (role === CUSTOM_ROLE) { openEditPerson({ ...a, role: CUSTOM_ROLE }); return; }
     modal.confirm({
-      title: `把 ${a.username} 的角色改为 ${role}?`,
+      title: `把 ${a.username} 的角色改为 ${roleLabelOf(role)}?`,
       onOk: async () => {
-        try {
+        try { await api.patch(`/admin/api/admins/${a.id}`, { role }); message.success('已更新'); loadAll(); }
-          await api.patch(`/admin/api/admins/${a.id}`, { role });
+        catch (e) { message.error(errMsg(e)); }
-          message.success('已更新');
-          load();
-        } catch (e) {
-          message.error(errMsg(e));
-        }
       },
     });
   };
-
+  const toggleStatus = (a: AdminInfo) => {
-  const toggle = (a: AdminInfo) => {
     const next = a.status === 'active' ? 'disabled' : 'active';
     modal.confirm({
       title: `${next === 'disabled' ? '禁用' : '启用'}管理员 ${a.username}?`,
       onOk: async () => {
-        try {
+        try { await api.patch(`/admin/api/admins/${a.id}`, { status: next }); message.success('已更新'); loadAll(); }
-          await api.patch(`/admin/api/admins/${a.id}`, { status: next });
+        catch (e) { message.error(errMsg(e)); }
-          message.success('已更新');
+      },
-          load();
+    });
-        } catch (e) {
+  };
-          message.error(errMsg(e));
+  const deletePerson = (a: AdminInfo) => {
-        }
+    modal.confirm({
+      title: '确认删除',
+      content: `确定删除管理员「${a.username}」吗?删除后该账号将无法登录,不可恢复。`,
+      okText: '确认删除', okButtonProps: { danger: true },
+      onOk: async () => {
+        try { await api.delete(`/admin/api/admins/${a.id}`); message.success('已删除'); loadAll(); }
+        catch (e) { message.error(errMsg(e)); }
+      },
+    });
+  };
+
+  // ===== 角色设置状态 =====
+  const [selRoleId, setSelRoleId] = useState<number | null>(null);
+  const selRole = roles.find((r) => r.id === selRoleId) ?? roles[0] ?? null;
+  const openRoles = () => {
+    setSelRoleId((prev) => prev ?? roles[0]?.id ?? null);
+    setView('roles');
+  };
+
+  // 角色表单(新增 / 编辑)
+  const [roleEditing, setRoleEditing] = useState<AdminRole | null>(null);
+  const [roleName, setRoleName] = useState('');
+  const [rolePages, setRolePages] = useState<string[]>([]);
+  const openCreateRole = () => {
+    setRoleEditing(null); setRoleName(''); setRolePages([]); setView('roleForm');
+  };
+  const openEditRole = (r: AdminRole) => {
+    setRoleEditing(r); setRoleName(r.label); setRolePages(r.pages); setView('roleForm');
+  };
+  const submitRole = async () => {
+    if (!roleName.trim()) { message.error('请输入角色名称'); return; }
+    try {
+      if (roleEditing) {
+        // 只改展示名 + 可见页(key 不可变)
+        await api.patch(`/admin/api/roles/${roleEditing.id}`, { label: roleName.trim(), pages: rolePages });
+        message.success('角色已保存');
+      } else {
+        await api.post('/admin/api/roles', { name: roleName.trim(), pages: rolePages });
+        message.success('角色已创建');
+      }
+      await loadAll();
+      setView('roles');
+    } catch (e) {
+      message.error(errMsg(e));
+    }
+  };
+  const deleteRole = (r: AdminRole) => {
+    modal.confirm({
+      title: '确认删除角色',
+      content: `确定删除角色「${r.label}」吗?${r.in_use > 0 ? `当前有 ${r.in_use} 名成员在用,需先改派。` : '此操作不可恢复。'}`,
+      okText: '确认删除', okButtonProps: { danger: true },
+      onOk: async () => {
+        try { await api.delete(`/admin/api/roles/${r.id}`); message.success('已删除角色'); await loadAll(); setSelRoleId(null); }
+        catch (e) { message.error(errMsg(e)); }
       },
     });
   };
@@ -84,60 +293,174 @@ export default function AdminsPage() {
     { title: 'ID', dataIndex: 'id', width: 70 },
     { title: '用户名', dataIndex: 'username' },
     {
-      title: '角色',
+      title: '角色', dataIndex: 'role', width: 170,
-      dataIndex: 'role',
+      // options 含「自定义」→ custom 用户在列表里显示为「自定义」;选它会转去编辑页勾选(见 changeRole)
       render: (r: string, a: AdminInfo) => (
-        <Select
+        <Select size="small" value={r} style={{ width: 150 }} options={personRoleOptions} onChange={(v) => changeRole(a, v)} />
-          size="small"
-          value={r}
-          style={{ width: 140 }}
-          options={ROLES}
-          onChange={(v) => changeRole(a, v)}
-        />
       ),
     },
+    { title: '状态', dataIndex: 'status', width: 90, render: (s: string) => <Tag color={s === 'active' ? 'green' : 'default'}>{s === 'active' ? 'active' : '已禁用'}</Tag> },
+    { title: '最后登录', dataIndex: 'last_login_at', width: 180, render: dt },
     {
-      title: '状态',
+      title: '操作', key: 'op', width: 200,
-      dataIndex: 'status',
-      render: (s: string) => <Tag color={s === 'active' ? 'green' : 'red'}>{s}</Tag>,
-    },
-    { title: '最后登录', dataIndex: 'last_login_at', render: dt },
-    {
-      title: '操作',
-      key: 'op',
       render: (_: unknown, a: AdminInfo) => (
-        <a onClick={() => toggle(a)}>{a.status === 'active' ? '禁用' : '启用'}</a>
+        <Space size="middle">
+          <a onClick={() => openEditPerson(a)}>编辑</a>
+          <a onClick={() => toggleStatus(a)}>{a.status === 'active' ? '禁用' : '启用'}</a>
+          <a style={{ color: '#cf1322' }} onClick={() => deletePerson(a)}>删除</a>
+        </Space>
       ),
     },
   ];
 
+  // ============ 视图 1:管理员账号列表 ============
+  if (view === 'list') {
+    return (
+      <div>
+        <h2>权限管理</h2>
+        <Space style={{ marginBottom: 16 }}>
+          <Button type="primary" onClick={openCreatePerson}>+ 新增人员</Button>
+          <Button onClick={openRoles}>角色设置</Button>
+        </Space>
+        <Table rowKey="id" columns={columns} dataSource={admins} loading={loading} pagination={false} />
+      </div>
+    );
+  }
+
+  // ============ 视图 2:新增 / 编辑人员 ============
+  if (view === 'person') {
+    const rolePagesPreview = roleByName[personRole]?.pages ?? [];
+    return (
+      <div>
+        <Space style={{ marginBottom: 16 }}><a onClick={() => setView('list')}>‹ 返回</a></Space>
+        <Card style={{ maxWidth: 720, margin: '0 auto' }}>
+          <h2 style={{ fontSize: 19, fontWeight: 600, marginBottom: 22 }}>{personEditing ? '编辑人员' : '新增人员'}</h2>
+          <div style={{ marginBottom: 20 }}>
+            <div style={{ marginBottom: 8 }}>用户名<span style={{ color: '#cf1322' }}> *</span></div>
+            <Input value={personName} disabled={!!personEditing} onChange={(e) => setPersonName(e.target.value)} placeholder="至少 3 位" />
+            {personEditing && <div style={{ color: '#999', fontSize: 12, marginTop: 6 }}>用户名不可修改</div>}
+          </div>
+
+          {!personEditing ? (
+            // 新增:系统生成初始密码(可换)
+            <div style={{ marginBottom: 20 }}>
+              <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 8 }}>
+                <span>初始密码</span>
+                <a onClick={() => setInitPw(genPassword())}>换一个 ↻</a>
+              </div>
+              {pwBox(initPw)}
+            </div>
+          ) : personEditing.password ? (
+            // 编辑:显示该成员已确定的登录密码(只读、不可换)
+            <div style={{ marginBottom: 20 }}>
+              <div style={{ marginBottom: 8 }}>登录密码</div>
+              {pwBox(personEditing.password)}
+              <div style={{ color: '#999', fontSize: 12, marginTop: 6 }}>该成员已确定的登录密码,可复制转交本人</div>
+            </div>
+          ) : (
+            // 编辑:无留存明文(脚本/起后台建的超管)→ 不显示密码
+            <div style={{ marginBottom: 20 }}>
+              <div style={{ marginBottom: 8 }}>登录密码</div>
+              <div style={{ color: '#999', fontSize: 13, padding: '6px 0' }}>该账号密码仅在后台创建时设定、系统未留存,不可查看。</div>
+            </div>
+          )}
+
+          <div style={{ marginBottom: 20 }}>
+            <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 8 }}>
+              <span>选择角色<span style={{ color: '#cf1322' }}> *</span></span>
+              {isSuper && <a onClick={openRoles}>设置角色权限 ›</a>}
+            </div>
+            <Select value={personRole} options={personRoleOptions} onChange={setPersonRole} style={{ width: '100%' }} />
+            <div style={{ color: '#999', fontSize: 12, marginTop: 6 }}>
+              {isCustom
+                ? '「自定义」:下方逐页勾选该成员可见的页面,仅对本人生效(不影响任何角色)'
+                : '可见页面完全由所选角色决定;如需调整请到「角色设置」修改该角色'}
+            </div>
+          </div>
+
+          <div>
+            <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 8 }}>
+              <span>可见页面</span>
+              <span style={{ color: '#999', fontSize: 12 }}>
+                {isCustom ? '勾选本成员可见的页面' : '跟随所选角色,此处只读(深色=可见)'}
+              </span>
+            </div>
+            {isCustom ? (
+              <PermEditor catalog={catalog} value={personPages} onChange={setPersonPages} />
+            ) : (
+              <PermMatrix catalog={catalog} pages={personRole === 'super_admin' ? catalog.flatMap((g) => g.pages.map((p) => p.key)) : rolePagesPreview} />
+            )}
+          </div>
+
+          <div style={{ marginTop: 24, textAlign: 'right' }}>
+            <Space><Button onClick={() => setView('list')}>取消</Button><Button type="primary" onClick={submitPerson}>确定</Button></Space>
+          </div>
+        </Card>
+      </div>
+    );
+  }
+
+  // ============ 视图 3:角色设置(角色列表 + 只读权限详情)============
+  if (view === 'roles') {
+    return (
+      <div>
+        <Space style={{ marginBottom: 16 }}><a onClick={() => setView('list')}>‹ 返回</a><b>角色设置</b></Space>
+        <div>
+          <Button type="primary" style={{ marginBottom: 16 }} onClick={openCreateRole}>+ 新增角色权限</Button>
+          <div style={{ display: 'flex', background: '#fff', border: '1px solid #e8ebf1', borderRadius: 10, boxShadow: '0 1px 3px rgba(16,24,40,.06)', overflow: 'hidden' }}>
+            <div style={{ width: 176, flexShrink: 0, borderRight: '1px solid #eff1f6', padding: 8 }}>
+              {roles.map((r) => (
+                <div
+                  key={r.id}
+                  onClick={() => setSelRoleId(r.id)}
+                  style={{
+                    padding: '10px 14px', borderRadius: 8, cursor: 'pointer', marginBottom: 2,
+                    background: selRole?.id === r.id ? '#e6f0ff' : undefined,
+                    color: selRole?.id === r.id ? '#1677ff' : undefined,
+                    fontWeight: selRole?.id === r.id ? 600 : undefined,
+                  }}
+                >
+                  {r.label}{r.is_builtin && <Tag style={{ marginLeft: 6 }}>内建</Tag>}
+                </div>
+              ))}
+            </div>
+            <div style={{ flex: 1, minWidth: 0, padding: '18px 22px' }}>
+              {selRole && (
+                <>
+                  <Space style={{ marginBottom: 16 }} size="middle">
+                    <b style={{ fontSize: 16 }}>{selRole.label}</b>
+                    {!selRole.is_builtin && <a onClick={() => openEditRole(selRole)}>编辑角色权限</a>}
+                    {!selRole.is_builtin && <a style={{ color: '#cf1322' }} onClick={() => deleteRole(selRole)}>删除角色权限</a>}
+                    {selRole.in_use > 0 && <span style={{ color: '#999', fontSize: 12 }}>{selRole.in_use} 名成员在用</span>}
+                  </Space>
+                  <PermMatrix catalog={catalog} pages={selRole.pages} />
+                </>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  // ============ 视图 4:新增 / 编辑角色权限 ============
   return (
     <div>
-      <h2>管理员账号</h2>
+      <Space style={{ marginBottom: 16 }}><a onClick={() => setView('roles')}>‹ 返回</a></Space>
-      <Button type="primary" style={{ marginBottom: 16 }} onClick={() => setCreateOpen(true)}>
+      <Card style={{ maxWidth: 920, margin: '0 auto' }}>
-        新建管理员
+        <h2 style={{ fontSize: 19, fontWeight: 600, marginBottom: 22 }}>{roleEditing ? '编辑角色权限' : '新增角色权限'}</h2>
-      </Button>
+        <div style={{ marginBottom: 20 }}>
-      <Table rowKey="id" columns={columns} dataSource={admins} loading={loading} pagination={false} />
+          <div style={{ marginBottom: 8 }}>角色名称<span style={{ color: '#cf1322' }}> *</span></div>
-
+          <Input value={roleName} onChange={(e) => setRoleName(e.target.value)} placeholder="如:运营专员 / 财务 / 审核" maxLength={32} />
-      <Modal
+        </div>
-        title="新建管理员"
+        <div>
-        open={createOpen}
+          <div style={{ marginBottom: 8 }}>角色权限(可见页面)<span style={{ color: '#cf1322' }}> *</span></div>
-        onOk={create}
+          <PermEditor catalog={catalog} value={rolePages} onChange={setRolePages} />
-        onCancel={() => setCreateOpen(false)}
+        </div>
-        destroyOnClose
+        <div style={{ marginTop: 24, textAlign: 'right' }}>
-      >
+          <Space><Button onClick={() => setView('roles')}>取消</Button><Button type="primary" onClick={submitRole}>确定</Button></Space>
-        <Form form={form} layout="vertical" initialValues={{ role: 'operator' }}>
+        </div>
-          <Form.Item name="username" label="用户名" rules={[{ required: true, min: 3 }]}>
+      </Card>
-            <Input />
-          </Form.Item>
-          <Form.Item name="password" label="密码(≥8 位)" rules={[{ required: true, min: 8 }]}>
-            <Input.Password />
-          </Form.Item>
-          <Form.Item name="role" label="角色" rules={[{ required: true }]}>
-            <Select options={ROLES} />
-          </Form.Item>
-        </Form>
-      </Modal>
     </div>
   );
 }

src/app/(main)/comparison-records/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import type { CSSProperties } from 'react';
+import type { CSSProperties, ReactNode } from 'react';
 import {
   App, Button, Card, Collapse, Descriptions, Drawer, Input, InputNumber,
   Select, Space, Spin, Table, Tag, Typography,
@@ -48,6 +48,33 @@ function pretty(s: string | null): string {
   }
 }
 
+// 搜索命中高亮:把 text 里匹配 keyword 的子串套黄底荧光,方便审计快速定位。
+// 大小写不敏感;用 indexOf 逐段切(非正则,keyword 含特殊字符也安全)。keyword 取「已应用」
+// 的搜索词(applied.store / applied.product),不是输入框实时值——只高亮真正搜过的词。
+function highlightMatch(text: string | null, keyword: unknown): ReactNode {
+  if (!text) return '-';
+  const kw = (typeof keyword === 'string' ? keyword : '').trim();
+  if (!kw) return text;
+  const parts: ReactNode[] = [];
+  const hay = text.toLowerCase();
+  const needle = kw.toLowerCase();
+  let from = 0;
+  let hit = hay.indexOf(needle);
+  let k = 0;
+  while (hit !== -1) {
+    if (hit > from) parts.push(text.slice(from, hit));
+    parts.push(
+      <mark key={k++} style={{ background: '#fff566', padding: 0 }}>
+        {text.slice(hit, hit + kw.length)}
+      </mark>,
+    );
+    from = hit + kw.length;
+    hit = hay.indexOf(needle, from);
+  }
+  if (from < text.length) parts.push(text.slice(from));
+  return parts;
+}
+
 const preStyle: CSSProperties = {
   background: '#f6f8fa', padding: 8, borderRadius: 6, fontSize: 12,
   maxHeight: 340, overflow: 'auto', whiteSpace: 'pre-wrap', wordBreak: 'break-word', margin: 0,
@@ -59,6 +86,8 @@ export default function ComparisonRecordsPage() {
   const [userId, setUserId] = useState<number | null>(null);
   const [phone, setPhone] = useState('');
   const [status, setStatus] = useState<string | undefined>();
+  const [store, setStore] = useState('');
+  const [product, setProduct] = useState('');
   const [applied, setApplied] = useState<Record<string, unknown>>({});
   // LLM 单价(元/百万 token),本地持久化;仅用于前端估算成本,不入库、不影响其它页面
   const [pricePerMTok, setPricePerMTok] = useState<number | null>(() => {
@@ -80,12 +109,20 @@ export default function ComparisonRecordsPage() {
   const [detailLoading, setDetailLoading] = useState(false);
 
   const search = () =>
-    setApplied({ user_id: userId ?? undefined, phone: phone || undefined, status });
+    setApplied({
+      user_id: userId ?? undefined,
+      phone: phone || undefined,
+      status,
+      store: store.trim() || undefined,
+      product: product.trim() || undefined,
+    });
 
   const reset = () => {
     setUserId(null);
     setPhone('');
     setStatus(undefined);
+    setStore('');
+    setProduct('');
     setApplied({});
   };
 
@@ -122,7 +159,21 @@ export default function ComparisonRecordsPage() {
     },
     { title: '状态', dataIndex: 'status', width: 72, render: (s: string) => <Tag color={STATUS_COLOR[s]}>{STATUS_LABEL[s] || s}</Tag> },
     { title: '源平台', dataIndex: 'source_platform_name', width: 90, render: (v) => v || '-' },
-    { title: '店/商品', dataIndex: 'store_name', width: 150, ellipsis: true, render: (v) => v || '-' },
+    {
+      title: '店',
+      dataIndex: 'store_name',
+      width: 170,
+      // 审计要一眼看全:不截断、整格自动换行(去 ellipsis),而非靠 hover tooltip
+      onCell: () => ({ style: { whiteSpace: 'normal', wordBreak: 'break-word', verticalAlign: 'top' } }),
+      render: (v: string | null) => highlightMatch(v, applied.store),
+    },
+    {
+      title: '商品',
+      dataIndex: 'product_names',
+      width: 280,
+      onCell: () => ({ style: { whiteSpace: 'normal', wordBreak: 'break-word', verticalAlign: 'top' } }),
+      render: (v: string | null) => highlightMatch(v, applied.product),
+    },
     { title: '最优', dataIndex: 'best_platform_name', width: 80, render: (v) => v || '-' },
     {
       title: '省',
@@ -192,6 +243,22 @@ export default function ComparisonRecordsPage() {
           allowClear
           style={{ width: 150 }}
         />
+        <Input
+          placeholder="搜索店名"
+          value={store}
+          onChange={(e) => setStore(e.target.value)}
+          onPressEnter={search}
+          allowClear
+          style={{ width: 150 }}
+        />
+        <Input
+          placeholder="搜索商品"
+          value={product}
+          onChange={(e) => setProduct(e.target.value)}
+          onPressEnter={search}
+          allowClear
+          style={{ width: 150 }}
+        />
         <Select
           placeholder="状态"
           value={status}
@@ -230,7 +297,7 @@ export default function ComparisonRecordsPage() {
           showTotal: (t) => `共 ${t} 条`,
           onChange,
         }}
-        scroll={{ x: 1520 }}
+        scroll={{ x: 1820 }}
         onRow={(r) => ({ onClick: () => openDetail(r.id), style: { cursor: 'pointer' } })}
       />
 
@@ -261,7 +328,7 @@ export default function ComparisonRecordsPage() {
               <Descriptions.Item label="源平台">{detail.source_platform_name || '-'}（{cents(detail.source_price_cents)}）</Descriptions.Item>
               <Descriptions.Item label="最优">{detail.best_platform_name || '-'}（{cents(detail.best_price_cents)}）</Descriptions.Item>
               <Descriptions.Item label="省" span={2}>{cents(detail.saved_amount_cents)}{detail.is_source_best ? '（源平台最便宜）' : ''}</Descriptions.Item>
-              <Descriptions.Item label="店/商品" span={2}>{detail.store_name || '-'}</Descriptions.Item>
+              <Descriptions.Item label="店" span={2}>{detail.store_name || '-'}</Descriptions.Item>
               <Descriptions.Item label="结论文案" span={2}>{detail.information || '-'}</Descriptions.Item>
               <Descriptions.Item label="trace" span={2}>
                 {detail.trace_url

src/app/(main)/config/FeedbackQrConfig.tsx

@@ -12,7 +12,7 @@ const { Text } = Typography;
 
 const ACCEPT = ['image/jpeg', 'image/png', 'image/webp'];
 
-/** 反馈页「加群二维码」卡配置。改完 App 意见反馈页下次进入即同步。「反馈工单」页的一个区块。 */
+/** 反馈页「加群二维码」卡配置。改完 App 意见反馈页下次进入即同步。「系统配置 → 反馈二维码」tab 的一个区块。 */
 export default function FeedbackQrConfig() {
   const [cfg, setCfg] = useState<QrConfig | null>(null);
   const [loading, setLoading] = useState(true);

src/app/(main)/config/HomeMarqueeSeeds.tsx

@@ -9,6 +9,7 @@ import {
   InputNumber,
   Modal,
   Popconfirm,
+  Segmented,
   Space,
   Spin,
   Switch,
@@ -41,13 +42,15 @@ interface BulkVals {
   enabled: boolean;
 }
 
-interface PreviewItem {
+interface RealRecord {
   masked_user: string;
   saved_amount_cents: number;
-  time: string;
+  created_at: string;
+  user_id: number;
 }
 
 const yuan = (cents: number) => (cents / 100).toFixed(2);
+const MODE_LABEL: Record<string, string> = { mixed: '混播', real: '只真实', seed: '只种子' };
 
 /** 首页轮播「种子」管理(真实记录不足时的兜底假数据,现为「生成规则」)。「系统配置 / 首页」里的一个区块。 */
 export default function HomeMarqueeSeeds() {
@@ -55,6 +58,8 @@ export default function HomeMarqueeSeeds() {
   const [seeds, setSeeds] = useState<Seed[]>([]);
   const [loading, setLoading] = useState(true);
   const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]); // 批量操作选中行
+  const [mode, setMode] = useState<string>('mixed'); // 轮播数据源 mixed/real/seed
+  const [modeSaving, setModeSaving] = useState(false);
 
   const [modalOpen, setModalOpen] = useState(false);
   const [editing, setEditing] = useState<Seed | null>(null);
@@ -63,9 +68,12 @@ export default function HomeMarqueeSeeds() {
   const [bulkOpen, setBulkOpen] = useState(false);
   const [bulkForm] = Form.useForm<BulkVals>();
 
-  const [previewOpen, setPreviewOpen] = useState(false);
+  // 「可展示的真实记录」分页浏览(替代原随机预览):翻遍所有 success+省>0 的真实记录
-  const [previewItems, setPreviewItems] = useState<PreviewItem[]>([]);
+  const REC_PAGE_SIZE = 8;
-  const [previewLoading, setPreviewLoading] = useState(false);
+  const [recItems, setRecItems] = useState<RealRecord[]>([]);
+  const [recTotal, setRecTotal] = useState(0);
+  const [recPage, setRecPage] = useState(0); // 0-based
+  const [recLoading, setRecLoading] = useState(false);
 
   const load = async () => {
     setLoading(true);
@@ -80,8 +88,30 @@ export default function HomeMarqueeSeeds() {
   };
   useEffect(() => {
     load();
+    // 轮播数据源模式(mixed/real/seed):单独拉,与种子列表解耦
+    api
+      .get<{ mode: string }>('/admin/api/marquee-seeds/mode')
+      .then(({ data }) => setMode(data.mode))
+      .catch(() => {});
   }, []);
 
+  // 切换数据源:乐观更新 + 失败回滚
+  const changeMode = async (m: string) => {
+    const prev = mode;
+    setMode(m);
+    setRecPage(0); // 切模式回第 1 页(不同模式条数不同,避免停在越界页)
+    setModeSaving(true);
+    try {
+      await api.patch('/admin/api/marquee-seeds/mode', { mode: m });
+      message.success('已切换,客户端下次进首页生效');
+    } catch (e) {
+      setMode(prev);
+      message.error(errMsg(e));
+    } finally {
+      setModeSaving(false);
+    }
+  };
+
   // ===== 单条 新增 / 编辑 =====
   const openAdd = () => {
     setEditing(null);
@@ -144,22 +174,29 @@ export default function HomeMarqueeSeeds() {
     }
   };
 
-  // ===== 预览实际 feed =====
+  // ===== 可展示的记录:按「当前模式」分页浏览全部(不去重)=====
-  const fetchPreview = async () => {
+  // 只真实=真实记录;只种子=各启用种子按生成逻辑各出一行;混播=真实+种子。与 app 同口径洗牌+去连簇,
-    setPreviewLoading(true);
+  // 后端固定种子 → 翻页稳定、能翻遍全部。
+  const fetchRecords = async (page: number, m: string) => {
+    setRecLoading(true);
     try {
-      const { data } = await api.get<{ items: PreviewItem[] }>('/admin/api/marquee-seeds/preview?limit=8');
+      const { data } = await api.get<{ items: RealRecord[]; total: number }>(
-      setPreviewItems(data.items);
+        '/admin/api/marquee-seeds/real-records',
+        { params: { offset: page * REC_PAGE_SIZE, limit: REC_PAGE_SIZE, mode: m } },
+      );
+      setRecItems(data.items);
+      setRecTotal(data.total);
     } catch (e) {
       message.error(errMsg(e));
     } finally {
-      setPreviewLoading(false);
+      setRecLoading(false);
     }
   };
-  const openPreview = () => {
+  // 页码或模式变化都重拉(切模式时 changeMode 会把页码重置到 0)。
-    setPreviewOpen(true);
+  useEffect(() => {
-    fetchPreview();
+    fetchRecords(recPage, mode);
-  };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [recPage, mode]);
 
   const toggle = async (s: Seed, enabled: boolean) => {
     try {
@@ -260,6 +297,100 @@ export default function HomeMarqueeSeeds() {
         首页「用户xxx 比价后节省xx元」轮播的兜底假数据。真实比价记录不足时随机抽取这些补齐;停用的不参与混播。
         用户名留空则每次展示随机合成;金额为区间则每次随机取值。
       </p>
+      <Space style={{ marginBottom: 12 }} align="center" wrap>
+        <span style={{ fontSize: 13 }}>数据源</span>
+        <Segmented
+          value={mode}
+          disabled={modeSaving}
+          onChange={(v) => changeMode(v as string)}
+          options={[
+            { label: '混播(默认)', value: 'mixed' },
+            { label: '只真实', value: 'real' },
+            { label: '只种子', value: 'seed' },
+          ]}
+        />
+        <span style={{ color: '#999', fontSize: 12 }}>
+          混播=真实优先+种子补位;只真实=不掺假数据(真实不足则少显示);只种子=只用下方种子/合成(演示用)
+        </span>
+      </Space>
+
+      {/* 可展示的真实记录:分页浏览全部(success+省>0,不去重、稳定倒序);app 轮播即从这些记录
+          随机打乱、同一用户去连簇后展示。翻页可看全所有真实用户的展示信息。 */}
+      <div
+        style={{
+          marginBottom: 16,
+          border: '1px solid #f0f0f0',
+          borderRadius: 8,
+          padding: '10px 12px',
+          background: '#fafafa',
+        }}
+      >
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            marginBottom: 6,
+            flexWrap: 'wrap',
+            gap: 8,
+          }}
+        >
+          <span style={{ fontSize: 13, fontWeight: 500 }}>
+            可展示的记录 · {MODE_LABEL[mode] ?? mode} · 共 {recTotal} 条
+            <span style={{ color: '#999', fontWeight: 400, fontSize: 12, marginLeft: 8 }}>
+              当前模式下 app 轮播能露出的全部记录(不去重):只真实=真实、只种子=各种子生成、混播=真实+种子;
+              已按 app 口径洗牌+去连簇,顺序固定便于翻页看全
+            </span>
+          </span>
+          <Space size="small">
+            <Button size="small" disabled={recPage <= 0} onClick={() => setRecPage((p) => Math.max(0, p - 1))}>
+              上一页
+            </Button>
+            <span style={{ fontSize: 12, color: '#666' }}>
+              第 {recTotal === 0 ? 0 : recPage + 1}/{Math.max(1, Math.ceil(recTotal / REC_PAGE_SIZE))} 页
+            </span>
+            <Button
+              size="small"
+              disabled={(recPage + 1) * REC_PAGE_SIZE >= recTotal}
+              onClick={() => setRecPage((p) => p + 1)}
+            >
+              下一页
+            </Button>
+          </Space>
+        </div>
+        <Spin spinning={recLoading}>
+          <div style={{ minHeight: 120 }}>
+            {recItems.length === 0 && !recLoading ? (
+              <div style={{ color: '#bbb', textAlign: 'center', padding: '36px 0', fontSize: 13 }}>
+                当前模式暂无可展示的记录
+              </div>
+            ) : (
+              recItems.map((it, i) => (
+                <div
+                  key={i}
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                    padding: '6px 4px',
+                    borderBottom: '1px solid #f0f0f0',
+                  }}
+                >
+                  <span>
+                    {it.masked_user} 比价后节省{' '}
+                    <b style={{ color: '#fa541c' }}>{yuan(it.saved_amount_cents)} 元</b>
+                    <span style={{ color: '#ccc', fontSize: 12, marginLeft: 8 }}>
+                      {it.user_id > 0 ? `u${it.user_id}` : '种子'}
+                    </span>
+                  </span>
+                  <span style={{ color: '#999', fontSize: 12 }}>{it.created_at}</span>
+                </div>
+              ))
+            )}
+          </div>
+        </Spin>
+      </div>
+
       <Space style={{ marginBottom: 12 }} wrap>
         <Button type="primary" size="small" onClick={openAdd}>
           新增种子
@@ -267,9 +398,6 @@ export default function HomeMarqueeSeeds() {
         <Button size="small" onClick={openBulk}>
           批量生成
         </Button>
-        <Button size="small" onClick={openPreview}>
-          预览效果
-        </Button>
         <span style={{ borderLeft: '1px solid #eee', height: 18 }} />
         <Button size="small" disabled={!selectedRowKeys.length} onClick={() => batchSetEnabled(true)}>
           批量启用
@@ -373,48 +501,6 @@ export default function HomeMarqueeSeeds() {
           </Form.Item>
         </Form>
       </Modal>
-
-      {/* 预览实际 feed */}
-      <Modal
-        title="预览轮播效果"
-        open={previewOpen}
-        onCancel={() => setPreviewOpen(false)}
-        footer={
-          <Space>
-            <Button size="small" onClick={fetchPreview}>
-              换一批
-            </Button>
-            <Button size="small" type="primary" onClick={() => setPreviewOpen(false)}>
-              关闭
-            </Button>
-          </Space>
-        }
-      >
-        <p style={{ color: '#999', marginTop: 0 }}>
-          客户端实际会看到的混播结果:真实记录会插队,种子随机抽取、金额/用户名每次都不同。点「换一批」可重新随机。
-        </p>
-        <Spin spinning={previewLoading}>
-          <div style={{ minHeight: 120 }}>
-            {previewItems.map((it, i) => (
-              <div
-                key={i}
-                style={{
-                  display: 'flex',
-                  justifyContent: 'space-between',
-                  padding: '7px 4px',
-                  borderBottom: '1px solid #f0f0f0',
-                }}
-              >
-                <span>
-                  {it.masked_user} 比价后节省{' '}
-                  <b style={{ color: '#fa541c' }}>{yuan(it.saved_amount_cents)} 元</b>
-                </span>
-                <span style={{ color: '#999' }}>{it.time}</span>
-              </div>
-            ))}
-          </div>
-        </Spin>
-      </Modal>
     </div>
   );
 }

src/app/(main)/config/HomeStatsConfig.tsx

@@ -8,7 +8,6 @@ import {
   Checkbox,
   Col,
   InputNumber,
-  Popconfirm,
   Radio,
   Row,
   Select,
@@ -630,16 +629,14 @@ export default function HomeStatsConfig() {
       {!loading && (
         <div style={{ marginTop: 16 }}>
           <Space>
-            <Button type="primary" loading={saving != null} onClick={() => saveAll(false)}>
+            {/* 保存即生效:PATCH 带 apply_now,不再等各自「更新时间」的 tick(原「改了 app 不变」的主因)。
-              保存
+                自增长模式下保存会顺带推进一档。改小数字若没生效,记得勾对应卡片的「允许数字下降」。 */}
+            <Button type="primary" loading={saving != null} onClick={() => saveAll(true)}>
+              保存(立即生效)
             </Button>
-            <Popconfirm
+            <span style={{ color: '#999', fontSize: 12 }}>
-              title="立即更新会马上把三项都推进一次(自增长各走一档),不等更新时间。确定?"
+              三项共用,一次保存全部立即生效,客户端下次进首页即可见
-              onConfirm={() => saveAll(true)}
+            </span>
-            >
-              <Button loading={saving != null}>立即更新</Button>
-            </Popconfirm>
-            <span style={{ color: '#999', fontSize: 12 }}>三项配置共用,一次保存全部生效</span>
           </Space>
         </div>
       )}

src/app/(main)/config/page.tsx

@@ -5,6 +5,7 @@ import { App, Button, Card, Input, InputNumber, Space, Spin, Switch, Tabs, Tag,
 import { api, errMsg } from '@/lib/api';
 import HomeMarqueeSeeds from './HomeMarqueeSeeds';
 import HomeStatsConfig from './HomeStatsConfig';
+import FeedbackQrConfig from './FeedbackQrConfig';
 
 interface ConfigItem {
   key: string;
@@ -162,6 +163,7 @@ export default function ConfigPage() {
             ),
           },
           { key: 'welfare', label: '福利页', children: welfareConfig },
+          { key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
         ]}
       />
     </div>

src/app/(main)/coupon-data/page.tsx

@@ -0,0 +1,677 @@
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  App,
+  Button,
+  Card,
+  Col,
+  DatePicker,
+  Divider,
+  Input,
+  Row,
+  Select,
+  Space,
+  Statistic,
+  Table,
+  Tag,
+  Typography,
+} from 'antd';
+import dayjs, { type Dayjs } from 'dayjs';
+import { api, errMsg } from '@/lib/api';
+import { formatUtcTime } from '@/lib/format';
+import UserRecordsDrawer from '@/components/UserRecordsDrawer';
+
+const { RangePicker } = DatePicker;
+
+// ── 领券数据看板类型(仅本页用,内联定义)──
+interface CouponDataSummary {
+  started_count: number;
+  completed_count: number;
+  avg_elapsed_ms: number | null;
+  p5_ms: number | null;
+  p50_ms: number | null;
+  p95_ms: number | null;
+  p99_ms: number | null;
+}
+interface CouponDataDaily {
+  date: string;
+  started_count: number;
+  completed_count: number;
+  avg_elapsed_ms: number | null;
+}
+interface CouponDataHourly {
+  hour: number;
+  started_count: number;
+  completed_count: number;
+  avg_elapsed_ms: number | null;
+}
+interface CouponDataRow {
+  id: number;
+  trace_id: string;
+  user_id: number | null;
+  user_phone: string | null;
+  user_nickname: string | null;
+  status: string;
+  platforms: string[] | null;
+  origin_package: string | null;
+  elapsed_ms: number | null;
+  platform_elapsed: Record<string, number> | null;
+  device_model: string | null;
+  rom: string | null;
+  app_env: string | null;
+  started_at: string;
+  claimed_count: number | null;
+  trace_url: string | null;
+}
+interface CouponDataReport {
+  date_from: string;
+  date_to: string;
+  summary: CouponDataSummary;
+  daily: CouponDataDaily[];
+  hourly: CouponDataHourly[];
+  total: number;
+  items: CouponDataRow[];
+}
+
+// 发起来源 App 包名 → 中文(「发起平台」列):空=傻瓜比价首页发起,外卖 App 包名→对应平台。
+function originLabel(pkg: string | null): string {
+  if (!pkg) return '傻瓜比价';
+  if (pkg.includes('meituan') || pkg.includes('sankuai')) return '美团';
+  if (pkg.includes('taobao') || pkg.includes('ele')) return '淘宝';
+  if (pkg.includes('jingdong') || pkg.includes('jd')) return '京东';
+  return pkg;
+}
+
+// 领券状态 → 颜色 + 中文(started 无终态 = 中途流失)
+const STATUS_TAG: Record<string, { color: string; label: string }> = {
+  started: { color: 'default', label: '未完成' },
+  completed: { color: 'green', label: '完成' },
+  failed: { color: 'red', label: '失败' },
+  abandoned: { color: 'orange', label: '中途退出' },
+};
+
+// ms → "1.5s"(空值显示 -)
+const fmtSec = (ms: number | null | undefined): string =>
+  ms == null ? '-' : `${(ms / 1000).toFixed(1)}s`;
+
+// 点手机号弹出的「该用户全部领券」抽屉列(精简版:单用户,不含用户/手机号列)。
+const RECORD_COLUMNS: ColumnsType<CouponDataRow> = [
+  { title: '时间', dataIndex: 'started_at', width: 160, render: (v: string) => formatUtcTime(v) },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 80,
+    render: (s: string) => {
+      const t = STATUS_TAG[s] ?? { color: 'default', label: s };
+      return <Tag color={t.color}>{t.label}</Tag>;
+    },
+  },
+  { title: '发起平台', dataIndex: 'origin_package', width: 90, render: (pkg: string | null) => originLabel(pkg) },
+  { title: '耗时', dataIndex: 'elapsed_ms', width: 80, align: 'right', render: (v: number | null) => fmtSec(v) },
+  { title: '美团', key: 'mt', width: 70, align: 'right', render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['meituan-waimai']) },
+  { title: '淘宝', key: 'tb', width: 70, align: 'right', render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['taobao-shanguang']) },
+  { title: '京东', key: 'jd', width: 70, align: 'right', render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['jd-waimai']) },
+  {
+    title: 'trace',
+    dataIndex: 'trace_id',
+    width: 90,
+    render: (v: string, r: CouponDataRow) =>
+      r.trace_url ? (
+        <a href={r.trace_url} target="_blank" rel="noreferrer" title={v}>trace</a>
+      ) : (
+        <Typography.Text type="secondary" style={{ fontSize: 12 }}>{v.slice(0, 6)}…</Typography.Text>
+      ),
+  },
+];
+
+// ── 趋势图(纯 SVG,零依赖,复用广告报表同款):浅蓝柱=发起数、深蓝柱=完成数(左轴 次数),橙线=平均耗时(右轴 秒)──
+const CHART_BAR_STARTED = '#bae0ff';
+const CHART_BAR_COMPLETED = '#1677ff';
+const CHART_LINE = '#fa8c16';
+
+interface TrendPoint {
+  label: string; // x 轴刻度(小时数 / MM-DD)
+  tip: string; // hover 原生 tooltip
+  started: number;
+  completed: number;
+  avgSec: number | null; // 平均耗时(秒);该桶无完成为 null(不画线点)
+}
+
+// 按天聚合:用 from..to 补齐空缺日为 0,轴连续。
+function aggregateDaily(dateFrom: string, dateTo: string, daily: CouponDataDaily[]): TrendPoint[] {
+  const map = new Map(daily.map((d) => [d.date, d]));
+  const out: TrendPoint[] = [];
+  let cur = dayjs(dateFrom);
+  let guard = 0;
+  while (cur.format('YYYY-MM-DD') <= dateTo && guard < 400) {
+    const ds = cur.format('YYYY-MM-DD');
+    const d = map.get(ds);
+    const started = d?.started_count ?? 0;
+    const completed = d?.completed_count ?? 0;
+    const avgSec = d?.avg_elapsed_ms != null ? d.avg_elapsed_ms / 1000 : null;
+    out.push({
+      label: ds.slice(5),
+      tip: `${ds}　发起 ${started} · 完成 ${completed} · 平均耗时 ${avgSec == null ? '-' : avgSec.toFixed(1) + 's'}`,
+      started,
+      completed,
+      avgSec,
+    });
+    cur = cur.add(1, 'day');
+    guard += 1;
+  }
+  return out;
+}
+
+// 按小时聚合(0–23)。
+function aggregateHourly(rows: CouponDataHourly[]): TrendPoint[] {
+  const byHour = new Map(rows.map((r) => [r.hour, r]));
+  return Array.from({ length: 24 }, (_, h) => {
+    const r = byHour.get(h);
+    const started = r?.started_count ?? 0;
+    const completed = r?.completed_count ?? 0;
+    const avgSec = r?.avg_elapsed_ms != null ? r.avg_elapsed_ms / 1000 : null;
+    return {
+      label: String(h),
+      tip: `${String(h).padStart(2, '0')}:00　发起 ${started} · 完成 ${completed} · 平均耗时 ${avgSec == null ? '-' : avgSec.toFixed(1) + 's'}`,
+      started,
+      completed,
+      avgSec,
+    };
+  });
+}
+
+function TrendChart({ points }: { points: TrendPoint[] }) {
+  const n = points.length;
+  const maxBar = Math.max(1, ...points.map((p) => p.started));
+  const maxSec = Math.max(1e-9, ...points.map((p) => p.avgSec ?? 0));
+
+  const W = 960;
+  const H = 280;
+  const padL = 48;
+  const padR = 56;
+  const padT = 16;
+  const padB = 32;
+  const plotW = W - padL - padR;
+  const plotH = H - padT - padB;
+  const step = plotW / Math.max(1, n);
+  const barW = Math.min(24, step * 0.5);
+  const yBase = padT + plotH;
+
+  const barX = (i: number) => padL + i * step + (step - barW) / 2;
+  const cx = (i: number) => padL + i * step + step / 2;
+  const barH = (v: number) => (v / maxBar) * plotH;
+  const secY = (v: number) => yBase - (v / maxSec) * plotH;
+  // X 轴刻度按天/按小时尽量每格都标(≤31 个点每个都标,超出才抽稀),避免跨度稍大就隔天显示。
+  const labelEvery = Math.max(1, Math.ceil(n / 31));
+
+  // 平均耗时线:仅 avgSec 非 null 的点连线(无完成的桶断开)。
+  const linePts = points
+    .map((p, i) => (p.avgSec == null ? null : `${cx(i)},${secY(p.avgSec)}`))
+    .filter((x): x is string => x !== null)
+    .join(' ');
+
+  return (
+    <svg viewBox={`0 0 ${W} ${H}`} width="100%" style={{ display: 'block' }} role="img" aria-label="趋势图">
+      {[0, 0.25, 0.5, 0.75, 1].map((t) => {
+        const y = yBase - t * plotH;
+        return (
+          <g key={t}>
+            <line x1={padL} y1={y} x2={W - padR} y2={y} stroke="#f0f0f0" />
+            <text x={padL - 8} y={y + 4} textAnchor="end" fontSize={11} fill={CHART_BAR_COMPLETED}>
+              {Math.round(maxBar * t)}
+            </text>
+            <text x={W - padR + 8} y={y + 4} textAnchor="start" fontSize={11} fill={CHART_LINE}>
+              {(maxSec * t).toFixed(1)}
+            </text>
+          </g>
+        );
+      })}
+      {/* 发起数柱(浅) */}
+      {points.map((p, i) => (
+        <rect
+          key={`s-${i}`}
+          x={barX(i)}
+          y={yBase - barH(p.started)}
+          width={barW}
+          height={barH(p.started)}
+          fill={CHART_BAR_STARTED}
+          rx={2}
+        >
+          <title>{p.tip}</title>
+        </rect>
+      ))}
+      {/* 完成数柱(深,窄,叠中间) */}
+      {points.map((p, i) => {
+        const cw = barW * 0.55;
+        return (
+          <rect
+            key={`c-${i}`}
+            x={cx(i) - cw / 2}
+            y={yBase - barH(p.completed)}
+            width={cw}
+            height={barH(p.completed)}
+            fill={CHART_BAR_COMPLETED}
+            rx={1}
+          >
+            <title>{p.tip}</title>
+          </rect>
+        );
+      })}
+      {/* 平均耗时线(橙,右轴) */}
+      <polyline points={linePts} fill="none" stroke={CHART_LINE} strokeWidth={2} />
+      {points.map((p, i) =>
+        p.avgSec == null ? null : (
+          <circle key={`p-${i}`} cx={cx(i)} cy={secY(p.avgSec)} r={2.5} fill={CHART_LINE}>
+            <title>{p.tip}</title>
+          </circle>
+        ),
+      )}
+      {points.map((p, i) =>
+        i % labelEvery === 0 || i === n - 1 ? (
+          <text key={`x-${i}`} x={cx(i)} y={H - 14} textAnchor="middle" fontSize={11} fill="#999">
+            {p.label}
+          </text>
+        ) : null,
+      )}
+    </svg>
+  );
+}
+
+// 领券数据看板:上半汇总卡 + 按天/小时趋势(参考广告收益大盘),下半逐条领券明细。
+// 数据源 coupon_session(客户端 /api/v1/coupon/session 两段上报);耗时统计只算 completed。
+export default function CouponDataPage() {
+  const { message } = App.useApp();
+  const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs().subtract(6, 'day'), dayjs()]);
+  const [user, setUser] = useState<string>('');
+  const [appEnv, setAppEnv] = useState<string>('prod');
+  const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
+  const [sortBy, setSortBy] = useState<'time' | 'elapsed'>('time');
+  const [limit, setLimit] = useState<number>(100);
+  const [page, setPage] = useState<number>(1);
+  const [queriedGranularity, setQueriedGranularity] = useState<'day' | 'hour'>('day');
+  const [queriedMultiDay, setQueriedMultiDay] = useState(false);
+  const [queriedLimit, setQueriedLimit] = useState<number>(100);
+  const [data, setData] = useState<CouponDataReport | null>(null);
+  const [loading, setLoading] = useState(false);
+  // 点手机号:抽屉看该用户全部领券(总次数 + 记录)
+  const [recordsUser, setRecordsUser] = useState<{ userId: number; phone: string | null } | null>(null);
+  const openUserRecords = (r: CouponDataRow) => {
+    if (r.user_id != null) setRecordsUser({ userId: r.user_id, phone: r.user_phone });
+  };
+
+  // 跨多天时「按小时」无意义,粒度强制按天(同广告报表)。
+  const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
+
+  const load = useCallback(
+    async (targetPage = 1, targetLimit = limit, targetSort = sortBy) => {
+      const from = range[0].format('YYYY-MM-DD');
+      const to = range[1].format('YYYY-MM-DD');
+      const multiDay = from !== to;
+      const gran = multiDay ? 'day' : granularity;
+      setLoading(true);
+      try {
+        const res = await api.get<CouponDataReport>('/admin/api/coupon-data', {
+          params: {
+            date_from: from,
+            date_to: to,
+            user: user.trim() || undefined,
+            app_env: appEnv,
+            granularity: gran,
+            limit: targetLimit,
+            offset: (targetPage - 1) * targetLimit,
+            sort: targetSort,
+          },
+        });
+        setData(res.data);
+        setPage(targetPage);
+        setQueriedLimit(targetLimit);
+        setQueriedGranularity(gran);
+        setQueriedMultiDay(multiDay);
+      } catch (e) {
+        message.error(errMsg(e));
+      } finally {
+        setLoading(false);
+      }
+    },
+    [range, user, appEnv, granularity, limit, sortBy, message],
+  );
+
+  useEffect(() => {
+    load();
+    // 仅首次自动拉近 7 天;之后由「查询」按钮触发
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const columns: ColumnsType<CouponDataRow> = [
+    {
+      title: '用户',
+      dataIndex: 'user_nickname',
+      width: 140,
+      render: (_: unknown, r: CouponDataRow) => {
+        if (r.user_nickname) {
+          return (
+            <span>
+              {r.user_nickname}
+              {r.user_id != null && (
+                <Typography.Text type="secondary" style={{ fontSize: 11, marginLeft: 6 }}>
+                  #{r.user_id}
+                </Typography.Text>
+              )}
+            </span>
+          );
+        }
+        if (r.user_id != null) return <Typography.Text type="secondary">#{r.user_id}</Typography.Text>;
+        return <Typography.Text type="secondary">游客</Typography.Text>;
+      },
+    },
+    {
+      title: '手机号',
+      dataIndex: 'user_phone',
+      width: 130,
+      // 点手机号 → 抽屉看该用户全部领券(参考低价审核/反馈页)。游客(无 user_id)不可点。
+      render: (phone: string | null, r: CouponDataRow) =>
+        r.user_id != null ? (
+          <a onClick={() => openUserRecords(r)}>{phone || `#${r.user_id}`}</a>
+        ) : (
+          <Typography.Text type="secondary">游客</Typography.Text>
+        ),
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 90,
+      render: (s: string) => {
+        const t = STATUS_TAG[s] ?? { color: 'default', label: s };
+        return <Tag color={t.color}>{t.label}</Tag>;
+      },
+    },
+    {
+      title: '发起平台',
+      dataIndex: 'origin_package',
+      width: 110,
+      render: (pkg: string | null) => originLabel(pkg),
+    },
+    {
+      title: '耗时',
+      dataIndex: 'elapsed_ms',
+      width: 90,
+      align: 'right',
+      render: (v: number | null) => fmtSec(v),
+    },
+    {
+      title: '美团耗时',
+      key: 'mt_elapsed',
+      width: 90,
+      align: 'right',
+      render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['meituan-waimai']),
+    },
+    {
+      title: '淘宝耗时',
+      key: 'tb_elapsed',
+      width: 90,
+      align: 'right',
+      render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['taobao-shanguang']),
+    },
+    {
+      title: '京东耗时',
+      key: 'jd_elapsed',
+      width: 90,
+      align: 'right',
+      render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['jd-waimai']),
+    },
+    {
+      title: '机型/ROM',
+      key: 'device',
+      width: 200,
+      render: (_: unknown, r: CouponDataRow) => {
+        const parts = [r.device_model, r.rom].filter(Boolean);
+        return parts.length ? parts.join(' / ') : <Typography.Text type="secondary">-</Typography.Text>;
+      },
+    },
+    {
+      title: '时间',
+      dataIndex: 'started_at',
+      width: 165,
+      render: (v: string) => formatUtcTime(v),
+    },
+    {
+      title: '领券 trace',
+      dataIndex: 'trace_id',
+      width: 150,
+      // 有 trace_url(pricebot 上云,仅 completed)→ 可点链接打开完整现场;否则降级为可复制 trace_id。
+      render: (v: string, r: CouponDataRow) =>
+        r.trace_url ? (
+          <a href={r.trace_url} target="_blank" rel="noreferrer" title={v}>
+            trace（{v.slice(0, 8)}…）
+          </a>
+        ) : (
+          <Typography.Text copyable={{ text: v }} style={{ fontSize: 12 }}>
+            {v.slice(0, 8)}…
+          </Typography.Text>
+        ),
+    },
+  ];
+
+  const summary = data?.summary;
+  const items = data?.items ?? [];
+
+  return (
+    <div>
+      <Space align="center" style={{ display: 'flex', marginBottom: 16 }}>
+        <h2 style={{ margin: 0 }}>领券数据</h2>
+        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+          发起→完成耗时口径为客户端全程计时;均值/分位仅统计「完成」的领券
+        </Typography.Text>
+      </Space>
+
+      <Card size="small" style={{ marginBottom: 16 }}>
+        <Space wrap size="middle" align="center">
+          <Space size={6}>
+            <Typography.Text type="secondary">日期</Typography.Text>
+            <RangePicker
+              value={range}
+              onChange={(v) => v && v[0] && v[1] && setRange([v[0], v[1]])}
+              allowClear={false}
+              presets={[
+                { label: '今天', value: [dayjs(), dayjs()] },
+                { label: '近 7 天', value: [dayjs().subtract(6, 'day'), dayjs()] },
+                { label: '近 30 天', value: [dayjs().subtract(29, 'day'), dayjs()] },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">用户</Typography.Text>
+            <Input
+              placeholder="手机号/昵称"
+              value={user}
+              onChange={(e) => setUser(e.target.value)}
+              onPressEnter={() => load(1)}
+              allowClear
+              style={{ width: 150 }}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">环境</Typography.Text>
+            <Select
+              value={appEnv}
+              onChange={setAppEnv}
+              style={{ width: 120 }}
+              options={[
+                { value: 'prod', label: '正式(prod)' },
+                { value: 'dev', label: '测试(dev)' },
+                { value: 'all', label: '全部' },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">粒度</Typography.Text>
+            <Select
+              value={rangeMultiDay ? 'day' : granularity}
+              onChange={setGranularity}
+              disabled={rangeMultiDay}
+              style={{ width: 110 }}
+              title={rangeMultiDay ? '跨多天仅支持按天' : undefined}
+              options={[
+                { value: 'day', label: '按天' },
+                { value: 'hour', label: '按小时' },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">排序</Typography.Text>
+            <Select
+              value={sortBy}
+              onChange={(v) => {
+                setSortBy(v);
+                load(1, limit, v);
+              }}
+              style={{ width: 130 }}
+              options={[
+                { value: 'time', label: '时间倒序' },
+                { value: 'elapsed', label: '耗时倒序' },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">每页</Typography.Text>
+            <Select
+              value={limit}
+              onChange={(v) => {
+                setLimit(v);
+                load(1, v);
+              }}
+              style={{ width: 120 }}
+              options={[20, 50, 100, 200, 500].map((nn) => ({ value: nn, label: `${nn} 条/页` }))}
+            />
+          </Space>
+          <Button type="primary" onClick={() => load(1)} loading={loading}>
+            查询
+          </Button>
+        </Space>
+      </Card>
+
+      {summary && (
+        <Card size="small" style={{ marginBottom: 16 }}>
+          <Row gutter={[16, 12]}>
+            <Col flex="1 1 0">
+              <Statistic title="领券发起数" value={summary.started_count} />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic title="领券完成数" value={summary.completed_count} />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic title="平均耗时" value={fmtSec(summary.avg_elapsed_ms)} />
+            </Col>
+          </Row>
+          <Divider style={{ marginTop: 16, marginBottom: 16 }} />
+          <Row gutter={[16, 12]}>
+            <Col flex="1 1 0">
+              <Statistic title="耗时 5 分位" value={fmtSec(summary.p5_ms)} />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic title="耗时 50 分位" value={fmtSec(summary.p50_ms)} />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic title="耗时 95 分位" value={fmtSec(summary.p95_ms)} />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic title="耗时 99 分位" value={fmtSec(summary.p99_ms)} />
+            </Col>
+          </Row>
+        </Card>
+      )}
+
+      {data &&
+        (queriedMultiDay
+          ? (data.daily?.length ?? 0) > 0
+          : queriedGranularity === 'hour' && (data.hourly?.length ?? 0) > 0) && (
+        <Card
+          size="small"
+          title={queriedMultiDay ? '按天趋势' : '按小时趋势'}
+          style={{ marginBottom: 16 }}
+          extra={
+            <Space size={16}>
+              <span style={{ fontSize: 12, color: '#666' }}>
+                <span
+                  style={{
+                    display: 'inline-block',
+                    width: 10,
+                    height: 10,
+                    background: CHART_BAR_STARTED,
+                    borderRadius: 2,
+                    marginRight: 4,
+                  }}
+                />
+                发起数
+              </span>
+              <span style={{ fontSize: 12, color: '#666' }}>
+                <span
+                  style={{
+                    display: 'inline-block',
+                    width: 10,
+                    height: 10,
+                    background: CHART_BAR_COMPLETED,
+                    borderRadius: 2,
+                    marginRight: 4,
+                  }}
+                />
+                完成数
+              </span>
+              <span style={{ fontSize: 12, color: '#666' }}>
+                <span
+                  style={{
+                    display: 'inline-block',
+                    width: 14,
+                    borderTop: `2px solid ${CHART_LINE}`,
+                    marginRight: 4,
+                    verticalAlign: 'middle',
+                  }}
+                />
+                平均耗时(秒)
+              </span>
+            </Space>
+          }
+        >
+          {queriedMultiDay ? (
+            <TrendChart points={aggregateDaily(data.date_from, data.date_to, data.daily)} />
+          ) : (
+            <TrendChart points={aggregateHourly(data.hourly)} />
+          )}
+        </Card>
+      )}
+
+      <Table
+        rowKey="trace_id"
+        columns={columns}
+        dataSource={items}
+        loading={loading}
+        pagination={{
+          current: page,
+          pageSize: queriedLimit,
+          total: data?.total ?? 0,
+          showSizeChanger: false,
+          showTotal: (t) => `共 ${t} 条`,
+          onChange: (p) => load(p, queriedLimit),
+        }}
+        size="small"
+        scroll={{ x: 1450 }}
+      />
+
+      <UserRecordsDrawer<CouponDataRow>
+        open={recordsUser != null}
+        onClose={() => setRecordsUser(null)}
+        userId={recordsUser?.userId ?? null}
+        phone={recordsUser?.phone ?? null}
+        endpoint="/admin/api/coupon-data/user-records"
+        columns={RECORD_COLUMNS}
+        recordLabel="领券"
+        countLabel="领券次数"
+        rewardLabel="领到券张数"
+        rewardSuffix="张"
+        rewardOf={(r) => r.claimed_count ?? 0}
+      />
+    </div>
+  );
+}

src/app/(main)/dashboard/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState, type ReactNode } from 'react';
-import { Alert, Select, Spin, Tag, Tooltip, message } from 'antd';
+import { Alert, App, Select, Spin, Tag, Tooltip } from 'antd';
 import { CalendarOutlined, InfoCircleOutlined } from '@ant-design/icons';
 import dayjs from 'dayjs';
 import { api } from '@/lib/api';
@@ -10,6 +10,8 @@ import type { AdRevenueReport, DashboardOverview } from '@/lib/types';
 type PeriodKey = 'yesterday' | '7d' | '30d';
 type TrendSeriesKey = 'dau' | 'newUsers' | 'comparisons';
 type DashboardTrendPoint = DashboardOverview['period']['trend'][number];
+type DeltaTone = 'muted' | 'up' | 'down' | 'flat';
+type DeltaInfo = { value: ReactNode; tone: DeltaTone };
 
 const PERIODS: { key: PeriodKey; label: string; days: number }[] = [
   { key: 'yesterday', label: '昨日', days: 1 },
@@ -35,6 +37,72 @@ const fmtYuan = (yuan: number | null | undefined) => (yuan == null ? '--' : `¥$
 const fmtMsAsSeconds = (ms: number | null | undefined) => (ms == null ? '--' : (ms / 1000).toFixed(1));
 const pct = (v: number | null | undefined) => (v == null ? '--' : `${(v * 100).toFixed(1)}%`);
 const compact = (v: number) => (v >= 1000 ? `${(v / 1000).toFixed(v >= 10000 ? 0 : 1)}k` : String(v));
+const fmtCoinAmount = (v: number | null | undefined) => {
+  if (v == null) return '--';
+  if (Math.abs(v) >= 10000) return `${(v / 10000).toFixed(2).replace(/\.?0+$/, '')} 万`;
+  return numberFmt.format(v);
+};
+const CMP_LABEL = 'vs 上周期';
+
+function withCompare(main: string) {
+  return (
+    <>
+      {main}
+      <span className="cmp">{CMP_LABEL}</span>
+    </>
+  );
+}
+
+function percentDelta(current: number | null | undefined, previous: number | null | undefined): DeltaInfo {
+  if (current == null || previous == null) return { value: '暂无上期', tone: 'flat' };
+  if (previous === 0) {
+    if (current === 0) return { value: withCompare('持平'), tone: 'flat' };
+    return { value: '上期为 0', tone: current > 0 ? 'up' : 'down' };
+  }
+  const diff = (current - previous) / Math.abs(previous);
+  if (Math.abs(diff) < 0.0005) return { value: withCompare('持平'), tone: 'flat' };
+  const arrow = diff > 0 ? '▲' : '▼';
+  return {
+    value: withCompare(`${arrow} ${(Math.abs(diff) * 100).toFixed(1)}%`),
+    tone: diff > 0 ? 'up' : 'down',
+  };
+}
+
+function pointDelta(current: number | null | undefined, previous: number | null | undefined): DeltaInfo {
+  if (current == null || previous == null) return { value: '暂无上期', tone: 'flat' };
+  const diff = (current - previous) * 100;
+  if (Math.abs(diff) < 0.05) return { value: withCompare('持平'), tone: 'flat' };
+  const arrow = diff > 0 ? '▲' : '▼';
+  return {
+    value: withCompare(`${arrow} ${Math.abs(diff).toFixed(1)}pt`),
+    tone: diff > 0 ? 'up' : 'down',
+  };
+}
+
+function durationDelta(currentMs: number | null | undefined, previousMs: number | null | undefined): DeltaInfo {
+  if (currentMs == null || previousMs == null) return { value: '暂无上期', tone: 'flat' };
+  const diffSeconds = (currentMs - previousMs) / 1000;
+  if (Math.abs(diffSeconds) < 0.05) return { value: withCompare('持平'), tone: 'flat' };
+  return diffSeconds < 0
+    ? { value: `▼ ${Math.abs(diffSeconds).toFixed(1)}s 更快`, tone: 'up' }
+    : { value: `▲ ${Math.abs(diffSeconds).toFixed(1)}s 更慢`, tone: 'down' };
+}
+
+function moneyDeltaCents(current: number | null | undefined, previous: number | null | undefined): DeltaInfo {
+  if (current == null || previous == null) return { value: '暂无上期', tone: 'flat' };
+  const diff = current - previous;
+  if (Math.abs(diff) < 0.5) return { value: withCompare('持平'), tone: 'flat' };
+  const arrow = diff > 0 ? '▲' : '▼';
+  return {
+    value: withCompare(`${arrow} ${fmtCents(Math.abs(diff))}`),
+    tone: diff > 0 ? 'up' : 'down',
+  };
+}
+
+function ratioBadge(value: number | null | undefined, total: number | null | undefined): DeltaInfo {
+  if (value == null || total == null || total <= 0) return { value: '占 --', tone: 'flat' };
+  return { value: `占 ${((value / total) * 100).toFixed(1)}%`, tone: 'flat' };
+}
 
 function periodRange(period: PeriodKey) {
   const p = PERIODS.find((it) => it.key === period) ?? PERIODS[0];
@@ -43,10 +111,17 @@ function periodRange(period: PeriodKey) {
   return { start, end, label: `${start.format('MM-DD')} ~ ${end.format('MM-DD')}`, days: p.days };
 }
 
+function previousPeriodRange(range: ReturnType<typeof periodRange>) {
+  const end = range.start.subtract(1, 'day');
+  const start = end.subtract(range.days - 1, 'day');
+  return { start, end, label: `${start.format('MM-DD')} ~ ${end.format('MM-DD')}` };
+}
+
 function retentionTitle(period: PeriodKey) {
-  if (period === '7d') return '近 7 日新增留存';
+  // 次日留存口径(2026-07-05):每天取前一日新增用户,统计其当日活跃比例;单日窗口即「前日新增的昨日留存」。
-  if (period === '30d') return '近 30 日新增留存';
+  if (period === '7d') return '近 7 日新增次日留存';
-  return '昨日新增留存';
+  if (period === '30d') return '近 30 日新增次日留存';
+  return '前日用户新增留存';
 }
 
 function avgEcpm(report: AdRevenueReport | null) {
@@ -57,19 +132,23 @@ function avgEcpm(report: AdRevenueReport | null) {
 function adTypeSummary(report: AdRevenueReport | null, adType: string) {
   if (!report) return null;
   if (report.by_ad_type?.[adType]) return report.by_ad_type[adType];
+  // 优先用后端全量小计 type_stats(items 受 limit 分页截断,>1000 行的区间按 items 现算会漏旧数据)
+  const stat = report.type_stats?.[adType];
+  if (stat) return { impressions: stat.impressions, revenue_yuan: stat.revenue_yuan };
   const matched = report.items.filter((it) => it.ad_type === adType);
   if (matched.length === 0) return null;
   return {
-    ad_type: adType,
     impressions: matched.reduce((sum, it) => sum + it.impressions, 0),
     revenue_yuan: matched.reduce((sum, it) => sum + it.revenue_yuan, 0),
-    expected_coin: matched.reduce((sum, it) => sum + it.expected_coin, 0),
-    actual_coin: matched.reduce((sum, it) => sum + it.actual_coin, 0),
   };
 }
 
 function adSceneSummary(report: AdRevenueReport | null, feedScene: 'coupon' | 'comparison') {
   if (!report) return null;
+  // 优先用后端全量小计 scene_stats:2026-07-02 起 items 不再含信息流逐条展示行(唯一带收益+场景的行),
+  // 按 items 现算恒为 0;scene_stats 在全量 events 上聚合且不受分页截断。旧后端无此字段时回退 items 现算。
+  const stat = report.scene_stats?.[feedScene];
+  if (stat) return { impressions: stat.impressions, revenue_yuan: stat.revenue_yuan };
   const matched = report.items.filter((it) => it.feed_scene === feedScene);
   if (matched.length === 0) return null;
   return {
@@ -92,6 +171,16 @@ function sceneAdEcpm(summary: ReturnType<typeof adSceneSummary>) {
   return fmtYuan((summary.revenue_yuan / summary.impressions) * 1000);
 }
 
+function cpsCommissionCents(data: DashboardOverview | null | undefined) {
+  if (!data?.cps.available) return null;
+  return (data.cps.meituan_commission_cents ?? 0) + (data.cps.jd_commission_cents ?? 0);
+}
+
+function revenueYuan(ad: AdRevenueReport | null | undefined, cpsCents: number | null | undefined) {
+  if (ad?.total_revenue_yuan == null && cpsCents == null) return null;
+  return (ad?.total_revenue_yuan ?? 0) + ((cpsCents ?? 0) / 100);
+}
+
 function niceMax(v: number) {
   if (v <= 5) return 5;
   if (v <= 10) return 10;
@@ -99,7 +188,7 @@ function niceMax(v: number) {
   return Math.ceil(v / base) * base;
 }
 
-function StatusText({ children, tone = 'muted' }: { children: React.ReactNode; tone?: 'muted' | 'ok' | 'warn' }) {
+function StatusText({ children, tone = 'muted' }: { children: ReactNode; tone?: 'muted' | 'ok' | 'warn' }) {
   return <span className={`status status-${tone}`}>{children}</span>;
 }
 
@@ -107,8 +196,8 @@ function DeltaBadge({
   children,
   tone = 'muted',
 }: {
-  children: React.ReactNode;
+  children: ReactNode;
-  tone?: 'muted' | 'up' | 'down';
+  tone?: DeltaTone;
 }) {
   return <span className={`delta delta-${tone}`}>{children}</span>;
 }
@@ -116,11 +205,15 @@ function DeltaBadge({
 function MiniSpark({
   color = '#2F6BFF',
   down,
+  flat,
 }: {
   color?: string;
   down?: boolean;
+  flat?: boolean;
 }) {
-  const points = down
+  const points = flat
+    ? '0,16 13,16 26,15 39,16 52,15 65,16 78,15'
+    : down
     ? '0,8 13,10 26,9 39,14 52,12 65,18 78,20'
     : '0,24 13,22 26,20 39,15 52,13 65,8 78,5';
   return (
@@ -149,9 +242,9 @@ function StatCard({
   status?: string;
   tone?: 'muted' | 'ok' | 'warn';
   emphasis?: boolean;
-  spark?: 'up' | 'down';
+  spark?: 'up' | 'down' | 'flat';
-  delta?: string;
+  delta?: ReactNode;
-  deltaTone?: 'muted' | 'up' | 'down';
+  deltaTone?: DeltaTone;
 }) {
   return (
     <div className={`stat-card${emphasis ? ' stat-card-emphasis' : ''}`}>
@@ -168,7 +261,13 @@ function StatCard({
           {value}
           {unit && value !== '--' && <span>{unit}</span>}
         </div>
-        {spark && <MiniSpark color={spark === 'down' ? '#EF4444' : '#2F6BFF'} down={spark === 'down'} />}
+        {spark && (
+          <MiniSpark
+            color={spark === 'down' ? '#EF4444' : '#2F6BFF'}
+            down={spark === 'down'}
+            flat={spark === 'flat'}
+          />
+        )}
       </div>
       {delta ? <DeltaBadge tone={deltaTone}>{delta}</DeltaBadge> : status && <StatusText tone={tone}>{status}</StatusText>}
     </div>
@@ -181,18 +280,20 @@ function RevenueCard({
   meta,
   accent,
   delta,
+  deltaTone = 'up',
 }: {
   title: string;
   value: string;
   meta?: { label: string; value: string }[];
-  accent?: 'blue' | 'green' | 'yellow' | 'red';
+  accent?: 'blue' | 'green' | 'yellow' | 'red' | 'jd';
-  delta?: string;
+  delta?: ReactNode;
+  deltaTone?: DeltaTone;
 }) {
   return (
     <div className={`revenue-card ${accent ? `rev-${accent}` : ''}`}>
       <div className="revenue-top">
         <div className="revenue-tag">{title}</div>
-        {delta && <DeltaBadge tone="up">{delta}</DeltaBadge>}
+        {delta && <DeltaBadge tone={deltaTone}>{delta}</DeltaBadge>}
       </div>
       <div className="revenue-value">{value}</div>
       {meta && meta.length > 0 && (
@@ -349,9 +450,12 @@ function TrendChart({ rangeLabel, points }: { rangeLabel: string; points: Dashbo
 }
 
 export default function DashboardPage() {
+  const { message } = App.useApp();
   const [period, setPeriod] = useState<PeriodKey>('yesterday');
   const [data, setData] = useState<DashboardOverview | null>(null);
+  const [previousData, setPreviousData] = useState<DashboardOverview | null>(null);
   const [adReport, setAdReport] = useState<AdRevenueReport | null>(null);
+  const [previousAdReport, setPreviousAdReport] = useState<AdRevenueReport | null>(null);
   const [loading, setLoading] = useState(true);
   const [adLoading, setAdLoading] = useState(false);
   const [overviewError, setOverviewError] = useState<string | null>(null);
@@ -361,7 +465,9 @@ export default function DashboardPage() {
   const [cpsSyncing, setCpsSyncing] = useState(false);
 
   const range = useMemo(() => periodRange(period), [period]);
+  const previousRange = useMemo(() => previousPeriodRange(range), [range]);
   const periodData = data?.period ?? null;
+  const previousPeriodData = previousData?.period ?? null;
   const adAvgEcpm = avgEcpm(adReport);
   const rewardVideoAdSummary = adTypeSummary(adReport, 'reward_video');
   const couponAdSummary = adSceneSummary(adReport, 'coupon');
@@ -381,44 +487,101 @@ export default function DashboardPage() {
   const regularTaskCoinTotal =
     periodData?.coins.regular_task_coin_total ??
     ((signinCoinTotal ?? 0) + (signinBoostCoinTotal ?? 0) + (taskCoinTotal ?? 0));
-  const cpsCommissionCents = data?.cps.meituan_commission_cents;
   const cpsAvailable = data?.cps.available === true;
-  const totalRevenueYuan =
+  const meituanCpsCommissionCents = data?.cps.meituan_commission_cents;
-    adReport?.total_revenue_yuan == null && (!cpsAvailable || cpsCommissionCents == null)
+  const jdCpsCommissionCents = data?.cps.jd_commission_cents;
-      ? null
+  const totalCpsCommissionCents = cpsCommissionCents(data);
-      : (adReport?.total_revenue_yuan ?? 0) + (cpsAvailable ? (cpsCommissionCents ?? 0) / 100 : 0);
+  const previousTotalCpsCommissionCents = cpsCommissionCents(previousData);
+  const totalRevenueYuan = revenueYuan(adReport, totalCpsCommissionCents);
+  const previousTotalRevenueYuan = revenueYuan(previousAdReport, previousTotalCpsCommissionCents);
   const yesterdayTrendPoint = periodData?.trend?.[periodData.trend.length - 1];
   const yesterdayActiveUsers = yesterdayTrendPoint?.active_users ?? null;
   const arpuYuan =
     totalRevenueYuan == null || yesterdayActiveUsers == null || yesterdayActiveUsers <= 0
       ? null
       : totalRevenueYuan / yesterdayActiveUsers;
-  const cpsRevenueText = cpsAvailable ? fmtCents(cpsCommissionCents) : '--';
+  const cpsRevenueText = cpsAvailable ? fmtCents(totalCpsCommissionCents) : '--';
+  const meituanCpsRevenueText = cpsAvailable ? fmtCents(meituanCpsCommissionCents) : '--';
+  const jdCpsRevenueText = cpsAvailable ? fmtCents(jdCpsCommissionCents) : '--';
   const cpsHitRate = !cpsAvailable || data?.cps.meituan_hit_rate == null ? '--' : pct(data.cps.meituan_hit_rate);
   const retentionValue =
     periodData?.users.retention_rate == null
       ? '--'
       : (periodData.users.retention_rate * 100).toFixed(1);
+  const activeUserDelta = percentDelta(periodData?.users.active, previousPeriodData?.users.active);
+  const newUserDelta = percentDelta(periodData?.users.new, previousPeriodData?.users.new);
+  const retentionDelta = pointDelta(periodData?.users.retention_rate, previousPeriodData?.users.retention_rate);
+  const retentionSpark: 'up' | 'down' | 'flat' | undefined =
+    periodData?.users.retention_rate == null
+      ? undefined
+      : retentionDelta.tone === 'down'
+      ? 'down'
+      : retentionDelta.tone === 'up' || periodData.users.retention_rate >= 1
+      ? 'up'
+      : 'flat';
+  const comparisonTotalDelta = percentDelta(periodData?.comparison.total, previousPeriodData?.comparison.total);
+  const comparisonSuccessDelta = percentDelta(periodData?.comparison.success, previousPeriodData?.comparison.success);
+  const comparisonOrderedDelta = percentDelta(periodData?.comparison.ordered, previousPeriodData?.comparison.ordered);
+  const durationDeltaInfo = durationDelta(
+    periodData?.comparison.average_duration_ms,
+    previousPeriodData?.comparison.average_duration_ms,
+  );
+  // 领券核心数据(period.coupon;旧后端无此字段时整节显示 '--')
+  const couponPeriod = periodData?.coupon ?? null;
+  const previousCouponPeriod = previousPeriodData?.coupon ?? null;
+  const couponStartedDelta = percentDelta(couponPeriod?.started, previousCouponPeriod?.started);
+  const couponSuccessRateValue =
+    couponPeriod?.success_rate == null ? '--' : (couponPeriod.success_rate * 100).toFixed(1);
+  const couponSuccessRateDelta = pointDelta(couponPeriod?.success_rate, previousCouponPeriod?.success_rate);
+  const couponPointRateValue =
+    couponPeriod?.point_success_rate == null ? '--' : (couponPeriod.point_success_rate * 100).toFixed(1);
+  const couponPointRateDelta = pointDelta(
+    couponPeriod?.point_success_rate,
+    previousCouponPeriod?.point_success_rate,
+  );
+  const couponMedianDelta = durationDelta(
+    couponPeriod?.median_elapsed_ms,
+    previousCouponPeriod?.median_elapsed_ms,
+  );
+  const averageSavedDelta = moneyDeltaCents(
+    periodData?.comparison.average_saved_cents,
+    previousPeriodData?.comparison.average_saved_cents,
+  );
+  const totalRevenueDelta = percentDelta(totalRevenueYuan, previousTotalRevenueYuan);
+  const adRevenueDelta = percentDelta(adReport?.total_revenue_yuan, previousAdReport?.total_revenue_yuan);
+  const cpsRevenueDelta = percentDelta(totalCpsCommissionCents, previousTotalCpsCommissionCents);
+  const grantedCoinDelta = percentDelta(periodData?.coins.granted_total, previousPeriodData?.coins.granted_total);
+  const couponCoinRatio = ratioBadge(couponRewardCoinTotal, periodData?.coins.granted_total);
+  const comparisonCoinRatio = ratioBadge(comparisonRewardCoinTotal, periodData?.coins.granted_total);
+  const rewardVideoCoinRatio = ratioBadge(periodData?.coins.reward_video_coin_total, periodData?.coins.granted_total);
+  const regularTaskCoinRatio = ratioBadge(regularTaskCoinTotal, periodData?.coins.granted_total);
 
   useEffect(() => {
     let alive = true;
     setLoading(true);
     setOverviewError(null);
-    api
+    const currentParams = {
-      .get<DashboardOverview>('/admin/api/stats/overview', {
+      date_from: range.start.format('YYYY-MM-DD'),
-        params: {
+      date_to: range.end.format('YYYY-MM-DD'),
-          date_from: range.start.format('YYYY-MM-DD'),
+    };
-          date_to: range.end.format('YYYY-MM-DD'),
+    const previousParams = {
-        },
+      date_from: previousRange.start.format('YYYY-MM-DD'),
-      })
+      date_to: previousRange.end.format('YYYY-MM-DD'),
-      .then((r) => {
+    };
+    Promise.allSettled([
+      api.get<DashboardOverview>('/admin/api/stats/overview', { params: currentParams }),
+      api.get<DashboardOverview>('/admin/api/stats/overview', { params: previousParams }),
+    ])
+      .then(([current, previous]) => {
         if (!alive) return;
-        setData(r.data);
+        if (current.status === 'fulfilled') {
-        setUpdatedAt(dayjs().format('YYYY-MM-DD HH:mm'));
+          setData(current.value.data);
-      })
+          setUpdatedAt(dayjs().format('YYYY-MM-DD HH:mm'));
-      .catch(() => {
+        } else {
-        if (!alive) return;
+          setData(null);
-        setOverviewError('总览接口加载失败');
+          setOverviewError('总览接口加载失败');
+        }
+        setPreviousData(previous.status === 'fulfilled' ? previous.value.data : null);
       })
       .finally(() => {
         if (alive) setLoading(false);
@@ -426,29 +589,37 @@ export default function DashboardPage() {
     return () => {
       alive = false;
     };
-  }, [range.start, range.end, refreshKey]);
+  }, [range.start, range.end, previousRange.start, previousRange.end, refreshKey]);
 
   useEffect(() => {
     let alive = true;
     setAdLoading(true);
     setAdError(null);
-    api
+    const currentParams = {
-      .get<AdRevenueReport>('/admin/api/ad-revenue-report', {
+      date_from: range.start.format('YYYY-MM-DD'),
-        params: {
+      date_to: range.end.format('YYYY-MM-DD'),
-          date_from: range.start.format('YYYY-MM-DD'),
+      granularity: 'day',
-          date_to: range.end.format('YYYY-MM-DD'),
+      limit: 1000,
-          granularity: 'day',
+    };
-          limit: 1000,
+    const previousParams = {
-        },
+      date_from: previousRange.start.format('YYYY-MM-DD'),
-      })
+      date_to: previousRange.end.format('YYYY-MM-DD'),
-      .then((r) => {
+      granularity: 'day',
+      limit: 1000,
+    };
+    Promise.allSettled([
+      api.get<AdRevenueReport>('/admin/api/ad-revenue-report', { params: currentParams }),
+      api.get<AdRevenueReport>('/admin/api/ad-revenue-report', { params: previousParams }),
+    ])
+      .then(([current, previous]) => {
         if (!alive) return;
-        setAdReport(r.data);
+        if (current.status === 'fulfilled') {
-      })
+          setAdReport(current.value.data);
-      .catch(() => {
+        } else {
-        if (!alive) return;
+          setAdReport(null);
-        setAdReport(null);
+          setAdError('广告收益接口加载失败');
-        setAdError('广告收益接口加载失败');
+        }
+        setPreviousAdReport(previous.status === 'fulfilled' ? previous.value.data : null);
       })
       .finally(() => {
         if (alive) setAdLoading(false);
@@ -456,7 +627,7 @@ export default function DashboardPage() {
     return () => {
       alive = false;
     };
-  }, [range.start, range.end]);
+  }, [range.start, range.end, previousRange.start, previousRange.end]);
 
   if (loading) return <Spin style={{ display: 'block', marginTop: 80 }} />;
 
@@ -464,7 +635,7 @@ export default function DashboardPage() {
     return <Alert type="error" showIcon message={overviewError ?? '数据大盘加载失败'} />;
   }
 
-  const syncMeituanCps = async () => {
+  const syncCpsOrders = async () => {
     setCpsSyncing(true);
     try {
       const resp = await api.post<{
@@ -476,12 +647,13 @@ export default function DashboardPage() {
         params: {
           date_from: range.start.format('YYYY-MM-DD'),
           date_to: range.end.format('YYYY-MM-DD'),
+          platform: 'all',
         },
       });
       message.success(`已同步 ${resp.data.fetched} 单`);
       setRefreshKey((v) => v + 1);
     } catch {
-      message.error('美团订单刷新失败');
+      message.error('CPS 订单刷新失败');
     } finally {
       setCpsSyncing(false);
     }
@@ -527,20 +699,20 @@ export default function DashboardPage() {
           <h3>核心趋势</h3>
           <span>先看用户、留存与比价活跃度</span>
         </div>
-        <div className="grid g5">
+        <div className="grid g4">
-          <StatCard title="总用户" value={fmtInt(data.users.total)} status="累计用户数" tone="ok" spark="up" />
           <StatCard
             title="活跃用户"
             value={fmtInt(periodData?.users.active)}
-            status="本期活跃去重"
+            delta={activeUserDelta.value}
-            tone="ok"
+            deltaTone={activeUserDelta.tone}
-            hint="当前按本期内进入 App、完成比价记录、开始领券流程任一满足去重；未完成上报的比价开始事件待后续补埋点。"
+            hint="当前按本期内登录、开始比价、开始领券任一满足去重；比价按 real_compare_start，领券按 real_coupon_start/claim_started。"
             spark="up"
           />
           <StatCard
             title="新增用户"
             value={fmtInt(periodData?.users.new)}
-            status="本期新用户"
+            delta={newUserDelta.value}
+            deltaTone={newUserDelta.tone}
             hint="当前按注册时间落在所选日期范围统计；若产品要按首次进入 App/首次流程启动定义新增，需要补首次行为聚合。"
             spark="up"
           />
@@ -548,16 +720,16 @@ export default function DashboardPage() {
             title={retentionTitle(period)}
             value={retentionValue}
             unit="%"
-            status={`${fmtInt(periodData?.users.retained_new_users)} / ${fmtInt(periodData?.users.new)} 新用户`}
+            delta={retentionDelta.value}
-            tone="warn"
+            deltaTone={retentionDelta.tone}
             hint={periodData?.users.retention_note ?? '暂无留存数据'}
-            spark="down"
+            spark={retentionSpark}
           />
           <StatCard
             title="比价次数"
             value={fmtInt(periodData?.comparison.total)}
-            status="本期比价次数"
+            delta={comparisonTotalDelta.value}
-            tone="muted"
+            deltaTone={comparisonTotalDelta.tone}
             spark="up"
           />
         </div>
@@ -571,23 +743,88 @@ export default function DashboardPage() {
           <span>发起、成功、下单与效率</span>
         </div>
         <div className="grid g5">
-          <StatCard title="发起比价" value={fmtInt(periodData?.comparison.total)} unit="次" status="本期发起次数" />
+          <StatCard
-          <StatCard title="比价成功" value={fmtInt(periodData?.comparison.success)} unit="次" status={pct(compareSuccessRate)} tone="ok" />
+            title="发起比价"
+            value={fmtInt(periodData?.comparison.total)}
+            unit="次"
+            delta={comparisonTotalDelta.value}
+            deltaTone={comparisonTotalDelta.tone}
+          />
+          <StatCard
+            title="比价成功"
+            value={fmtInt(periodData?.comparison.success)}
+            unit="次"
+            delta={comparisonSuccessDelta.value}
+            deltaTone={comparisonSuccessDelta.tone}
+            hint={`当前成功率 ${pct(compareSuccessRate)}`}
+          />
           <StatCard
             title="成功下单"
             value={fmtInt(periodData?.comparison.ordered)}
             unit="单"
-            status="已下单记录"
+            delta={comparisonOrderedDelta.value}
+            deltaTone={comparisonOrderedDelta.tone}
             hint="按比价记录页同一口径：用户有通过比价产生的下单记录，且店名与比价记录店名一致，则这条比价记录记为已下单。"
           />
           <StatCard
             title="平均耗时"
             value={fmtMsAsSeconds(averageDurationMs)}
             unit="秒"
-            status={averageDurationMs == null ? '暂无耗时数据' : '本期平均耗时'}
+            delta={durationDeltaInfo.value}
+            deltaTone={durationDeltaInfo.tone}
             hint="按比价记录页同一口径：取所选日期范围内已上报耗时的比价记录，求平均后换算为秒。"
           />
-          <StatCard title="平均节省金额" value={fmtCents(periodData?.comparison.average_saved_cents)} status="有节省的成功比价" />
+          <StatCard
+            title="平均节省金额"
+            value={fmtCents(periodData?.comparison.average_saved_cents)}
+            delta={averageSavedDelta.value}
+            deltaTone={averageSavedDelta.tone}
+          />
+        </div>
+      </section>
+
+      <section className="section">
+        <div className="section-head">
+          <span className="bar" />
+          <h3>领券核心数据</h3>
+          <span>发起、整场成功、点位成功与效率</span>
+        </div>
+        <div className="grid g4">
+          <StatCard
+            title="领券发起数"
+            value={fmtInt(couponPeriod?.started)}
+            unit="次"
+            delta={couponStartedDelta.value}
+            deltaTone={couponStartedDelta.tone}
+          />
+          <StatCard
+            title="领券成功率"
+            value={couponSuccessRateValue}
+            unit="%"
+            delta={couponSuccessRateDelta.value}
+            deltaTone={couponSuccessRateDelta.tone}
+            hint={`全部点位领成功的次数 / 领券发起数;本期 ${fmtInt(couponPeriod?.all_success)} / ${fmtInt(
+              couponPeriod?.started,
+            )} 次。点位成功口径含「今日已领过」。`}
+          />
+          <StatCard
+            title="点位成功率"
+            value={couponPointRateValue}
+            unit="%"
+            delta={couponPointRateDelta.value}
+            deltaTone={couponPointRateDelta.tone}
+            hint={`成功点位数 / (领券发起数 × 每次应领点位数);中途退出未跑到的点位计入分母视为失败。本期成功点位 ${fmtInt(
+              couponPeriod?.point_success,
+            )} 个,每次应领 ${fmtInt(couponPeriod?.points_per_session)} 个(按本期完成场自动校准)。`}
+          />
+          <StatCard
+            title="耗时中位数"
+            value={fmtMsAsSeconds(couponPeriod?.median_elapsed_ms)}
+            unit="秒"
+            delta={couponMedianDelta.value}
+            deltaTone={couponMedianDelta.tone}
+            hint="仅统计「完成」的领券(同领券数据页口径),中位数比均值更抗中途暂停等待的长尾。"
+          />
         </div>
       </section>
 
@@ -597,7 +834,7 @@ export default function DashboardPage() {
           <h3>变现</h3>
           <span>
             {cpsAvailable
-              ? (adError ? '广告收益接口当前后端不可用，美团 CPS 已接入' : '广告收益与美团 CPS 已接入')
+              ? (adError ? '广告收益接口当前后端不可用，美团/京东 CPS 已接入' : '广告收益与美团/京东 CPS 已接入')
               : (adError ? '广告收益接口当前后端不可用，订单/佣金数据待接' : '广告收益已接入，订单/佣金数据待接')}
           </span>
         </div>
@@ -607,6 +844,8 @@ export default function DashboardPage() {
             title="总收入"
             value={adLoading ? '--' : fmtYuan(totalRevenueYuan)}
             accent="blue"
+            delta={totalRevenueDelta.value}
+            deltaTone={totalRevenueDelta.tone}
             meta={[
               { label: '广告收入', value: adLoading ? '--' : fmtYuan(adReport?.total_revenue_yuan) },
               { label: 'CPS 收入', value: cpsRevenueText },
@@ -615,38 +854,58 @@ export default function DashboardPage() {
           <RevenueCard
             title="广告收入"
             value={adLoading ? '--' : fmtYuan(adReport?.total_revenue_yuan)}
-            meta={[{ label: '展示数', value: adLoading ? '--' : fmtInt(adReport?.total_impressions) }]}
+            delta={adRevenueDelta.value}
+            deltaTone={adRevenueDelta.tone}
+            meta={[
+              {
+                label: '占总收入',
+                value:
+                  totalRevenueYuan && totalRevenueYuan > 0 && adReport?.total_revenue_yuan != null
+                    ? `${((adReport.total_revenue_yuan / totalRevenueYuan) * 100).toFixed(1)}%`
+                    : '--',
+              },
+            ]}
           />
           <RevenueCard
             title="CPS 收入"
             value={cpsRevenueText}
-            meta={[{ label: '来源', value: cpsAvailable ? '美团已接，淘宝/京东暂空' : '订单/佣金待接' }]}
+            delta={cpsRevenueDelta.value}
+            deltaTone={cpsRevenueDelta.tone}
+            meta={[
+              {
+                label: '占总收入',
+                value:
+                  totalRevenueYuan && totalRevenueYuan > 0 && totalCpsCommissionCents != null
+                    ? `${(((totalCpsCommissionCents / 100) / totalRevenueYuan) * 100).toFixed(1)}%`
+                    : '--',
+              },
+            ]}
           />
           <RevenueCard
             title="ARPU"
             value={adLoading ? '--' : fmtYuan(arpuYuan)}
             meta={[
-              { label: '口径', value: '收入 / 活跃用户' },
+              { label: '口径', value: '总收入 / 昨日活跃用户' },
-              { label: 'ARPPU', value: '待确认付费用户口径' },
+              { label: '分母', value: yesterdayActiveUsers == null ? '--' : `${fmtInt(yesterdayActiveUsers)} 人` },
             ]}
           />
         </div>
 
         <div className="sub-label cps-sub-label">
           <span>CPS 收益</span>
-          <button type="button" onClick={syncMeituanCps} disabled={cpsSyncing}>
+          <button type="button" onClick={syncCpsOrders} disabled={cpsSyncing}>
-            {cpsSyncing ? '刷新中' : '刷新美团订单'}
+            {cpsSyncing ? '刷新中' : '刷新 CPS 订单'}
           </button>
         </div>
         <div className="grid g4">
           <RevenueCard
             title="总 CPS 收益"
             value={cpsRevenueText}
-            meta={[{ label: '来源', value: cpsAvailable ? '美团订单佣金，淘宝/京东暂空' : '订单/佣金待接' }]}
+            meta={[{ label: '来源', value: cpsAvailable ? '美团+京东订单佣金，淘宝暂未接入' : '订单/佣金待接' }]}
           />
           <RevenueCard
             title="美团 CPS"
-            value={cpsRevenueText}
+            value={meituanCpsRevenueText}
             meta={[
               { label: '订单量', value: cpsAvailable ? fmtInt(data?.cps.meituan_order_count) : '待订单数据' },
               {
@@ -658,8 +917,16 @@ export default function DashboardPage() {
             ]}
             accent="yellow"
           />
-          <RevenueCard title="淘宝 CPS" value="--" meta={[{ label: '状态', value: '后续接入后填写' }]} accent="red" />
+          <RevenueCard title="淘宝 CPS" value="--" meta={[{ label: '状态', value: '暂未接入' }]} accent="red" />
-          <RevenueCard title="京东 CPS" value="--" meta={[{ label: '状态', value: '后续接入后填写' }]} accent="red" />
+          <RevenueCard
+            title="京东 CPS"
+            value={jdCpsRevenueText}
+            meta={[
+              { label: '有效订单', value: cpsAvailable ? fmtInt(data?.cps.jd_order_count) : '待订单数据' },
+              { label: '无效订单', value: cpsAvailable ? fmtInt(data?.cps.jd_invalid_count ?? 0) : '待订单数据' },
+            ]}
+            accent="jd"
+          />
         </div>
 
         <div className="sub-label">广告收益</div>
@@ -705,32 +972,58 @@ export default function DashboardPage() {
           <span className="bar" />
           <h3>金币经济</h3>
           <Tag color="warning">风控重点</Tag>
-          <span>发放是账面负债，提现是真实现金成本</span>
+          <span>发放 = 平台负债，提现 = 真实现金成本</span>
         </div>
         <div className="grid g6">
-          <StatCard title="本期发放金币" value={fmtInt(periodData?.coins.granted_total)} status="本期发放合计" />
+          <StatCard
+            title="本期发放金币"
+            value={fmtInt(periodData?.coins.granted_total)}
+            delta={grantedCoinDelta.value}
+            deltaTone={grantedCoinDelta.tone}
+            emphasis
+          />
           <StatCard
             title="领券奖励金币"
             value={fmtInt(couponRewardCoinTotal)}
-            status="领券相关发放"
+            delta={couponCoinRatio.value}
+            deltaTone={couponCoinRatio.tone}
           />
           <StatCard
             title="比价奖励金币"
             value={fmtInt(comparisonRewardCoinTotal)}
-            status="比价相关发放"
+            delta={comparisonCoinRatio.value}
+            deltaTone={comparisonCoinRatio.tone}
+          />
+          <StatCard
+            title="激励视频金币"
+            value={fmtInt(periodData?.coins.reward_video_coin_total)}
+            delta={rewardVideoCoinRatio.value}
+            deltaTone={rewardVideoCoinRatio.tone}
+            hint="独立统计激励视频发放，不再重复计入领券奖励。"
           />
-          <StatCard title="激励视频金币" value="--" status="并入领券奖励" />
           <StatCard
             title="常规任务金币"
             value={fmtInt(regularTaskCoinTotal)}
-            status="任务等发放"
+            delta={regularTaskCoinRatio.value}
+            deltaTone={regularTaskCoinRatio.tone}
+          />
+          <StatCard
+            title="本期提现金额"
+            value={fmtCents(periodData?.cash.withdraw_success_cents)}
+            delta="实付现金"
+            deltaTone="flat"
           />
-          <StatCard title="本期提现金额" value={fmtCents(periodData?.cash.withdraw_success_cents)} status="成功提现" />
         </div>
         <div className="risk-note">
-          本期已发放 {fmtInt(periodData?.coins.granted_total)} 金币，成功提现 {fmtCents(periodData?.cash.withdraw_success_cents)}；
+          ⚠️
-          累计已发放 {fmtInt(data.coins.granted_total)} 金币，累计成功提现 {fmtCents(data.cash.withdraw_success_cents)}。
+          <div>
-          金币分类已按产品口径归类；邀请、后台手动加金币、福利页广告、无法判断来源的广告不进入上述分类。
+            本期 4 项奖励合计发放 <b>{fmtCoinAmount(periodData?.coins.granted_total)}</b> 金币
+            （账面负债 ≈ <b>{fmtYuan((periodData?.coins.granted_total ?? 0) / 1000)}</b>），
+            实际提现兑付 <b>{fmtCents(periodData?.cash.withdraw_success_cents)}</b>。
+            累计已发放 <b>{fmtCoinAmount(data.coins.granted_total)}</b> 金币但累计真实提现仅
+            <b>{fmtCents(data.cash.withdraw_success_cents)}</b>，发放与现金兑付背离属正常（金币沉淀/过期）；
+            邀请奖励、后台手动加金币、福利页/老版本未打标签信息流不进入这 4 项，需盯紧各来源占比突变与异常领取。
+          </div>
         </div>
       </section>
 
@@ -772,7 +1065,7 @@ export default function DashboardPage() {
           --coin: #ffb300;
           --p-mt-waimai: #ffc300;
           --p-taobao: #ff4400;
-          --p-jd: #e1251b;
+          --p-jd: #b91c1c;
           --radius: 10px;
           --shadow: 0 1px 2px rgba(16, 24, 40, 0.04), 0 1px 3px rgba(16, 24, 40, 0.04);
           color: var(--ink);
@@ -967,10 +1260,17 @@ export default function DashboardPage() {
           font-weight: 600;
         }
         .status-muted,
-        .delta-muted {
+        .delta-muted,
+        .delta-flat {
           color: var(--ink-3);
           background: #f1f3f7;
         }
+        .delta .cmp {
+          margin-left: 3px;
+          color: var(--ink-3);
+          font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", Arial, sans-serif;
+          font-weight: 400;
+        }
         .status-ok,
         .delta-up {
           color: var(--up);
@@ -1144,6 +1444,10 @@ export default function DashboardPage() {
           background: var(--p-taobao);
           color: #fff;
         }
+        .rev-jd .revenue-tag {
+          background: var(--p-jd);
+          color: #fff;
+        }
         .revenue-value {
           color: var(--ink);
           font-family: "DIN Alternate", "Helvetica Neue", sans-serif;

src/app/(main)/feedbacks/FeedbackHandleDrawer.tsx

@@ -19,7 +19,7 @@ import {
 } from 'antd';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
-import { formatUtcTime } from '@/lib/format';
+import { formatWallTime } from '@/lib/format';
 import { mediaUrl } from '@/lib/media';
 import type { CursorPage, Feedback } from '@/lib/types';
 
@@ -49,6 +49,17 @@ const statusTag = (s: string) => {
   return <Tag color={m.color}>{m.label}</Tag>;
 };
 
+// 反馈类型:comparison=比价反馈 / profile(及旧数据)=普通反馈
+const SOURCE_META: Record<string, { label: string; color: string }> = {
+  comparison: { label: '比价反馈', color: 'geekblue' },
+  profile: { label: '普通反馈', color: 'default' },
+};
+
+const sourceTag = (s: string) => {
+  const m = SOURCE_META[s] ?? { label: '普通反馈', color: 'default' };
+  return <Tag color={m.color}>{m.label}</Tag>;
+};
+
 function FeedbackImages({ images }: { images: string[] | null }) {
   if (!images || !images.length) return <Text type="secondary">无截图</Text>;
   return (
@@ -113,12 +124,14 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
         await api.post(`/admin/api/feedbacks/${feedback.id}/approve`, {
           reward_coins: v.reward_coins,
           note: v.note?.trim() || null,
+          reply: v.reply?.trim() || null,
         });
         message.success(`已采纳,发放 ${v.reward_coins} 金币`);
       } else {
         await api.post(`/admin/api/feedbacks/${feedback.id}/reject`, {
           reason: v.reason.trim(),
           note: v.note?.trim() || null,
+          reply: v.reply?.trim() || null,
         });
         message.success('已拒绝');
       }
@@ -153,8 +166,16 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
           {/* 本条反馈 */}
           <div>
             <Text type="secondary">
-              用户 {feedback.user_id} · {formatUtcTime(feedback.created_at)}
+              用户 {feedback.user_id} · {formatWallTime(feedback.created_at)}
             </Text>
+            <div style={{ marginTop: 6 }}>
+              {sourceTag(feedback.source)}
+              {feedback.scene ? (
+                <Text type="secondary" style={{ marginLeft: 6 }}>
+                  场景:{feedback.scene}
+                </Text>
+              ) : null}
+            </div>
             <Paragraph style={{ whiteSpace: 'pre-wrap', marginTop: 8, marginBottom: 8 }}>
               {feedback.content || '-'}
             </Paragraph>
@@ -185,7 +206,7 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
               <div>
                 状态:{statusTag(feedback.status)}
                 {feedback.reviewed_at ? (
-                  <Text type="secondary"> · {formatUtcTime(feedback.reviewed_at)}</Text>
+                  <Text type="secondary"> · {formatWallTime(feedback.reviewed_at)}</Text>
                 ) : null}
               </div>
               {feedback.status === 'adopted' && (
@@ -200,7 +221,11 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
                 </div>
               )}
               <div style={{ marginTop: 6 }}>
-                审核备注:{feedback.review_note || <Text type="secondary">（无）</Text>}
+                审核备注(内部):{feedback.review_note || <Text type="secondary">（无）</Text>}
+              </div>
+              <div style={{ marginTop: 6 }}>
+                给用户的回复(用户可见):
+                {feedback.admin_reply || <Text type="secondary">（无）</Text>}
               </div>
               {isPending(feedback.status) && (
                 <div style={{ marginTop: 6 }}>
@@ -243,11 +268,23 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
                     </Form.Item>
                     <Form.Item
                       name="note"
-                      label="采纳要点 / 审核备注(选填)"
+                      label="采纳要点 / 审核备注(选填,内部)"
                       rules={[{ max: 256, message: '最多 256 字' }]}
                     >
                       <Input.TextArea rows={3} maxLength={256} showCount placeholder="如:建议已采纳,将在下个版本上线" />
                     </Form.Item>
+                    <Form.Item
+                      name="reply"
+                      label="给用户的回复(选填,用户端可见)"
+                      rules={[{ max: 256, message: '最多 256 字' }]}
+                    >
+                      <Input.TextArea
+                        rows={2}
+                        maxLength={256}
+                        showCount
+                        placeholder="将展示在用户的「我的反馈」里,如:感谢反馈,已收到~"
+                      />
+                    </Form.Item>
                   </>
                 ) : (
                   <>
@@ -268,6 +305,18 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
                     >
                       <Input.TextArea rows={2} maxLength={256} showCount placeholder="运营内部备注" />
                     </Form.Item>
+                    <Form.Item
+                      name="reply"
+                      label="给用户的回复(选填,用户端可见)"
+                      rules={[{ max: 256, message: '最多 256 字' }]}
+                    >
+                      <Input.TextArea
+                        rows={2}
+                        maxLength={256}
+                        showCount
+                        placeholder="除未采纳原因外,想额外对用户说的话(选填)"
+                      />
+                    </Form.Item>
                   </>
                 )}
               </Form>
@@ -292,9 +341,12 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
                   >
                     <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                       <Text type="secondary">
-                        #{h.id} · {formatUtcTime(h.created_at)}
+                        #{h.id} · {formatWallTime(h.created_at)}
                       </Text>
-                      {statusTag(h.status)}
+                      <Space size={4}>
+                        {sourceTag(h.source)}
+                        {statusTag(h.status)}
+                      </Space>
                     </div>
                     <Paragraph
                       style={{ whiteSpace: 'pre-wrap', margin: '6px 0 0' }}
@@ -313,6 +365,9 @@ export default function FeedbackHandleDrawer({ feedback, open, onClose, onDone }
                         未采纳:{h.reject_reason || '-'}
                       </Text>
                     )}
+                    {h.admin_reply ? (
+                      <div style={{ fontSize: 12, marginTop: 2 }}>回复:{h.admin_reply}</div>
+                    ) : null}
                   </div>
                 ))}
               </Space>

src/app/(main)/feedbacks/page.tsx

@@ -1,26 +1,29 @@
 'use client';
 
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import type { SorterResult } from 'antd/es/table/interface';
 import {
   Button,
+  Card,
   DatePicker,
   Image,
   Input,
   Select,
   Space,
+  Statistic,
   Table,
   Tag,
   Typography,
 } from 'antd';
 import type { Dayjs } from 'dayjs';
+import { api } from '@/lib/api';
 import { canDo } from '@/lib/auth';
-import { formatUtcTime } from '@/lib/format';
+import { formatWallTime } from '@/lib/format';
 import { usePagedList } from '@/lib/usePagedList';
-import type { Feedback } from '@/lib/types';
+import type { Feedback, FeedbackSummary } from '@/lib/types';
-import FeedbackQrConfig from './FeedbackQrConfig';
 import FeedbackHandleDrawer from './FeedbackHandleDrawer';
+import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 
 const { Text, Paragraph } = Typography;
 const { RangePicker } = DatePicker;
@@ -41,9 +44,119 @@ const STATUS_META: Record<string, { label: string; color: string }> = {
   rejected: { label: '未采纳', color: 'red' },
 };
 
+const statusTag = (s: string) => {
+  const m = STATUS_META[s] ?? { label: s, color: 'default' };
+  return <Tag color={m.color}>{m.label}</Tag>;
+};
+
+// 反馈类型:comparison=比价反馈(比价结果页入口) / profile=普通反馈(「我的」页入口)。
+// 旧数据与未识别来源按普通反馈展示。
+const SOURCE_META: Record<string, { label: string; color: string }> = {
+  comparison: { label: '比价反馈', color: 'geekblue' },
+  profile: { label: '普通反馈', color: 'default' },
+};
+
+const SOURCE_OPTIONS = [
+  { value: 'comparison', label: '比价反馈' },
+  { value: 'profile', label: '普通反馈' },
+];
+
+// 反馈类型标签 +(比价反馈时)问题场景副标题
+const renderSource = (f: Feedback) => {
+  const m = SOURCE_META[f.source] ?? { label: '普通反馈', color: 'default' };
+  return (
+    <Space direction="vertical" size={0}>
+      <Tag color={m.color}>{m.label}</Tag>
+      {f.scene ? (
+        <Text type="secondary" style={{ fontSize: 12 }}>
+          {f.scene}
+        </Text>
+      ) : null}
+    </Space>
+  );
+};
+
+// 用户可见的运营回复留言(采纳/未采纳都可能有)
+const replyLine = (f: Feedback) =>
+  f.admin_reply ? (
+    <Text style={{ fontSize: 12 }} ellipsis>
+      回复:{f.admin_reply}
+    </Text>
+  ) : null;
+
+// 审核结果展示(采纳=金币+批注 / 未采纳=原因 / 回复留言 / 待审核=-),主表与「该用户全部反馈」抽屉共用
+const renderReview = (f: Feedback) => {
+  if (f.status === 'adopted') {
+    return (
+      <Space direction="vertical" size={0}>
+        <Tag color="gold">+{f.reward_coins ?? 0} 金币</Tag>
+        {f.review_note ? (
+          <Text type="secondary" style={{ fontSize: 12 }} ellipsis>
+            {f.review_note}
+          </Text>
+        ) : null}
+        {replyLine(f)}
+      </Space>
+    );
+  }
+  if (f.status === 'rejected') {
+    return (
+      <Space direction="vertical" size={0}>
+        <Text type="secondary" style={{ fontSize: 12 }} ellipsis>
+          未采纳:{f.reject_reason || '-'}
+        </Text>
+        {replyLine(f)}
+      </Space>
+    );
+  }
+  return <Text type="secondary">-</Text>;
+};
+
+// 机型 / OS版本(提交反馈时的端环境;改版前历史反馈无 → -)
+const renderDeviceOs = (f: Feedback) => {
+  const os = [f.android_version ? `Android ${f.android_version}` : null, f.rom_name]
+    .filter(Boolean)
+    .join(' · ');
+  if (!f.device_model && !os) return <Text type="secondary">-</Text>;
+  return (
+    <Space direction="vertical" size={0}>
+      <Text>{f.device_model || '-'}</Text>
+      {os ? (
+        <Text type="secondary" style={{ fontSize: 12 }}>
+          {os}
+        </Text>
+      ) : null}
+    </Space>
+  );
+};
+
+// 点手机号弹出的「该用户全部反馈」抽屉列(精简版:不含操作/手机号,避免抽屉里再套抽屉)
+const RECORD_COLUMNS: ColumnsType<Feedback> = [
+  { title: '提交时间', dataIndex: 'created_at', width: 150, render: (v: string) => formatWallTime(v) },
+  { title: '状态', dataIndex: 'status', width: 80, render: statusTag },
+  { title: '反馈类型', key: 'source', width: 100, render: (_: unknown, f: Feedback) => renderSource(f) },
+  {
+    title: '内容',
+    dataIndex: 'content',
+    render: (v: string) =>
+      v ? (
+        <Paragraph
+          style={{ marginBottom: 0, whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}
+          ellipsis={{ rows: 2, expandable: true, symbol: '展开' }}
+        >
+          {v}
+        </Paragraph>
+      ) : (
+        <Text type="secondary">-</Text>
+      ),
+  },
+  { title: '审核结果', key: 'review', width: 160, render: (_: unknown, f: Feedback) => renderReview(f) },
+];
+
 export default function FeedbacksPage() {
   // 筛选草稿:点「查询」才应用(避免输入即刷新)
   const [status, setStatus] = useState<string | undefined>();
+  const [source, setSource] = useState<string | undefined>();
   const [userId, setUserId] = useState('');
   const [content, setContent] = useState('');
   const [createdRange, setCreatedRange] = useState<[Dayjs, Dayjs] | null>(null);
@@ -58,6 +171,19 @@ export default function FeedbacksPage() {
 
   const canReview = canDo(['operator']);
 
+  const [summary, setSummary] = useState<FeedbackSummary | null>(null);
+  const loadSummary = async () => {
+    try {
+      const { data } = await api.get<FeedbackSummary>('/admin/api/feedbacks/summary');
+      setSummary(data);
+    } catch {
+      /* 统计失败不阻塞列表 */
+    }
+  };
+  useEffect(() => {
+    loadSummary();
+  }, []);
+
   // 审核/查看抽屉(采纳发金币 / 拒绝填原因 + 看该用户历史反馈)
   const [drawerFb, setDrawerFb] = useState<Feedback | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);
@@ -66,9 +192,14 @@ export default function FeedbacksPage() {
     setDrawerOpen(true);
   };
 
+  // 点手机号:看该用户全部反馈
+  const [recordsUser, setRecordsUser] = useState<{ userId: number; phone: string | null } | null>(null);
+  const openUserRecords = (f: Feedback) => setRecordsUser({ userId: f.user_id, phone: f.phone });
+
   const search = () =>
     setApplied({
       status,
+      source,
       user_id: userId.trim() ? Number(userId.trim()) : undefined,
       content: content.trim() || undefined,
       created_from: createdRange?.[0] ? createdRange[0].startOf('day').toISOString() : undefined,
@@ -77,6 +208,7 @@ export default function FeedbacksPage() {
 
   const resetFilters = () => {
     setStatus(undefined);
+    setSource(undefined);
     setUserId('');
     setContent('');
     setCreatedRange(null);
@@ -104,8 +236,47 @@ export default function FeedbacksPage() {
     sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
 
   const columns: ColumnsType<Feedback> = [
-    { title: 'ID', dataIndex: 'id', width: 70, sorter: true, sortOrder: sortOrderOf('id') },
+    {
-    { title: '用户', dataIndex: 'user_id', width: 80 },
+      title: '用户ID',
+      dataIndex: 'user_id',
+      width: 80,
+      render: (v: number) => <Text strong>#{v}</Text>,
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      width: 130,
+      render: (_: unknown, f: Feedback) =>
+        f.phone ? (
+          <a onClick={() => openUserRecords(f)}>{f.phone}</a>
+        ) : (
+          <Text type="secondary">无手机号</Text>
+        ),
+    },
+    {
+      title: '用户昵称',
+      dataIndex: 'nickname',
+      width: 120,
+      render: (v: string | null) => v || <Text type="secondary">无昵称</Text>,
+    },
+    {
+      title: '反馈类型',
+      key: 'source',
+      width: 110,
+      render: (_: unknown, f: Feedback) => renderSource(f),
+    },
+    {
+      title: '提交版本号',
+      dataIndex: 'app_version',
+      width: 100,
+      render: (v: string | null) => v || <Text type="secondary">-</Text>,
+    },
+    {
+      title: '机型 / OS版本',
+      key: 'device',
+      width: 150,
+      render: (_: unknown, f: Feedback) => renderDeviceOs(f),
+    },
     {
       title: '内容',
       dataIndex: 'content',
@@ -145,49 +316,20 @@ export default function FeedbacksPage() {
           <Text type="secondary">无</Text>
         ),
     },
-    {
+    { title: '状态', dataIndex: 'status', width: 90, render: statusTag },
-      title: '状态',
-      dataIndex: 'status',
-      width: 90,
-      render: (s: string) => {
-        const m = STATUS_META[s] ?? { label: s, color: 'default' };
-        return <Tag color={m.color}>{m.label}</Tag>;
-      },
-    },
     {
       title: '审核结果',
       key: 'review',
       width: 170,
-      render: (_: unknown, f: Feedback) => {
+      render: (_: unknown, f: Feedback) => renderReview(f),
-        if (f.status === 'adopted') {
-          return (
-            <Space direction="vertical" size={0}>
-              <Tag color="gold">+{f.reward_coins ?? 0} 金币</Tag>
-              {f.review_note ? (
-                <Text type="secondary" style={{ fontSize: 12 }} ellipsis>
-                  {f.review_note}
-                </Text>
-              ) : null}
-            </Space>
-          );
-        }
-        if (f.status === 'rejected') {
-          return (
-            <Text type="secondary" style={{ fontSize: 12 }} ellipsis>
-              未采纳:{f.reject_reason || '-'}
-            </Text>
-          );
-        }
-        return <Text type="secondary">-</Text>;
-      },
     },
     {
-      title: '时间',
+      title: '提交时间',
       dataIndex: 'created_at',
       width: 170,
       sorter: true,
       sortOrder: sortOrderOf('created_at'),
-      render: (v: string) => formatUtcTime(v),
+      render: (v: string) => formatWallTime(v),
     },
     {
       title: '操作',
@@ -204,8 +346,21 @@ export default function FeedbacksPage() {
 
   return (
     <div>
-      <h2>反馈工单</h2>
+      <h2>用户反馈</h2>
-      <FeedbackQrConfig />
+      <div style={{ display: 'flex', gap: 16, marginBottom: 16, flexWrap: 'wrap' }}>
+        <Card size="small" style={{ minWidth: 120 }}>
+          <Statistic title="待审核" value={summary?.pending ?? 0} valueStyle={{ color: '#fa8c16' }} />
+        </Card>
+        <Card size="small" style={{ minWidth: 120 }}>
+          <Statistic title="已采纳" value={summary?.adopted ?? 0} valueStyle={{ color: '#52c41a' }} />
+        </Card>
+        <Card size="small" style={{ minWidth: 120 }}>
+          <Statistic title="未采纳" value={summary?.rejected ?? 0} valueStyle={{ color: '#8c8c8c' }} />
+        </Card>
+        <Card size="small" style={{ minWidth: 120 }}>
+          <Statistic title="合计" value={summary?.total ?? 0} />
+        </Card>
+      </div>
       <Space style={{ marginBottom: 16 }} wrap>
         <Select
           placeholder="状态"
@@ -219,6 +374,14 @@ export default function FeedbacksPage() {
             { value: 'rejected', label: '未采纳' },
           ]}
         />
+        <Select
+          placeholder="反馈类型"
+          value={source}
+          onChange={setSource}
+          allowClear
+          style={{ width: 130 }}
+          options={SOURCE_OPTIONS}
+        />
         <Input
           placeholder="用户ID"
           value={userId}
@@ -261,13 +424,27 @@ export default function FeedbacksPage() {
           onChange: onPageChange,
         }}
         onChange={onTableChange}
+        scroll={{ x: 1720 }}
       />
 
       <FeedbackHandleDrawer
         feedback={drawerFb}
         open={drawerOpen}
         onClose={() => setDrawerOpen(false)}
-        onDone={reload}
+        onDone={() => { reload(); loadSummary(); }}
+      />
+
+      <UserRecordsDrawer<Feedback>
+        open={recordsUser != null}
+        onClose={() => setRecordsUser(null)}
+        userId={recordsUser?.userId ?? null}
+        phone={recordsUser?.phone ?? null}
+        endpoint="/admin/api/feedbacks"
+        columns={RECORD_COLUMNS}
+        recordLabel="反馈"
+        countLabel="提交总计"
+        rewardLabel="提交奖励总计"
+        rewardOf={(f) => (f.status === 'adopted' ? (f.reward_coins ?? 0) : 0)}
       />
     </div>
   );

src/app/(main)/layout.tsx

@@ -8,10 +8,10 @@ import {
   DatabaseOutlined,
   FileSearchOutlined,
   FlagOutlined,
+  GiftOutlined,
   HeartOutlined,
   LogoutOutlined,
   MessageOutlined,
-  MobileOutlined,
   MoneyCollectOutlined,
   NotificationOutlined,
   ProfileOutlined,
@@ -20,53 +20,113 @@ import {
   TeamOutlined,
   UserOutlined,
 } from '@ant-design/icons';
-import { Avatar, Dropdown, Layout, Menu } from 'antd';
+import { Avatar, Dropdown, Layout, Tooltip } from 'antd';
-import { clearAuth, getAdmin, getToken } from '@/lib/auth';
+import { api } from '@/lib/api';
+import { clearAuth, getAdmin, getToken, setAuth } from '@/lib/auth';
 import type { AdminInfo } from '@/lib/types';
 
 const { Sider, Header, Content } = Layout;
 
-const MENU = [
+type NavItem = {
-  { key: '/dashboard', icon: <DashboardOutlined />, label: '数据大盘' },
+  key: string;
-  { key: '/users', icon: <UserOutlined />, label: '用户管理' },
+  icon: React.ReactNode;
-  { key: '/devices', icon: <MobileOutlined />, label: '设备管理' },
+  label: string;
-  { key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
+};
-  { key: '/withdraws', icon: <MoneyCollectOutlined />, label: '提现管理' },
+
-  { key: '/price-reports', icon: <FlagOutlined />, label: '上报审核' },
+type NavGroup =
-  { key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
+  | (NavItem & { children?: never })
-  { key: '/feedbacks', icon: <MessageOutlined />, label: '反馈工单' },
+  | {
-  { key: '/ad-revenue', icon: <NotificationOutlined />, label: '广告配置' },
+      key: string;
-  { key: '/ad-revenue-report', icon: <BarChartOutlined />, label: '广告收益' },
+      icon: React.ReactNode;
-  { key: '/cps', icon: <ShareAltOutlined />, label: 'CPS 分发' },
+      label: string;
-  { key: '/config', icon: <SettingOutlined />, label: '系统配置' },
+      children: NavItem[];
-  { key: '/admins', icon: <TeamOutlined />, label: '管理员', superOnly: true },
+    };
+
+const hasChildren = (group: NavGroup): group is NavGroup & { children: NavItem[] } =>
+  Array.isArray(group.children);
+
+const NAV_GROUPS: NavGroup[] = [
+  {
+    key: 'dashboard',
+    icon: <DashboardOutlined />,
+    label: '看板',
+    children: [
+      { key: '/dashboard', icon: <DashboardOutlined />, label: '数据大盘' },
+      { key: '/coupon-data', icon: <GiftOutlined />, label: '领券数据' },
+      { key: '/ad-revenue-report', icon: <BarChartOutlined />, label: '广告收益' },
+      { key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
+      { key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' },
+      { key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
+    ],
+  },
+  {
+    key: 'reward-review',
+    icon: <MoneyCollectOutlined />,
+    label: '奖励审核',
+    children: [
+      { key: '/withdraws', icon: <MoneyCollectOutlined />, label: '提现审核' },
+      { key: '/price-reports', icon: <FlagOutlined />, label: '低价审核' },
+      { key: '/feedbacks', icon: <MessageOutlined />, label: '用户反馈' },
+    ],
+  },
+  {
+    key: 'data-config',
+    icon: <SettingOutlined />,
+    label: '数据配置',
+    children: [
+      { key: '/config', icon: <SettingOutlined />, label: '系统配置' },
+      { key: '/ad-revenue', icon: <NotificationOutlined />, label: '广告配置' },
+      { key: '/users', icon: <UserOutlined />, label: '用户管理' },
+    ],
+  },
+  { key: '/admins', icon: <TeamOutlined />, label: '权限管理' },
   { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
   { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
 ];
 
+// 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐
+const permOf = (key: string) => key.replace(/^\//, '');
+
 export default function MainLayout({ children }: { children: React.ReactNode }) {
   const router = useRouter();
   const pathname = usePathname();
   const [admin, setAdmin] = useState<AdminInfo | null>(null);
+  const [collapsed, setCollapsed] = useState(false);
 
   useEffect(() => {
-    if (!getToken()) {
+    const token = getToken();
+    if (!token) {
       router.replace('/login');
       return;
     }
-    setAdmin(getAdmin());
+    setAdmin(getAdmin()); // 先用本地存的(快、不闪)
+    // 再拉 /me 刷新有效可见页:超管改过该角色权限也能及时反映到左侧导航
+    api
+      .get<AdminInfo>('/admin/api/auth/me')
+      .then(({ data }) => {
+        setAdmin(data);
+        setAuth(token, data);
+      })
+      .catch(() => {});
   }, [router]);
 
   if (!admin) return null; // 守卫期间不闪烁内容
 
-  const items = MENU.filter((m) => !m.superOnly || admin.role === 'super_admin').map((m) => ({
+  // 选中态:取路径一级(/users/123 -> /users)
-    key: m.key,
-    icon: m.icon,
-    label: m.label,
-  }));
-
-  // 选中态:取路径一级(/users/123 → /users)
   const selectedKey = '/' + (pathname.split('/')[1] || 'dashboard');
+  // 叶子导航项按当前角色的有效可见页过滤:super_admin 恒可见;缺 pages 信息(旧登录)兜底全显示不锁死。
+  const isSuper = admin.role === 'super_admin';
+  const canShowLeaf = (item: { key: string }) =>
+    isSuper || !admin.pages || admin.pages.includes(permOf(item.key));
+  const visibleGroups = NAV_GROUPS
+    .map((group) => {
+      if (!hasChildren(group)) return group;
+      return { ...group, children: group.children.filter(canShowLeaf) };
+    })
+    .filter((group) => (hasChildren(group) ? group.children.length > 0 : canShowLeaf(group)));
+  const flatNavItems = visibleGroups.flatMap((group) =>
+    hasChildren(group) ? group.children : [group],
+  );
 
   const logout = () => {
     clearAuth();
@@ -75,7 +135,15 @@ export default function MainLayout({ children }: { children: React.ReactNode })
 
   return (
     <Layout style={{ minHeight: '100vh' }}>
-      <Sider theme="dark" breakpoint="lg" collapsible>
+      <Sider
+        theme="dark"
+        breakpoint="lg"
+        collapsible
+        collapsed={collapsed}
+        collapsedWidth={72}
+        width={220}
+        onCollapse={setCollapsed}
+      >
         <div
           style={{
             height: 48,
@@ -88,13 +156,61 @@ export default function MainLayout({ children }: { children: React.ReactNode })
         >
           运营后台
         </div>
-        <Menu
+        <nav className={`side-nav${collapsed ? ' side-nav-collapsed' : ''}`} aria-label="后台导航">
-          theme="dark"
+          {collapsed
-          mode="inline"
+            ? flatNavItems.map((item) => (
-          selectedKeys={[selectedKey]}
+                <Tooltip key={item.key} title={item.label} placement="right">
-          items={items}
+                  <button
-          onClick={({ key }) => router.push(key)}
+                    type="button"
-        />
+                    className={`nav-icon-button${selectedKey === item.key ? ' is-selected' : ''}`}
+                    onClick={() => router.push(item.key)}
+                    aria-label={item.label}
+                  >
+                    {item.icon}
+                  </button>
+                </Tooltip>
+              ))
+            : visibleGroups.map((group) => {
+                const isGroup = hasChildren(group);
+                const groupSelected = isGroup
+                  ? group.children.some((child) => child.key === selectedKey)
+                  : selectedKey === group.key;
+                if (!isGroup) {
+                  return (
+                    <button
+                      key={group.key}
+                      type="button"
+                      className={`nav-primary nav-direct${groupSelected ? ' is-selected' : ''}`}
+                      onClick={() => router.push(group.key)}
+                    >
+                      <span className="nav-primary-icon">{group.icon}</span>
+                      <span>{group.label}</span>
+                    </button>
+                  );
+                }
+                return (
+                  <section key={group.key} className={`nav-group${groupSelected ? ' is-active' : ''}`}>
+                    <div className="nav-primary">
+                      <span className="nav-primary-icon">{group.icon}</span>
+                      <span>{group.label}</span>
+                    </div>
+                    <div className="nav-children">
+                      {group.children.map((child) => (
+                        <button
+                          key={child.key}
+                          type="button"
+                          className={`nav-child${selectedKey === child.key ? ' is-selected' : ''}`}
+                          onClick={() => router.push(child.key)}
+                        >
+                          <span className="nav-child-icon">{child.icon}</span>
+                          <span>{child.label}</span>
+                        </button>
+                      ))}
+                    </div>
+                  </section>
+                );
+              })}
+        </nav>
       </Sider>
       <Layout>
         <Header
@@ -120,6 +236,119 @@ export default function MainLayout({ children }: { children: React.ReactNode })
         </Header>
         <Content style={{ margin: 24 }}>{children}</Content>
       </Layout>
+      <style jsx global>{`
+        .side-nav {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          padding: 0 10px 14px;
+        }
+        .nav-group {
+          padding: 6px 0 8px;
+        }
+        .nav-group + .nav-group,
+        .nav-group + .nav-direct,
+        .nav-direct + .nav-direct {
+          margin-top: 4px;
+        }
+        .nav-primary {
+          display: flex;
+          align-items: center;
+          gap: 10px;
+          min-height: 36px;
+          padding: 0 12px;
+          color: rgba(255, 255, 255, 0.88);
+          font-size: 14px;
+          font-weight: 600;
+          letter-spacing: 0;
+        }
+        .nav-primary-icon,
+        .nav-child-icon {
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+          color: rgba(255, 255, 255, 0.72);
+          font-size: 16px;
+        }
+        .nav-direct,
+        .nav-child,
+        .nav-icon-button {
+          border: 0;
+          cursor: pointer;
+          font: inherit;
+          text-align: left;
+        }
+        .nav-direct {
+          width: 100%;
+          border-radius: 8px;
+          background: transparent;
+        }
+        .nav-direct:hover,
+        .nav-direct.is-selected {
+          background: #1677ff;
+          color: #fff;
+        }
+        .nav-direct:hover .nav-primary-icon,
+        .nav-direct.is-selected .nav-primary-icon {
+          color: #fff;
+        }
+        .nav-children {
+          display: flex;
+          flex-direction: column;
+          gap: 2px;
+          margin-left: 34px;
+          margin-top: -2px;
+          padding-right: 2px;
+        }
+        .nav-child {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          width: 100%;
+          min-height: 34px;
+          border-radius: 8px;
+          background: transparent;
+          color: rgba(255, 255, 255, 0.72);
+          font-size: 13px;
+          padding: 0 10px;
+        }
+        .nav-child:hover {
+          background: rgba(255, 255, 255, 0.08);
+          color: #fff;
+        }
+        .nav-child.is-selected {
+          background: #1677ff;
+          color: #fff;
+          font-weight: 600;
+        }
+        .nav-child.is-selected .nav-child-icon {
+          color: #fff;
+        }
+        .nav-group.is-active .nav-primary {
+          color: #fff;
+        }
+        .side-nav-collapsed {
+          align-items: center;
+          gap: 6px;
+          padding: 0 8px 14px;
+        }
+        .nav-icon-button {
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+          width: 40px;
+          height: 40px;
+          border-radius: 8px;
+          background: transparent;
+          color: rgba(255, 255, 255, 0.72);
+          font-size: 17px;
+        }
+        .nav-icon-button:hover,
+        .nav-icon-button.is-selected {
+          background: #1677ff;
+          color: #fff;
+        }
+      `}</style>
     </Layout>
   );
 }

src/app/(main)/price-reports/page.tsx

@@ -16,6 +16,7 @@ import {
   Typography,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
+import type { SorterResult } from 'antd/es/table/interface';
 import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import dayjs from 'dayjs';
 import { api, errMsg } from '@/lib/api';
@@ -23,6 +24,7 @@ import { canDo } from '@/lib/auth';
 import { mediaUrl } from '@/lib/media';
 import { usePagedList } from '@/lib/usePagedList';
 import type { PriceReport, PriceReportSummary } from '@/lib/types';
+import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 
 const { Text } = Typography;
 
@@ -55,19 +57,112 @@ function statusTag(status: string) {
   return <Tag color={STATUS_COLOR[status]}>{STATUS_LABEL[status] || status}</Tag>;
 }
 
+type SortField = 'id' | 'created_at';
+
+// 门店/菜品、原价→上报价、审核结果:主表与「该用户全部上报」抽屉共用
+const renderStore = (r: PriceReport) => (
+  <Space direction="vertical" size={0}>
+    <Text>{r.store_name || '-'}</Text>
+    <Text type="secondary" style={{ fontSize: 12 }}>
+      {r.dish_summary || '-'}
+    </Text>
+  </Space>
+);
+
+const renderPrice = (r: PriceReport) => (
+  <Space direction="vertical" size={0}>
+    <Text type="secondary" style={{ fontSize: 12 }}>
+      {r.original_platform_name || '原'}: {yuan(r.original_price_cents)}
+    </Text>
+    <Text strong style={{ color: '#fa541c' }}>
+      {r.reported_platform_name}: {yuan(r.reported_price_cents)}
+    </Text>
+  </Space>
+);
+
+// 只读审核结果(「审核结果」列 + 抽屉共用,不带操作按钮;待审核在「状态」列已显示,这里给 -)
+const renderResult = (r: PriceReport) => {
+  if (r.status === 'approved') return <Text type="success">已发 {r.reward_coins ?? 0} 金币</Text>;
+  if (r.status === 'rejected') return <Text type="secondary">拒绝: {r.reject_reason || '-'}</Text>;
+  return <Text type="secondary">-</Text>;
+};
+
+// Trace:与「比价记录」页一致 —— 有 trace_url(本地比价=localhost debug viewer,线上=公网)
+// 就给可点的「trace」链接,否则 -。
+const traceLink = (r: PriceReport) =>
+  r.trace_url ? (
+    <a href={r.trace_url} target="_blank" rel="noreferrer">
+      trace
+    </a>
+  ) : (
+    <Text type="secondary">-</Text>
+  );
+
+// 机型 / OS版本(取自关联比价记录;无关联记录时为 -)
+const renderDeviceOs = (r: PriceReport) => {
+  const os = [r.android_version ? `Android ${r.android_version}` : null, r.rom_name]
+    .filter(Boolean)
+    .join(' · ');
+  if (!r.device_model && !os) return <Text type="secondary">-</Text>;
+  return (
+    <Space direction="vertical" size={0}>
+      <Text>{r.device_model || '-'}</Text>
+      {os ? (
+        <Text type="secondary" style={{ fontSize: 12 }}>
+          {os}
+        </Text>
+      ) : null}
+    </Space>
+  );
+};
+
+// 点手机号弹出的「该用户全部低价上报」抽屉列(精简版:不含操作/手机号)
+const RECORD_COLUMNS: ColumnsType<PriceReport> = [
+  { title: '提交时间', dataIndex: 'created_at', width: 150, render: (v: string) => dt(v) },
+  { title: '门店 / 菜品', key: 'store', width: 180, render: (_: unknown, r: PriceReport) => renderStore(r) },
+  { title: '原价 → 上报价', key: 'price', width: 200, render: (_: unknown, r: PriceReport) => renderPrice(r) },
+  { title: '状态', dataIndex: 'status', width: 90, render: statusTag },
+  { title: 'Trace', key: 'trace', width: 80, render: (_: unknown, r: PriceReport) => traceLink(r) },
+  { title: '结果', key: 'result', width: 150, render: (_: unknown, r: PriceReport) => renderResult(r) },
+];
+
 export default function PriceReportsPage() {
   const { message, modal } = App.useApp();
   const [activeStatus, setActiveStatus] = useState('pending');
   const [summary, setSummary] = useState<PriceReportSummary | null>(null);
   const [rejecting, setRejecting] = useState<PriceReport | null>(null);
   const [rejectReason, setRejectReason] = useState('');
+  // 提交时间列服务端排序(默认按提交时间倒序,最新在前)
+  const [sortBy, setSortBy] = useState<SortField>('created_at');
+  const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
+  // 点手机号:看该用户全部低价上报
+  const [recordsUser, setRecordsUser] = useState<{ userId: number; phone: string | null } | null>(null);
+  const openUserRecords = (r: PriceReport) => setRecordsUser({ userId: r.user_id, phone: r.phone });
 
-  const filters: Record<string, unknown> = {};
+  const filters: Record<string, unknown> = { sort_by: sortBy, sort_order: sortOrder };
   if (activeStatus !== 'all') filters.status = activeStatus;
 
   const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
     usePagedList<PriceReport>('/admin/api/price-reports', filters);
 
+  const sortOrderOf = (field: SortField) =>
+    sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
+
+  const onTableChange = (
+    _pagination: unknown,
+    _filters: unknown,
+    sorter: SorterResult<PriceReport> | SorterResult<PriceReport>[],
+  ) => {
+    const s = Array.isArray(sorter) ? sorter[0] : sorter;
+    if (s && s.order && s.field) {
+      setSortBy(s.field as SortField);
+      setSortOrder(s.order === 'ascend' ? 'asc' : 'desc');
+    } else {
+      setSortBy('created_at');
+      setSortOrder('desc');
+    }
+  };
+
   const canReview = canDo(['operator']);
 
   const loadSummary = async () => {
@@ -136,38 +231,51 @@ export default function PriceReportsPage() {
 
   const columns: ColumnsType<PriceReport> = [
     {
-      title: '用户',
+      title: '用户ID',
       dataIndex: 'user_id',
-      width: 90,
+      width: 80,
       render: (v: number) => <Text strong>#{v}</Text>,
     },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      width: 130,
+      render: (_: unknown, r: PriceReport) =>
+        r.phone ? (
+          <a onClick={() => openUserRecords(r)}>{r.phone}</a>
+        ) : (
+          <Text type="secondary">无手机号</Text>
+        ),
+    },
+    {
+      title: '用户昵称',
+      dataIndex: 'nickname',
+      width: 120,
+      render: (v: string | null) => v || <Text type="secondary">无昵称</Text>,
+    },
+    {
+      title: '提交版本号',
+      dataIndex: 'app_version',
+      width: 100,
+      render: (v: string | null) => v || <Text type="secondary">-</Text>,
+    },
+    {
+      title: '机型 / OS版本',
+      key: 'device',
+      width: 150,
+      render: (_: unknown, r: PriceReport) => renderDeviceOs(r),
+    },
     {
       title: '门店 / 菜品',
       key: 'store',
       width: 200,
-      render: (_: unknown, r: PriceReport) => (
+      render: (_: unknown, r: PriceReport) => renderStore(r),
-        <Space direction="vertical" size={0}>
-          <Text>{r.store_name || '-'}</Text>
-          <Text type="secondary" style={{ fontSize: 12 }}>
-            {r.dish_summary || '-'}
-          </Text>
-        </Space>
-      ),
     },
     {
       title: '原最低价 → 上报价',
       key: 'price',
       width: 220,
-      render: (_: unknown, r: PriceReport) => (
+      render: (_: unknown, r: PriceReport) => renderPrice(r),
-        <Space direction="vertical" size={0}>
-          <Text type="secondary" style={{ fontSize: 12 }}>
-            {r.original_platform_name || '原'}: {yuan(r.original_price_cents)}
-          </Text>
-          <Text strong style={{ color: '#fa541c' }}>
-            {r.reported_platform_name}: {yuan(r.reported_price_cents)}
-          </Text>
-        </Space>
-      ),
     },
     {
       title: '截图证明',
@@ -193,52 +301,58 @@ export default function PriceReportsPage() {
         ),
     },
     { title: '状态', dataIndex: 'status', width: 90, render: statusTag },
+    {
+      title: '审核结果',
+      key: 'review',
+      width: 160,
+      render: (_: unknown, r: PriceReport) => renderResult(r),
+    },
     {
       title: '提交时间',
       dataIndex: 'created_at',
       width: 150,
+      sorter: true,
+      sortOrder: sortOrderOf('created_at'),
       render: (v: string) => dt(v),
     },
     {
-      title: '操作 / 结果',
+      title: 'Trace',
+      key: 'trace',
+      width: 80,
+      render: (_: unknown, r: PriceReport) => traceLink(r),
+    },
+    {
+      title: '操作',
       key: 'op',
       fixed: 'right',
-      width: 200,
+      width: 150,
       render: (_: unknown, r: PriceReport) => {
-        if (r.status === 'pending') {
+        if (r.status !== 'pending') return <Text type="secondary">-</Text>;
-          if (!canReview) return <Text type="secondary">无审核权限</Text>;
+        if (!canReview) return <Text type="secondary">无审核权限</Text>;
-          return (
+        return (
-            <Space>
+          <Space>
-              <Button
+            <Button
-                size="small"
+              size="small"
-                type="link"
+              type="link"
-                icon={<CheckCircleOutlined />}
+              icon={<CheckCircleOutlined />}
-                onClick={() => approve(r)}
+              onClick={() => approve(r)}
-              >
+            >
-                通过
+              通过
-              </Button>
+            </Button>
-              <Button
+            <Button
-                size="small"
+              size="small"
-                type="link"
+              type="link"
-                danger
+              danger
-                icon={<CloseCircleOutlined />}
+              icon={<CloseCircleOutlined />}
-                onClick={() => {
+              onClick={() => {
-                  setRejecting(r);
+                setRejecting(r);
-                  setRejectReason('');
+                setRejectReason('');
-                }}
+              }}
-              >
+            >
-                拒绝
+              拒绝
-              </Button>
+            </Button>
-            </Space>
+          </Space>
-          );
+        );
-        }
-        if (r.status === 'approved') {
-          return <Text type="success">已发 {r.reward_coins ?? 0} 金币</Text>;
-        }
-        if (r.status === 'rejected') {
-          return <Text type="secondary">拒绝: {r.reject_reason || '-'}</Text>;
-        }
-        return <Text type="secondary">-</Text>;
       },
     },
   ];
@@ -247,7 +361,7 @@ export default function PriceReportsPage() {
     <div>
       <Space direction="vertical" style={{ marginBottom: 16 }}>
         <Typography.Title level={4} style={{ margin: 0 }}>
-          上报审核
+          低价审核
         </Typography.Title>
         <Text type="secondary">
           用户上报「某平台更低价」+ 截图，人工核实后通过发放 1000 金币奖励、拒绝需填理由。用户在 app
@@ -255,14 +369,20 @@ export default function PriceReportsPage() {
         </Text>
       </Space>
 
-      {summary && (
+      <div style={{ display: 'flex', gap: 16, marginBottom: 16, flexWrap: 'wrap' }}>
-        <Space size="large" style={{ marginBottom: 16 }}>
+        <Card size="small" style={{ minWidth: 120 }}>
-          <Statistic title="待审核" value={summary.pending} valueStyle={{ color: '#faad14' }} />
+          <Statistic title="待审核" value={summary?.pending ?? 0} valueStyle={{ color: '#fa8c16' }} />
-          <Statistic title="已通过" value={summary.approved} valueStyle={{ color: '#52c41a' }} />
+        </Card>
-          <Statistic title="已拒绝" value={summary.rejected} />
+        <Card size="small" style={{ minWidth: 120 }}>
-          <Statistic title="合计" value={summary.total} />
+          <Statistic title="已通过" value={summary?.approved ?? 0} valueStyle={{ color: '#52c41a' }} />
-        </Space>
+        </Card>
-      )}
+        <Card size="small" style={{ minWidth: 120 }}>
+          <Statistic title="已拒绝" value={summary?.rejected ?? 0} valueStyle={{ color: '#8c8c8c' }} />
+        </Card>
+        <Card size="small" style={{ minWidth: 120 }}>
+          <Statistic title="合计" value={summary?.total ?? 0} />
+        </Card>
+      </div>
 
       <Card>
         <Tabs
@@ -275,6 +395,7 @@ export default function PriceReportsPage() {
           columns={columns}
           dataSource={items}
           loading={loading}
+          onChange={onTableChange}
           pagination={{
             current: page,
             pageSize,
@@ -283,7 +404,7 @@ export default function PriceReportsPage() {
             showTotal: (t) => `共 ${t} 条`,
             onChange: onPageChange,
           }}
-          scroll={{ x: 1100 }}
+          scroll={{ x: 1790 }}
         />
       </Card>
 
@@ -320,6 +441,19 @@ export default function PriceReportsPage() {
           </Space>
         )}
       </Modal>
+
+      <UserRecordsDrawer<PriceReport>
+        open={recordsUser != null}
+        onClose={() => setRecordsUser(null)}
+        userId={recordsUser?.userId ?? null}
+        phone={recordsUser?.phone ?? null}
+        endpoint="/admin/api/price-reports"
+        columns={RECORD_COLUMNS}
+        recordLabel="低价上报"
+        countLabel="上报总计"
+        rewardLabel="上报奖励总计"
+        rewardOf={(r) => (r.status === 'approved' ? (r.reward_coins ?? 0) : 0)}
+      />
     </div>
   );
 }

src/app/(main)/users/[id]/page.tsx

@@ -23,6 +23,7 @@ import { canDo } from '@/lib/auth';
 import { formatUtcTime, formatWallTime, yuan } from '@/lib/format';
 import { useCursorList } from '@/lib/useCursorList';
 import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
+import { DeleteUserModal } from '@/components/DeleteUserModal';
 import type { CashTxn, CoinTxn, UserOverview, WithdrawOrder } from '@/lib/types';
 
 export default function UserDetailPage() {
@@ -33,6 +34,7 @@ export default function UserDetailPage() {
   const [err, setErr] = useState<string | null>(null);
   const [coinOpen, setCoinOpen] = useState(false);
   const [cashOpen, setCashOpen] = useState(false);
+  const [delOpen, setDelOpen] = useState(false);
 
   const loadData = useCallback(() => {
     setErr(null);
@@ -52,6 +54,7 @@ export default function UserDetailPage() {
 
   const canCoins = canDo(['finance']);
   const canStatus = canDo(['operator']);
+  const canDelete = canDo(['super_admin']); // 注销账号最高危,仅 super_admin(与后端 require_role 对齐)
 
   const toggleStatus = () => {
     if (!data) return;
@@ -154,6 +157,11 @@ export default function UserDetailPage() {
               {data.user.status === 'active' ? '封禁' : '解封'}
             </Button>
           )}
+          {canDelete && data.user.status !== 'deleted' && (
+            <Button danger onClick={() => setDelOpen(true)}>
+              注销账号
+            </Button>
+          )}
         </Space>
       </Space>
       <Card style={{ marginBottom: 16 }}>
@@ -272,6 +280,12 @@ export default function UserDetailPage() {
           cash.reload();
         }}
       />
+      <DeleteUserModal
+        user={data.user}
+        open={delOpen}
+        onClose={() => setDelOpen(false)}
+        onDone={loadData}
+      />
     </div>
   );
 }

src/app/(main)/users/page.tsx

@@ -5,20 +5,21 @@ import type { Key } from 'react';
 import { useRouter } from 'next/navigation';
 import type { ColumnsType } from 'antd/es/table';
 import type { SorterResult } from 'antd/es/table/interface';
-import { App, Button, DatePicker, Input, Select, Space, Table, Tag } from 'antd';
+import { App, Button, DatePicker, Input, Select, Space, Table, Tag, Tooltip } from 'antd';
 import dayjs, { type Dayjs } from 'dayjs';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
 import { formatUtcTime } from '@/lib/format';
 import { usePagedList } from '@/lib/usePagedList';
 import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
+import { DeleteUserModal } from '@/components/DeleteUserModal';
 import type { UserListItem } from '@/lib/types';
 
 const { RangePicker } = DatePicker;
 
 const STATUS_COLOR: Record<string, string> = { active: 'green', disabled: 'red', deleted: 'default' };
 
-type SortField = 'id' | 'created_at' | 'last_login_at';
+type SortField = 'id' | 'created_at' | 'last_active_at';
 
 export default function UsersPage() {
   const router = useRouter();
@@ -43,9 +44,11 @@ export default function UsersPage() {
 
   const canCoins = canDo(['finance']);
   const canStatus = canDo(['operator']);
+  const canDelete = canDo(['super_admin']); // 注销账号最高危,仅 super_admin(与后端 require_role 对齐)
 
   const [coinUser, setCoinUser] = useState<UserListItem | null>(null);
   const [cashUser, setCashUser] = useState<UserListItem | null>(null);
+  const [delUser, setDelUser] = useState<UserListItem | null>(null);
   const [selectedRowKeys, setSelectedRowKeys] = useState<Key[]>([]);
 
   // 筛选/排序变化后清空已选(避免选中项跨筛选错位)
@@ -61,8 +64,8 @@ export default function UsersPage() {
       register_channel: channel || undefined,
       created_from: regRange?.[0] ? regRange[0].startOf('day').toISOString() : undefined,
       created_to: regRange?.[1] ? regRange[1].endOf('day').toISOString() : undefined,
-      last_login_from: loginRange?.[0] ? loginRange[0].startOf('day').toISOString() : undefined,
+      last_active_from: loginRange?.[0] ? loginRange[0].startOf('day').toISOString() : undefined,
-      last_login_to: loginRange?.[1] ? loginRange[1].endOf('day').toISOString() : undefined,
+      last_active_to: loginRange?.[1] ? loginRange[1].endOf('day').toISOString() : undefined,
     });
 
   const resetFilters = () => {
@@ -235,18 +238,25 @@ export default function UsersPage() {
       render: (v: string) => formatUtcTime(v),
     },
     {
-      title: '最近登录',
+      // 最近活跃 = max(最近登录, 最近发起比价, 最近发起领券),与大盘 DAU/留存活跃口径一致(2026-07-05)
-      dataIndex: 'last_login_at',
+      title: (
+        <Tooltip title="进入 App(登录)/ 发起比价 / 发起领券,取最近一次">
+          最近活跃
+        </Tooltip>
+      ),
+      dataIndex: 'last_active_at',
       width: 160,
       sorter: true,
-      sortOrder: sortOrderOf('last_login_at'),
+      // 关掉 antd 默认的「点击升序/降序」表头提示,否则与上面自定义口径 Tooltip 同时弹出互相遮挡
-      render: (v: string) => formatUtcTime(v),
+      showSorterTooltip: false,
+      sortOrder: sortOrderOf('last_active_at'),
+      render: (v: string | null, u: UserListItem) => formatUtcTime(v ?? u.last_login_at),
     },
     {
       title: '操作',
       key: 'op',
       fixed: 'right',
-      width: 300,
+      width: 340,
       render: (_: unknown, u: UserListItem) => (
         <Space wrap={false} onClick={(e) => e.stopPropagation()}>
           <a onClick={() => router.push(`/users/${u.id}`)}>详情</a>
@@ -269,6 +279,11 @@ export default function UsersPage() {
             ) : (
               <a onClick={() => setForceOnboarding(u, true)}>开启新手引导</a>
             ))}
+          {canDelete && u.status !== 'deleted' && (
+            <a style={{ color: '#cf1322' }} onClick={() => setDelUser(u)}>
+              注销
+            </a>
+          )}
         </Space>
       ),
     },
@@ -324,7 +339,7 @@ export default function UsersPage() {
           allowClear
         />
         <RangePicker
-          placeholder={['最近登录起', '最近登录止']}
+          placeholder={['最近活跃起', '最近活跃止']}
           value={loginRange}
           onChange={(v) => setLoginRange(v as [Dayjs, Dayjs] | null)}
           allowClear
@@ -377,12 +392,18 @@ export default function UsersPage() {
           showTotal: (t) => `共 ${t} 个用户`,
           onChange: onPageChange,
         }}
-        scroll={{ x: 1160 }}
+        scroll={{ x: 1200 }}
         onChange={onTableChange}
       />
 
       <AdjustCoinModal user={coinUser} open={!!coinUser} onClose={() => setCoinUser(null)} />
       <AdjustCashModal user={cashUser} open={!!cashUser} onClose={() => setCashUser(null)} />
+      <DeleteUserModal
+        user={delUser}
+        open={!!delUser}
+        onClose={() => setDelUser(null)}
+        onDone={reload}
+      />
     </div>
   );
 }

src/app/(main)/withdraws/UserRewardPanel.tsx

@@ -39,10 +39,12 @@ const PAGE_SIZE = 10; // 金币记录每页条数
 interface Props {
   userId: number;
   user: WithdrawUserSnapshot | null;
+  // 统计区字段集:withdraw(默认,提现详情:含提现细分) / ad(广告收益详情:只看看广告观看统计,对齐参考图 6 项)
+  statsVariant?: 'withdraw' | 'ad';
 }
 
-/** 提现详情抽屉:用户基本信息 + 互斥时间筛选 + 看广告/提现统计区 + 金币发放记录表。 */
+/** 用户看广告/提现详情:基本信息 + 互斥时间筛选 + 统计区(按 statsVariant 取字段集)+ 金币发放记录表。 */
-export default function UserRewardPanel({ userId, user }: Props) {
+export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw' }: Props) {
   const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
   const [range, setRange] = useState<[Dayjs, Dayjs] | null>(null);
   const [stats, setStats] = useState<UserRewardStats | null>(null);
@@ -164,7 +166,7 @@ export default function UserRewardPanel({ userId, user }: Props) {
         </Space>
       </Space>
 
-      {/* 统计区(受时间筛选;现金余额为当前快照) */}
+      {/* 统计区(受时间筛选;现金余额为当前快照)。ad 视图只保留看广告观看统计(对齐参考图 6 项) */}
       <Descriptions bordered size="small" column={2} style={{ marginBottom: 8 }}>
         <Descriptions.Item label="累计提现">
           {stats ? yuan(stats.withdraw_success_cents) : '-'}
@@ -172,29 +174,51 @@ export default function UserRewardPanel({ userId, user }: Props) {
         <Descriptions.Item label="现金余额">
           {stats ? yuan(stats.cash_balance_cents) : '-'}
         </Descriptions.Item>
-        <Descriptions.Item label="提现总次数">{stats?.withdraw_total ?? '-'}</Descriptions.Item>
+        {statsVariant === 'ad' ? (
-        <Descriptions.Item label="传统任务提现">
+          <>
-          {stats ? yuan(stats.traditional_task_cash_cents) : '-'}
+            <Descriptions.Item label="激励视频观看数">
-        </Descriptions.Item>
+              {stats?.reward_video_count ?? '-'}
-        <Descriptions.Item label="累计激励视频数">
+            </Descriptions.Item>
-          {stats?.reward_video_count ?? '-'}
+            {/* eCPM 均按元展示(reward_video / feed avg_ecpm 原始为分/千次,÷100 转元) */}
-        </Descriptions.Item>
+            <Descriptions.Item label="平均激励视频ECPM">
-        <Descriptions.Item label="平均激励视频ECPM">
+              {stats ? `${(stats.reward_video_avg_ecpm / 100).toFixed(2)} 元/千` : '-'}
-          {stats ? `${stats.reward_video_avg_ecpm} 分/千` : '-'}
+            </Descriptions.Item>
-        </Descriptions.Item>
+            <Descriptions.Item label="draw信息流视频观看数">
-        <Descriptions.Item label="激励视频提现">
+              {stats?.feed_count ?? '-'}
-          {stats ? yuan(stats.reward_video_cash_cents) : '-'}
+            </Descriptions.Item>
-        </Descriptions.Item>
+            <Descriptions.Item label="平均draw信息流ECPM">
-        <Descriptions.Item label="累计信息流广告数">{stats?.feed_count ?? '-'}</Descriptions.Item>
+              {stats ? `${(stats.feed_avg_ecpm / 100).toFixed(2)} 元/千` : '-'}
-        <Descriptions.Item label="平均信息流广告ECPM">
+            </Descriptions.Item>
-          {stats ? `${stats.feed_avg_ecpm} 分/千` : '-'}
+          </>
-        </Descriptions.Item>
+        ) : (
-        <Descriptions.Item label="信息流广告提现">
+          <>
-          {stats ? yuan(stats.feed_cash_cents) : '-'}
+            <Descriptions.Item label="提现总次数">{stats?.withdraw_total ?? '-'}</Descriptions.Item>
-        </Descriptions.Item>
+            <Descriptions.Item label="传统任务提现">
+              {stats ? yuan(stats.traditional_task_cash_cents) : '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="累计激励视频数">
+              {stats?.reward_video_count ?? '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="平均激励视频ECPM">
+              {stats ? `${stats.reward_video_avg_ecpm} 分/千` : '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="激励视频提现">
+              {stats ? yuan(stats.reward_video_cash_cents) : '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="累计信息流广告数">{stats?.feed_count ?? '-'}</Descriptions.Item>
+            <Descriptions.Item label="平均信息流广告ECPM">
+              {stats ? `${stats.feed_avg_ecpm} 分/千` : '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="信息流广告提现">
+              {stats ? yuan(stats.feed_cash_cents) : '-'}
+            </Descriptions.Item>
+          </>
+        )}
       </Descriptions>
       <Text type="secondary" style={{ fontSize: 12 }}>
-        统计随上方时间筛选(现金余额除外,为当前快照);eCPM 单位分/千次,同金币审计。
+        {statsVariant === 'ad'
+          ? '统计随上方时间筛选(现金余额除外,为当前快照);eCPM 均按元展示(原始分/千次 ÷100)。'
+          : '统计随上方时间筛选(现金余额除外,为当前快照);eCPM 单位分/千次,同金币审计。'}
       </Text>
 
       {/* 金币记录 */}

src/app/(main)/withdraws/page.tsx

@@ -104,6 +104,19 @@ const SORT_OPTIONS = [
   { value: 'created_at', label: '申请时间' },
   { value: 'amount_cents', label: '提现金额' },
 ];
+// 提现类型:coin_cash=福利页提现(金币兑换现金) / invite_cash=邀请提现(邀请奖励金)
+const SOURCE_LABEL: Record<string, string> = {
+  coin_cash: '福利页提现',
+  invite_cash: '邀请提现',
+};
+const SOURCE_COLOR: Record<string, string> = {
+  coin_cash: 'blue',
+  invite_cash: 'purple',
+};
+const SOURCE_OPTIONS = [
+  { value: 'coin_cash', label: '福利页提现' },
+  { value: 'invite_cash', label: '邀请提现' },
+];
 const DATE_FIELD_OPTIONS = [
   { value: 'created_at', label: '申请时间' },
   { value: 'updated_at', label: '更新时间' },
@@ -184,9 +197,11 @@ export default function WithdrawsPage() {
   const [sortBy, setSortBy] = useState<'created_at' | 'amount_cents'>('created_at');
   const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
   const [quickFilter, setQuickFilter] = useState<string | undefined>(undefined);
+  const [source, setSource] = useState<string | undefined>(undefined);
 
   const filters: Record<string, unknown> = {};
   if (activeStatus !== 'all') filters.status = activeStatus;
+  if (source) filters.source = source;
   if (keyword.trim()) filters.keyword = keyword.trim();
   if (dateRange?.[0]) filters.date_from = dateRange[0].startOf('day').toISOString();
   if (dateRange?.[1]) filters.date_to = dateRange[1].endOf('day').toISOString();
@@ -211,6 +226,7 @@ export default function WithdrawsPage() {
     setSortBy('created_at');
     setSortOrder('desc');
     setQuickFilter(undefined);
+    setSource(undefined);
   };
 
   const applyQuickFilter = (value?: string) => {
@@ -481,6 +497,12 @@ export default function WithdrawsPage() {
       width: 120,
       render: (v: number) => <Text strong>{yuan(v)}</Text>,
     },
+    {
+      title: '提现类型',
+      dataIndex: 'source',
+      width: 110,
+      render: (v: string) => <Tag color={SOURCE_COLOR[v] || 'default'}>{SOURCE_LABEL[v] || v}</Tag>,
+    },
     {
       title: '累计提现',
       dataIndex: 'cumulative_success_cents',
@@ -602,12 +624,27 @@ export default function WithdrawsPage() {
   const rejectAmount = rejectTargets.reduce((sum, item) => sum + item.amount_cents, 0);
   const ledgerIssues = ledger
     ? [
-        ledger.balance_diff_cents ? `余额差额 ${yuan(ledger.balance_diff_cents)}` : '',
+        // 普通现金账(coin_cash)
-        ledger.missing_withdraw_txn_count ? `缺扣款流水 ${ledger.missing_withdraw_txn_count} 笔` : '',
+        ledger.balance_diff_cents ? `现金余额差额 ${yuan(ledger.balance_diff_cents)}` : '',
-        ledger.missing_refund_txn_count ? `缺退款流水 ${ledger.missing_refund_txn_count} 笔` : '',
+        ledger.missing_withdraw_txn_count ? `现金缺扣款流水 ${ledger.missing_withdraw_txn_count} 笔` : '',
-        ledger.duplicate_refund_txn_count ? `重复退款流水 ${ledger.duplicate_refund_txn_count} 类` : '',
+        ledger.missing_refund_txn_count ? `现金缺退款流水 ${ledger.missing_refund_txn_count} 笔` : '',
+        ledger.duplicate_refund_txn_count ? `现金重复退款流水 ${ledger.duplicate_refund_txn_count} 类` : '',
         ledger.refund_txn_on_non_terminal_count
-          ? `非退款终态存在退款流水 ${ledger.refund_txn_on_non_terminal_count} 笔`
+          ? `现金非退款终态存在退款流水 ${ledger.refund_txn_on_non_terminal_count} 笔`
+          : '',
+        // 邀请奖励金账(invite_cash)
+        ledger.invite_balance_diff_cents ? `邀请金余额差额 ${yuan(ledger.invite_balance_diff_cents)}` : '',
+        ledger.invite_missing_withdraw_txn_count
+          ? `邀请金缺扣款流水 ${ledger.invite_missing_withdraw_txn_count} 笔`
+          : '',
+        ledger.invite_missing_refund_txn_count
+          ? `邀请金缺退款流水 ${ledger.invite_missing_refund_txn_count} 笔`
+          : '',
+        ledger.invite_duplicate_refund_txn_count
+          ? `邀请金重复退款流水 ${ledger.invite_duplicate_refund_txn_count} 类`
+          : '',
+        ledger.invite_refund_txn_on_non_terminal_count
+          ? `邀请金非退款终态存在退款流水 ${ledger.invite_refund_txn_on_non_terminal_count} 笔`
           : '',
       ].filter(Boolean)
     : [];
@@ -647,7 +684,7 @@ export default function WithdrawsPage() {
               message={ledger.ok ? '现金账本校验正常' : '现金账本存在异常'}
               description={
                 ledger.ok
-                  ? `账户余额合计 ${yuan(ledger.cash_balance_total_cents)}，现金流水净额 ${yuan(ledger.cash_transaction_total_cents)}`
+                  ? `现金 余额 ${yuan(ledger.cash_balance_total_cents)} / 流水 ${yuan(ledger.cash_transaction_total_cents)}；邀请金 余额 ${yuan(ledger.invite_cash_balance_total_cents)} / 流水 ${yuan(ledger.invite_cash_transaction_total_cents)}`
                   : ledgerIssues.join('；')
               }
               action={
@@ -724,6 +761,14 @@ export default function WithdrawsPage() {
               }}
               onSearch={(value) => setKeyword(value.trim())}
             />
+            <Select
+              value={source}
+              allowClear
+              placeholder="提现类型"
+              style={{ width: 140 }}
+              options={SOURCE_OPTIONS}
+              onChange={(value?: string) => setSource(value)}
+            />
             <Select
               value={quickFilter}
               allowClear
@@ -849,7 +894,7 @@ export default function WithdrawsPage() {
             showTotal: (t) => `共 ${t} 条`,
             onChange: onPageChange,
           }}
-          scroll={{ x: 1350 }}
+          scroll={{ x: 1460 }}
           onRow={(record) => ({
             onClick: () => openDetail(record),
             style: { cursor: 'pointer' },
@@ -881,6 +926,11 @@ export default function WithdrawsPage() {
                 <Descriptions.Item label="金额">
                   <Text strong>{yuan(detail.order.amount_cents)}</Text>
                 </Descriptions.Item>
+                <Descriptions.Item label="提现类型">
+                  <Tag color={SOURCE_COLOR[detail.order.source] || 'default'}>
+                    {SOURCE_LABEL[detail.order.source] || detail.order.source}
+                  </Tag>
+                </Descriptions.Item>
                 <Descriptions.Item label="提现实名">
                   {detail.order.user_name || '-'}
                 </Descriptions.Item>

src/components/AdjustBalanceModals.tsx

@@ -3,7 +3,7 @@
 // 调金币 / 调现金弹窗(受控)。列表页与用户详情页共用,避免两处各写一套。
 // 每个弹窗自带「增减 / 设为指定值」两种模式;打开时拉一次 360 概览展示当前余额。
 import { useEffect, useState } from 'react';
-import { App, Form, Input, InputNumber, Modal, Segmented } from 'antd';
+import { App, Form, Input, InputNumber, Modal, Radio, Segmented } from 'antd';
 import { api, errMsg } from '@/lib/api';
 import { yuan } from '@/lib/format';
 import type { UserOverview } from '@/lib/types';
@@ -17,15 +17,19 @@ interface ModalProps {
   onDone?: () => void; // 调整成功后回调(刷新余额/列表)
 }
 
-const balanceLine = (balances: { coin: number; cashCents: number } | null) => (
+type Balances = { coin: number; cashCents: number; inviteCashCents: number };
+
+const balanceLine = (balances: Balances | null) => (
   <p style={{ color: '#888', marginBottom: 12 }}>
-    当前余额:金币 {balances ? balances.coin : '…'} ｜ 现金 {balances ? yuan(balances.cashCents) : '…'}
+    当前余额:金币 {balances ? balances.coin : '…'} ｜ 现金(金币兑现金){' '}
+    {balances ? yuan(balances.cashCents) : '…'} ｜ 邀请奖励金{' '}
+    {balances ? yuan(balances.inviteCashCents) : '…'}
   </p>
 );
 
 // 弹窗打开时拉一次该用户余额;用户切换/关闭时丢弃过期响应(alive 标记防竞态)。
 function useBalances(userId: number | undefined, open: boolean) {
-  const [balances, setBalances] = useState<{ coin: number; cashCents: number } | null>(null);
+  const [balances, setBalances] = useState<Balances | null>(null);
   useEffect(() => {
     if (!open || userId == null) {
       setBalances(null);
@@ -36,7 +40,12 @@ function useBalances(userId: number | undefined, open: boolean) {
     api
       .get<UserOverview>(`/admin/api/users/${userId}`)
       .then((r) => {
-        if (alive) setBalances({ coin: r.data.coin_balance, cashCents: r.data.cash_balance_cents });
+        if (alive)
+          setBalances({
+            coin: r.data.coin_balance,
+            cashCents: r.data.cash_balance_cents,
+            inviteCashCents: r.data.invite_cash_balance_cents,
+          });
       })
       .catch(() => {});
     return () => {
@@ -113,39 +122,39 @@ export function AdjustCoinModal({ user, open, onClose, onDone }: ModalProps) {
 export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
   const { message } = App.useApp();
   const [form] = Form.useForm();
-  const [mode, setMode] = useState<'delta' | 'set'>('delta');
+  // 操作方式改为表单必选项(无默认、手动选);用 watch 驱动金额栏文案/最小值
+  const mode = Form.useWatch('mode', form) as 'delta' | 'set' | undefined;
   const balances = useBalances(user?.id, open);
 
   useEffect(() => {
-    if (open) {
+    if (open) form.resetFields(); // 目标账户 / 操作方式 都重置为「未选」
-      setMode('delta');
-      form.resetFields();
-    }
   }, [open, form]);
 
   // 输入元,×100 转分后调后端(主要给无现金用户发钱直接测试提现)
   const submit = async () => {
     if (!user) return;
-    const v = await form.validateFields();
+    const v = await form.validateFields(); // 任一必填/必选缺失 → 该项下方红字 + 阻断提交
     const amountCents = Math.round(Number(v.amount_yuan) * 100);
-    if (mode === 'delta' && amountCents === 0) {
+    if (v.mode === 'delta' && amountCents === 0) {
       message.warning('金额不能为 0(且不小于 1 分)');
       return;
     }
-    if (mode === 'set' && amountCents < 0) {
+    if (v.mode === 'set' && amountCents < 0) {
       message.warning('目标金额不能为负');
       return;
     }
+    const acctName = v.account === 'invite_cash' ? '邀请奖励金' : '现金';
     try {
       await api.post(`/admin/api/users/${user.id}/cash`, {
-        mode,
+        account: v.account,
+        mode: v.mode,
         amount_cents: amountCents,
         reason: v.reason,
       });
       message.success(
-        mode === 'set'
+        v.mode === 'set'
-          ? `已设为 ¥${(amountCents / 100).toFixed(2)} 现金`
+          ? `已设为 ¥${(amountCents / 100).toFixed(2)} ${acctName}`
-          : `已${amountCents > 0 ? '发放' : '扣减'} ¥${(Math.abs(amountCents) / 100).toFixed(2)} 现金`,
+          : `已${amountCents > 0 ? '发放' : '扣减'} ¥${(Math.abs(amountCents) / 100).toFixed(2)} ${acctName}`,
       );
       onClose();
       onDone?.();
@@ -164,10 +173,20 @@ export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
     >
       {balanceLine(balances)}
       <Form form={form} layout="vertical">
-        <Form.Item label="操作方式">
+        <Form.Item name="account" label="目标账户" rules={[{ required: true, message: '请选择目标账户' }]}>
-          <Segmented
+          <Radio.Group
-            value={mode}
+            optionType="button"
-            onChange={(v) => setMode(v as 'delta' | 'set')}
+            buttonStyle="solid"
+            options={[
+              { label: '金币兑现金账户', value: 'coin_cash' },
+              { label: '邀请账户', value: 'invite_cash' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item name="mode" label="操作方式" rules={[{ required: true, message: '请选择操作方式' }]}>
+          <Radio.Group
+            optionType="button"
+            buttonStyle="solid"
             options={[
               { label: '增减', value: 'delta' },
               { label: '设为指定值', value: 'set' },
@@ -182,7 +201,7 @@ export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
               : '现金变动(元,正=发放,负=扣减;不可扣成负)'
           }
           rules={[
-            { required: true },
+            { required: true, message: '请输入现金变动金额' },
             ...(mode === 'set' ? [{ type: 'number' as const, min: 0, message: '目标值不能为负' }] : []),
           ]}
         >
@@ -194,7 +213,7 @@ export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
             min={mode === 'set' ? 0 : undefined}
           />
         </Form.Item>
-        <Form.Item name="reason" label="原因(入审计)" rules={[{ required: true }]}>
+        <Form.Item name="reason" label="原因(入审计)" rules={[{ required: true, message: '请填写原因' }]}>
           <Input.TextArea rows={2} />
         </Form.Item>
       </Form>

src/components/DeleteUserModal.tsx

@@ -0,0 +1,61 @@
+'use client';
+
+// 注销/删除账号弹窗(受控)。列表页与用户详情页共用,避免两处各写一套(同 AdjustBalanceModals)。
+// 复用 C 端自助注销同一套后端清理:物理删除个人内容/行为/PII 表 + 清零余额 + 匿名化 user 行,
+// 保留资金流水/邀请关系/广告幂等+对账表。仅 super_admin 可见入口;后端亦 require_role("super_admin") 兜底。
+// 后端资金前置闸(有未提现现金/邀请金 / 在审提现单 → 409)带明确 detail,errMsg 原样透出。
+import { App, Form, Input, Modal } from 'antd';
+import { api, errMsg } from '@/lib/api';
+
+export type DeleteTargetUser = { id: number; phone: string };
+
+interface Props {
+  user: DeleteTargetUser | null;
+  open: boolean;
+  onClose: () => void;
+  onDone?: () => void; // 删除成功后回调(刷新详情/列表)
+}
+
+export function DeleteUserModal({ user, open, onClose, onDone }: Props) {
+  const { message } = App.useApp();
+  const [form] = Form.useForm();
+
+  const submit = async () => {
+    if (!user) return;
+    const v = await form.validateFields(); // 原因必填,缺失即红字阻断
+    try {
+      // axios 的 DELETE 带 body 要放在 config.data 里
+      await api.delete(`/admin/api/users/${user.id}`, { data: { reason: v.reason } });
+      message.success('账号已注销');
+      onClose();
+      onDone?.();
+    } catch (e) {
+      message.error(errMsg(e));
+    }
+  };
+
+  return (
+    <Modal
+      title={`注销账号 - ${user?.phone ?? ''}`}
+      open={open}
+      onOk={submit}
+      onCancel={onClose}
+      okText="确认注销"
+      okButtonProps={{ danger: true }}
+      afterOpenChange={(o) => {
+        if (o) form.resetFields();
+      }}
+      destroyOnHidden
+    >
+      <p style={{ color: '#cf1322', marginBottom: 12 }}>
+        将永久删除该账号的个人数据(比价/省钱/签到/领券/埋点/设备/邀请指纹等)并清零余额、匿名化手机号,
+        <strong>不可恢复</strong>。资金流水/邀请关系/广告对账记录按合规保留。
+      </p>
+      <Form form={form} layout="vertical">
+        <Form.Item name="reason" label="注销原因(入审计)" rules={[{ required: true, message: '请填写注销原因' }]}>
+          <Input.TextArea rows={2} />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}

src/components/UserRecordsDrawer.tsx

@@ -0,0 +1,113 @@
+'use client';
+
+// 点列表里的手机号 → 抽屉列出该用户「同类型」的全部记录(反馈页=全部反馈;低价审核页=全部上报)。
+// 顶部汇总该用户的「提交/上报总计」+「奖励总计」;复用各自的 list 接口按 user_id 过滤(无需新后端接口)。
+import { useEffect, useState } from 'react';
+import { Drawer, Empty, Space, Spin, Statistic, Table, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { api } from '@/lib/api';
+import type { CursorPage } from '@/lib/types';
+
+const { Text } = Typography;
+
+interface Props<T> {
+  open: boolean;
+  onClose: () => void;
+  userId: number | null;
+  phone: string | null;
+  endpoint: string; // 列表接口,按 user_id 过滤,如 /admin/api/feedbacks
+  columns: ColumnsType<T>;
+  recordLabel: string; // 「反馈」/「低价上报」,用于标题与空态文案
+  countLabel: string; // 顶部计数卡标题,如「提交总计」/「上报总计」
+  rewardLabel: string; // 顶部奖励卡标题,如「提交奖励总计」/「上报奖励总计」
+  rewardOf: (item: T) => number; // 单条已发奖励金币(未采纳/未通过返回 0)
+  rewardSuffix?: string; // 第二个汇总卡单位,默认「金币」;领券场景可传「张」(领到券张数)等
+}
+
+export default function UserRecordsDrawer<T extends { id: number }>({
+  open,
+  onClose,
+  userId,
+  phone,
+  endpoint,
+  columns,
+  recordLabel,
+  countLabel,
+  rewardLabel,
+  rewardOf,
+  rewardSuffix = '金币',
+}: Props<T>) {
+  const [items, setItems] = useState<T[]>([]);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    if (!open || userId == null) return;
+    let alive = true;
+    setLoading(true);
+    api
+      .get<CursorPage<T>>(endpoint, {
+        params: { user_id: userId, limit: 100, sort_by: 'created_at', sort_order: 'desc' },
+      })
+      .then((r) => {
+        if (!alive) return;
+        setItems(r.data.items);
+        setTotal(r.data.total ?? r.data.items.length);
+      })
+      .catch(() => {
+        if (!alive) return;
+        setItems([]);
+        setTotal(0);
+      })
+      .finally(() => {
+        if (alive) setLoading(false);
+      });
+    return () => {
+      alive = false;
+    };
+  }, [open, userId, endpoint]);
+
+  // 奖励总计在已加载记录上累加(单用户记录数远小于 100 上限,够用)
+  const rewardTotal = items.reduce((sum, it) => sum + rewardOf(it), 0);
+
+  return (
+    <Drawer
+      title={
+        <span>
+          用户 #{userId ?? '-'} 的全部{recordLabel}
+          {phone ? (
+            <Text type="secondary" style={{ fontSize: 13, marginLeft: 8 }}>
+              {phone}
+            </Text>
+          ) : null}
+        </span>
+      }
+      width={760}
+      open={open}
+      onClose={onClose}
+      destroyOnHidden
+    >
+      {loading ? (
+        <Spin style={{ display: 'block', margin: '40px auto' }} />
+      ) : (
+        <>
+          <Space size={48} style={{ marginBottom: 20 }}>
+            <Statistic title={countLabel} value={total} />
+            <Statistic title={rewardLabel} value={rewardTotal} suffix={rewardSuffix} />
+          </Space>
+          {items.length === 0 ? (
+            <Empty description={`该用户暂无${recordLabel}`} style={{ marginTop: 24 }} />
+          ) : (
+            <Table<T>
+              rowKey="id"
+              size="small"
+              columns={columns}
+              dataSource={items}
+              pagination={false}
+            />
+          )}
+        </>
+      )}
+    </Drawer>
+  );
+}

src/lib/types.ts

@@ -3,10 +3,32 @@
 export interface AdminInfo {
   id: number;
   username: string;
-  role: string; // super_admin / finance / operator
+  role: string; // super_admin / finance / operator / custom(自定义) / 自定义角色名
   status: string;
   created_at: string;
   last_login_at: string | null;
+  pages?: string[]; // 当前有效可见页 key(登录 / /me 下发);super_admin = 全部页;role==custom = pages_override。左侧导航按此过滤
+  pages_override?: string[] | null; // 「自定义」勾选的可见页原始集(role==custom 时非空);列表接口下发,供编辑回填勾选
+  password?: string | null; // 明文登录密码(仅账号列表下发);无留存(脚本建的超管)为 null → 不显示
+}
+
+// RBAC:页面权限目录(= 左侧导航项,后端 /admin/api/roles/catalog 下发)
+export interface PermissionPage {
+  key: string;
+  label: string;
+}
+export interface PermissionGroup {
+  group: string;
+  pages: PermissionPage[];
+}
+// RBAC:角色(可见页集合)
+export interface AdminRole {
+  id: number;
+  name: string; // 角色 key(承重,admin_user.role 引用)
+  label: string; // 展示名(UI 显示,如 管理员/运营/财务/技术)
+  pages: string[]; // 该角色有效可见页 key(super_admin = 全部)
+  is_builtin: boolean; // 内建(super_admin):不可编辑/删除
+  in_use: number; // 使用该角色的管理员数
 }
 
 export interface LoginResponse {
@@ -35,6 +57,8 @@ export interface UserListItem {
   wechat_openid: string | null;
   created_at: string;
   last_login_at: string;
+  // 最近活跃 = max(最近登录, 最近发起比价, 最近发起领券);与大盘 DAU/留存活跃口径一致
+  last_active_at: string | null;
 }
 
 // 设备维度新手引导:一台设备(ANDROID_ID)聚合,走过引导的账号数 + 最近完成时间。
@@ -81,6 +105,7 @@ export interface UserOverview {
   user: UserListItem;
   coin_balance: number;
   cash_balance_cents: number;
+  invite_cash_balance_cents: number; // 邀请奖励金余额(与 cash_balance_cents 物理隔离)
   total_coin_earned: number;
   comparison_total: number;
   comparison_success: number;
@@ -116,6 +141,8 @@ export interface WithdrawOrder {
   user_id: number;
   out_bill_no: string;
   amount_cents: number;
+  // 提现类型:coin_cash(福利页提现,金币兑换现金) / invite_cash(邀请提现,邀请奖励金)
+  source: string;
   user_name: string | null;
   status: string; // reviewing / pending / success / failed / rejected
   wechat_state: string | null;
@@ -207,6 +234,7 @@ export interface WithdrawBulkResult {
 
 export interface WithdrawLedgerCheck {
   ok: boolean;
+  // 普通现金账(coin_cash)
   cash_balance_total_cents: number;
   cash_transaction_total_cents: number;
   balance_diff_cents: number;
@@ -214,6 +242,14 @@ export interface WithdrawLedgerCheck {
   missing_refund_txn_count: number;
   duplicate_refund_txn_count: number;
   refund_txn_on_non_terminal_count: number;
+  // 邀请奖励金账(invite_cash:与普通现金物理隔离,各自对账)
+  invite_cash_balance_total_cents: number;
+  invite_cash_transaction_total_cents: number;
+  invite_balance_diff_cents: number;
+  invite_missing_withdraw_txn_count: number;
+  invite_missing_refund_txn_count: number;
+  invite_duplicate_refund_txn_count: number;
+  invite_refund_txn_on_non_terminal_count: number;
 }
 
 export interface WxpayHealthCheck {
@@ -238,15 +274,36 @@ export interface Feedback {
   user_id: number;
   content: string;
   contact: string;
+  // 反馈来源入口:profile(「我的」页=普通反馈) / comparison(比价结果页=比价反馈)
+  source: string;
+  // 比价反馈的问题场景(找错商品/优惠不对…);普通反馈为 null
+  scene: string | null;
   images: string[] | null;
   // pending(审核中) / adopted(已采纳) / rejected(未采纳)；历史数据可能为 new
   status: string;
   reject_reason: string | null; // 未采纳原因(用户端可见)
   reward_coins: number | null; // 采纳后发放金币
-  review_note: string | null; // 审核批注(采纳要点 / 内部备注)
+  review_note: string | null; // 审核批注(采纳要点 / 内部备注,用户不可见)
+  admin_reply: string | null; // 运营给用户的回复留言(用户端可见)
   reviewed_by_admin_id: number | null;
   reviewed_at: string | null;
   created_at: string;
+  // 提交端环境快照:提交版本号 / 机型OS版本;改版前的历史反馈为 null
+  app_version: string | null;
+  device_model: string | null;
+  rom_name: string | null;
+  android_version: string | null;
+  // 联表瞬态:展示完整手机号(点手机号查该用户全部反馈)
+  phone: string | null;
+  nickname: string | null;
+}
+
+// 反馈审核台顶部各状态计数(pending 含历史 new 态)。后端 GET /admin/api/feedbacks/summary。
+export interface FeedbackSummary {
+  pending: number;
+  adopted: number;
+  rejected: number;
+  total: number;
 }
 
 // 反馈页「加群二维码」卡配置(运营后台改 → App 意见反馈页同步)。
@@ -285,6 +342,7 @@ export interface ComparisonRecordListItem {
   status: string;
   information: string | null;
   store_name: string | null;
+  product_names: string | null; // 下单商品名派生串(顿号分隔),「商品」列展示
   source_platform_name: string | null;
   best_platform_name: string | null;
   source_price_cents: number | null;
@@ -369,7 +427,9 @@ export interface AdRevenueRecord {
 export interface AdRevenueDaily {
   date: string; // 北京时间 YYYY-MM-DD
   impressions: number;
-  revenue_yuan: number;
+  revenue_yuan: number; // 客户端预估收益(eCPM 折算)
+  pangle_revenue_yuan: number | null; // 穿山甲后台预估收益(GroMore revenue);非全量视图/无数据为 null
+  pangle_api_revenue_yuan: number | null; // 穿山甲收益API(更接近结算);未配/当天/无数据为 null
   expected_coin: number;
   actual_coin: number;
 }
@@ -406,6 +466,7 @@ export interface AdRevenueRow {
   impressions: number; // 本行展示条数 1/0(供日汇总、趋势图复用)
   ecpm: string | null; // 分/千次;展示行取展示值,纯发奖行取发奖采用值
   revenue_yuan: number; // 本次展示预估收益(元);纯发奖行=0
+  row_revenue_yuan?: number | null; // 主表逐行显示用:一次比价/领券聚合行=该次发奖广告 eCPM 折算之和;其它行空(回退 revenue_yuan)
   adn: string | null; // 实际填充 ADN;纯发奖行为空
   slot_id: string | null; // 底层 mediation rit;纯发奖行为空
   // ── 发奖侧 ──
@@ -415,6 +476,8 @@ export interface AdRevenueRow {
   actual_coin: number; // 实发金币;纯展示=0
   matched: boolean; // 本条应发==实发;纯展示恒 true(不计对账)
   reward_detail: AdRevenueRecord | null; // 发奖复算明细(点行展开下钻);纯展示为空
+  sub_rewards?: AdRevenueRecord[]; // 一次比价/领券聚合行的组内逐条明细(同整场 ad_session_id 的多条广告);展开渲染多行
+  sub_count?: number; // 本行聚合的发奖条数:一次比价/领券=该次广告条数(≥1);激励视频/纯展示=1
 }
 
 export interface AdRevenueReport {
@@ -423,21 +486,27 @@ export interface AdRevenueReport {
   daily: AdRevenueDaily[]; // 按日期汇总序列(全量,供按天趋势图)
   hourly: AdRevenueHourly[]; // 按小时汇总序列(全量,供按小时趋势图;按天查询时为空)
   type_stats: Record<string, AdRevenueTypeStat>; // 按广告类型小计;前端取 draw / reward_video
-  dau: number | null; // 今日活跃(复用大盘 last_login_at);仅查询=今日时有值,否则 null
+  // 按信息流场景小计(comparison/coupon/welfare;全量,不受分页截断)。数据大盘「领券广告/比价广告」卡
+  // 优先读它:2026-07-02 后端起 items 不再含信息流逐条展示行(唯一带收益+场景的行),按 items 现算恒 0。
+  // 可选(`?.` 探测)以兼容未升级后端,缺失时回退 items 现算。
+  scene_stats?: Record<string, AdRevenueTypeStat>;
+  // 可选:后端预聚合的「按广告类型」富小计(含发放金币明细)。当前后端未下发 → 数据大盘页
+  // (dashboard adTypeSummary)用 `?.` 探测、缺失时按 items 现算兜底;后端补上即自动启用。
+  by_ad_type?: Record<
+    string,
+    { ad_type: string; impressions: number; revenue_yuan: number; expected_coin: number; actual_coin: number }
+  >;
+  dau: number | null; // 区间去重活跃用户(口径同数据大盘 period.users.active:登录+开始比价+开始领券);按查询区间统计、含今日,全局口径不随筛选变化
   total: number; // 当前筛选下的分页总条数(全量,不受分页影响)
   truncated: boolean; // 当前页之后是否还有更多事件(分页后前端不再据此报警)
   total_impressions: number;
-  total_revenue_yuan: number;
+  total_revenue_yuan: number; // 客户端预估收益合计(eCPM 折算)
+  total_pangle_revenue_yuan: number | null; // 穿山甲后台预估收益合计(GroMore revenue);非全量视图/无数据为 null
+  total_pangle_api_revenue_yuan: number | null; // 穿山甲收益API合计(更接近结算);未配/当天/非全量视图为 null
+  pangle_revenue_available: boolean; // 本次结果是否带穿山甲后台收益(全量视图且已同步到数据)
   total_expected_coin: number;
   total_actual_coin: number;
   mismatch_count: number; // 应发≠实发的发奖条数
-  by_ad_type?: Record<string, {
-    ad_type: string;
-    impressions: number;
-    revenue_yuan: number;
-    expected_coin: number;
-    actual_coin: number;
-  }>;
   items: AdRevenueRow[];
 }
 
@@ -451,15 +520,15 @@ export interface DashboardOverview {
     dau: number;
   };
   coins: {
+    reward_video_coin_total: number;
+    reward_video_watch_count: number;
+    feed_ad_coin_total: number;
+    feed_ad_watch_count: number;
+    signin_coin_total: number;
+    signin_count: number;
+    signin_boost_coin_total: number;
+    signin_boost_watch_count: number;
     granted_total: number;
-    reward_video_coin_total?: number;
-    reward_video_watch_count?: number;
-    feed_ad_coin_total?: number;
-    feed_ad_watch_count?: number;
-    signin_coin_total?: number;
-    signin_count?: number;
-    signin_boost_coin_total?: number;
-    signin_boost_watch_count?: number;
   };
   cash: {
     withdraw_success_cents: number;
@@ -468,6 +537,7 @@ export interface DashboardOverview {
     withdraw_failed_count: number;
   };
   comparison: { total: number; success: number; success_rate: number };
+  // 时段大盘(对应后端 app/admin/schemas/dashboard.py DashboardPeriod);新版数据大盘页用
   period: {
     date_from: string;
     date_to: string;
@@ -475,6 +545,8 @@ export interface DashboardOverview {
       new: number;
       active: number;
       retained_new_users: number;
+      // 次日留存基数:窗口内逐日「前一日新增用户数」之和(retention_rate 的分母;旧后端无此字段)
+      retention_cohort?: number;
       retention_rate: number | null;
       retention_note: string;
     };
@@ -486,6 +558,17 @@ export interface DashboardOverview {
       average_duration_ms: number | null;
       average_saved_cents: number | null;
     };
+    // 领券核心数据(2026-07-05 新增;旧后端无此字段,前端 `?.` 探测)。
+    // 点位=一张券;成功口径 success+already_claimed;点位成功率分母=发起数×应领点位数(未跑到视为失败)。
+    coupon?: {
+      started: number;
+      all_success: number; // 全部点位领成功的完成场次数
+      success_rate: number | null;
+      point_success: number;
+      points_per_session: number | null; // 应领点位数(本期完成场点位数众数)
+      point_success_rate: number | null;
+      median_elapsed_ms: number | null; // 仅 completed,同「领券数据」页口径
+    };
     coins: {
       granted_total: number;
       reward_video_coin_total: number;
@@ -497,26 +580,29 @@ export interface DashboardOverview {
       comparison_reward_coin_total: number;
       regular_task_coin_total: number;
     };
-    cash: {
+    cash: { withdraw_success_cents: number };
-      withdraw_success_cents: number;
+    trend: {
-    };
-    trend: Array<{
       date: string;
       active_users: number;
       new_users: number;
       comparisons: number;
-    }>;
+    }[];
   };
   feedback: { new: number };
   cps: {
     available: boolean;
     note: string;
-    meituan_order_count?: number;
+    meituan_order_count: number;
-    meituan_commission_cents?: number;
+    meituan_commission_cents: number;
-    meituan_hit_count?: number;
+    meituan_hit_count: number;
-    meituan_miss_count?: number;
+    meituan_miss_count: number;
-    meituan_unknown_rate_count?: number;
+    meituan_unknown_rate_count: number;
-    meituan_hit_rate?: number | null;
+    meituan_hit_rate: number | null;
+    jd_order_count?: number;
+    jd_commission_cents?: number;
+    jd_actual_commission_cents?: number;
+    jd_estimated_commission_cents?: number;
+    jd_invalid_count?: number;
   };
 }
 
@@ -538,6 +624,16 @@ export interface PriceReport {
   reward_coins: number | null;
   reviewed_at: string | null;
   created_at: string;
+  // 联表瞬态:phone/nickname 展示完整手机号(点手机号查该用户全部上报);
+  // 其余取自关联比价记录(无关联记录时为 null):trace 调试链接、机型OS版本、提交版本号
+  phone: string | null;
+  nickname: string | null;
+  trace_id: string | null;
+  trace_url: string | null;
+  device_model: string | null; // 机型,如 PEEM00
+  rom_name: string | null; // ROM/OS 名,如 ColorOS / MIUI / HarmonyOS
+  android_version: string | null; // Android 版本号,如 13
+  app_version: string | null; // 提交时我们 app 的 versionName,如 1.2.3
 }
 
 export interface PriceReportSummary {