Compare commits

..

4 Commits

Author SHA1 Message Date
guke 996d3853e0 Merge branch 'main' into codex/ad-revenue-video-total 2026-07-27 11:36:30 +08:00
linkeyu dd28307413 优化:修复侧栏滚动与权限管理位置 (#77)
## 本次改动

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

## 范围

仅修改 `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>
2026-07-27 11:36:20 +08:00
linkeyu c055cd705d 优化:完善广告收益顶部筛选默认值 (#78)
## 本次改动

- 类型和场景筛选增加明确的“全部”选项
- 将默认每页记录数从 1000 调整为 50

## 范围

仅修改 `src/app/(main)/ad-revenue-report/page.tsx`。

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #78
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-27 11:36:10 +08:00
linkeyu 13a08cf1c1 修复:看视频统计包含提现视频 2026-07-26 19:53:31 +08:00
5 changed files with 161 additions and 115 deletions
+23 -15
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 }> = {
@@ -396,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=关闭)
@@ -670,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;
@@ -784,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: '提现看视频' },
@@ -799,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: '福利' },
@@ -996,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 }}>
+123 -94
View File
@@ -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: '开始比价' },
};
function SceneConfig({ scene }: { scene: Scene }) {
const meta = META[scene];
/**
* 领券等候浮层的「新手引导视频」配置。
*
* 用户点首页「一键自动领取」→ 出等候浮层,浮层下方那块位置**前 3 次**放这支引导视频
* (而不是广告),每次固定发 120 金币;播完若浮层还开着,自动接着放广告(原逻辑)。
* 「系统配置 → 领券引导视频」tab 的一个区块。
*
* 后台只管两件事:**开关** 和 **换片**。次数(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) => {
setCfg(value);
setEnabled(value.enabled);
setMaxPlays(value.max_plays);
setRewardCoin(value.reward_coin);
const sync = (c: GuideCfg) => {
setCfg(c);
setEnabled(c.enabled);
};
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();
}, [scene]);
load();
}, []);
const save = async () => {
setSaving(true);
try {
const { data } = await api.patch<GuideCfg>(
'/admin/api/guide-video',
{ enabled, max_plays: maxPlays, reward_coin: rewardCoin },
{ params: { scene } },
);
const { data } = await api.patch<GuideCfg>('/admin/api/guide-video', { enabled });
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) => {
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);
}
};
// antd Upload:beforeUpload 里自行 POST(multipart),返回 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>(
'/admin/api/guide-video/video',
{ params: { scene } },
);
const { data } = await api.delete<GuideCfg>('/admin/api/guide-video/video');
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 }}>
Android {meta.action}广
<p style={{ color: '#999', marginTop: 0 }}>
广<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 ? (
// eslint-disable-next-line jsx-a11y/media-has-caption
<video
src={mediaUrl(cfg.video_url)}
controls
style={{ width: 240, maxHeight: 420, borderRadius: 12, background: '#000' }}
/>
) : (
<div style={{ height: 280, border: '1px dashed #d9d9d9', borderRadius: 12, display: 'grid', placeItems: 'center', color: '#aaa' }}>
{/* 左:视频预览 */}
<div>
<Text type="secondary" style={{ fontSize: 12 }}>
</Text>
<div style={{ marginTop: 8, width: 240 }}>
{cfg.video_url ? (
// eslint-disable-next-line jsx-a11y/media-has-caption
<video
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">MP4H.264100MB</Text>
<Text type="secondary" style={{ fontSize: 12 }}>
MP4H.264100MB
</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" />
</>
);
}
+1 -1
View File
@@ -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>
+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;
-1
View File
@@ -406,7 +406,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,后台不开放调整)