Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b685768569 |
+1
-1
@@ -3,7 +3,7 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev -p 3002",
|
||||
"dev": "next dev -p 3001",
|
||||
"build": "next build",
|
||||
"start": "next start -p 3001",
|
||||
"lint": "next lint"
|
||||
|
||||
@@ -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({
|
||||
open,
|
||||
onClose,
|
||||
userId,
|
||||
phone,
|
||||
dateFrom,
|
||||
dateTo,
|
||||
appEnv,
|
||||
revenueScope,
|
||||
feedScene,
|
||||
}: Props) {
|
||||
export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: 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 && (
|
||||
<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}
|
||||
/>
|
||||
)}
|
||||
{userId != null && <UserRewardPanel userId={userId} user={user} statsVariant="ad" />}
|
||||
</Drawer>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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<{
|
||||
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 [userDrawer, setUserDrawer] = useState<{ userId: number; phone: string | null } | null>(null);
|
||||
|
||||
// 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
|
||||
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}
|
||||
@@ -785,9 +758,9 @@ export default function AdRevenueReportPage() {
|
||||
.filter((item) => item.feed_scene === sceneName)
|
||||
.map((item) => item.sub_count ?? 1);
|
||||
return {
|
||||
p5: nearestRankPercentile(counts, 0.05),
|
||||
p50: nearestRankPercentile(counts, 0.5),
|
||||
p95: nearestRankPercentile(counts, 0.95),
|
||||
p5: percentile(counts, 0.05, false),
|
||||
p50: percentile(counts, 0.5, false),
|
||||
p95: percentile(counts, 0.95, false),
|
||||
};
|
||||
};
|
||||
return { coupon: summarize('coupon'), comparison: summarize('comparison') };
|
||||
@@ -1110,12 +1083,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="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={0} /></Col>
|
||||
<Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={0} /></Col>
|
||||
<Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={0} /></Col>
|
||||
<Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={0} /></Col>
|
||||
<Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} 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={1} /></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={1} /></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={1} /></Col>
|
||||
</Row>
|
||||
</Card>
|
||||
)}
|
||||
@@ -1311,11 +1284,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>
|
||||
|
||||
@@ -1,21 +1,7 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import {
|
||||
Alert,
|
||||
Button,
|
||||
Card,
|
||||
Descriptions,
|
||||
InputNumber,
|
||||
Popconfirm,
|
||||
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';
|
||||
@@ -23,79 +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;
|
||||
const MIN_PLAYS = 1;
|
||||
const MAX_PLAYS = 50;
|
||||
const MIN_REWARD_COIN = 10;
|
||||
const MAX_REWARD_COIN = 10000;
|
||||
type Scene = 'coupon' | 'comparison';
|
||||
|
||||
const META: Record<Scene, { title: string; action: string }> = {
|
||||
coupon: { title: '一键自动领取引导视频', action: '一键自动领取' },
|
||||
comparison: { title: '开始比价引导视频', action: '开始比价' },
|
||||
};
|
||||
|
||||
function formatDuration(durationMs: number | null | undefined) {
|
||||
if (durationMs == null || !Number.isFinite(durationMs)) return '—';
|
||||
return `${(durationMs / 1000).toFixed(3).replace(/\.?0+$/, '')} 秒`;
|
||||
}
|
||||
|
||||
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);
|
||||
const [enabled, setEnabled] = useState(false);
|
||||
const [maxPlays, setMaxPlays] = useState(3);
|
||||
const [rewardCoin, setRewardCoin] = useState(100);
|
||||
const canEdit = canDo(['operator']);
|
||||
const configValid =
|
||||
Number.isInteger(maxPlays) &&
|
||||
maxPlays >= MIN_PLAYS &&
|
||||
maxPlays <= MAX_PLAYS &&
|
||||
Number.isInteger(rewardCoin) &&
|
||||
rewardCoin >= MIN_REWARD_COIN &&
|
||||
rewardCoin <= MAX_REWARD_COIN &&
|
||||
rewardCoin % 10 === 0;
|
||||
|
||||
const sync = (value: GuideCfg) => {
|
||||
setCfg(value);
|
||||
setEnabled(value.enabled);
|
||||
setMaxPlays(value.max_plays);
|
||||
setRewardCoin(value.reward_coin);
|
||||
// 本地编辑态,保存时一次性 PATCH
|
||||
const [enabled, setEnabled] = useState(true);
|
||||
|
||||
const canEdit = canDo(['operator']);
|
||||
|
||||
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 () => {
|
||||
if (!configValid) {
|
||||
message.error('请检查配置:播放次数为 1~50,每次金币为 10~10000 且必须是 10 的倍数');
|
||||
return;
|
||||
}
|
||||
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 {
|
||||
@@ -103,28 +65,12 @@ 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)) {
|
||||
message.error('仅支持 MP4 视频(H.264 或 HEVC/H.265 编码)');
|
||||
// 有些系统给 .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;
|
||||
}
|
||||
if (file.size > MAX_BYTES) {
|
||||
@@ -135,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 {
|
||||
@@ -154,107 +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}」后,符合次数条件时播放本视频。次数按账号、按功能分别计算,
|
||||
每完整观看 1/10 视频立即发放 1/10 金币;中途退出只保留已完成圈的奖励。
|
||||
<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 }}>
|
||||
{cfg.analysis_status === 'invalid' || cfg.analysis_error ? (
|
||||
<Alert
|
||||
type="error"
|
||||
showIcon
|
||||
message="视频分析异常,当前场景不可启用"
|
||||
description={cfg.analysis_error || '请重新上传符合要求的视频'}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
{/* 右:编辑控件 */}
|
||||
<Space direction="vertical" size="middle" style={{ minWidth: 360 }}>
|
||||
<Space>
|
||||
<span>启用:</span>
|
||||
<Switch
|
||||
checked={enabled}
|
||||
disabled={!canEdit || (!enabled && cfg.analysis_status !== 'valid')}
|
||||
onChange={setEnabled}
|
||||
/>
|
||||
<span>启用引导视频:</span>
|
||||
<Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
|
||||
{!enabled && <Tag color="orange">已关闭</Tag>}
|
||||
{!enabled && cfg.analysis_status !== 'valid' && <Text type="secondary">请先上传并通过视频分析</Text>}
|
||||
</Space>
|
||||
<Space>
|
||||
<span>播放次数:</span>
|
||||
<InputNumber
|
||||
min={MIN_PLAYS}
|
||||
max={MAX_PLAYS}
|
||||
precision={0}
|
||||
status={maxPlays < MIN_PLAYS || maxPlays > MAX_PLAYS ? 'error' : undefined}
|
||||
value={maxPlays}
|
||||
disabled={!canEdit}
|
||||
onChange={(v) => setMaxPlays(v ?? MIN_PLAYS)}
|
||||
/>
|
||||
<Text type="secondary">每个账号 1~50 次(默认 3)</Text>
|
||||
</Space>
|
||||
<Space>
|
||||
<span>每次金币总价:</span>
|
||||
<InputNumber
|
||||
min={MIN_REWARD_COIN}
|
||||
max={MAX_REWARD_COIN}
|
||||
step={10}
|
||||
precision={0}
|
||||
status={
|
||||
rewardCoin < MIN_REWARD_COIN ||
|
||||
rewardCoin > MAX_REWARD_COIN ||
|
||||
rewardCoin % 10 !== 0
|
||||
? 'error'
|
||||
: undefined
|
||||
}
|
||||
value={rewardCoin}
|
||||
disabled={!canEdit}
|
||||
onChange={(v) => setRewardCoin(v ?? MIN_REWARD_COIN)}
|
||||
/>
|
||||
<Text type="secondary">10~10000,必须是 10 的倍数(默认 100)</Text>
|
||||
</Space>
|
||||
{cfg.video_url ? (
|
||||
<Descriptions size="small" bordered column={2}>
|
||||
<Descriptions.Item label="总时长">{formatDuration(cfg.duration_ms)}</Descriptions.Item>
|
||||
<Descriptions.Item label="单圈时长">
|
||||
{formatDuration(cfg.circle_duration_ms ?? (cfg.duration_ms == null ? null : cfg.duration_ms / 10))}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="单圈金币">
|
||||
{rewardCoin === cfg.reward_coin ? cfg.reward_per_circle : rewardCoin / cfg.circle_count}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="编码">
|
||||
视频 {cfg.video_codec || '—'} / 音频 {cfg.audio_codec || '无'}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="分析状态" span={2}>
|
||||
<Tag color={cfg.analysis_status === 'valid' ? 'green' : 'orange'}>
|
||||
{cfg.analysis_status === 'valid'
|
||||
? '分析完成'
|
||||
: cfg.analysis_status === 'invalid'
|
||||
? '分析异常'
|
||||
: '未上传'}
|
||||
</Tag>
|
||||
</Descriptions.Item>
|
||||
</Descriptions>
|
||||
) : null}
|
||||
|
||||
<Space wrap>
|
||||
<Upload accept="video/mp4,.mp4" showUploadList={false} beforeUpload={beforeUpload} disabled={!canEdit}>
|
||||
<Button icon={<UploadOutlined />} loading={uploading} disabled={!canEdit}>
|
||||
@@ -262,37 +195,28 @@ function SceneConfig({ scene }: { scene: Scene }) {
|
||||
</Button>
|
||||
</Upload>
|
||||
{cfg.video_url && (
|
||||
<Popconfirm
|
||||
title={`确认移除${meta.title}?`}
|
||||
description="移除后该场景的新播放将无法使用引导视频,已经开始的播放不受影响。"
|
||||
okText="确认移除"
|
||||
cancelText="取消"
|
||||
okButtonProps={{ danger: true }}
|
||||
onConfirm={removeVideo}
|
||||
<Button
|
||||
icon={<DeleteOutlined />}
|
||||
danger
|
||||
loading={uploading}
|
||||
disabled={!canEdit}
|
||||
onClick={removeVideo}
|
||||
>
|
||||
<Button icon={<DeleteOutlined />} danger loading={uploading} disabled={!canEdit}>
|
||||
移除视频
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
移除视频
|
||||
</Button>
|
||||
)}
|
||||
<Text type="secondary">MP4(H.264 或 HEVC/H.265,可无音轨;有音轨须 AAC),30~180 秒,≤100MB</Text>
|
||||
<Text type="secondary" style={{ fontSize: 12 }}>
|
||||
MP4(H.264),≤100MB
|
||||
</Text>
|
||||
</Space>
|
||||
<Button type="primary" loading={saving} disabled={!canEdit || !configValid} onClick={save}>
|
||||
保存配置
|
||||
|
||||
<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" />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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'>(hasInitialRange ? 'range' : 'all');
|
||||
const [range, setRange] = useState<[Dayjs, Dayjs] | null>(() =>
|
||||
hasInitialRange ? [dayjs(initialDateFrom), dayjs(initialDateTo)] : null,
|
||||
);
|
||||
const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
|
||||
const [range, setRange] = useState<[Dayjs, Dayjs] | null>(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>
|
||||
|
||||
|
||||
@@ -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)。 */
|
||||
|
||||
+8
-15
@@ -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; // 信息流广告提现
|
||||
}
|
||||
|
||||
@@ -414,23 +414,16 @@ export interface FeedbackQrConfig {
|
||||
updated_at: string | null;
|
||||
}
|
||||
|
||||
/** 领券/比价等候浮层的引导视频配置。视频分析结果均由服务端 ffprobe 生成。 */
|
||||
/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,每次固定 120 金币)。
|
||||
* 后台只开放 enabled + 换片;下面几个字段接口仍返回,但页面不展示、也不回传。 */
|
||||
export interface GuideVideoConfig {
|
||||
scene: 'coupon' | 'comparison';
|
||||
enabled: boolean;
|
||||
video_url: string | null;
|
||||
max_plays: number;
|
||||
reward_coin: number;
|
||||
video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
|
||||
max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
|
||||
reward_coin: number; // 每次固定金币(服务端默认 120,播完 / 中途关闭都发)
|
||||
updated_at: string | null;
|
||||
duration_ms: number | null;
|
||||
circle_duration_ms: number | null;
|
||||
circle_count: 10;
|
||||
reward_per_circle: number;
|
||||
video_codec: string | null;
|
||||
audio_codec: string | null;
|
||||
analysis_status: 'missing' | 'valid' | 'invalid';
|
||||
analysis_error: string | null;
|
||||
config_version: number;
|
||||
total_plays: number; // 只读统计:全站已播次数(后台不再展示)
|
||||
granted_plays: number; // 只读统计:其中已发币次数(后台不再展示)
|
||||
}
|
||||
|
||||
export interface AuditLog {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# 一键启动傻瓜比价本地联调:用户侧 API(8772) + 运营后台 API(8773) + 运营后台前端(3002)。
|
||||
# 一键启动傻瓜比价本地联调:用户侧 API(8770) + 运营后台 API(8771) + 运营后台前端(3001)。
|
||||
# 跨平台:Windows(Git Bash)与 macOS 通用。停止用 ./stop.sh。
|
||||
#
|
||||
# 路径相对本脚本推导(本脚本在 shaguabijia-admin-web 内,server 是它的同级目录),
|
||||
@@ -93,19 +93,19 @@ start_uvicorn() {
|
||||
}
|
||||
|
||||
# 用户侧绑 0.0.0.0,真机/模拟器可经局域网 IP 访问;后台只本机用,绑 127.0.0.1
|
||||
start_uvicorn "user-api" "app.main:app" 8772 "0.0.0.0"
|
||||
start_uvicorn "admin-api" "app.admin.main:admin_app" 8773 "127.0.0.1"
|
||||
start_uvicorn "user-api" "app.main:app" 8770 "0.0.0.0"
|
||||
start_uvicorn "admin-api" "app.admin.main:admin_app" 8771 "127.0.0.1"
|
||||
|
||||
if port_in_use 3002; then
|
||||
echo "↺ admin-web 已在 :3002(跳过)"
|
||||
if port_in_use 3001; then
|
||||
echo "↺ admin-web 已在 :3001(跳过)"
|
||||
else
|
||||
cd "$WEB_DIR" || exit 1
|
||||
nohup npm run dev > "$LOG_DIR/admin-web.log" 2>&1 &
|
||||
echo "$!" > "$LOG_DIR/admin-web.pid"
|
||||
echo "✅ admin-web 起在 :3002 (日志 $LOG_DIR/admin-web.log)"
|
||||
echo "✅ admin-web 起在 :3001 (日志 $LOG_DIR/admin-web.log)"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "⏳ 前端首次编译要几秒,然后开 👉 http://localhost:3002 (admin / admin12345)"
|
||||
echo " 用户侧 API: http://127.0.0.1:8772 | 后台 API: http://127.0.0.1:8773/admin/docs"
|
||||
echo "⏳ 前端首次编译要几秒,然后开 👉 http://localhost:3001 (admin / admin12345)"
|
||||
echo " 用户侧 API: http://127.0.0.1:8770 | 后台 API: http://127.0.0.1:8771/admin/docs"
|
||||
echo " 看日志: tail -f $LOG_DIR/admin-web.log | 停止: bash \"$SCRIPT_DIR/stop.sh\""
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# 停止 start.sh 起的三个服务:用户侧 API(8772) + 后台 API(8773) + 前端(3002)。
|
||||
# 停止 start.sh 起的三个服务:用户侧 API(8770) + 后台 API(8771) + 前端(3001)。
|
||||
# 双保险:先按 start.sh 落的 PID 文件杀,再按端口兜底(Windows 走 PowerShell,mac 走 lsof)。
|
||||
# (PG 若由 brew 自启,本脚本不停它。)
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
@@ -32,8 +32,8 @@ kill_port() {
|
||||
fi
|
||||
}
|
||||
|
||||
for port in 8772 8773 3002; do
|
||||
for port in 8770 8771 3001; do
|
||||
kill_port "$port"
|
||||
done
|
||||
|
||||
echo "✅ 已停止(用户侧 8772 / 后台 8773 / 前端 3002)。"
|
||||
echo "✅ 已停止(用户侧 8770 / 后台 8771 / 前端 3001)。"
|
||||
|
||||
Reference in New Issue
Block a user