Compare commits

..

1 Commits

Author SHA1 Message Date
linkeyu 8d75a6fde3 优化:展示反馈机型与系统版本
反馈列表展示可读手机型号、原始硬件编码、厂商系统版本和 Android 版本。
2026-07-27 10:55:27 +08:00
3 changed files with 35 additions and 14 deletions
+10 -10
View File
@@ -43,8 +43,6 @@ 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 }> = {
@@ -389,13 +387,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>(DEFAULT_PAGE_SIZE);
const [limit, setLimit] = useState<number>(1000); // 默认拉满接口单页上限,供单次流程广告数分位统计
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>(DEFAULT_PAGE_SIZE);
const [queriedLimit, setQueriedLimit] = useState<number>(1000);
const [loading, setLoading] = useState(false);
const [formulaOpen, setFormulaOpen] = useState(false);
// 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
@@ -777,11 +775,12 @@ export default function AdRevenueReportPage() {
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={adType ?? ALL_FILTER_VALUE}
onChange={(value) => setAdType(value === ALL_FILTER_VALUE ? undefined : value)}
placeholder="全部"
value={adType}
onChange={setAdType}
allowClear
style={{ width: 150 }}
options={[
{ value: ALL_FILTER_VALUE, label: '全部' },
{ value: 'reward_video', label: '看视频' },
{ value: 'draw', label: 'Draw 信息流' },
{ value: 'withdrawal_video', label: '提现看视频' },
@@ -791,11 +790,12 @@ export default function AdRevenueReportPage() {
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={scene ?? ALL_FILTER_VALUE}
onChange={(value) => setScene(value === ALL_FILTER_VALUE ? undefined : value)}
placeholder="全部"
value={scene}
onChange={setScene}
allowClear
style={{ width: 130 }}
options={[
{ value: ALL_FILTER_VALUE, label: '全部' },
{ value: 'comparison', label: '比价' },
{ value: 'coupon', label: '领券' },
{ value: 'welfare', label: '福利' },
+22 -4
View File
@@ -122,13 +122,31 @@ const renderReview = (f: Feedback) => {
// 机型 / OS版本(提交反馈时的端环境;改版前历史反馈无 → -)
const renderDeviceOs = (f: Feedback) => {
const os = [f.android_version ? `Android ${f.android_version}` : null, f.rom_name]
const modelName = f.device_model_name || f.device_model;
const rawModel =
f.device_model_name && f.device_model_name !== f.device_model ? f.device_model : null;
const romHasVersion = /\d/.test(f.rom_name || '');
const vendorOs = [
f.rom_name,
f.rom_version && !romHasVersion ? f.rom_version : null,
]
.filter(Boolean)
.join(' ');
const os = [
vendorOs || null,
f.android_version ? `Android ${f.android_version}` : null,
]
.filter(Boolean)
.join(' · ');
if (!f.device_model && !os) return <Text type="secondary">-</Text>;
if (!modelName && !os) return <Text type="secondary">-</Text>;
return (
<Space direction="vertical" size={0}>
<Text>{f.device_model || '-'}</Text>
<Text>{modelName || '-'}</Text>
{rawModel ? (
<Text type="secondary" style={{ fontSize: 12 }}>
{[f.device_manufacturer, rawModel].filter(Boolean).join(' · ')}
</Text>
) : null}
{os ? (
<Text type="secondary" style={{ fontSize: 12 }}>
{os}
@@ -352,7 +370,7 @@ export default function FeedbacksPage() {
{
title: '机型 / OS版本',
key: 'device',
width: 150,
width: 180,
render: (_: unknown, f: Feedback) => renderDeviceOs(f),
},
{
+3
View File
@@ -377,7 +377,10 @@ export interface Feedback {
// 提交端环境快照:提交版本号 / 机型OS版本;改版前的历史反馈为 null
app_version: string | null;
device_model: string | null;
device_model_name: string | null;
device_manufacturer: string | null;
rom_name: string | null;
rom_version: number | null;
android_version: string | null;
// 联表瞬态:展示完整手机号(点手机号查该用户全部反馈)
phone: string | null;