WonderableAI/shaguabijia-admin-web
2
0
Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
guke
2026-07-27 11:36:30 +08:00
parent 13a08cf1c1 dd28307413
commit 996d3853e0
3 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/(main)/ad-revenue-report/page.tsx
+29 -13
View File
@@ -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=关闭)
@@ -783,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: '提现看视频' },
@@ -798,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: '福利' },
@@ -1110,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 }}
@@ -1126,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
+14 -4
View File
@@ -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/lib/types.ts
+2
View File
@@ -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
}
// 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)