优化：展示反馈机型与系统版本

反馈列表展示可读手机型号、原始硬件编码、厂商系统版本和 Android 版本。

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

@@ -9,6 +9,7 @@ import {
   Card,
   Col,
   DatePicker,
+  Descriptions,
   Divider,
   InputNumber,
   Modal,
@@ -189,61 +190,7 @@ const LT_FACTOR_ROWS = [
   { key: '5', lt: '第 11 条及以后', factor: 1.0 },
 ];
 
-type AdRevenueDetailRow = AdRevenueRecord & {
+type AdRevenueDetailRow = AdRevenueRecord & { source_adn?: string | null };
-  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,
-    source_adn: row.adn,
-    is_impression_only: true,
-  };
-}
 
 // 展开行(逐条事件展开)- 该条的发奖复算明细(还原金币审计的 eCPM/因子1/份数/LT/因子2 等列)
 const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
@@ -261,25 +208,18 @@ 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, row: AdRevenueDetailRow) =>
+    render: (_: unknown, r: AdRevenueDetailRow) => fmtFactorRange(r.lt_factor_start, r.lt_factor_end),
-      renderFormulaValue(fmtFactorRange(row.lt_factor_start, row.lt_factor_end), row),
   },
   {
     title: 'LT累计条数',
     key: 'lt_index',
     width: 100,
-    render: (_: unknown, row: AdRevenueDetailRow) =>
+    render: (_: unknown, r: AdRevenueDetailRow) => fmtIndexRange(r.lt_index_start, r.lt_index_end),
-      renderFormulaValue(fmtIndexRange(row.lt_index_start, row.lt_index_end), row),
   },
 ];
 
@@ -1186,19 +1126,24 @@ export default function AdRevenueReportPage() {
               </div>
             ) : (
               <div>
-                <Typography.Text strong>本次广告逐条明细</Typography.Text>{' '}
+                <Typography.Text strong>展示明细</Typography.Text>{' '}
-                <Typography.Text type="secondary">
+                <Typography.Text type="secondary">(纯展示事件,未单独发奖,无金币复算)</Typography.Text>
-                  (共 1 条 · 应发 0 / 实发 0；仅展示，未单独发奖)
+                <Descriptions size="small" column={3} bordered style={{ marginTop: 8 }}>
-                </Typography.Text>
+                  <Descriptions.Item label="时间">{formatUtcTime(r.created_at)}</Descriptions.Item>
-                <Table<AdRevenueDetailRow>
+                  <Descriptions.Item label="eCPM（分）">{r.ecpm ?? '-'}</Descriptions.Item>
-                  style={{ marginTop: 8 }}
+                  <Descriptions.Item label="eCPM（元）">
-                  rowKey="record_id"
+                    {r.ecpm != null && !Number.isNaN(Number(r.ecpm))
-                  columns={DETAIL_COLUMNS}
+                      ? (Number(r.ecpm) / 100).toFixed(2)
-                  dataSource={[impressionOnlyDetail(r)]}
+                      : '-'}
-                  pagination={false}
+                  </Descriptions.Item>
-                  size="small"
+                  <Descriptions.Item label="预估收益(元)">
-                  scroll={{ x: 900 }}
+                    {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>
             ),
         }}

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/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;