From 604c9d1912760921107ec8b8bb36f6795bcf30ce Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Mon, 5 Oct 2026 19:08:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(delivery):=20=E6=8F=90=E8=B4=A7=E9=A1=B5?=
 =?UTF-8?q?=E4=B9=B0=E5=AE=B6=E5=AD=97=E6=AE=B5=E4=BC=98=E5=85=88=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=86=E5=88=AB=E5=88=B0=E7=9A=84=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=A7=92=E8=89=B2=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 优化买家身份呈现：当外部订单未传递 buyer_name 时，不再展示单薄的横杠 "-"，而是优先展示扫码识别到的游戏角色名（如「罡舍」）；
2. 完善多级兜底回退：依次按 游戏角色名 -> 外部买家昵称 -> 游戏UID 优先级回退，确保买家打开提货页具备强烈的游戏角色归属感。
---
 frontend/src/pages/Delivery.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Delivery.tsx b/frontend/src/pages/Delivery.tsx
index b730358..5b74f80 100644
--- a/frontend/src/pages/Delivery.tsx
+++ b/frontend/src/pages/Delivery.tsx
@@ -366,10 +366,20 @@ export default function Delivery() {
               </Space>
 
               <Descriptions column={{ xs: 1, sm: 2 }} size="small" bordered>
-                <Descriptions.Item label="买家">{order.buyer_name || '-'}</Descriptions.Item>
+                <Descriptions.Item label="买家">
+                  {(() => {
+                    const role = (order.role_name || boundInfo?.role_name || '').trim()
+                    if (role && role !== '-') return role
+                    const buyer = (order.buyer_name || '').trim()
+                    if (buyer && buyer !== '-') return buyer
+                    const uid = (order.game_uid || gameAccount || '').trim()
+                    if (uid && uid !== '-') return `玩家 (${uid})`
+                    return '游戏玩家'
+                  })()}
+                </Descriptions.Item>
                 <Descriptions.Item label="金额">{order.amount} 积分</Descriptions.Item>
                 <Descriptions.Item label="创建时间">{formatDateTime(order.created_at)}</Descriptions.Item>
-                <Descriptions.Item label="渠道">{order.product?.game || '自动发货'}</Descriptions.Item>
+                <Descriptions.Item label="渠道">{order.product?.game || '和平精英'}</Descriptions.Item>
               </Descriptions>
 
               {order.ship_fail_reason && order.status !== 'ship_failed' && (