Merge branch 'main' into codex/ad-revenue-video-total

## 本次改动

- 修复小屏时左侧导航无法滚动、末尾菜单不可见的问题
- 将“权限管理”调整至“监控审计”板块之前

## 范围

仅修改 `src/app/(main)/layout.tsx`。

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #77
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>

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

@@ -43,6 +43,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 }> = {
@@ -194,7 +196,16 @@ type AdRevenueDetailRow = AdRevenueRecord & { source_adn?: string | null };
 
 // 展开行(逐条事件展开)- 该条的发奖复算明细(还原金币审计的 eCPM/因子1/份数/LT/因子2 等列)
 const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
-  { title: '来源广告网络', dataIndex: 'source_adn', width: 110, render: (value: string | null) => value || '-' },
+  {
+    title: '来源广告网络',
+    dataIndex: 'source_adn',
+    width: 110,
+    render: (value: string | null) => value?.trim() || (
+      <Tooltip title="该历史记录没有可唯一确认的 SDK 广告来源，未猜测填充。">
+        <span>未上报</span>
+      </Tooltip>
+    ),
+  },
   {
     title: 'eCPM（元）',
     dataIndex: 'ecpm',
@@ -387,13 +398,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=关闭)
@@ -661,9 +672,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;
 
@@ -775,12 +794,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: '提现看视频' },
@@ -790,12 +808,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: '福利' },
@@ -987,13 +1004,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 }}>
@@ -1102,7 +1119,11 @@ export default function AdRevenueReportPage() {
                   style={{ marginTop: 8 }}
                   rowKey="record_id"
                   columns={DETAIL_COLUMNS}
-                  dataSource={r.sub_rewards.map((detail) => ({ ...detail, source_adn: r.adn }))}
+                  dataSource={r.sub_rewards.map((detail) => ({
+                    ...detail,
+                    // 一次比价/领券可能由不同 ADN 连续填充，优先显示本条发奖记录的来源。
+                    source_adn: detail.adn ?? r.adn,
+                  }))}
                   pagination={false}
                   size="small"
                   scroll={{ x: 900 }}
@@ -1118,7 +1139,10 @@ export default function AdRevenueReportPage() {
                   style={{ marginTop: 8 }}
                   rowKey="record_id"
                   columns={DETAIL_COLUMNS}
-                  dataSource={[{ ...r.reward_detail, source_adn: r.adn }]}
+                  dataSource={[{
+                    ...r.reward_detail,
+                    source_adn: r.reward_detail.adn ?? r.adn,
+                  }]}
                   pagination={false}
                   size="small"
                   scroll={{ x: 900 }}

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/app/(main)/withdraws/page.tsx

@@ -29,7 +29,6 @@ import {
   CheckCircleOutlined,
   ClearOutlined,
   CloseCircleOutlined,
-  FilterOutlined,
   ReloadOutlined,
   SearchOutlined,
   SortAscendingOutlined,
@@ -86,42 +85,6 @@ const STATUS_TABS = [
 ];
 
 const REJECT_TEMPLATES = ['账号异常', '提现金额异常', '微信实名不匹配', '风控拦截', '其他原因'];
-const QUICK_FILTER_OPTIONS = [
-  { value: 'abnormal', label: '异常单' },
-  { value: 'failed', label: '打款失败' },
-  { value: 'overdue_reviewing', label: '待审核超30分钟' },
-  { value: 'pending_overdue', label: '打款中超15分钟' },
-  { value: 'today', label: '今日申请' },
-  { value: 'high_risk', label: '高风险用户' },
-];
-const QUICK_FILTER_STATUS: Record<string, string> = {
-  abnormal: 'all',
-  failed: 'failed',
-  overdue_reviewing: 'reviewing',
-  pending_overdue: 'pending',
-  high_risk: 'all',
-};
-const SORT_OPTIONS = [
-  { value: 'created_at', label: '申请时间' },
-  { value: 'amount_cents', label: '提现金额' },
-];
-// 提现类型:coin_cash=福利页提现(金币兑换现金) / invite_cash=邀请提现(邀请奖励金)
-const SOURCE_LABEL: Record<string, string> = {
-  coin_cash: '福利页提现',
-  invite_cash: '邀请提现',
-};
-const SOURCE_COLOR: Record<string, string> = {
-  coin_cash: 'blue',
-  invite_cash: 'purple',
-};
-const SOURCE_OPTIONS = [
-  { value: 'coin_cash', label: '福利页提现' },
-  { value: 'invite_cash', label: '邀请提现' },
-];
-const DATE_FIELD_OPTIONS = [
-  { value: 'created_at', label: '申请时间' },
-  { value: 'updated_at', label: '更新时间' },
-];
 
 function statusTag(status: string) {
   return <Tag color={STATUS_COLOR[status]}>{STATUS_LABEL[status] || status}</Tag>;
@@ -197,21 +160,15 @@ export default function WithdrawsPage() {
   const [searchDraft, setSearchDraft] = useState('');
   const [keyword, setKeyword] = useState('');
   const [dateRange, setDateRange] = useState<[Dayjs, Dayjs] | null>(null);
-  const [dateField, setDateField] = useState<'created_at' | 'updated_at'>('created_at');
-  const [sortBy, setSortBy] = useState<'created_at' | 'amount_cents'>('created_at');
   const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
-  const [quickFilter, setQuickFilter] = useState<string | undefined>(undefined);
-  const [source, setSource] = useState<string | undefined>(undefined);
 
   const filters: Record<string, unknown> = {};
   if (activeStatus !== 'all') filters.status = activeStatus;
-  if (source) filters.source = source;
   if (keyword.trim()) filters.keyword = keyword.trim();
   if (dateRange?.[0]) filters.date_from = dateRange[0].startOf('day').toISOString();
   if (dateRange?.[1]) filters.date_to = dateRange[1].endOf('day').toISOString();
-  if (quickFilter) filters.quick_filter = quickFilter;
-  filters.date_field = dateField;
-  filters.sort_by = sortBy;
+  filters.date_field = 'created_at';
+  filters.sort_by = 'created_at';
   filters.sort_order = sortOrder;
   const filterKey = JSON.stringify(filters);
   const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
@@ -226,27 +183,7 @@ export default function WithdrawsPage() {
     setSearchDraft('');
     setKeyword('');
     setDateRange(null);
-    setDateField('created_at');
-    setSortBy('created_at');
     setSortOrder('desc');
-    setQuickFilter(undefined);
-    setSource(undefined);
-  };
-
-  const applyQuickFilter = (value?: string) => {
-    setQuickFilter(value);
-    const targetStatus = value ? QUICK_FILTER_STATUS[value] : undefined;
-    if (targetStatus) setActiveStatus(targetStatus);
-  };
-
-  const changeStatus = (status: string) => {
-    setActiveStatus(status);
-    setQuickFilter((current) => {
-      if (!current) return current;
-      const targetStatus = QUICK_FILTER_STATUS[current];
-      if (!targetStatus || status === targetStatus) return current;
-      return undefined;
-    });
   };
 
   const loadSummary = useCallback(async () => {
@@ -520,12 +457,6 @@ export default function WithdrawsPage() {
       width: 120,
       render: (v: number) => <Text strong>{yuan(v)}</Text>,
     },
-    {
-      title: '提现类型',
-      dataIndex: 'source',
-      width: 110,
-      render: (v: string) => <Tag color={SOURCE_COLOR[v] || 'default'}>{SOURCE_LABEL[v] || v}</Tag>,
-    },
     {
       title: '累计提现',
       dataIndex: 'cumulative_success_cents',
@@ -798,7 +729,7 @@ export default function WithdrawsPage() {
       <Card>
         <Tabs
           activeKey={activeStatus}
-          onChange={changeStatus}
+          onChange={setActiveStatus}
           items={STATUS_TABS.map((tab) => {
             const count = summaryCount(summary, tab.key);
             return {
@@ -820,89 +751,55 @@ export default function WithdrawsPage() {
           align="start"
           style={{
             width: '100%',
-            justifyContent: 'space-between',
             marginBottom: 12,
             paddingBottom: 12,
             borderBottom: '1px solid #f0f0f0',
           }}
         >
-          <Space wrap>
-            <Input.Search
-              allowClear
-              enterButton="搜索"
-              prefix={<SearchOutlined />}
-              placeholder="用户手机号"
-              value={searchDraft}
-              style={{ width: 240 }}
-              onChange={(e) => {
-                const value = e.target.value;
-                setSearchDraft(value);
-                if (!value) setKeyword('');
-              }}
-              onSearch={(value) => setKeyword(value.trim())}
-            />
-            <Select
-              value={source}
-              allowClear
-              placeholder="提现类型"
-              style={{ width: 140 }}
-              options={SOURCE_OPTIONS}
-              onChange={(value?: string) => setSource(value)}
-            />
-            <Select
-              value={quickFilter}
-              allowClear
-              placeholder="快捷筛选"
-              style={{ width: 170 }}
-              suffixIcon={<FilterOutlined />}
-              options={QUICK_FILTER_OPTIONS}
-              onChange={applyQuickFilter}
-            />
-            <Select
-              value={dateField}
-              style={{ width: 120 }}
-              options={DATE_FIELD_OPTIONS}
-              onChange={(value: 'created_at' | 'updated_at') => setDateField(value)}
-            />
-            <RangePicker
-              value={dateRange}
-              allowClear
-              style={{ width: 260 }}
-              presets={[
-                { label: '今天', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
-                {
-                  label: '最近7天',
-                  value: [dayjs().subtract(6, 'day').startOf('day'), dayjs().endOf('day')],
-                },
-                {
-                  label: '最近30天',
-                  value: [dayjs().subtract(29, 'day').startOf('day'), dayjs().endOf('day')],
-                },
-              ]}
-              onChange={(values) => setDateRange(values as [Dayjs, Dayjs] | null)}
-            />
-          </Space>
-          <Space wrap>
-            <Select
-              value={sortBy}
-              style={{ width: 130 }}
-              suffixIcon={<SortAscendingOutlined />}
-              options={SORT_OPTIONS}
-              onChange={(value: 'created_at' | 'amount_cents') => setSortBy(value)}
-            />
-            <Select
-              value={sortOrder}
-              style={{ width: 96 }}
-              options={[
-                { value: 'desc', label: '倒序' },
-                { value: 'asc', label: '正序' },
-              ]}
-              onChange={(value: 'asc' | 'desc') => setSortOrder(value)}
-            />
-            <Button icon={<ClearOutlined />} onClick={resetFilters}>
-              重置
-            </Button>
-          </Space>
+          <Input.Search
+            allowClear
+            enterButton="搜索"
+            prefix={<SearchOutlined />}
+            placeholder="用户手机号"
+            value={searchDraft}
+            style={{ width: 240 }}
+            onChange={(e) => {
+              const value = e.target.value;
+              setSearchDraft(value);
+              if (!value) setKeyword('');
+            }}
+            onSearch={(value) => setKeyword(value.trim())}
+          />
+          <RangePicker
+            value={dateRange}
+            allowClear
+            style={{ width: 260 }}
+            presets={[
+              { label: '今天', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+              {
+                label: '最近7天',
+                value: [dayjs().subtract(6, 'day').startOf('day'), dayjs().endOf('day')],
+              },
+              {
+                label: '最近30天',
+                value: [dayjs().subtract(29, 'day').startOf('day'), dayjs().endOf('day')],
+              },
+            ]}
+            onChange={(values) => setDateRange(values as [Dayjs, Dayjs] | null)}
+          />
+          <Select
+            value={sortOrder}
+            style={{ width: 96 }}
+            suffixIcon={<SortAscendingOutlined />}
+            options={[
+              { value: 'desc', label: '倒序' },
+              { value: 'asc', label: '正序' },
+            ]}
+            onChange={(value: 'asc' | 'desc') => setSortOrder(value)}
+          />
+          <Button icon={<ClearOutlined />} onClick={resetFilters}>
+            重置
+          </Button>
         </Space>
         {canManage && selectedOrders.length > 0 && (
           <Space
@@ -974,7 +871,7 @@ export default function WithdrawsPage() {
             showTotal: (t) => `共 ${t} 条`,
             onChange: onPageChange,
           }}
-          scroll={{ x: 1460 }}
+          scroll={{ x: 1350 }}
           onRow={(record) => ({
             onClick: () => openDetail(record),
             style: { cursor: 'pointer' },
@@ -1006,11 +903,6 @@ export default function WithdrawsPage() {
                 <Descriptions.Item label="金额">
                   <Text strong>{yuan(detail.order.amount_cents)}</Text>
                 </Descriptions.Item>
-                <Descriptions.Item label="提现类型">
-                  <Tag color={SOURCE_COLOR[detail.order.source] || 'default'}>
-                    {SOURCE_LABEL[detail.order.source] || detail.order.source}
-                  </Tag>
-                </Descriptions.Item>
                 <Descriptions.Item label="提现实名">
                   {detail.order.user_name || '-'}
                 </Descriptions.Item>

src/lib/types.ts

@@ -542,6 +542,8 @@ export interface AdRevenueRecord {
   expected_coin: number;
   actual_coin: number;
   matched: boolean;
+  adn: string | null; // 本条发奖对应的实际填充 ADN
+  slot_id: string | null; // 本条发奖对应的底层 mediation rit
 }
 
 // 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)