修复：统一提现审核状态汇总与列表口径

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

@@ -32,24 +32,9 @@ interface Props {
   onClose: () => void;
   userId: number | null;
   phone: string | null; // 报表行已有的手机号:概览拉取失败时兜底展示
-  dateFrom: string | null;
-  dateTo: string | null;
-  appEnv?: 'prod' | 'test';
-  revenueScope: 'business' | 'all';
-  feedScene?: 'comparison' | 'coupon' | 'welfare';
 }
 
-export default function UserAdRevenueDrawer({
+export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: Props) {
-  open,
-  onClose,
-  userId,
-  phone,
-  dateFrom,
-  dateTo,
-  appEnv,
-  revenueScope,
-  feedScene,
-}: Props) {
   // UserRewardPanel 的 user 快照:它只读 phone/nickname/wechat_nickname/created_at,其余按 snapshot 形状补齐。
   const [user, setUser] = useState<WithdrawUserSnapshot | null>(null);
 
@@ -97,19 +82,7 @@ export default function UserAdRevenueDrawer({
     >
       {/* userId 就绪即渲染;UserRewardPanel 内部按 userId 自行拉统计与金币记录,user 基本信息随后补上。
           statsVariant="ad":统计区只显示 6 项看广告统计(累计提现/现金余额/激励视频观看数+eCPM/draw观看数+eCPM) */}
-      {userId != null && (
+      {userId != null && <UserRewardPanel userId={userId} user={user} statsVariant="ad" />}
-        <UserRewardPanel
-          key={`${userId}-${dateFrom}-${dateTo}-${appEnv}-${revenueScope}-${feedScene}`}
-          userId={userId}
-          user={user}
-          statsVariant="ad"
-          initialDateFrom={dateFrom ?? undefined}
-          initialDateTo={dateTo ?? undefined}
-          appEnv={appEnv}
-          revenueScope={revenueScope}
-          feedScene={feedScene}
-        />
-      )}
     </Drawer>
   );
 }

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

@@ -30,7 +30,7 @@ import {
 } from '@ant-design/icons';
 import dayjs, { type Dayjs } from 'dayjs';
 import { api, errMsg } from '@/lib/api';
-import { formatUtcTime, nearestRankPercentile } from '@/lib/format';
+import { formatUtcTime, percentile } from '@/lib/format';
 import type {
   AdRevenueDaily,
   AdRevenueHourly,
@@ -470,27 +470,7 @@ export default function AdRevenueReportPage() {
   const [loading, setLoading] = useState(false);
   const [formulaOpen, setFormulaOpen] = useState(false);
   // 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
-  const [userDrawer, setUserDrawer] = useState<{
+  const [userDrawer, setUserDrawer] = useState<{ userId: number; phone: string | null } | null>(null);
-    userId: number;
-    phone: string | null;
-    dateFrom: string;
-    dateTo: string;
-    appEnv?: 'prod' | 'test';
-    revenueScope: 'business' | 'all';
-    feedScene?: 'comparison' | 'coupon' | 'welfare';
-  } | null>(null);
-  const [queriedDetailFilters, setQueriedDetailFilters] = useState<{
-    dateFrom: string;
-    dateTo: string;
-    appEnv?: 'prod' | 'test';
-    revenueScope: 'business' | 'all';
-    feedScene?: 'comparison' | 'coupon' | 'welfare';
-  }>({
-    dateFrom: range[0].format('YYYY-MM-DD'),
-    dateTo: range[1].format('YYYY-MM-DD'),
-    appEnv: 'prod',
-    revenueScope: 'business',
-  });
 
   // 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
   const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
@@ -523,13 +503,6 @@ export default function AdRevenueReportPage() {
           },
         });
         setData(res.data);
-        setQueriedDetailFilters({
-          dateFrom: from,
-          dateTo: to,
-          appEnv: appEnv === 'all' ? undefined : appEnv,
-          revenueScope,
-          feedScene: scene as 'comparison' | 'coupon' | 'welfare' | undefined,
-        });
         setPage(targetPage);
         setQueriedLimit(targetLimit);
         setQueriedGranularity(gran);
@@ -578,7 +551,7 @@ export default function AdRevenueReportPage() {
       width: 150,
       render: (phone: string | null, r: AdRevenueRow) => (
         // 点手机号/用户 → 打开该用户「广告收益详情」半屏抽屉(统计卡 + 金币记录)
-        <a onClick={() => setUserDrawer({ userId: r.user_id, phone, ...queriedDetailFilters })}>
+        <a onClick={() => setUserDrawer({ userId: r.user_id, phone })}>
           {phone ? (
             <span>
               {phone}
@@ -762,7 +735,7 @@ export default function AdRevenueReportPage() {
       : `${data.date_from} ~ ${data.date_to}`;
 
   // 第二行大盘「分广告类型」：看视频包含福利视频与提现视频；
-  // eCPM 优先使用后端按真实展示加权的经营分类口径；兼容旧后端时才用合并收益÷展示数回退。
+  // eCPM 使用合并后的总收益 ÷ 总展示数 × 1000，避免只读取 reward_video 而漏算提现视频。
   const drawStat = data?.type_stats?.draw;
   const rewardVideoStat = data?.type_stats?.reward_video;
   const withdrawalVideoStat = data?.type_stats?.withdrawal_video;
@@ -772,10 +745,8 @@ export default function AdRevenueReportPage() {
     revenue_yuan:
       (rewardVideoStat?.revenue_yuan ?? 0) + (withdrawalVideoStat?.revenue_yuan ?? 0),
   };
-  const drawEcpmStat = data?.category_stats?.draw ?? drawStat;
-  const videoEcpmStat = data?.category_stats?.video ?? videoStat;
   const ecpmOf = (s?: AdRevenueTypeStat) =>
-    s?.ecpm_yuan ?? (s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0);
+    s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0;
 
   // 明细直接用后端返回的当前页 items(「场景」已由后端 feed_scene 全局过滤,前端不再二次筛)。
   const items = data?.items ?? [];
@@ -785,9 +756,9 @@ export default function AdRevenueReportPage() {
         .filter((item) => item.feed_scene === sceneName)
         .map((item) => item.sub_count ?? 1);
       return {
-        p5: nearestRankPercentile(counts, 0.05),
+        p5: percentile(counts, 0.05, false),
-        p50: nearestRankPercentile(counts, 0.5),
+        p50: percentile(counts, 0.5, false),
-        p95: nearestRankPercentile(counts, 0.95),
+        p95: percentile(counts, 0.95, false),
       };
     };
     return { coupon: summarize('coupon'), comparison: summarize('comparison') };
@@ -1089,7 +1060,7 @@ export default function AdRevenueReportPage() {
               <Statistic title="Draw 信息流收益(元)" value={drawStat?.revenue_yuan ?? 0} precision={4} />
             </Col>
             <Col span={4}>
-              <Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawEcpmStat)} precision={2} />
+              <Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawStat)} precision={2} />
             </Col>
             <Col span={4}>
               <Statistic title="Draw 信息流条数" value={drawStat?.impressions ?? 0} />
@@ -1098,7 +1069,7 @@ export default function AdRevenueReportPage() {
               <Statistic title="看视频收益(元)" value={videoStat.revenue_yuan} precision={4} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoEcpmStat)} precision={2} />
+              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoStat)} precision={2} />
             </Col>
             <Col span={4}>
               <Statistic title="看视频条数" value={videoStat.impressions} />
