diff --git a/src/app/(main)/feedbacks/page.tsx b/src/app/(main)/feedbacks/page.tsx index b37008d..4bb89ce 100644 --- a/src/app/(main)/feedbacks/page.tsx +++ b/src/app/(main)/feedbacks/page.tsx @@ -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 -; + if (!modelName && !os) return -; return ( - {f.device_model || '-'} + {modelName || '-'} + {rawModel ? ( + + {[f.device_manufacturer, rawModel].filter(Boolean).join(' · ')} + + ) : null} {os ? ( {os} @@ -352,7 +370,7 @@ export default function FeedbacksPage() { { title: '机型 / OS版本', key: 'device', - width: 150, + width: 180, render: (_: unknown, f: Feedback) => renderDeviceOs(f), }, { diff --git a/src/lib/types.ts b/src/lib/types.ts index 18c2a32..307284f 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -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;