Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 66823d876d |
@@ -194,16 +194,7 @@ 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?.trim() || (
|
||||
<Tooltip title="该历史记录没有可唯一确认的 SDK 广告来源,未猜测填充。">
|
||||
<span>未上报</span>
|
||||
</Tooltip>
|
||||
),
|
||||
},
|
||||
{ title: '来源广告网络', dataIndex: 'source_adn', width: 110, render: (value: string | null) => value || '-' },
|
||||
{
|
||||
title: 'eCPM(元)',
|
||||
dataIndex: 'ecpm',
|
||||
@@ -1111,11 +1102,7 @@ export default function AdRevenueReportPage() {
|
||||
style={{ marginTop: 8 }}
|
||||
rowKey="record_id"
|
||||
columns={DETAIL_COLUMNS}
|
||||
dataSource={r.sub_rewards.map((detail) => ({
|
||||
...detail,
|
||||
// 一次比价/领券可能由不同 ADN 连续填充,优先显示本条发奖记录的来源。
|
||||
source_adn: detail.adn ?? r.adn,
|
||||
}))}
|
||||
dataSource={r.sub_rewards.map((detail) => ({ ...detail, source_adn: r.adn }))}
|
||||
pagination={false}
|
||||
size="small"
|
||||
scroll={{ x: 900 }}
|
||||
@@ -1131,10 +1118,7 @@ export default function AdRevenueReportPage() {
|
||||
style={{ marginTop: 8 }}
|
||||
rowKey="record_id"
|
||||
columns={DETAIL_COLUMNS}
|
||||
dataSource={[{
|
||||
...r.reward_detail,
|
||||
source_adn: r.reward_detail.adn ?? r.adn,
|
||||
}]}
|
||||
dataSource={[{ ...r.reward_detail, source_adn: r.adn }]}
|
||||
pagination={false}
|
||||
size="small"
|
||||
scroll={{ x: 900 }}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -542,8 +542,6 @@ export interface AdRevenueRecord {
|
||||
expected_coin: number;
|
||||
actual_coin: number;
|
||||
matched: boolean;
|
||||
adn: string | null; // 本条发奖对应的实际填充 ADN
|
||||
slot_id: string | null; // 本条发奖对应的底层 mediation rit
|
||||
}
|
||||
|
||||
// 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)
|
||||
|
||||
Reference in New Issue
Block a user