Merge branch 'main' into codex/ad-revenue-ecpm-display

同步最新主分支，保留福利视频与提现视频合并统计，并继续优先使用后端加权 eCPM 口径。

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

@@ -46,41 +46,6 @@ const fmtTok = (inTok: number | null, outTok: number | null) =>
   inTok == null && outTok == null ? '-' : `${inTok ?? 0}/${outTok ?? 0}`;
 const fmtRate = (value: number | null) => (value == null ? '-' : `${(value * 100).toFixed(1)}%`);
 
-function deviceName(record: ComparisonRecordListItem): string {
-  return record.device_model_name || record.device_model || '-';
-}
-
-function romName(record: ComparisonRecordListItem): string {
-  return [
-    record.rom_vendor,
-    record.rom_name,
-    record.rom_version != null ? String(record.rom_version) : null,
-  ]
-    .filter(Boolean)
-    .join(' ') || '-';
-}
-
-function renderDevice(record: ComparisonRecordListItem): ReactNode {
-  const readableName = deviceName(record);
-  const showRawModel =
-    record.device_model_name
-    && record.device_model
-    && record.device_model_name !== record.device_model;
-  return (
-    <Space direction="vertical" size={0}>
-      <span>{readableName}</span>
-      {showRawModel ? (
-        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-          {record.device_model}
-        </Typography.Text>
-      ) : null}
-      <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-        {romName(record)}
-      </Typography.Text>
-    </Space>
-  );
-}
-
 // LLM 价格快照只展示 prices 里各模型的单价(元/每百万 token),忽略 mode/_source 等元字段。
 function llmPriceRows(snapshot: Record<string, unknown> | null): string[] {
   const prices = snapshot?.prices;
@@ -343,9 +308,9 @@ export default function ComparisonRecordsPage() {
     {
       title: '机型/ROM',
       key: 'device',
-      width: 180,
+      width: 150,
       ellipsis: true,
-      render: (_, r) => renderDevice(r),
+      render: (_, r) => [r.device_model, r.rom_name].filter(Boolean).join(' / ') || '-',
     },
     {
       title: 'traceid',
@@ -534,15 +499,8 @@ export default function ComparisonRecordsPage() {
 
             <Card size="small" title="设备环境">
               <Descriptions size="small" column={2}>
-                <Descriptions.Item label="机型">
-                  {deviceName(detail)}
-                  {detail.device_model_name && detail.device_model_name !== detail.device_model
-                    ? `（${[detail.device_manufacturer, detail.device_model].filter(Boolean).join(' · ')}）`
-                    : detail.device_manufacturer
-                      ? `（${detail.device_manufacturer}）`
-                      : ''}
-                </Descriptions.Item>
-                <Descriptions.Item label="ROM">{romName(detail)}</Descriptions.Item>
+                <Descriptions.Item label="机型">{detail.device_model || '-'}（{detail.device_manufacturer || '-'}）</Descriptions.Item>
+                <Descriptions.Item label="ROM">{[detail.rom_vendor, detail.rom_name, detail.rom_version].filter(Boolean).join(' ') || '-'}</Descriptions.Item>
                 <Descriptions.Item label="Android">{detail.android_version || '-'}（SDK {detail.android_sdk ?? '-'}）</Descriptions.Item>
                 <Descriptions.Item label="App 版本">{detail.app_version || '-'}（{detail.app_version_code ?? '-'}）</Descriptions.Item>
                 <Descriptions.Item label="源 App 版本" span={2}>{detail.source_app_version || '-'}</Descriptions.Item>

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import type { SorterResult } from 'antd/es/table/interface';
 import {
@@ -35,7 +35,6 @@ import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 const { Text, Paragraph } = Typography;
 const { RangePicker } = DatePicker;
 const REWARD_MAX = 10000;
-const REVIEW_PAGE_POLL_INTERVAL_MS = 60_000;
 
 // 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。
 const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || '';
@@ -197,10 +196,6 @@ export default function FeedbacksPage() {
   const filters: Record<string, unknown> = { ...applied, sort_by: sortBy, sort_order: sortOrder };
   const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
     usePagedList<Feedback>('/admin/api/feedbacks', filters);
-  const reloadRef = useRef(reload);
-  useEffect(() => {
-    reloadRef.current = reload;
-  }, [reload]);
 
   const canReview = canDo(['operator']);
   const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
@@ -218,39 +213,17 @@ export default function FeedbacksPage() {
   }, [items]);
 
   const [summary, setSummary] = useState<FeedbackSummary | null>(null);
-  const loadSummary = useCallback(async () => {
+  const loadSummary = async () => {
     try {
       const { data } = await api.get<FeedbackSummary>('/admin/api/feedbacks/summary');
       setSummary(data);
     } catch {
       /* 统计失败不阻塞列表 */
     }
-  }, []);
-
-  const refreshPageData = useCallback(() => {
-    void reloadRef.current();
-    void loadSummary();
-  }, [loadSummary]);
-
+  };
   useEffect(() => {
-    void loadSummary();
-
-    const onWindowFocus = () => refreshPageData();
-    const onVisibilityChange = () => {
-      if (document.visibilityState === 'visible') refreshPageData();
-    };
-    const pollTimer = window.setInterval(() => {
-      if (document.visibilityState === 'visible') refreshPageData();
-    }, REVIEW_PAGE_POLL_INTERVAL_MS);
-
-    window.addEventListener('focus', onWindowFocus);
-    document.addEventListener('visibilitychange', onVisibilityChange);
-    return () => {
-      window.clearInterval(pollTimer);
-      window.removeEventListener('focus', onWindowFocus);
-      document.removeEventListener('visibilitychange', onVisibilityChange);
-    };
-  }, [loadSummary, refreshPageData]);
+    loadSummary();
+  }, []);
 
   // 审核/查看抽屉(采纳发金币 / 拒绝填原因 + 看该用户历史反馈)
   const [drawerFb, setDrawerFb] = useState<Feedback | null>(null);

src/app/(main)/layout.tsx

@@ -37,8 +37,6 @@ import type {
   WithdrawSummary,
 } from '@/lib/types';
 
-const REVIEW_BADGE_POLL_INTERVAL_MS = 60_000;
-
 const { Sider, Header, Content } = Layout;
 
 type NavItem = {
@@ -164,39 +162,22 @@ export default function MainLayout({ children }: { children: React.ReactNode })
     };
 
     const refreshSafely = (key: ReviewBadgeKey) => refresh(key).catch(() => {});
-    const refreshAll = () => {
-      void Promise.all([
-        refreshSafely('/withdraws'),
-        refreshSafely('/invite-withdraws'),
-        refreshSafely('/price-reports'),
-        refreshSafely('/feedbacks'),
-      ]);
-    };
-
-    refreshAll();
+    void Promise.all([
+      refreshSafely('/withdraws'),
+      refreshSafely('/invite-withdraws'),
+      refreshSafely('/price-reports'),
+      refreshSafely('/feedbacks'),
+    ]);
 
     const onReviewCompleted = (event: Event) => {
       const key = (event as CustomEvent<ReviewBadgeKey>).detail;
       if (key) void refreshSafely(key);
     };
-    const onWindowFocus = () => refreshAll();
-    const onVisibilityChange = () => {
-      if (document.visibilityState === 'visible') refreshAll();
-    };
-    const pollTimer = window.setInterval(() => {
-      if (document.visibilityState === 'visible') refreshAll();
-    }, REVIEW_BADGE_POLL_INTERVAL_MS);
-
     window.addEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
-    window.addEventListener('focus', onWindowFocus);
-    document.addEventListener('visibilitychange', onVisibilityChange);
     return () => {
-      window.clearInterval(pollTimer);
       window.removeEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
-      window.removeEventListener('focus', onWindowFocus);
-      document.removeEventListener('visibilitychange', onVisibilityChange);
     };
-  }, [admin, pathname]);
+  }, [admin]);
 
   if (!admin) return null; // 守卫期间不闪烁内容
 

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import {
   App,
   Button,
@@ -30,7 +30,6 @@ import type { PriceReport, PriceReportSummary } from '@/lib/types';
 import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 
 const { Text } = Typography;
-const REVIEW_PAGE_POLL_INTERVAL_MS = 60_000;
 
 // 后端 created_at/reviewed_at 存的是北京 wall-clock(naive,同 savings/comparison),
 // 直接本地解析、不加 Z(否则会差 8h)。
@@ -151,10 +150,6 @@ export default function PriceReportsPage() {
 
   const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
     usePagedList<PriceReport>('/admin/api/price-reports', filters);
-  const reloadRef = useRef(reload);
-  useEffect(() => {
-    reloadRef.current = reload;
-  }, [reload]);
 
   const sortOrderOf = (field: SortField) =>
     sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
@@ -186,39 +181,17 @@ export default function PriceReportsPage() {
     setSelectedRowKeys((keys) => keys.filter((id) => visiblePendingIds.has(id)));
   }, [items]);
 
-  const loadSummary = useCallback(async () => {
+  const loadSummary = async () => {
     try {
       const { data } = await api.get<PriceReportSummary>('/admin/api/price-reports/summary');
       setSummary(data);
     } catch {
       /* 统计失败不阻塞列表 */
     }
-  }, []);
-
-  const refreshPageData = useCallback(() => {
-    void reloadRef.current();
-    void loadSummary();
-  }, [loadSummary]);
-
+  };
   useEffect(() => {
-    void loadSummary();
-
-    const onWindowFocus = () => refreshPageData();
-    const onVisibilityChange = () => {
-      if (document.visibilityState === 'visible') refreshPageData();
-    };
-    const pollTimer = window.setInterval(() => {
-      if (document.visibilityState === 'visible') refreshPageData();
-    }, REVIEW_PAGE_POLL_INTERVAL_MS);
-
-    window.addEventListener('focus', onWindowFocus);
-    document.addEventListener('visibilitychange', onVisibilityChange);
-    return () => {
-      window.clearInterval(pollTimer);
-      window.removeEventListener('focus', onWindowFocus);
-      document.removeEventListener('visibilitychange', onVisibilityChange);
-    };
-  }, [loadSummary, refreshPageData]);
+    loadSummary();
+  }, []);
 
   const refreshAfterChange = () => {
     reload();

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

@@ -124,10 +124,7 @@ function summaryCount(summary: WithdrawSummary | null, key: string) {
   if (!summary) return undefined;
   if (key === 'reviewing') return summary.reviewing_count;
   if (key === 'pending') return summary.pending_count;
-  if (key === 'success') return summary.success_count;
-  if (key === 'rejected') return summary.rejected_count;
   if (key === 'failed') return summary.failed_count;
-  if (key === 'all') return summary.total_count;
   return undefined;
 }
 

src/lib/types.ts

@@ -167,10 +167,7 @@ export interface WithdrawSummary {
   reviewing_count: number;
   reviewing_amount_cents: number;
   pending_count: number;
-  success_count: number;
-  rejected_count: number;
   failed_count: number;
-  total_count: number;
   today_success_count: number;
   today_success_amount_cents: number;
   today_rejected_count: number;
@@ -465,10 +462,8 @@ export interface ComparisonRecordListItem {
   output_tokens: number | null;
   llm_cost_yuan: number | null;   // 后端按「当时价」冻结的实际成本(元);旧记录 null → 「成本」列回退估算
   device_model: string | null;
-  device_model_name: string | null;
   rom_vendor: string | null;
   rom_name: string | null;
-  rom_version: number | null;
   android_version: string | null;
   app_version: string | null;
   ad_revenue_yuan: number; // 本次比价看的信息流广告预估收益(元)
@@ -519,6 +514,7 @@ export interface ComparisonRecordDetail extends ComparisonRecordListItem {
   comparison_results: Record<string, unknown>[];
   skipped_dish_names: string[];
   device_manufacturer: string | null;
+  rom_version: number | null;
   android_sdk: number | null;
   app_version_code: number | null;
   source_app_version: string | null;