From 8d75a6fde33e516f9608a939ae7e513d4b519232 Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Mon, 27 Jul 2026 10:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=9C=BA=E5=9E=8B=E4=B8=8E=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

反馈列表展示可读手机型号、原始硬件编码、厂商系统版本和 Android 版本。
---
 src/app/(main)/feedbacks/page.tsx | 26 ++++++++++++++++++++++----
 src/lib/types.ts                  |  3 +++
 2 files changed, 25 insertions(+), 4 deletions(-)

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 <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),
     },
     {
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 26d8d95..0571d1b 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;