Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 linkeyu
|
6a232cc52e |
@@ -66,89 +66,21 @@ const APP_TAG: Record<string, { color: string; label: string }> = {
|
||||
test: { color: 'default', label: '测试应用' },
|
||||
};
|
||||
|
||||
const REWARD_STATUS_HINT: Record<string, string> = {
|
||||
granted: '已完成金币发放',
|
||||
capped: '次数超限，未发金币',
|
||||
ecpm_missing: '缺少有效 eCPM，未发金币',
|
||||
too_short: '播放时长未达到发奖条件，未发金币',
|
||||
closed_early: '用户提前关闭广告，未发金币',
|
||||
};
|
||||
|
||||
const PLAYBACK_STATUS_TAG: Record<string, { color: string; label: string }> = {
|
||||
completed: { color: 'green', label: '已完成' },
|
||||
// 发奖状态 → 颜色 + 中文(含「不发金币的原因」:提前关闭/未满10秒/缺eCPM/次数超限)
|
||||
const STATUS_TAG: Record<string, { color: string; label: string }> = {
|
||||
granted: { color: 'green', label: '已发' },
|
||||
capped: { color: 'orange', label: '次数超限' },
|
||||
ecpm_missing: { color: 'red', label: '缺 eCPM' },
|
||||
too_short: { color: 'gold', label: '未满10秒' },
|
||||
closed_early: { color: 'default', label: '提前关闭' },
|
||||
unknown: { color: 'default', label: '未知' },
|
||||
};
|
||||
|
||||
function rewardStatuses(row: AdRevenueRow): string[] {
|
||||
if (row.sub_rewards?.length) return row.sub_rewards.map((reward) => reward.status);
|
||||
return row.status ? [row.status] : [];
|
||||
}
|
||||
|
||||
function rewardStatusTag(row: AdRevenueRow) {
|
||||
const statuses = rewardStatuses(row);
|
||||
if (!row.has_reward || statuses.length === 0) {
|
||||
return { color: 'default', label: '无记录', hint: '仅记录到广告展示，没有对应发奖记录。' };
|
||||
}
|
||||
|
||||
const grantedCount = statuses.filter((status) => status === 'granted').length;
|
||||
const reasonSummary = Object.entries(
|
||||
statuses
|
||||
.filter((status) => status !== 'granted')
|
||||
.reduce<Record<string, number>>((counts, status) => {
|
||||
counts[status] = (counts[status] ?? 0) + 1;
|
||||
return counts;
|
||||
}, {}),
|
||||
)
|
||||
.map(([status, count]) => `${REWARD_STATUS_HINT[status] ?? status} ${count} 条`)
|
||||
.join('；');
|
||||
|
||||
if (grantedCount === statuses.length) {
|
||||
return { color: 'green', label: '已发', hint: `已完成金币发放${statuses.length > 1 ? ` ${statuses.length} 条` : ''}。` };
|
||||
}
|
||||
if (grantedCount > 0) {
|
||||
return {
|
||||
color: 'blue',
|
||||
label: '部分已发',
|
||||
hint: `已发 ${grantedCount} 条，未发 ${statuses.length - grantedCount} 条${reasonSummary ? `；${reasonSummary}` : ''}。`,
|
||||
};
|
||||
}
|
||||
return { color: 'default', label: '未发', hint: reasonSummary ? `${reasonSummary}。` : '未发放金币。' };
|
||||
}
|
||||
|
||||
function playbackStatusTag(row: AdRevenueRow) {
|
||||
const statuses = rewardStatuses(row);
|
||||
if (statuses.length === 0) {
|
||||
return row.has_impression
|
||||
? { color: 'blue', label: '仅展示', hint: '记录到广告展示，但没有对应的播放结果。' }
|
||||
: { color: 'default', label: '无记录', hint: '没有可用的广告播放记录。' };
|
||||
}
|
||||
|
||||
const playbackCounts = statuses.reduce<Record<string, number>>((counts, status) => {
|
||||
const playbackStatus =
|
||||
status === 'too_short' || status === 'closed_early'
|
||||
? status
|
||||
: status === 'granted' || status === 'capped' || status === 'ecpm_missing'
|
||||
? 'completed'
|
||||
: 'unknown';
|
||||
counts[playbackStatus] = (counts[playbackStatus] ?? 0) + 1;
|
||||
return counts;
|
||||
}, {});
|
||||
const entries = Object.entries(playbackCounts);
|
||||
if (entries.length === 1) {
|
||||
const [status, count] = entries[0];
|
||||
const tag = PLAYBACK_STATUS_TAG[status];
|
||||
return {
|
||||
...tag,
|
||||
hint: `${tag.label}${count > 1 ? ` ${count} 条` : ''}。`,
|
||||
};
|
||||
}
|
||||
const hint = entries
|
||||
.map(([status, count]) => `${PLAYBACK_STATUS_TAG[status].label} ${count} 条`)
|
||||
.join('；');
|
||||
return { color: 'purple', label: '混合状态', hint: `${hint}。` };
|
||||
}
|
||||
const STATUS_HINT: Record<string, string> = {
|
||||
granted: '已满足当前客户端发奖条件并完成金币发放。',
|
||||
too_short: '旧版 Draw 信息流观看不足 10 秒，不发金币；新版按观看比例发放时会记为已发。',
|
||||
closed_early: '用户在达到发奖条件前主动关闭，不发金币。',
|
||||
capped: '已达到次数上限，不再发金币。',
|
||||
ecpm_missing: '缺少有效 eCPM，无法计算金币。',
|
||||
};
|
||||
|
||||
const fmtFactorRange = (a: number | null, b: number | null) => {
|
||||
if (a == null) return '-';
|
||||
@@ -368,8 +300,6 @@ export default function AdRevenueReportPage() {
|
||||
const { message } = App.useApp();
|
||||
const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs().subtract(1, 'day'), dayjs().subtract(1, 'day')]);
|
||||
const [userId, setUserId] = useState<number | null>(null);
|
||||
const [appEnv, setAppEnv] = useState<'prod' | 'test' | 'all'>('prod');
|
||||
const [revenueScope, setRevenueScope] = useState<'business' | 'all'>('business');
|
||||
const [adType, setAdType] = useState<string | undefined>();
|
||||
// 「场景」作为后端全局筛选(feed_scene):同时影响明细 / 合计 / 趋势,与「用户 / 类型」一致,点「查询」生效。
|
||||
const [scene, setScene] = useState<string | undefined>();
|
||||
@@ -403,8 +333,6 @@ export default function AdRevenueReportPage() {
|
||||
date_from: from,
|
||||
date_to: to,
|
||||
user_id: userId ?? undefined,
|
||||
app_env: appEnv === 'all' ? undefined : appEnv,
|
||||
revenue_scope: revenueScope,
|
||||
ad_type: adType ?? undefined,
|
||||
feed_scene: scene ?? undefined,
|
||||
granularity: gran,
|
||||
@@ -446,7 +374,7 @@ export default function AdRevenueReportPage() {
|
||||
setLoading(false);
|
||||
}
|
||||
},
|
||||
[range, userId, appEnv, revenueScope, adType, scene, granularity, limit, sortBy],
|
||||
[range, userId, adType, scene, granularity, limit, sortBy],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -553,20 +481,12 @@ export default function AdRevenueReportPage() {
|
||||
},
|
||||
{
|
||||
title: '发奖状态',
|
||||
key: 'reward_status',
|
||||
dataIndex: 'status',
|
||||
width: 100,
|
||||
render: (_: unknown, row: AdRevenueRow) => {
|
||||
const tag = rewardStatusTag(row);
|
||||
return <Tooltip title={tag.hint}><Tag color={tag.color}>{tag.label}</Tag></Tooltip>;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '广告播放状态',
|
||||
key: 'playback_status',
|
||||
width: 120,
|
||||
render: (_: unknown, row: AdRevenueRow) => {
|
||||
const tag = playbackStatusTag(row);
|
||||
return <Tooltip title={tag.hint}><Tag color={tag.color}>{tag.label}</Tag></Tooltip>;
|
||||
render: (s: string | null) => {
|
||||
if (!s) return <Tooltip title="仅记录广告展示，没有对应发奖事件。"><Tag>仅展示</Tag></Tooltip>;
|
||||
const t = STATUS_TAG[s] ?? { color: 'default', label: s };
|
||||
return <Tooltip title={STATUS_HINT[s]}><Tag color={t.color}>{t.label}</Tag></Tooltip>;
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -608,8 +528,7 @@ export default function AdRevenueReportPage() {
|
||||
'ecpm_yuan',
|
||||
'revenue_yuan',
|
||||
'actual_coin',
|
||||
'reward_status',
|
||||
'playback_status',
|
||||
'status',
|
||||
'ad_type',
|
||||
'app_env',
|
||||
'our_code_id',
|
||||
@@ -701,8 +620,7 @@ export default function AdRevenueReportPage() {
|
||||
<br />
|
||||
核心指标里的<b>「穿山甲后台收益(T+1)」</b>来自穿山甲 GroMore 数据 API(后台结算口径,次日出数):
|
||||
<b>穿山甲预估收益</b>=接口 revenue、<b>收益API</b>=各 ADN 回传更接近结算。穿山甲不提供分用户/类型/场景维度,
|
||||
故仅在<b>可对账视图</b>(未按用户/类型/场景筛选)展示;环境和数据范围会同时作用于客户端与穿山甲汇总。
|
||||
默认“正式 + 业务代码位”用于同口径对账;切到“全部代码位”会包含广告测试等非业务曝光。
|
||||
故仅在<b>全量视图</b>(未按用户/类型/场景筛选)展示;逐条事件行仍是客户端预估,不受其影响。
|
||||
</div>
|
||||
}
|
||||
>
|
||||
@@ -737,31 +655,6 @@ export default function AdRevenueReportPage() {
|
||||
style={{ width: 130 }}
|
||||
/>
|
||||
</Space>
|
||||
<Space size={6}>
|
||||
<Typography.Text type="secondary">环境</Typography.Text>
|
||||
<Select
|
||||
value={appEnv}
|
||||
onChange={setAppEnv}
|
||||
style={{ width: 130 }}
|
||||
options={[
|
||||
{ value: 'prod', label: '正式(prod)' },
|
||||
{ value: 'test', label: '测试(dev)' },
|
||||
{ value: 'all', label: '全部' },
|
||||
]}
|
||||
/>
|
||||
</Space>
|
||||
<Space size={6}>
|
||||
<Typography.Text type="secondary">数据范围</Typography.Text>
|
||||
<Select
|
||||
value={revenueScope}
|
||||
onChange={setRevenueScope}
|
||||
style={{ width: 150 }}
|
||||
options={[
|
||||
{ value: 'business', label: '业务代码位' },
|
||||
{ value: 'all', label: '全部代码位' },
|
||||
]}
|
||||
/>
|
||||
</Space>
|
||||
<Space size={6}>
|
||||
<Typography.Text type="secondary">类型</Typography.Text>
|
||||
<Select
|
||||
|
||||
@@ -10,11 +10,9 @@ import {
|
||||
DatePicker,
|
||||
Divider,
|
||||
Input,
|
||||
Popover,
|
||||
Row,
|
||||
Select,
|
||||
Space,
|
||||
Spin,
|
||||
Statistic,
|
||||
Table,
|
||||
Tag,
|
||||
@@ -74,23 +72,9 @@ interface CouponDataRow {
|
||||
app_env: string | null;
|
||||
started_at: string;
|
||||
claimed_count: number | null;
|
||||
point_success_count: number | null;
|
||||
point_total_count: number | null;
|
||||
// 兼容旧后端的内嵌明细；新后端不再返回，改为点击后按 trace 加载。
|
||||
point_details?: CouponPointDetail[];
|
||||
trace_url: string | null;
|
||||
ad_revenue_yuan: number | null; // 本次领券看的信息流广告预估收益(元);未填充为 null
|
||||
}
|
||||
interface CouponPointDetail {
|
||||
coupon_id: string;
|
||||
coupon_name: string | null;
|
||||
status: string;
|
||||
reason: string | null;
|
||||
}
|
||||
interface CouponPointDetailsOut {
|
||||
trace_id: string;
|
||||
items: CouponPointDetail[];
|
||||
}
|
||||
interface CouponDataReport {
|
||||
date_from: string;
|
||||
date_to: string;
|
||||
@@ -132,100 +116,6 @@ const STATUS_TAG: Record<string, { color: string; label: string }> = {
|
||||
abandoned: { color: 'orange', label: '中途退出' },
|
||||
};
|
||||
|
||||
const POINT_STATUS_TAG: Record<string, { color: string; label: string }> = {
|
||||
success: { color: 'success', label: '成功' },
|
||||
already_claimed: { color: 'processing', label: '已领' },
|
||||
failed: { color: 'error', label: '失败' },
|
||||
skipped: { color: 'default', label: '跳过' },
|
||||
};
|
||||
|
||||
function PointScorePopover({ row }: { row: CouponDataRow }) {
|
||||
const { message } = App.useApp();
|
||||
const [details, setDetails] = useState<CouponPointDetail[] | null>(row.point_details ?? null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [loadError, setLoadError] = useState<string | null>(null);
|
||||
|
||||
if (row.point_success_count == null || row.point_total_count == null || row.point_total_count <= 0) {
|
||||
return <Typography.Text type="secondary">-</Typography.Text>;
|
||||
}
|
||||
const score = `${row.point_success_count}/${row.point_total_count}`;
|
||||
const scoreColor =
|
||||
row.point_success_count === row.point_total_count
|
||||
? STATUS_TAG.completed.color
|
||||
: STATUS_TAG.abandoned.color;
|
||||
const loadDetails = async () => {
|
||||
if (details !== null || loading) return;
|
||||
setLoading(true);
|
||||
setLoadError(null);
|
||||
try {
|
||||
const response = await api.get<CouponPointDetailsOut>('/admin/api/coupon-data/point-details', {
|
||||
params: { trace_id: row.trace_id },
|
||||
});
|
||||
setDetails(response.data.items);
|
||||
} catch (error) {
|
||||
const errorMessage = errMsg(error);
|
||||
setLoadError(errorMessage);
|
||||
message.error(errorMessage);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Popover
|
||||
trigger="click"
|
||||
placement="bottomLeft"
|
||||
title={`点位明细（${score}）`}
|
||||
onOpenChange={(open) => {
|
||||
if (open) void loadDetails();
|
||||
}}
|
||||
content={(
|
||||
<div style={{ width: 380, maxHeight: 360, overflowY: 'auto' }}>
|
||||
{loading || (details === null && loadError === null) ? (
|
||||
<Spin size="small" style={{ display: 'block', margin: '24px auto' }} />
|
||||
) : loadError ? (
|
||||
<Typography.Text type="danger">明细加载失败，请关闭后重试</Typography.Text>
|
||||
) : details && details.length > 0 ? details.map((point, index) => {
|
||||
const status = POINT_STATUS_TAG[point.status] ?? {
|
||||
color: 'default', label: point.status,
|
||||
};
|
||||
return (
|
||||
<div
|
||||
key={`${point.coupon_id}-${index}`}
|
||||
style={{
|
||||
padding: '8px 0',
|
||||
borderBottom: index < details.length - 1 ? '1px solid #f0f0f0' : undefined,
|
||||
}}
|
||||
>
|
||||
<div style={{ display: 'flex', alignItems: 'flex-start', gap: 12 }}>
|
||||
<div style={{ flex: 1, minWidth: 0 }}>
|
||||
<Typography.Text>{point.coupon_name || point.coupon_id}</Typography.Text>
|
||||
{point.coupon_name ? (
|
||||
<div><Typography.Text type="secondary">{point.coupon_id}</Typography.Text></div>
|
||||
) : null}
|
||||
</div>
|
||||
<Tag color={status.color} style={{ marginInlineEnd: 0 }}>{status.label}</Tag>
|
||||
</div>
|
||||
{point.reason ? (
|
||||
<div style={{ marginTop: 4 }}>
|
||||
<Typography.Text type="danger">原因：{point.reason}</Typography.Text>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}) : (
|
||||
<Typography.Text type="secondary">暂无点位明细</Typography.Text>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
>
|
||||
<Button type="link" size="small" style={{ height: 'auto', padding: 0, color: scoreColor }}>
|
||||
{score}
|
||||
</Button>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
|
||||
// ms → "1.5s"(空值显示 -)
|
||||
const fmtSec = (ms: number | null | undefined): string =>
|
||||
ms == null ? '-' : `${(ms / 1000).toFixed(1)}s`;
|
||||
@@ -602,10 +492,20 @@ export default function CouponDataPage() {
|
||||
render: (v: number | null) => fmtSec(v),
|
||||
},
|
||||
{
|
||||
title: '百分比',
|
||||
title: '点位成功率',
|
||||
key: 'point_success_rate',
|
||||
width: 110,
|
||||
render: (_: unknown, r: CouponDataRow) => <PointScorePopover row={r} />,
|
||||
render: (_: unknown, r: CouponDataRow) => (
|
||||
<Tooltip title="当前接口未返回本场应领点位及逐点结果，前端不使用全局均值冒充本场成功率。">
|
||||
{r.trace_url ? (
|
||||
<a href={r.trace_url} target="_blank" rel="noreferrer">
|
||||
查看明细
|
||||
</a>
|
||||
) : (
|
||||
<Typography.Text type="secondary">待埋点</Typography.Text>
|
||||
)}
|
||||
</Tooltip>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: '广告收益',
|
||||
|
||||
@@ -499,7 +499,12 @@ export default function DashboardPage() {
|
||||
const tokenCostYuan = periodData?.comparison.token_cost_total_yuan ?? null;
|
||||
const couponRewardCoinTotal = periodData?.coins.coupon_reward_coin_total;
|
||||
const comparisonRewardCoinTotal = periodData?.coins.comparison_reward_coin_total;
|
||||
const regularTaskCoinTotal = periodData?.coins.regular_task_coin_total;
|
||||
const signinCoinTotal = periodData?.coins.signin_coin_total;
|
||||
const signinBoostCoinTotal = periodData?.coins.signin_boost_coin_total;
|
||||
const taskCoinTotal = periodData?.coins.task_coin_total;
|
||||
const regularTaskCoinTotal =
|
||||
periodData?.coins.regular_task_coin_total ??
|
||||
((signinCoinTotal ?? 0) + (signinBoostCoinTotal ?? 0) + (taskCoinTotal ?? 0));
|
||||
const cpsAvailable = data?.cps.available === true;
|
||||
const meituanCpsCommissionCents = data?.cps.meituan_commission_cents;
|
||||
const jdCpsCommissionCents = data?.cps.jd_commission_cents;
|
||||
@@ -1072,7 +1077,6 @@ export default function DashboardPage() {
|
||||
value={fmtInt(regularTaskCoinTotal)}
|
||||
delta={regularTaskCoinRatio.value}
|
||||
deltaTone={regularTaskCoinRatio.tone}
|
||||
hint="每日签到、历史签到膨胀、通知/其他任务、上报更低价和反馈采纳的实发金币之和。"
|
||||
/>
|
||||
<StatCard
|
||||
title="本期提现金额"
|
||||
|
||||
@@ -20,7 +20,6 @@ import type { Dayjs } from 'dayjs';
|
||||
import { api } from '@/lib/api';
|
||||
import { canDo } from '@/lib/auth';
|
||||
import { formatWallTime } from '@/lib/format';
|
||||
import { refreshReviewBadge } from '@/lib/reviewBadge';
|
||||
import { usePagedList } from '@/lib/usePagedList';
|
||||
import type { Feedback, FeedbackSummary } from '@/lib/types';
|
||||
import FeedbackHandleDrawer from './FeedbackHandleDrawer';
|
||||
@@ -432,11 +431,7 @@ export default function FeedbacksPage() {
|
||||
feedback={drawerFb}
|
||||
open={drawerOpen}
|
||||
onClose={() => setDrawerOpen(false)}
|
||||
onDone={() => {
|
||||
reload();
|
||||
loadSummary();
|
||||
refreshReviewBadge('/feedbacks');
|
||||
}}
|
||||
onDone={() => { reload(); loadSummary(); }}
|
||||
/>
|
||||
|
||||
<UserRecordsDrawer<Feedback>
|
||||
|
||||
+8
-110
@@ -1,6 +1,6 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { usePathname, useRouter } from 'next/navigation';
|
||||
import {
|
||||
BarChartOutlined,
|
||||
@@ -25,16 +25,7 @@ import {
|
||||
import { Avatar, Dropdown, Layout, Tooltip } from 'antd';
|
||||
import { api } from '@/lib/api';
|
||||
import { clearAuth, getAdmin, getToken, setAuth } from '@/lib/auth';
|
||||
import {
|
||||
REVIEW_BADGE_REFRESH_EVENT,
|
||||
type ReviewBadgeKey,
|
||||
} from '@/lib/reviewBadge';
|
||||
import type {
|
||||
AdminInfo,
|
||||
FeedbackSummary,
|
||||
PriceReportSummary,
|
||||
WithdrawSummary,
|
||||
} from '@/lib/types';
|
||||
import type { AdminInfo } from '@/lib/types';
|
||||
|
||||
const { Sider, Header, Content } = Layout;
|
||||
|
||||
@@ -67,6 +58,8 @@ const NAV_GROUPS: NavGroup[] = [
|
||||
{ key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
|
||||
{ key: '/coupon-data', icon: <GiftOutlined />, label: '领券记录' },
|
||||
{ key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' },
|
||||
{ key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
|
||||
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
|
||||
],
|
||||
},
|
||||
{
|
||||
@@ -90,18 +83,9 @@ const NAV_GROUPS: NavGroup[] = [
|
||||
{ key: '/users', icon: <UserOutlined />, label: '用户管理' },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'monitoring-audit',
|
||||
icon: <FileSearchOutlined />,
|
||||
label: '监控审计',
|
||||
children: [
|
||||
{ key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
|
||||
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
|
||||
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
|
||||
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
|
||||
],
|
||||
},
|
||||
{ key: '/admins', icon: <TeamOutlined />, label: '权限管理' },
|
||||
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
|
||||
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
|
||||
];
|
||||
|
||||
// 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐
|
||||
@@ -112,8 +96,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
const pathname = usePathname();
|
||||
const [admin, setAdmin] = useState<AdminInfo | null>(null);
|
||||
const [collapsed, setCollapsed] = useState(false);
|
||||
const [pendingReviewCounts, setPendingReviewCounts] = useState<Partial<Record<ReviewBadgeKey, number>>>({});
|
||||
const reviewRefreshVersion = useRef<Partial<Record<ReviewBadgeKey, number>>>({});
|
||||
|
||||
useEffect(() => {
|
||||
const token = getToken();
|
||||
@@ -132,44 +114,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
.catch(() => {});
|
||||
}, [router]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!admin) return;
|
||||
const canAccess = (page: string) =>
|
||||
admin.role === 'super_admin' || !admin.pages || admin.pages.includes(page);
|
||||
|
||||
const refresh = async (key: ReviewBadgeKey) => {
|
||||
if (!canAccess(key.slice(1))) return;
|
||||
const version = (reviewRefreshVersion.current[key] ?? 0) + 1;
|
||||
reviewRefreshVersion.current[key] = version;
|
||||
let count: number;
|
||||
if (key === '/withdraws') {
|
||||
count = (await api.get<WithdrawSummary>('/admin/api/withdraws/summary')).data.reviewing_count;
|
||||
} else if (key === '/price-reports') {
|
||||
count = (await api.get<PriceReportSummary>('/admin/api/price-reports/summary')).data.pending;
|
||||
} else {
|
||||
count = (await api.get<FeedbackSummary>('/admin/api/feedbacks/summary')).data.pending;
|
||||
}
|
||||
if (reviewRefreshVersion.current[key] !== version) return;
|
||||
setPendingReviewCounts((current) => ({ ...current, [key]: count }));
|
||||
};
|
||||
|
||||
const refreshSafely = (key: ReviewBadgeKey) => refresh(key).catch(() => {});
|
||||
void Promise.all([
|
||||
refreshSafely('/withdraws'),
|
||||
refreshSafely('/price-reports'),
|
||||
refreshSafely('/feedbacks'),
|
||||
]);
|
||||
|
||||
const onReviewCompleted = (event: Event) => {
|
||||
const key = (event as CustomEvent<ReviewBadgeKey>).detail;
|
||||
if (key) void refreshSafely(key);
|
||||
};
|
||||
window.addEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
|
||||
return () => {
|
||||
window.removeEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
|
||||
};
|
||||
}, [admin]);
|
||||
|
||||
if (!admin) return null; // 守卫期间不闪烁内容
|
||||
|
||||
// 选中态:取路径一级(/users/123 -> /users)
|
||||
@@ -188,20 +132,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
hasChildren(group) ? group.children : [group],
|
||||
);
|
||||
|
||||
const reviewBadge = (key: string) => {
|
||||
const count = pendingReviewCounts[key as ReviewBadgeKey] ?? 0;
|
||||
if (count <= 0) return null;
|
||||
return (
|
||||
<span
|
||||
className="nav-review-badge"
|
||||
aria-label={`${count} 条未审核`}
|
||||
title={`${count} 条未审核`}
|
||||
>
|
||||
{count}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
const logout = () => {
|
||||
clearAuth();
|
||||
router.replace('/login');
|
||||
@@ -236,7 +166,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
aria-label={item.label}
|
||||
>
|
||||
{item.icon}
|
||||
{reviewBadge(item.key)}
|
||||
</button>
|
||||
</Tooltip>
|
||||
))
|
||||
@@ -254,8 +183,7 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
onClick={() => router.push(group.key)}
|
||||
>
|
||||
<span className="nav-primary-icon">{group.icon}</span>
|
||||
<span className="nav-item-label">{group.label}</span>
|
||||
{reviewBadge(group.key)}
|
||||
<span>{group.label}</span>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
@@ -274,8 +202,7 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
onClick={() => router.push(child.key)}
|
||||
>
|
||||
<span className="nav-child-icon">{child.icon}</span>
|
||||
<span className="nav-item-label">{child.label}</span>
|
||||
{reviewBadge(child.key)}
|
||||
<span>{child.label}</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
@@ -342,29 +269,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
color: rgba(255, 255, 255, 0.72);
|
||||
font-size: 16px;
|
||||
}
|
||||
.nav-item-label {
|
||||
min-width: 0;
|
||||
flex: 1;
|
||||
}
|
||||
.nav-review-badge {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
box-sizing: border-box;
|
||||
flex: 0 0 auto;
|
||||
min-width: 18px;
|
||||
height: 18px;
|
||||
padding: 0 5px;
|
||||
border-radius: 9px;
|
||||
background: #ff4d4f;
|
||||
color: #fff;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
line-height: 18px;
|
||||
white-space: nowrap;
|
||||
font-variant-numeric: tabular-nums;
|
||||
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
.nav-direct,
|
||||
.nav-child,
|
||||
.nav-icon-button {
|
||||
@@ -428,7 +332,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
padding: 0 8px 14px;
|
||||
}
|
||||
.nav-icon-button {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -439,11 +342,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
color: rgba(255, 255, 255, 0.72);
|
||||
font-size: 17px;
|
||||
}
|
||||
.nav-icon-button .nav-review-badge {
|
||||
position: absolute;
|
||||
top: 1px;
|
||||
right: -6px;
|
||||
}
|
||||
.nav-icon-button:hover,
|
||||
.nav-icon-button.is-selected {
|
||||
background: #1677ff;
|
||||
|
||||
@@ -22,7 +22,6 @@ import dayjs from 'dayjs';
|
||||
import { api, errMsg } from '@/lib/api';
|
||||
import { canDo } from '@/lib/auth';
|
||||
import { mediaUrl } from '@/lib/media';
|
||||
import { refreshReviewBadge } from '@/lib/reviewBadge';
|
||||
import { usePagedList } from '@/lib/usePagedList';
|
||||
import type { PriceReport, PriceReportSummary } from '@/lib/types';
|
||||
import UserRecordsDrawer from '@/components/UserRecordsDrawer';
|
||||
@@ -203,7 +202,6 @@ export default function PriceReportsPage() {
|
||||
onOk: async () => {
|
||||
try {
|
||||
await api.post(`/admin/api/price-reports/${r.id}/approve`);
|
||||
refreshReviewBadge('/price-reports');
|
||||
message.success('已通过，已发放 1000 金币');
|
||||
refreshAfterChange();
|
||||
} catch (e) {
|
||||
@@ -222,7 +220,6 @@ export default function PriceReportsPage() {
|
||||
}
|
||||
try {
|
||||
await api.post(`/admin/api/price-reports/${rejecting.id}/reject`, { reason });
|
||||
refreshReviewBadge('/price-reports');
|
||||
message.success('已拒绝');
|
||||
setRejecting(null);
|
||||
setRejectReason('');
|
||||
|
||||
@@ -39,7 +39,6 @@ import dayjs, { type Dayjs } from 'dayjs';
|
||||
import { api, errMsg } from '@/lib/api';
|
||||
import { canDo } from '@/lib/auth';
|
||||
import { formatUtcTime, utcDayjs, utcFromNow, yuan } from '@/lib/format';
|
||||
import { refreshReviewBadge } from '@/lib/reviewBadge';
|
||||
import { usePagedList } from '@/lib/usePagedList';
|
||||
import type {
|
||||
AuditLog,
|
||||
@@ -333,7 +332,6 @@ export default function WithdrawsPage() {
|
||||
onOk: async () => {
|
||||
try {
|
||||
await api.post(`/admin/api/withdraws/${o.out_bill_no}/approve`);
|
||||
refreshReviewBadge('/withdraws');
|
||||
message.success('已通过审核并发起打款');
|
||||
await refreshAfterChange(o.out_bill_no);
|
||||
} catch (e) {
|
||||
@@ -364,7 +362,6 @@ export default function WithdrawsPage() {
|
||||
await api.post(`/admin/api/withdraws/${targets[0].out_bill_no}/reject`, { reason: trimmed });
|
||||
message.success('已拒绝并退回余额');
|
||||
}
|
||||
refreshReviewBadge('/withdraws');
|
||||
setRejecting(null);
|
||||
setBulkRejecting([]);
|
||||
setRejectReason('');
|
||||
@@ -403,7 +400,6 @@ export default function WithdrawsPage() {
|
||||
const { data } = await api.post<WithdrawBulkResult>('/admin/api/withdraws/bulk/approve', {
|
||||
out_bill_nos: selectedReviewing.map((item) => item.out_bill_no),
|
||||
});
|
||||
refreshReviewBadge('/withdraws');
|
||||
const text = bulkResultText('批量通过完成', data);
|
||||
if (data.failed) message.warning(text);
|
||||
else message.success(text);
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
export type ReviewBadgeKey = '/withdraws' | '/price-reports' | '/feedbacks';
|
||||
|
||||
export const REVIEW_BADGE_REFRESH_EVENT = 'review-badge-refresh';
|
||||
|
||||
export function refreshReviewBadge(key: ReviewBadgeKey) {
|
||||
if (typeof window === 'undefined') return;
|
||||
window.dispatchEvent(
|
||||
new CustomEvent<ReviewBadgeKey>(REVIEW_BADGE_REFRESH_EVENT, { detail: key }),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user