fix(types): 同步 DashboardOverview/AdRevenueReport 类型, 修数据大盘页编译失败

新版数据大盘页(dashboard/page.tsx, #24)引用的后端字段在 types.ts 未同步,
next build 类型检查失败致 admin-web main 无法构建/部署(0.2.6 发车 deploy 卡在此步):
- DashboardOverview 补 period 嵌套结构(date_from/to + users/comparison/coins/cash/trend),
  对齐已部署后端 app/admin/schemas/dashboard.py 的 DashboardPeriod
- AdRevenueReport 补可选 by_ad_type(按广告类型富小计含金币明细);后端当前不下发,
  页面用 ?. 探测、缺失时按 items 现算兜底, 此处仅补类型声明让其编译通过

均为类型声明同步, 不改任何运行逻辑;本地 next build 已通过。

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

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

@@ -9,6 +9,7 @@ import {
   Card,
   Col,
   DatePicker,
+  Descriptions,
   Divider,
   InputNumber,
   Modal,
@@ -19,6 +20,7 @@ import {
   Statistic,
   Table,
   Tag,
+  Tooltip,
   Typography,
 } from 'antd';
 import {
@@ -32,9 +34,11 @@ import { api, errMsg } from '@/lib/api';
 import { formatUtcTime } from '@/lib/format';
 import type {
   AdRevenueDaily,
+  AdRevenueHourly,
   AdRevenueRecord,
   AdRevenueReport,
   AdRevenueRow,
+  AdRevenueTypeStat,
 } from '@/lib/types';
 
 const { RangePicker } = DatePicker;
@@ -135,19 +139,22 @@ const DETAIL_COLUMNS: ColumnsType<AdRevenueRecord> = [
   },
 ];
 
-// 趋势图(纯 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),数据源是 items(被 limit 截断时会偏少,调用处给警告)
-function aggregateHourly(rows: AdRevenueRow[]): TrendPoint[] {
+// 按小时聚合(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) {
     if (r.hour == null || r.hour < 0 || r.hour > 23) continue;
@@ -159,10 +166,12 @@ function aggregateHourly(rows: AdRevenueRow[]): 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[] = [];
@@ -173,11 +182,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;
@@ -188,7 +200,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;
@@ -244,6 +260,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">
@@ -263,10 +297,12 @@ export default function AdRevenueReportPage() {
   const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs(), dayjs()]);
   const [userId, setUserId] = useState<number | null>(null);
   const [adType, setAdType] = useState<string | undefined>();
-  // 「场景」为纯前端过滤(后端 query 暂不支持 feed_scene),只作用于下方明细表,不重新请求、不影响趋势/日汇总。
+  // 「场景」作为后端全局筛选(feed_scene):同时影响明细 / 合计 / 趋势,与「用户 / 类型」一致,点「查询」生效。
   const [scene, setScene] = useState<string | undefined>();
   const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
-  const [limit, setLimit] = useState<number>(500);
+  const [sortBy, setSortBy] = useState<'time' | 'ecpm'>('time'); // 明细排序:time=时间倒序 / ecpm=eCPM 倒序
+  const [limit, setLimit] = useState<number>(500); // 每页条数(分页大小)
+  const [page, setPage] = useState<number>(1); // 当前页码(后端分页;1 起)
   const [queriedGranularity, setQueriedGranularity] = useState<'day' | 'hour'>('day'); // 本次结果对应的粒度,决定是否显示「小时」列
   const [queriedMultiDay, setQueriedMultiDay] = useState(false); // 本次结果是否跨多天,决定显示「日期」列 + 按天/按小时图
   const [data, setData] = useState<AdRevenueReport | null>(null);
@@ -277,33 +313,41 @@ export default function AdRevenueReportPage() {
   // 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
   const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
 
-  const load = useCallback(async () => {
-    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<AdRevenueReport>('/admin/api/ad-revenue-report', {
-        params: {
-          date_from: from,
-          date_to: to,
-          user_id: userId ?? undefined,
-          ad_type: adType ?? undefined,
-          granularity: gran,
-          limit,
-        },
-      });
-      setData(res.data);
-      setQueriedLimit(limit);
-      setQueriedGranularity(gran);
-      setQueriedMultiDay(multiDay);
-    } catch (e) {
-      message.error(errMsg(e));
-    } finally {
-      setLoading(false);
-    }
-  }, [range, userId, adType, granularity, limit]);
+  // load(目标页, 每页条数):分页与筛选都经它。offset 由 页码×每页 算;场景(feed_scene)随筛选下推后端。
+  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<AdRevenueReport>('/admin/api/ad-revenue-report', {
+          params: {
+            date_from: from,
+            date_to: to,
+            user_id: userId ?? undefined,
+            ad_type: adType ?? undefined,
+            feed_scene: scene ?? undefined,
+            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, userId, adType, scene, granularity, limit, sortBy],
+  );
 
   useEffect(() => {
     load();
@@ -361,13 +405,6 @@ export default function AdRevenueReportPage() {
         return <Tag color={t.color}>{t.label}</Tag>;
       },
     },
-    {
-      title: '广告位ID',
-      dataIndex: 'our_code_id',
-      width: 110,
-      render: (v: string | null) =>
-        v ? <Typography.Text code>{v}</Typography.Text> : <Typography.Text type="secondary">-</Typography.Text>,
-    },
     {
       title: 'eCPM（分）',
       dataIndex: 'ecpm',
@@ -375,6 +412,17 @@ export default function AdRevenueReportPage() {
       align: 'right',
       render: (v: string | null) => v ?? '-',
     },
+    {
+      title: 'eCPM（元）',
+      key: 'ecpm_yuan',
+      width: 100,
+      align: 'right',
+      render: (_: unknown, r: AdRevenueRow) => {
+        // eCPM 原始值单位「分/千次」,÷100 转「元/千次」(块);非数字 / 空显示 -。
+        const cents = r.ecpm == null ? null : Number(r.ecpm);
+        return cents == null || Number.isNaN(cents) ? '-' : (cents / 100).toFixed(2);
+      },
+    },
     {
       title: '预估收益(元)',
       dataIndex: 'revenue_yuan',
@@ -420,6 +468,13 @@ export default function AdRevenueReportPage() {
           <Typography.Text type="secondary">-</Typography.Text>
         ),
     },
+    {
+      title: '广告位ID',
+      dataIndex: 'our_code_id',
+      width: 110,
+      render: (v: string | null) =>
+        v ? <Typography.Text code>{v}</Typography.Text> : <Typography.Text type="secondary">-</Typography.Text>,
+    },
     {
       title: '底层 ADN',
       dataIndex: 'adn',
@@ -429,14 +484,11 @@ export default function AdRevenueReportPage() {
     },
   ];
 
-  // 派生指标(全部基于全量 total_* 字段,不受 limit 截断影响,准):
-  // 平均 eCPM = 收益÷展示×1000;发奖成本(元)= 实发金币÷汇率;预估毛利 = 收益−发奖成本;
-  // 发奖占收益比 = 发奖成本÷收益;应发实发差额(金币)= 应发−实发(正=少发/负=多发)。
+  // 派生指标(全部基于全量 total_* 字段,不受分页影响,准):
+  // 发奖成本(元)= 实发金币÷汇率;预估毛利 = 收益−发奖成本;发奖占收益比 = 发奖成本÷收益;
+  // 应发实发差额(金币)= 应发−实发(正=少发/负=多发);ARPU = 预估收益÷今日DAU(仅今日)。
   const derived = data
     ? {
-        avgEcpm: data.total_impressions
-          ? (data.total_revenue_yuan / data.total_impressions) * 1000
-          : 0,
         payoutYuan: data.total_actual_coin / COIN_PER_YUAN,
         grossProfit: data.total_revenue_yuan - data.total_actual_coin / COIN_PER_YUAN,
         payoutRatioPct:
@@ -444,18 +496,19 @@ 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: data.dau && data.dau > 0 ? data.total_revenue_yuan / data.dau : null,
       }
     : null;
 
-  // 「场景」纯前端过滤:只对已加载的明细 items 生效(后端 query 暂不支持 feed_scene);趋势图/日汇总仍用全量 daily/total_*。
-  const allItems = data?.items ?? [];
-  const filteredItems = scene ? allItems.filter((r) => r.feed_scene === scene) : allItems;
+  // 第二行大盘「分广告类型」:draw / 激励视频 各自 收益 / eCPM / 展示条数;eCPM = 收益÷展示×1000。
+  const drawStat = data?.type_stats?.draw;
+  const rvStat = data?.type_stats?.reward_video;
+  const ecpmOf = (s?: AdRevenueTypeStat) =>
+    s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0;
 
-  // 选中比价/领券且类型=draw 时,给出该场景在已加载明细内的实发金币小计(仅明细口径,可能受 limit 截断)。
-  const sceneCoinSubtotal =
-    adType === 'draw' && (scene === 'comparison' || scene === 'coupon')
-      ? filteredItems.reduce((s, r) => s + (r.has_reward ? r.actual_coin : 0), 0)
-      : null;
+  // 明细直接用后端返回的当前页 items(「场景」已由后端 feed_scene 全局过滤,前端不再二次筛)。
+  const items = data?.items ?? [];
 
   return (
     <div>
@@ -477,6 +530,11 @@ export default function AdRevenueReportPage() {
               「预估收益」为客户端在广告展示(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>
           }
         >
@@ -534,7 +592,6 @@ export default function AdRevenueReportPage() {
               onChange={setScene}
               allowClear
               style={{ width: 130 }}
-              title="仅前端过滤下方明细,不影响趋势图/汇总"
               options={[
                 { value: 'comparison', label: '比价' },
                 { value: 'coupon', label: '领券' },
@@ -557,15 +614,33 @@ export default function AdRevenueReportPage() {
             />
           </Space>
           <Space size={6}>
-            <Typography.Text type="secondary">条数</Typography.Text>
+            <Typography.Text type="secondary">排序</Typography.Text>
             <Select
-              value={limit}
-              onChange={setLimit}
-              style={{ width: 110 }}
-              options={[100, 200, 500, 1000].map((n) => ({ value: n, label: `${n} 条` }))}
+              value={sortBy}
+              onChange={(v) => {
+                setSortBy(v);
+                load(1, limit, v); // 改排序:回第 1 页并重查
+              }}
+              style={{ width: 130 }}
+              options={[
+                { value: 'time', label: '时间倒序' },
+                { value: 'ecpm', label: 'eCPM 倒序' },
+              ]}
             />
           </Space>
-          <Button type="primary" onClick={load} loading={loading}>
+          <Space size={6}>
+            <Typography.Text type="secondary">每页</Typography.Text>
+            <Select
+              value={limit}
+              onChange={(v) => {
+                setLimit(v);
+                load(1, v); // 改每页大小:回到第 1 页并重查
+              }}
+              style={{ width: 120 }}
+              options={[20, 50, 100, 200, 500, 1000].map((n) => ({ value: n, label: `${n} 条/页` }))}
+            />
+          </Space>
+          <Button type="primary" onClick={() => load(1)} loading={loading}>
             查询
           </Button>
         </Space>
@@ -575,41 +650,46 @@ 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 }}>
-              广告展示与收益
+              核心指标
             </Typography.Text>
           </Divider>
           <Row gutter={[16, 12]}>
-            <Col span={6}>
-              <Statistic title="展示条数合计" value={data.total_impressions} />
-            </Col>
-            <Col span={6}>
-              <Statistic title="平均 eCPM(元/千次)" value={derived.avgEcpm} precision={2} />
-            </Col>
-            <Col span={6}>
+            <Col flex="1 1 0">
               <Statistic title="预估收益合计(元)" value={data.total_revenue_yuan} precision={4} />
             </Col>
-            <Col span={6}>
-              <Statistic title="广告事件数" value={data.total} />
-            </Col>
-          </Row>
-          <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
-            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-              发奖与对账
-            </Typography.Text>
-          </Divider>
-          <Row gutter={[16, 12]}>
-            <Col span={6}>
-              <Statistic title="应发金币合计" value={data.total_expected_coin} />
-            </Col>
-            <Col span={6}>
-              <Statistic title="实发金币合计" value={data.total_actual_coin} />
-            </Col>
-            <Col span={6}>
-              <Statistic title="发奖成本(元)" value={derived.payoutYuan} precision={4} />
-            </Col>
-            <Col span={6}>
+            <Col flex="1 1 0">
               <Statistic
-                title="预估毛利(元)"
+                title={
+                  <Tooltip title="每活跃用户广告预估收入 = 预估收益 ÷ 今日 DAU;DAU 仅今日口径,历史/多天显示 -">
+                    <span>
+                      ARPU(今日)
+                      <InfoCircleOutlined style={{ marginLeft: 4 }} />
+                    </span>
+                  </Tooltip>
+                }
+                value={derived.arpu ?? '-'}
+                precision={4}
+              />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic
+                title={
+                  <Tooltip title="今日活跃用户(复用大盘口径 last_login_at = 今日登录过);仅查询=今日时有值,历史/多天显示 -">
+                    <span>
+                      今日活跃 DAU
+                      <InfoCircleOutlined style={{ marginLeft: 4 }} />
+                    </span>
+                  </Tooltip>
+                }
+                value={data.dau ?? '-'}
+              />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic title="发放金币合计(元)" value={derived.payoutYuan} precision={4} />
+            </Col>
+            <Col flex="1 1 0">
+              <Statistic
+                title="预估广告毛利(元)"
                 value={derived.grossProfit}
                 precision={4}
                 prefix={derived.grossProfit >= 0 ? <RiseOutlined /> : <FallOutlined />}
@@ -621,6 +701,94 @@ 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 }}>
+              分广告类型
+            </Typography.Text>
+          </Divider>
+          <Row gutter={[16, 12]}>
+            <Col span={4}>
+              <Statistic title="Draw 信息流收益(元)" value={drawStat?.revenue_yuan ?? 0} precision={4} />
+            </Col>
+            <Col span={4}>
+              <Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawStat)} precision={2} />
+            </Col>
+            <Col span={4}>
+              <Statistic title="Draw 信息流条数" value={drawStat?.impressions ?? 0} />
+            </Col>
+            <Col span={4}>
+              <Statistic title="激励视频收益(元)" value={rvStat?.revenue_yuan ?? 0} precision={4} />
+            </Col>
+            <Col span={4}>
+              <Statistic title="激励视频 eCPM(元/千次)" value={ecpmOf(rvStat)} precision={2} />
+            </Col>
+            <Col span={4}>
+              <Statistic title="激励视频条数" value={rvStat?.impressions ?? 0} />
+            </Col>
+          </Row>
         </Card>
       )}
 
@@ -637,36 +805,13 @@ export default function AdRevenueReportPage() {
           ) : (
             <Alert type="success" showIcon message={`共 ${data.total} 条广告事件,应发与实发全部一致。`} />
           )}
-          {data.truncated && (
-            <Alert
-              type="warning"
-              showIcon
-              message={`明细已截断到 ${queriedLimit} 条,还有更多未显示——请按用户/类型/日期缩小范围,或调大「条数」。合计数字不受影响。`}
-            />
-          )}
-          {sceneCoinSubtotal != null && (
-            <Alert
-              type="info"
-              showIcon
-              message={
-                <span>
-                  当前已加载明细中,
-                  <Tag color={SCENE_TAG[scene!].color} style={{ marginInline: 4 }}>
-                    {SCENE_TAG[scene!].text}
-                  </Tag>
-                  Draw 信息流 实发金币小计 <b>{sceneCoinSubtotal}</b>(共 {filteredItems.length} 条;
-                  仅明细口径,若已截断可能偏少;上方汇总/趋势仍为全量)。
-                </span>
-              }
-            />
-          )}
         </Space>
       )}
 
       {data &&
         (queriedMultiDay
           ? (data.daily?.length ?? 0) > 0
-          : queriedGranularity === 'hour' && (data.items?.length ?? 0) > 0) && (
+          : queriedGranularity === 'hour' && (data.hourly?.length ?? 0) > 0) && (
         <Card
           size="small"
           title={queriedMultiDay ? '按天趋势' : '按小时趋势'}
@@ -696,32 +841,30 @@ 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>
           }
         >
-          {/* 趋势图与日汇总恒为全量:按天图用 daily(全量),按小时图用全量 items;「场景」前端过滤只作用于下方明细表,不影响此图。 */}
-          {!queriedMultiDay && data.truncated && (
-            <Alert
-              type="warning"
-              showIcon
-              style={{ marginBottom: 12 }}
-              message={`图表按小时聚合的是已截断到 ${queriedLimit} 组的明细,可能少算——调大「条数」或缩小筛选可还原真实趋势。`}
-            />
-          )}
-          {scene && (
-            <Alert
-              type="info"
-              showIcon
-              style={{ marginBottom: 12 }}
-              message="趋势图为全量数据,不随「场景」筛选变化;场景过滤仅作用于下方明细表与其金币小计。"
-            />
-          )}
+          {/* 趋势图恒为全量(不受分页影响):按天图用 daily,按小时图用 hourly;「场景」已下推后端,趋势随场景筛选一并变化。 */}
           {queriedMultiDay ? (
             <TrendChart points={aggregateDaily(data.date_from, data.date_to, data.daily)} />
           ) : (
-            <TrendChart points={aggregateHourly(data.items)} />
+            <TrendChart points={aggregateHourly(data.hourly)} />
           )}
         </Card>
       )}
