功能：展示比价记录是否下单

在比价记录的省金额列后新增是否下单列，并同步接口类型。

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

@@ -9,7 +9,6 @@ import {
   Card,
   Col,
   DatePicker,
-  Descriptions,
   Divider,
   InputNumber,
   Modal,
@@ -43,6 +42,8 @@ import type {
 import UserAdRevenueDrawer from './UserAdRevenueDrawer';
 
 const { RangePicker } = DatePicker;
+const DEFAULT_PAGE_SIZE = 50;
+const ALL_FILTER_VALUE = '__all__';
 
 // 广告类型标签
 const TYPE_TAG: Record<string, { color: string; label: string }> = {
@@ -190,7 +191,63 @@ const LT_FACTOR_ROWS = [
   { key: '5', lt: '第 11 条及以后', factor: 1.0 },
 ];
 
-type AdRevenueDetailRow = AdRevenueRecord & { source_adn?: string | null };
+type AdRevenueDetailRow = AdRevenueRecord & {
+  source_adn?: string | null;
+  is_impression_only?: boolean;
+};
+
+const FORMULA_EMPTY_STATUS_LABEL: Record<string, string> = {
+  capped: '次数超限',
+  ecpm_missing: 'eCPM 缺失',
+  too_short: '观看时长不足',
+  closed_early: '提前关闭',
+  impression_only: '仅展示',
+};
+
+// 未发奖记录用可读状态代替空值，避免误认为数据丢失；悬停时说明为何没有计算因子。
+function renderFormulaValue(value: string | number, row: AdRevenueDetailRow) {
+  if (value !== '-') return value;
+  const isGrantedButMissing = row.status === 'granted';
+  const reason = isGrantedButMissing
+    ? '该记录标记为已发奖，但计算因子缺失，需要进一步排查'
+    : row.is_impression_only
+      ? '该记录只有广告展示，没有对应发奖记录'
+      : REWARD_STATUS_HINT[row.status] ?? `发奖状态为 ${row.status || '未知'}`;
+  const statusLabel = isGrantedButMissing
+    ? '计算数据缺失'
+    : (FORMULA_EMPTY_STATUS_LABEL[row.status] ?? row.status) || '未进入计算';
+  return (
+    <Tooltip
+      title={isGrantedButMissing
+        ? reason
+        : `${reason}；未进入金币计算，不占用 LT 累计条数，因此不展示因子。`}
+    >
+      <span>{statusLabel}</span>
+    </Tooltip>
+  );
+}
+
+function impressionOnlyDetail(row: AdRevenueRow): AdRevenueDetailRow {
+  return {
+    record_id: 0,
+    created_at: row.created_at,
+    status: 'impression_only',
+    ecpm: row.ecpm,
+    ecpm_factor: null,
+    units: 0,
+    lt_index_start: null,
+    lt_index_end: null,
+    lt_factor_start: null,
+    lt_factor_end: null,
+    expected_coin: 0,
+    actual_coin: 0,
+    matched: true,
+    adn: row.adn,
+    slot_id: row.slot_id,
+    source_adn: row.adn,
+    is_impression_only: true,
+  };
+}
 
 // 展开行(逐条事件展开)- 该条的发奖复算明细(还原金币审计的 eCPM/因子1/份数/LT/因子2 等列)
 const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
@@ -217,18 +274,25 @@ const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
     render: (v: string | null) => (v == null || Number.isNaN(Number(v)) ? '-' : (Number(v) / 100 / 1000).toFixed(4)),
   },
   { title: '实发金币数', dataIndex: 'actual_coin', width: 100 },
-  { title: '因子1', dataIndex: 'ecpm_factor', width: 70, render: (v: number | null) => v ?? '-' },
+  {
+    title: '因子1',
+    dataIndex: 'ecpm_factor',
+    width: 70,
+    render: (v: number | null, row: AdRevenueDetailRow) => renderFormulaValue(v ?? '-', row),
+  },
   {
     title: '因子2',
     key: 'lt_factor',
     width: 90,
-    render: (_: unknown, r: AdRevenueDetailRow) => fmtFactorRange(r.lt_factor_start, r.lt_factor_end),
+    render: (_: unknown, row: AdRevenueDetailRow) =>
+      renderFormulaValue(fmtFactorRange(row.lt_factor_start, row.lt_factor_end), row),
   },
   {
     title: 'LT累计条数',
     key: 'lt_index',
     width: 100,
-    render: (_: unknown, r: AdRevenueDetailRow) => fmtIndexRange(r.lt_index_start, r.lt_index_end),
+    render: (_: unknown, row: AdRevenueDetailRow) =>
+      renderFormulaValue(fmtIndexRange(row.lt_index_start, row.lt_index_end), row),
   },
 ];
 
@@ -396,13 +460,13 @@ export default function AdRevenueReportPage() {
   const [scene, setScene] = useState<string | undefined>();
   const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
   const [sortBy, setSortBy] = useState<'time' | 'ecpm'>('time'); // 明细排序:time=时间倒序 / ecpm=eCPM 倒序
-  const [limit, setLimit] = useState<number>(1000); // 默认拉满接口单页上限，供单次流程广告数分位统计
+  const [limit, setLimit] = useState<number>(DEFAULT_PAGE_SIZE);
   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);
   const [allFlowItems, setAllFlowItems] = useState<AdRevenueRow[]>([]);
-  const [queriedLimit, setQueriedLimit] = useState<number>(1000);
+  const [queriedLimit, setQueriedLimit] = useState<number>(DEFAULT_PAGE_SIZE);
   const [loading, setLoading] = useState(false);
   const [formulaOpen, setFormulaOpen] = useState(false);
   // 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
@@ -670,9 +734,17 @@ export default function AdRevenueReportPage() {
         : data.date_from
       : `${data.date_from} ~ ${data.date_to}`;
 
-  // 第二行大盘「分广告类型」:draw / 激励视频 各自 收益 / eCPM / 展示条数;eCPM = 收益÷展示×1000。
+  // 第二行大盘「分广告类型」：看视频包含福利视频与提现视频；
+  // eCPM 使用合并后的总收益 ÷ 总展示数 × 1000，避免只读取 reward_video 而漏算提现视频。
   const drawStat = data?.type_stats?.draw;
-  const rvStat = data?.type_stats?.reward_video;
+  const rewardVideoStat = data?.type_stats?.reward_video;
+  const withdrawalVideoStat = data?.type_stats?.withdrawal_video;
+  const videoStat: AdRevenueTypeStat = {
+    impressions:
+      (rewardVideoStat?.impressions ?? 0) + (withdrawalVideoStat?.impressions ?? 0),
+    revenue_yuan:
+      (rewardVideoStat?.revenue_yuan ?? 0) + (withdrawalVideoStat?.revenue_yuan ?? 0),
+  };
   const ecpmOf = (s?: AdRevenueTypeStat) =>
     s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0;
 
@@ -784,12 +856,11 @@ export default function AdRevenueReportPage() {
           <Space size={6}>
             <Typography.Text type="secondary">类型</Typography.Text>
             <Select
-              placeholder="全部"
-              value={adType}
-              onChange={setAdType}
-              allowClear
+              value={adType ?? ALL_FILTER_VALUE}
+              onChange={(value) => setAdType(value === ALL_FILTER_VALUE ? undefined : value)}
               style={{ width: 150 }}
               options={[
+                { value: ALL_FILTER_VALUE, label: '全部' },
                 { value: 'reward_video', label: '看视频' },
                 { value: 'draw', label: 'Draw 信息流' },
                 { value: 'withdrawal_video', label: '提现看视频' },
@@ -799,12 +870,11 @@ export default function AdRevenueReportPage() {
           <Space size={6}>
             <Typography.Text type="secondary">场景</Typography.Text>
             <Select
-              placeholder="全部"
-              value={scene}
-              onChange={setScene}
-              allowClear
+              value={scene ?? ALL_FILTER_VALUE}
+              onChange={(value) => setScene(value === ALL_FILTER_VALUE ? undefined : value)}
               style={{ width: 130 }}
               options={[
+                { value: ALL_FILTER_VALUE, label: '全部' },
                 { value: 'comparison', label: '比价' },
                 { value: 'coupon', label: '领券' },
                 { value: 'welfare', label: '福利' },
@@ -996,13 +1066,13 @@ export default function AdRevenueReportPage() {
               <Statistic title="Draw 信息流条数" value={drawStat?.impressions ?? 0} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频收益(元)" value={rvStat?.revenue_yuan ?? 0} precision={4} />
+              <Statistic title="看视频收益(元)" value={videoStat.revenue_yuan} precision={4} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(rvStat)} precision={2} />
+              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoStat)} precision={2} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频条数" value={rvStat?.impressions ?? 0} />
+              <Statistic title="看视频条数" value={videoStat.impressions} />
             </Col>
           </Row>
           <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
@@ -1142,24 +1212,19 @@ export default function AdRevenueReportPage() {
               </div>
             ) : (
               <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>
+                <Typography.Text strong>本次广告逐条明细</Typography.Text>{' '}
+                <Typography.Text type="secondary">
+                  (共 1 条 · 应发 0 / 实发 0；仅展示，未单独发奖)
+                </Typography.Text>
+                <Table<AdRevenueDetailRow>
+                  style={{ marginTop: 8 }}
+                  rowKey="record_id"
+                  columns={DETAIL_COLUMNS}
+                  dataSource={[impressionOnlyDetail(r)]}
+                  pagination={false}
+                  size="small"
+                  scroll={{ x: 900 }}
+                />
               </div>
             ),
         }}

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

@@ -237,9 +237,9 @@ export default function ComparisonRecordsPage() {
       key: 'user',
       width: 140,
       render: (_, r) => (
-        <div>
+        <div style={{ color: '#1677ff' }}>
           <div>{r.phone || `#${r.user_id}`}</div>
-          {r.nickname && <div style={{ color: '#999', fontSize: 12 }}>{r.nickname}</div>}
+          {r.nickname && <div style={{ fontSize: 12 }}>{r.nickname}</div>}
         </div>
       ),
     },
@@ -298,6 +298,14 @@ export default function ComparisonRecordsPage() {
           <b style={{ color: r.saved_amount_cents > 0 ? '#3f8600' : '#999' }}>{yuan(r.saved_amount_cents)}</b>
         ),
     },
+    {
+      title: '是否下单',
+      dataIndex: 'ordered',
+      width: 84,
+      render: (ordered: boolean) => (
+        <Tag color={ordered ? 'green' : 'default'}>{ordered ? '已下单' : '未下单'}</Tag>
+      ),
+    },
     { title: 'LLM', dataIndex: 'llm_call_count', width: 56, render: (v) => v ?? '-' },
     {
       title: 'TOKEN',

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

@@ -122,13 +122,31 @@ const renderReview = (f: Feedback) => {
 
 // 机型 / OS版本(提交反馈时的端环境;改版前历史反馈无 → -)
 const renderDeviceOs = (f: Feedback) => {
-  const os = [f.android_version ? `Android ${f.android_version}` : null, f.rom_name]
+  const modelName = f.device_model_name || f.device_model;
+  const rawModel =
+    f.device_model_name && f.device_model_name !== f.device_model ? f.device_model : null;
+  const romHasVersion = /\d/.test(f.rom_name || '');
+  const vendorOs = [
+    f.rom_name,
+    f.rom_version && !romHasVersion ? f.rom_version : null,
+  ]
+    .filter(Boolean)
+    .join(' ');
+  const os = [
+    vendorOs || null,
+    f.android_version ? `Android ${f.android_version}` : null,
+  ]
     .filter(Boolean)
     .join(' · ');
-  if (!f.device_model && !os) return <Text type="secondary">-</Text>;
+  if (!modelName && !os) return <Text type="secondary">-</Text>;
   return (
     <Space direction="vertical" size={0}>
-      <Text>{f.device_model || '-'}</Text>
+      <Text>{modelName || '-'}</Text>
+      {rawModel ? (
+        <Text type="secondary" style={{ fontSize: 12 }}>
+          {[f.device_manufacturer, rawModel].filter(Boolean).join(' · ')}
+        </Text>
+      ) : null}
       {os ? (
         <Text type="secondary" style={{ fontSize: 12 }}>
           {os}
@@ -352,7 +370,7 @@ export default function FeedbacksPage() {
     {
       title: '机型 / OS版本',
       key: 'device',
-      width: 150,
+      width: 180,
       render: (_: unknown, f: Feedback) => renderDeviceOs(f),
     },
     {

src/app/(main)/layout.tsx

@@ -91,6 +91,7 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/users', icon: <UserOutlined />, label: '用户管理' },
     ],
   },
+  { key: '/admins', icon: <TeamOutlined />, label: '权限管理' },
   {
     key: 'monitoring-audit',
     icon: <FileSearchOutlined />,
@@ -103,7 +104,6 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
     ],
   },
-  { key: '/admins', icon: <TeamOutlined />, label: '权限管理' },
 ];
 
 // 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐
@@ -223,8 +223,7 @@ export default function MainLayout({ children }: { children: React.ReactNode })
           position: 'sticky',
           top: 0,
           height: '100vh',
-          overflowY: 'auto',
-          overflowX: 'hidden',
+          overflow: 'hidden',
         }}
       >
         <nav className={`side-nav${collapsed ? ' side-nav-collapsed' : ''}`} aria-label="后台导航">
@@ -314,8 +313,19 @@ export default function MainLayout({ children }: { children: React.ReactNode })
         .side-nav {
           display: flex;
           flex-direction: column;
+          box-sizing: border-box;
           gap: 4px;
-          padding: 0 10px 14px;
+          height: calc(100vh - 48px);
+          min-height: 0;
+          overflow-x: hidden;
+          overflow-y: auto;
+          overscroll-behavior: contain;
+          padding: 0 10px 20px;
+          scrollbar-gutter: stable;
+          -webkit-overflow-scrolling: touch;
+        }
+        .side-nav:focus-within {
+          scroll-behavior: smooth;
         }
         .nav-group {
           padding: 6px 0 8px;

src/lib/types.ts

@@ -377,7 +377,10 @@ export interface Feedback {
   // 提交端环境快照:提交版本号 / 机型OS版本;改版前的历史反馈为 null
   app_version: string | null;
   device_model: string | null;
+  device_model_name: string | null;
+  device_manufacturer: string | null;
   rom_name: string | null;
+  rom_version: number | null;
   android_version: string | null;
   // 联表瞬态:展示完整手机号(点手机号查该用户全部反馈)
   phone: string | null;
@@ -446,6 +449,7 @@ export interface ComparisonRecordListItem {
   source_price_cents: number | null;
   best_price_cents: number | null;
   saved_amount_cents: number | null;
+  ordered: boolean;
   total_ms: number | null;
   step_count: number | null;
   llm_call_count: number | null;