Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a232cc52e |
@@ -300,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>();
|
||||
@@ -335,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,
|
||||
@@ -378,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(() => {
|
||||
@@ -624,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>
|
||||
}
|
||||
>
|
||||
@@ -660,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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -105,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();
|
||||
@@ -125,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)
|
||||
@@ -181,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');
|
||||
@@ -229,7 +166,6 @@ export default function MainLayout({ children }: { children: React.ReactNode })
|
||||
aria-label={item.label}
|
||||
>
|
||||
{item.icon}
|
||||
{reviewBadge(item.key)}
|
||||
</button>
|
||||
</Tooltip>
|
||||
))
|
||||
@@ -247,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>
|
||||
);
|
||||
}
|
||||
@@ -267,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>
|
||||
@@ -335,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 {
|
||||
@@ -421,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;
|
||||
@@ -432,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