@@ -729,15 +872,22 @@ export default function AdRevenueReportPage() {
       <Table
         rowKey="event_key"
         columns={columns}
-        dataSource={filteredItems}
+        dataSource={items}
         loading={loading}
-        pagination={false}
+        pagination={{
+          current: page,
+          pageSize: queriedLimit,
+          total: data?.total ?? 0,
+          showSizeChanger: false,
+          showTotal: (t) => `共 ${t} 条`,
+          onChange: (p) => load(p, queriedLimit),
+        }}
         size="small"
-        scroll={{ x: 1280 }}
+        scroll={{ x: 1380 }}
         rowClassName={(r) => (r.has_reward && !r.matched ? 'row-mismatch' : '')}
         expandable={{
-          // 只有发了奖的事件可展开,看「这条广告金币怎么算的」;纯展示行无复算、不可展开。
-          rowExpandable: (r) => r.reward_detail != null,
+          // 每行都可展开(左侧恒有 + 号):有发奖看「金币复算因子」;纯展示看「展示明细」。
+          rowExpandable: () => true,
           expandedRowRender: (r) =>
             r.reward_detail ? (
               <div>
@@ -756,7 +906,28 @@ export default function AdRevenueReportPage() {
                   rowClassName={(d) => (d.matched ? '' : 'row-mismatch')}
                 />
               </div>
-            ) : null,
+            ) : (
+              <div>
+                <Typography.Text strong>展示明细</Typography.Text>{' '}
+                <Typography.Text type="secondary">(纯展示事件,未单独发奖,无金币复算)</Typography.Text>
+                <Descriptions size="small" column={3} bordered style={{ marginTop: 8 }}>
+                  <Descriptions.Item label="时间">{formatUtcTime(r.created_at)}</Descriptions.Item>
+                  <Descriptions.Item label="eCPM（分）">{r.ecpm ?? '-'}</Descriptions.Item>
+                  <Descriptions.Item label="eCPM（元）">
+                    {r.ecpm != null && !Number.isNaN(Number(r.ecpm))
+                      ? (Number(r.ecpm) / 100).toFixed(2)
+                      : '-'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="预估收益(元)">
+                    {r.has_impression ? r.revenue_yuan.toFixed(4) : '-'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="底层 ADN">{r.adn ?? '-'}</Descriptions.Item>
+                  <Descriptions.Item label="底层代码位(rit)">{r.slot_id ?? '-'}</Descriptions.Item>
+                  <Descriptions.Item label="我方代码位">{r.our_code_id ?? '-'}</Descriptions.Item>
+                  <Descriptions.Item label="来源应用">{r.app_env ?? '-'}</Descriptions.Item>
+                </Descriptions>
+              </div>
+            ),
         }}
       />
       <Modal
@@ -772,7 +943,7 @@ export default function AdRevenueReportPage() {
         <Typography.Paragraph type="secondary" style={{ fontSize: 13 }}>
           · eCPM 取自穿山甲 SDK <Typography.Text code>getEcpm()</Typography.Text> 原值,单位「分/千次展示」,计算时 ÷100 转元;单次收益按「每千次 ÷1000」折到每次。
           <br />· 金币汇率:<b>1 元 ＝ {COIN_PER_YUAN.toLocaleString()} 金币</b>,最终四舍五入取整。
-          <br />· 因子2「LT 累计条数」按该账号累计第几条计(不按天重置);激励视频每次 1 条,信息流每满 10 秒折 1 条。
+          <br />· 因子2「LT 累计条数」按该账号累计第几条计(不按天重置);<b>一条广告 = 1 条</b>(激励视频每次 1 条;信息流看满 10 秒即发该条满额,不按时长折多份)。
           <br />· 本表与发奖后端同源,本页「应发金币」即按此复算并与「实发金币」对账。
         </Typography.Paragraph>
         <Row gutter={16}>

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

@@ -49,7 +49,7 @@ interface PreviewItem {
 
 const yuan = (cents: number) => (cents / 100).toFixed(2);
 
-/** 首页轮播「种子」管理(真实记录不足时的兜底假数据,现为「生成规则」)。「数据大盘」页的一个区块。 */
+/** 首页轮播「种子」管理(真实记录不足时的兜底假数据,现为「生成规则」)。「系统配置 / 首页」里的一个区块。 */
 export default function HomeMarqueeSeeds() {
   const { message } = App.useApp();
   const [seeds, setSeeds] = useState<Seed[]>([]);

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

@@ -246,7 +246,7 @@ function buildBody(metric: string, e: Edit, immediate: boolean): Record<string,
   return body;
 }
 
-/** 首页三门面数字(帮助用户/完成比价/累计节省)的展示模式配置。作为「数据大盘」页的一个区块。 */
+/** 首页三门面数字(帮助用户/完成比价/累计节省)的展示模式配置。「系统配置 / 首页」里的一个区块。 */
 export default function HomeStatsConfig() {
   const { message, modal } = App.useApp();
   const [items, setItems] = useState<StatItem[]>([]);

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

@@ -1,8 +1,11 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { App, Button, Card, Input, InputNumber, Space, Spin, Switch, Tag, Tooltip } from 'antd';
+import { App, Button, Card, Input, InputNumber, Space, Spin, Switch, Tabs, Tag, Tooltip } from 'antd';
 import { api, errMsg } from '@/lib/api';
+import HomeMarqueeSeeds from './HomeMarqueeSeeds';
+import HomeStatsConfig from './HomeStatsConfig';
+import FeedbackQrConfig from './FeedbackQrConfig';
 
 interface ConfigItem {
   key: string;
@@ -80,9 +83,66 @@ export default function ConfigPage() {
     }
   };
 
-  if (loading) return <Spin style={{ display: 'block', marginTop: 80 }} />;
-
   const groups = [...new Set(items.map((i) => i.group))];
+  const welfareConfig = loading ? (
+    <Spin style={{ display: 'block', marginTop: 24 }} />
+  ) : (
+    groups.map((g) => (
+      <Card key={g} title={g} size="small" style={{ marginBottom: 16 }}>
+        {items
+          .filter((i) => i.group === g)
+          .map((item) => (
+            <div
+              key={item.key}
+              style={{ marginBottom: 12, paddingBottom: 12, borderBottom: '1px solid #f0f0f0' }}
+            >
+              <div style={{ marginBottom: 4 }}>
+                <b>{item.label}</b> {item.overridden ? <Tag color="blue">已改</Tag> : <Tag>默认</Tag>}
+                {item.help && (
+                  <Tooltip title={item.help}>
+                    <span style={{ color: '#999', marginLeft: 6, fontSize: 12, cursor: 'help' }}>
+                      ⓘ
+                    </span>
+                  </Tooltip>
+                )}
+              </div>
+              <Space wrap>
+                {item.type === 'bool' ? (
+                  <Switch
+                    checked={!!edits[item.key]}
+                    onChange={(v) => setEdits({ ...edits, [item.key]: v })}
+                  />
+                ) : item.type === 'int' ? (
+                  <InputNumber
+                    value={edits[item.key]}
+                    onChange={(v) => setEdits({ ...edits, [item.key]: v })}
+                    style={{ width: 180 }}
+                  />
+                ) : (
+                  <Input
+                    value={edits[item.key]}
+                    onChange={(e) => setEdits({ ...edits, [item.key]: e.target.value })}
+                    style={{ width: 380 }}
+                    placeholder={
+                      item.type === 'int_list' ? '逗号分隔,如 10, 20, 30' : 'JSON,如 {"key": 100}'
+                    }
+                  />
+                )}
+                <Button
+                  type="primary"
+                  size="small"
+                  loading={saving === item.key}
+                  onClick={() => save(item)}
+                >
+                  保存
+                </Button>
+                <span style={{ color: '#bbb', fontSize: 12 }}>默认 {JSON.stringify(item.default)}</span>
+              </Space>
+            </div>
+          ))}
+      </Card>
+    ))
+  );
 
   return (
     <div>
@@ -90,64 +150,22 @@ export default function ConfigPage() {
       <p style={{ color: '#999' }}>
         改完即生效(业务下次读取用新值)。涉及金额 / 上限,改前请确认。每次改动都进审计日志。
       </p>
-      {groups.map((g) => (
-        <Card key={g} title={g} size="small" style={{ marginBottom: 16 }}>
-          {items
-            .filter((i) => i.group === g)
-            .map((item) => (
-              <div
-                key={item.key}
-                style={{ marginBottom: 12, paddingBottom: 12, borderBottom: '1px solid #f0f0f0' }}
-              >
-                <div style={{ marginBottom: 4 }}>
-                  <b>{item.label}</b>{' '}
-                  {item.overridden ? <Tag color="blue">已改</Tag> : <Tag>默认</Tag>}
-                  {item.help && (
-                    <Tooltip title={item.help}>
-                      <span style={{ color: '#999', marginLeft: 6, fontSize: 12, cursor: 'help' }}>
-                        ⓘ
-                      </span>
-                    </Tooltip>
-                  )}
-                </div>
-                <Space wrap>
-                  {item.type === 'bool' ? (
-                    <Switch
-                      checked={!!edits[item.key]}
-                      onChange={(v) => setEdits({ ...edits, [item.key]: v })}
-                    />
-                  ) : item.type === 'int' ? (
-                    <InputNumber
-                      value={edits[item.key]}
-                      onChange={(v) => setEdits({ ...edits, [item.key]: v })}
-                      style={{ width: 180 }}
-                    />
-                  ) : (
-                    <Input
-                      value={edits[item.key]}
-                      onChange={(e) => setEdits({ ...edits, [item.key]: e.target.value })}
-                      style={{ width: 380 }}
-                      placeholder={
-                        item.type === 'int_list' ? '逗号分隔,如 10, 20, 30' : 'JSON,如 {"key": 100}'
-                      }
-                    />
-                  )}
-                  <Button
-                    type="primary"
-                    size="small"
-                    loading={saving === item.key}
-                    onClick={() => save(item)}
-                  >
-                    保存
-                  </Button>
-                  <span style={{ color: '#bbb', fontSize: 12 }}>
-                    默认 {JSON.stringify(item.default)}
-                  </span>
-                </Space>
-              </div>
-            ))}
-        </Card>
-      ))}
+      <Tabs
+        items={[
+          {
+            key: 'home',
+            label: '首页',
+            children: (
+              <>
+                <HomeStatsConfig />
+                <HomeMarqueeSeeds />
+              </>
+            ),
+          },
+          { key: 'welfare', label: '福利页', children: welfareConfig },
+          { key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
+        ]}
+      />
     </div>
   );
 }

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';
 
@@ -153,7 +153,7 @@ 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>
             <Paragraph style={{ whiteSpace: 'pre-wrap', marginTop: 8, marginBottom: 8 }}>
               {feedback.content || '-'}
@@ -185,7 +185,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' && (
@@ -292,7 +292,7 @@ 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)}
                     </div>

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 FeedbackQrConfig from './FeedbackQrConfig';
+import type { Feedback, FeedbackSummary } from '@/lib/types';
 import FeedbackHandleDrawer from './FeedbackHandleDrawer';
+import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 
 const { Text, Paragraph } = Typography;
 const { RangePicker } = DatePicker;
@@ -41,6 +44,75 @@ 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>;
+};
+
+// 审核结果展示(采纳=金币+批注 / 未采纳=原因 / 待审核=-),主表与「该用户全部反馈」抽屉共用
+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}
+      </Space>
+    );
+  }
+  if (f.status === 'rejected') {
+    return (
+      <Text type="secondary" style={{ fontSize: 12 }} ellipsis>
+        未采纳:{f.reject_reason || '-'}
+      </Text>
+    );
+  }
+  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: '内容',
+    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>();
@@ -58,6 +130,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,6 +151,10 @@ 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,
@@ -104,8 +193,41 @@ 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: '提交版本号',
+      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 +267,20 @@ export default function FeedbacksPage() {
           <Text type="secondary">无</Text>
         ),
     },