@@ -1110,12 +1081,12 @@ export default function AdRevenueReportPage() {
             </Typography.Text>
           </Divider>
           <Row gutter={[16, 12]}>
-            <Col span={4}><Statistic title="单次领券广告数 P5" value={sessionAdCounts.coupon.p5 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次领券广告数 P5" value={sessionAdCounts.coupon.p5 ?? '-'} precision={1} /></Col>
-            <Col span={4}><Statistic title="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={1} /></Col>
-            <Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={1} /></Col>
-            <Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={1} /></Col>
-            <Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={1} /></Col>
-            <Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} precision={1} /></Col>
           </Row>
         </Card>
       )}
@@ -1311,11 +1282,6 @@ export default function AdRevenueReportPage() {
         open={!!userDrawer}
         userId={userDrawer?.userId ?? null}
         phone={userDrawer?.phone ?? null}
-        dateFrom={userDrawer?.dateFrom ?? null}
-        dateTo={userDrawer?.dateTo ?? null}
-        appEnv={userDrawer?.appEnv}
-        revenueScope={userDrawer?.revenueScope ?? 'all'}
-        feedScene={userDrawer?.feedScene}
         onClose={() => setUserDrawer(null)}
       />
     </div>

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;
@@ -333,14 +298,6 @@ 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',
@@ -351,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',
@@ -542,15 +499,8 @@ export default function ComparisonRecordsPage() {
 
             <Card size="small" title="设备环境">
               <Descriptions size="small" column={2}>
-                <Descriptions.Item label="机型">
+                <Descriptions.Item label="机型">{detail.device_model || '-'}（{detail.device_manufacturer || '-'}）</Descriptions.Item>
-                  {deviceName(detail)}
+                <Descriptions.Item label="ROM">{[detail.rom_vendor, detail.rom_name, detail.rom_version].filter(Boolean).join(' ') || '-'}</Descriptions.Item>
-                  {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="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)/config/GuideVideoConfig.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { Button, Card, InputNumber, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
+import { Button, Card, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
 import { DeleteOutlined, UploadOutlined } from '@ant-design/icons';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
@@ -9,58 +9,55 @@ import { mediaUrl } from '@/lib/media';
 import type { GuideVideoConfig as GuideCfg } from '@/lib/types';
 
 const { Text } = Typography;
+
+/** 后端 media.save_guide_video 只认 MP4 魔数;这里先在浏览器挡一道,省得白传 100MB。 */
 const MAX_BYTES = 100 * 1024 * 1024;
-type Scene = 'coupon' | 'comparison';
 
-const META: Record<Scene, { title: string; action: string }> = {
+/**
-  coupon: { title: '一键自动领取引导视频', action: '一键自动领取' },
+ * 领券等候浮层的「新手引导视频」配置。
-  comparison: { title: '开始比价引导视频', action: '开始比价' },
+ *
-};
+ * 用户点首页「一键自动领取」→ 出等候浮层,浮层下方那块位置**前 3 次**放这支引导视频
-
+ * (而不是广告),每次固定发 120 金币;播完若浮层还开着,自动接着放广告(原逻辑)。
-function SceneConfig({ scene }: { scene: Scene }) {
+ * 「系统配置 → 领券引导视频」tab 的一个区块。
-  const meta = META[scene];
+ *
+ * 后台只管两件事:**开关** 和 **换片**。次数(3)/ 金币(120)走服务端默认值,产品已拍板不再
+ * 开放配置,所以这里不渲染输入框、PATCH 也不带这两个字段(后端仍保留字段与默认值)。
+ */
+export default function GuideVideoConfig() {
   const [cfg, setCfg] = useState<GuideCfg | null>(null);
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
   const [uploading, setUploading] = useState(false);
+
+  // 本地编辑态,保存时一次性 PATCH
   const [enabled, setEnabled] = useState(true);
-  const [maxPlays, setMaxPlays] = useState(3);
+
-  const [rewardCoin, setRewardCoin] = useState(100);
   const canEdit = canDo(['operator']);
 
-  const sync = (value: GuideCfg) => {
+  const sync = (c: GuideCfg) => {
-    setCfg(value);
+    setCfg(c);
-    setEnabled(value.enabled);
+    setEnabled(c.enabled);
-    setMaxPlays(value.max_plays);
-    setRewardCoin(value.reward_coin);
   };
 
   const load = async () => {
     setLoading(true);
     try {
-      const { data } = await api.get<GuideCfg>('/admin/api/guide-video', { params: { scene } });
+      const { data } = await api.get<GuideCfg>('/admin/api/guide-video');
       sync(data);
-    } catch (e) {
-      message.error(errMsg(e));
     } finally {
       setLoading(false);
     }
   };
-
   useEffect(() => {
-    void load();
+    load();
-  }, [scene]);
+  }, []);
 
   const save = async () => {
     setSaving(true);
     try {
-      const { data } = await api.patch<GuideCfg>(
+      const { data } = await api.patch<GuideCfg>('/admin/api/guide-video', { enabled });
-        '/admin/api/guide-video',
-        { enabled, max_plays: maxPlays, reward_coin: rewardCoin },
-        { params: { scene } },
-      );
       sync(data);
-      message.success(`${meta.title}配置已保存，下次触发即生效`);
+      message.success('已保存，用户下一次进入领券浮层即生效');
     } catch (e) {
       message.error(errMsg(e));
     } finally {
@@ -68,27 +65,11 @@ function SceneConfig({ scene }: { scene: Scene }) {
     }
   };
 
-  const uploadVideo = async (file: File) => {
+  // antd Upload:beforeUpload 里自行 POST(multipart),返回 false 阻止其默认上传。
-    const form = new FormData();
-    form.append('file', file);
-    setUploading(true);
-    try {
-      const { data } = await api.post<GuideCfg>(
-        '/admin/api/guide-video/video',
-        form,
-        { params: { scene } },
-      );
-      sync(data);
-      message.success(`${meta.title}已更新`);
-    } catch (e) {
-      message.error(errMsg(e));
-    } finally {
-      setUploading(false);
-    }
-  };
-
   const beforeUpload = (file: File) => {
-    if (file.type !== 'video/mp4' && !/\.mp4$/i.test(file.name)) {
+    // 有些系统给 .mp4 的 type 是空串,不能只看 type,再兜一层扩展名。
+    const looksMp4 = file.type === 'video/mp4' || /\.mp4$/i.test(file.name);
+    if (!looksMp4) {
       message.error('仅支持 MP4 视频（H.264 编码）');
       return Upload.LIST_IGNORE;
     }
@@ -100,15 +81,27 @@ function SceneConfig({ scene }: { scene: Scene }) {
     return false;
   };
 
+  const uploadVideo = async (file: File) => {
+    const form = new FormData();
+    form.append('file', file);
+    setUploading(true);
+    try {
+      const { data } = await api.post<GuideCfg>('/admin/api/guide-video/video', form);
+      sync(data);
+      message.success('引导视频已更新，用户下一次进入领券浮层即生效');
+    } catch (e) {
+      message.error(errMsg(e));
+    } finally {
+      setUploading(false);
+    }
+  };
+
   const removeVideo = async () => {
     setUploading(true);
     try {
-      const { data } = await api.delete<GuideCfg>(
+      const { data } = await api.delete<GuideCfg>('/admin/api/guide-video/video');
-        '/admin/api/guide-video/video',
-        { params: { scene } },
-      );
       sync(data);
-      message.success(`已移除${meta.title}`);
+      message.success('已移除引导视频，领券浮层恢复为只放广告');
     } catch (e) {
       message.error(errMsg(e));
     } finally {
@@ -119,48 +112,82 @@ function SceneConfig({ scene }: { scene: Scene }) {
   return (
     <Card
       size="small"
-      title={meta.title}
+      title="领券引导视频（App 领券等候浮层，前 3 次替代广告）"
       style={{ marginBottom: 16 }}
-      extra={cfg?.updated_at ? <Text type="secondary">更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}</Text> : null}
+      extra={
+        cfg?.updated_at ? (
+          <Text type="secondary" style={{ fontSize: 12 }}>
+            更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}
+          </Text>
+        ) : null
+      }
     >
-      <p style={{ color: '#777', marginTop: 0 }}>
+      <p style={{ color: '#999', marginTop: 0 }}>
-        Android 用户点击「{meta.action}」后，前若干次在等候浮层广告位播放本视频并奖励金币。
+        用户点「一键自动领取」后出现的等候浮层，下方那块广告位<b>前 3 次</b>改放这支引导视频。
-        次数按账号、按功能分别计算；开播即计次，播完或中途关闭均发放当次配置的金币。
+        视频<b>不可快进</b>；播完或中途关闭都算看完，各发一次 <b>120 金币</b>；播完若浮层还开着，会自动接着放广告。
+        次数<b>按账号</b>计（换设备不重置），<b>视频一开播就算用掉一次</b>。
+        次数与金币走固定值、后台不开放调整；这里只管<b>开关</b>和<b>换片</b>，每次改动进审计日志。
       </p>
       {loading || !cfg ? (
         <Spin style={{ display: 'block', margin: '24px 0' }} />
       ) : (
         <Space align="start" size={32} wrap>
-          <div style={{ width: 240 }}>
+          {/* 左:视频预览 */}
-            {cfg.video_url ? (
+          <div>
-              // eslint-disable-next-line jsx-a11y/media-has-caption
+            <Text type="secondary" style={{ fontSize: 12 }}>
-              <video
+              当前引导视频
-                src={mediaUrl(cfg.video_url)}
+            </Text>
-                controls
+            <div style={{ marginTop: 8, width: 240 }}>
-                style={{ width: 240, maxHeight: 420, borderRadius: 12, background: '#000' }}
+              {cfg.video_url ? (
-              />
+                // eslint-disable-next-line jsx-a11y/media-has-caption
-            ) : (
+                <video
-              <div style={{ height: 280, border: '1px dashed #d9d9d9', borderRadius: 12, display: 'grid', placeItems: 'center', color: '#aaa' }}>
+                  src={mediaUrl(cfg.video_url)}
-                未上传视频
+                  controls
+                  style={{
+                    width: 240,
+                    maxHeight: 420,
+                    borderRadius: 12,
+                    background: '#000',
+                    border: '1px solid #f0f0f0',
+                  }}
+                />
+              ) : (
+                <div
+                  style={{
+                    width: 240,
+                    height: 320,
+                    borderRadius: 12,
+                    border: '1px dashed #d9d9d9',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    color: '#bbb',
+                    fontSize: 13,
+                    textAlign: 'center',
+                    padding: 16,
+                  }}
+                >
+                  未上传视频
+                  <br />
+                  （领券浮层照旧只放广告）
+                </div>
+              )}
+            </div>
+            {!enabled && cfg.video_url && (
+              <div style={{ color: '#fa8c16', fontSize: 12, marginTop: 6 }}>
+                当前为「关闭」：浮层不放引导视频，直接放广告
               </div>
             )}
           </div>
-          <Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
+
+          {/* 右:编辑控件 */}
+          <Space direction="vertical" size="middle" style={{ minWidth: 360 }}>
             <Space>
-              <span>启用：</span>
+              <span>启用引导视频：</span>
               <Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
               {!enabled && <Tag color="orange">已关闭</Tag>}
             </Space>
-            <Space>
+
-              <span>播放次数：</span>
-              <InputNumber min={0} max={50} precision={0} value={maxPlays} disabled={!canEdit} onChange={(v) => setMaxPlays(v ?? 0)} />
-              <Text type="secondary">每个账号前 N 次（默认 3）</Text>
-            </Space>
-            <Space>
-              <span>每次金币：</span>
-              <InputNumber min={0} max={10000} precision={0} value={rewardCoin} disabled={!canEdit} onChange={(v) => setRewardCoin(v ?? 0)} />
-              <Text type="secondary">默认 100</Text>
-            </Space>
             <Space wrap>
               <Upload accept="video/mp4,.mp4" showUploadList={false} beforeUpload={beforeUpload} disabled={!canEdit}>
                 <Button icon={<UploadOutlined />} loading={uploading} disabled={!canEdit}>
@@ -168,26 +195,28 @@ function SceneConfig({ scene }: { scene: Scene }) {
                 </Button>
               </Upload>
               {cfg.video_url && (
-                <Button icon={<DeleteOutlined />} danger loading={uploading} disabled={!canEdit} onClick={removeVideo}>
+                <Button
+                  icon={<DeleteOutlined />}
+                  danger
+                  loading={uploading}
+                  disabled={!canEdit}
+                  onClick={removeVideo}
+                >
                   移除视频
                 </Button>
               )}
-              <Text type="secondary">MP4（H.264），≤100MB</Text>
+              <Text type="secondary" style={{ fontSize: 12 }}>
+                MP4（H.264），≤100MB
+              </Text>
             </Space>
-            <Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>保存配置</Button>
+
-            <Text type="secondary">累计播放 {cfg.total_plays} 次，已发币 {cfg.granted_plays} 次</Text>
+            <Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>
+              保存开关
+            </Button>
+            {!canEdit && <Text type="secondary">仅 operator / super_admin 可修改</Text>}
           </Space>
         </Space>
       )}
     </Card>
   );
 }
-
-export default function GuideVideoConfig() {
-  return (
-    <>
-      <SceneConfig scene="coupon" />
-      <SceneConfig scene="comparison" />
-    </>
-  );
-}

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

@@ -165,7 +165,7 @@ export default function ConfigPage() {
           },
           { key: 'welfare', label: '福利页', children: welfareConfig },
           { key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
-          { key: 'guide-video', label: '引导视频奖励', children: <GuideVideoConfig /> },
+          { key: 'guide-video', label: '领券引导视频', children: <GuideVideoConfig /> },
         ]}
       />
     </div>

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

@@ -710,7 +710,7 @@ export default function DashboardPage() {
         <div>
           <h1>数据大盘</h1>
           <p>
-            数据更新于 {updatedAt ?? '--'} · 北京时间 · 日期窗口按 00:00 自然日切分，自定义日期可选择今日
+            数据更新于 {updatedAt ?? '--'} · 北京时间 · 日期窗口按 00:00 自然日切分，不包含今日
           </p>
         </div>
         <div className="controls">
@@ -734,7 +734,7 @@ export default function DashboardPage() {
             format="YYYY-MM-DD"
             allowClear={false}
             open={datePickerOpen}
-            disabledDate={(date) => date.isAfter(dayjs(), 'day')}
+            disabledDate={(date) => date.isAfter(dayjs().subtract(1, 'day'), 'day')}
             suffixIcon={<CalendarOutlined />}
             onClick={() => setDatePickerOpen(true)}
             onOpenChange={setDatePickerOpen}

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();
+    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]);
 
   // 审核/查看抽屉(采纳发金币 / 拒绝填原因 + 看该用户历史反馈)
   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([
-      void Promise.all([
+      refreshSafely('/withdraws'),
-        refreshSafely('/withdraws'),
+      refreshSafely('/invite-withdraws'),
-        refreshSafely('/invite-withdraws'),
+      refreshSafely('/price-reports'),
-        refreshSafely('/price-reports'),
+      refreshSafely('/feedbacks'),
-        refreshSafely('/feedbacks'),
+    ]);
-      ]);
-    };
-
-    refreshAll();
 
     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();
+    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]);
 
   const refreshAfterChange = () => {
     reload();

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

@@ -44,11 +44,6 @@ interface Props {
   withdrawSource?: 'coin_cash' | 'invite_cash';
   // 统计区字段集:withdraw(默认,提现详情:含提现细分) / ad(广告收益详情:只看看广告观看统计,对齐参考图 6 项)
   statsVariant?: 'withdraw' | 'ad';
-  initialDateFrom?: string;
-  initialDateTo?: string;
-  appEnv?: 'prod' | 'test';
-  revenueScope?: 'business' | 'all';
-  feedScene?: 'comparison' | 'coupon' | 'welfare';
 }
 
 /** 用户看广告/提现详情:基本信息 + 互斥时间筛选 + 统计区(按 statsVariant 取字段集)+ 金币发放记录表。 */
@@ -57,17 +52,9 @@ export default function UserRewardPanel({
   user,
   withdrawSource,
   statsVariant = 'withdraw',
-  initialDateFrom,
-  initialDateTo,
-  appEnv,
-  revenueScope = 'all',
-  feedScene,
 }: Props) {
-  const hasInitialRange = Boolean(initialDateFrom && initialDateTo);
+  const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
-  const [mode, setMode] = useState<'all' | 'range'>(hasInitialRange ? 'range' : 'all');
+  const [range, setRange] = useState<[Dayjs, Dayjs] | null>(null);
-  const [range, setRange] = useState<[Dayjs, Dayjs] | null>(() =>
-    hasInitialRange ? [dayjs(initialDateFrom), dayjs(initialDateTo)] : null,
-  );
   const [stats, setStats] = useState<UserRewardStats | null>(null);
   const [statsLoading, setStatsLoading] = useState(false);
 
@@ -93,9 +80,6 @@ export default function UserRewardPanel({
         params: {
           ...JSON.parse(paramsKey),
           ...(withdrawSource ? { withdraw_source: withdrawSource } : {}),
-          ...(appEnv ? { app_env: appEnv } : {}),
-          revenue_scope: revenueScope,
-          ...(feedScene ? { feed_scene: feedScene } : {}),
         },
       });
       setStats(data);
@@ -104,7 +88,7 @@ export default function UserRewardPanel({
     } finally {
       setStatsLoading(false);
     }
-  }, [userId, paramsKey, withdrawSource, appEnv, revenueScope, feedScene]);
+  }, [userId, paramsKey, withdrawSource]);
 
   const loadRecords = useCallback(
     async (p: number) => {
@@ -252,7 +236,7 @@ export default function UserRewardPanel({
       </Descriptions>
       <Text type="secondary" style={{ fontSize: 12 }}>
         {statsVariant === 'ad'
-          ? '统计继承广告收益页已查询的日期、环境、业务代码位和场景;次数仅统计成功发奖记录,信息流按奖励份数统计;Draw eCPM 按全部实际展示统计(含未发奖)。'
+          ? '统计随上方时间筛选(现金余额除外,为当前快照);次数仅统计成功发奖记录,信息流按奖励份数统计;eCPM 为预估值。'
           : '统计随上方时间筛选(现金余额除外,为当前快照);提现按申请提交时间统计;累计收益为已发金币按当前汇率折算,不代表实际已提现金额;eCPM 为预估值。'}
       </Text>
 

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

@@ -570,7 +570,6 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
     },
     {
       title: '失败/拒绝原因',
-      key: 'fail_reason',
       dataIndex: 'fail_reason',
       ellipsis: true,
       render: (v: string | null) => v || <Text type="secondary">-</Text>,
@@ -648,10 +647,6 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
       },
     },
   ];
-  const visibleColumns =
-    activeStatus === 'pending' || activeStatus === 'success'
-      ? columns.filter((column) => column.key !== 'fail_reason')
-      : columns;
 
   const inviteeColumns: ColumnsType<InviteeDetail> = [
     { title: '手机号', dataIndex: 'phone', width: 130 },
@@ -950,7 +945,7 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
                 }
               : undefined
           }
-          columns={visibleColumns}
+          columns={columns}
           dataSource={items}
           loading={loading}
           pagination={{
@@ -994,6 +989,12 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
                 <Descriptions.Item label="金额">
                   <Text strong>{yuan(detail.order.amount_cents)}</Text>
                 </Descriptions.Item>
+                <Descriptions.Item label="提现类型">
+                  {detail.order.source === 'invite_cash' ? '邀请奖励提现' : '福利页提现'}
+                </Descriptions.Item>
+                <Descriptions.Item label="累计成功提现">
+                  {yuan(detail.cumulative_success_cents)}
+                </Descriptions.Item>
                 <Descriptions.Item label="提交时间">
                   {dt(detail.order.created_at)}
                 </Descriptions.Item>

src/lib/format.ts

@@ -37,18 +37,6 @@ export function percentile(values: readonly number[], q: number, round = true):
   return round ? Math.round(result) : result;
 }
 
-/**
- * 离散计数分位数（nearest-rank）。
- * 广告条数等不可拆分的计数不做线性插值，结果始终取自真实样本。
- */
-export function nearestRankPercentile(values: readonly number[], q: number): number | null {
-  if (!values.length) return null;
-  const sorted = [...values].sort((a, b) => a - b);
-  const quantile = Math.min(1, Math.max(0, q));
-  const rank = Math.max(1, Math.ceil(quantile * sorted.length));
-  return sorted[rank - 1];
-}
-
 const hasTz = (v: string) => /(?:Z|[+-]\d{2}:?\d{2})$/i.test(v);
 
 /** 把 UTC 口径字符串解析为带时区的 dayjs(无时区后缀的补 Z 当 UTC)。 */

src/lib/types.ts

@@ -233,7 +233,7 @@ export interface UserRewardStats {
   reward_video_avg_ecpm: number; // 平均激励视频 eCPM(分/千次)
   reward_video_cash_cents: number; // 激励视频提现
   feed_count: number; // 累计信息流广告数(份)
-  feed_avg_ecpm: number; // 全部 Draw/feed 实际展示的平均 eCPM(分/千次,含未发奖展示)
+  feed_avg_ecpm: number; // 平均信息流广告 eCPM(分/千次)
   feed_cash_cents: number; // 信息流广告提现
 }
 
@@ -417,7 +417,6 @@ export interface FeedbackQrConfig {
 /** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,每次固定 120 金币)。
  *  后台只开放 enabled + 换片;下面几个字段接口仍返回,但页面不展示、也不回传。 */
 export interface GuideVideoConfig {
-  scene: 'coupon' | 'comparison';
   enabled: boolean;
   video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
   max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
@@ -458,7 +457,6 @@ 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;
@@ -467,10 +465,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; // 本次比价看的信息流广告预估收益(元)
@@ -521,6 +517,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;
@@ -584,7 +581,6 @@ export interface AdRevenueHourly {
 export interface AdRevenueTypeStat {
   impressions: number; // 该类型展示条数合计
   revenue_yuan: number; // 该类型预估收益合计(元)
-  ecpm_yuan?: number; // 按真实展示次数加权的 SDK eCPM(元/千次)
 }
 
 // 广告收益报表:一次广告事件(逐条一行)。激励视频展示+发奖按 ad_session_id 合并;信息流展示/发奖各自成行。
@@ -624,7 +620,6 @@ export interface AdRevenueReport {
   daily: AdRevenueDaily[]; // 按日期汇总序列(全量,供按天趋势图)
   hourly: AdRevenueHourly[]; // 按小时汇总序列(全量,供按小时趋势图;按天查询时为空)
   type_stats: Record<string, AdRevenueTypeStat>; // 按广告类型小计;前端取 draw / reward_video
-  category_stats?: Record<string, AdRevenueTypeStat>; // draw=draw+历史feed；video=福利视频+提现视频
   // 按信息流场景小计(comparison/coupon/welfare;全量,不受分页截断)。数据大盘「领券广告/比价广告」卡
   // 优先读它:2026-07-02 后端起 items 不再含信息流逐条展示行(唯一带收益+场景的行),按 items 现算恒 0。
   // 可选(`?.` 探测)以兼容未升级后端,缺失时回退 items 现算。