-    {
-      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: '状态', dataIndex: 'status', width: 90, render: statusTag },
     {
       title: '审核结果',
       key: 'review',
       width: 170,
-      render: (_: unknown, 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}
-            </Space>
-          );
-        }
-        if (f.status === 'rejected') {
-          return (
-            <Text type="secondary" style={{ fontSize: 12 }} ellipsis>
-              未采纳:{f.reject_reason || '-'}
-            </Text>
-          );
-        }
-        return <Text type="secondary">-</Text>;
-      },
+      render: (_: unknown, f: Feedback) => renderReview(f),
     },
     {
-      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 +297,21 @@ export default function FeedbacksPage() {
 
   return (
     <div>
-      <h2>反馈工单</h2>
-      <FeedbackQrConfig />
+      <h2>用户反馈</h2>
+      <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="状态"
@@ -261,13 +367,27 @@ export default function FeedbacksPage() {
           onChange: onPageChange,
         }}
         onChange={onTableChange}
+        scroll={{ x: 1610 }}
       />
 
       <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

@@ -32,9 +32,9 @@ const MENU = [
   { key: '/devices', icon: <MobileOutlined />, label: '设备管理' },
   { key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
   { key: '/withdraws', icon: <MoneyCollectOutlined />, label: '提现管理' },
-  { key: '/price-reports', icon: <FlagOutlined />, label: '上报审核' },
+  { key: '/price-reports', icon: <FlagOutlined />, label: '低价审核' },
   { key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
-  { key: '/feedbacks', icon: <MessageOutlined />, label: '反馈工单' },
+  { key: '/feedbacks', icon: <MessageOutlined />, label: '用户反馈' },
   { key: '/ad-revenue', icon: <NotificationOutlined />, label: '广告配置' },
   { key: '/ad-revenue-report', icon: <BarChartOutlined />, label: '广告收益' },
   { key: '/cps', icon: <ShareAltOutlined />, label: 'CPS 分发' },

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) => (
-        <Space direction="vertical" size={0}>
-          <Text>{r.store_name || '-'}</Text>
-          <Text type="secondary" style={{ fontSize: 12 }}>
-            {r.dish_summary || '-'}
-          </Text>
-        </Space>
-      ),
+      render: (_: unknown, r: PriceReport) => renderStore(r),
     },
     {
       title: '原最低价 → 上报价',
       key: 'price',
       width: 220,
-      render: (_: unknown, 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>
-      ),
+      render: (_: unknown, r: PriceReport) => renderPrice(r),
     },
     {
       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 (!canReview) return <Text type="secondary">无审核权限</Text>;
-          return (
-            <Space>
-              <Button
-                size="small"
-                type="link"
-                icon={<CheckCircleOutlined />}
-                onClick={() => approve(r)}
-              >
-                通过
-              </Button>
-              <Button
-                size="small"
-                type="link"
-                danger
-                icon={<CloseCircleOutlined />}
-                onClick={() => {
-                  setRejecting(r);
-                  setRejectReason('');
-                }}
-              >
-                拒绝
-              </Button>
-            </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>;
+        if (r.status !== 'pending') return <Text type="secondary">-</Text>;
+        if (!canReview) return <Text type="secondary">无审核权限</Text>;
+        return (
+          <Space>
+            <Button
+              size="small"
+              type="link"
+              icon={<CheckCircleOutlined />}
+              onClick={() => approve(r)}
+            >
+              通过
+            </Button>
+            <Button
+              size="small"
+              type="link"
+              danger
+              icon={<CloseCircleOutlined />}
+              onClick={() => {
+                setRejecting(r);
+                setRejectReason('');
+              }}
+            >
+              拒绝
+            </Button>
+          </Space>
+        );
       },
     },
   ];
@@ -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 && (
-        <Space size="large" style={{ marginBottom: 16 }}>
-          <Statistic title="待审核" value={summary.pending} valueStyle={{ color: '#faad14' }} />
-          <Statistic title="已通过" value={summary.approved} valueStyle={{ color: '#52c41a' }} />
-          <Statistic title="已拒绝" value={summary.rejected} />
-          <Statistic title="合计" value={summary.total} />
-        </Space>
-      )}
+      <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?.approved ?? 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>
 
       <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/components/UserRecordsDrawer.tsx

@@ -0,0 +1,111 @@
+'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)
+}
+
+export default function UserRecordsDrawer<T extends { id: number }>({
+  open,
+  onClose,
+  userId,
+  phone,
+  endpoint,
+  columns,
+  recordLabel,
+  countLabel,
+  rewardLabel,
+  rewardOf,
+}: 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="金币" />
+          </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

@@ -247,6 +247,22 @@ export interface Feedback {
   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 意见反馈页同步)。
@@ -365,15 +381,32 @@ export interface AdRevenueRecord {
   matched: boolean;
 }
 
-// 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受 limit 影响)
+// 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)
 export interface AdRevenueDaily {
   date: string; // 北京时间 YYYY-MM-DD
   impressions: 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;
+}
+
+// 广告收益报表:按北京小时(0–23)汇总的一小时(按小时趋势图用;全量,不受分页影响;按天查询时为空)
+export interface AdRevenueHourly {
+  hour: number; // 北京时间小时 0–23
+  impressions: number;
   revenue_yuan: number;
   expected_coin: number;
   actual_coin: number;
 }
 
+// 广告收益报表:按广告类型(ad_type)的小计(展示条数 + 预估收益;eCPM 前端用 收益÷展示×1000 算)
+export interface AdRevenueTypeStat {
+  impressions: number; // 该类型展示条数合计
+  revenue_yuan: number; // 该类型预估收益合计(元)
+}
+
 // 广告收益报表:一次广告事件(逐条一行)。激励视频展示+发奖按 ad_session_id 合并;信息流展示/发奖各自成行。
 export interface AdRevenueRow {
   event_key: string; // 事件稳定唯一键(前端 rowKey)
@@ -406,10 +439,22 @@ export interface AdRevenueReport {
   date_from: string; // 起始日 北京时间 YYYY-MM-DD
   date_to: string; // 结束日 北京时间 YYYY-MM-DD(闭区间;单日时与 date_from 相同)
   daily: AdRevenueDaily[]; // 按日期汇总序列(全量,供按天趋势图)
-  total: number; // 广告事件总数(全量,不受 limit 影响)
-  truncated: boolean;
+  hourly: AdRevenueHourly[]; // 按小时汇总序列(全量,供按小时趋势图;按天查询时为空)
+  type_stats: Record<string, AdRevenueTypeStat>; // 按广告类型小计;前端取 draw / reward_video
+  // 可选:后端预聚合的「按广告类型」富小计(含发放金币明细)。当前后端未下发 → 数据大盘页
+  // (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; // 今日活跃(复用大盘 last_login_at);仅查询=今日时有值,否则 null
+  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; // 应发≠实发的发奖条数
@@ -425,7 +470,17 @@ export interface DashboardOverview {
     new_today: number;
     dau: number;
   };
-  coins: { granted_total: 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;
+  };
   cash: {
     withdraw_success_cents: number;
     withdraw_pending_count: number;
@@ -433,8 +488,55 @@ 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;
+    users: {
+      new: number;
+      active: number;
+      retained_new_users: number;
+      retention_rate: number | null;
+      retention_note: string;
+    };
+    comparison: {
+      total: number;
+      success: number;
+      success_rate: number;
+      ordered: number;
+      average_duration_ms: number | null;
+      average_saved_cents: number | null;
+    };
+    coins: {
+      granted_total: number;
+      reward_video_coin_total: number;
+      feed_ad_coin_total: number;
+      signin_coin_total: number;
+      signin_boost_coin_total: number;
+      task_coin_total: number;
+      coupon_reward_coin_total: number;
+      comparison_reward_coin_total: number;
+      regular_task_coin_total: number;
+    };
+    cash: { withdraw_success_cents: number };
+    trend: {
+      date: string;
+      active_users: number;
+      new_users: number;
+      comparisons: number;
+    }[];
+  };
   feedback: { new: number };
-  cps: { available: boolean; note: string };
+  cps: {
+    available: boolean;
+    note: string;
+    meituan_order_count: number;
+    meituan_commission_cents: number;
+    meituan_hit_count: number;
+    meituan_miss_count: number;
+    meituan_unknown_rate_count: number;
+    meituan_hit_rate: number | null;
+  };
 }
 
 export interface PriceReport {
@@ -455,6 +557,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 {