From 1834a8e9ff49be60f2c8975e6c4d050e2d11583c Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Fri, 27 Feb 2026 12:05:57 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E6=AD=A3=E5=90=8D=E7=89=87?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=A0=BC=E5=AD=90=E5=9C=A8=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E5=9E=82=E7=9B=B4=E5=A0=86=E5=8F=A0?=
 =?UTF-8?q?=E7=9A=84BUG=E6=94=B9=E4=B8=BAFlex=E5=B8=83=E5=B1=80=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E7=9C=81=E5=B8=82=E6=89=80=E5=9C=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=A0=E4=B8=BA=E7=BC=93=E5=AD=98=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E5=AF=BC=E8=87=B4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserController.php              | 3 ++-
 resources/views/chat/partials/user-actions.blade.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 14f1e92..8f95315 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -74,7 +74,8 @@ class UserController extends Controller
                     try {
                         $position = Location::get($ipToLookup);
                         if ($position) {
-                            $data['location'] = ($position->countryName === '中国' || $position->countryName === 'Local') ?
+                            $isChinaOrLocal = in_array($position->countryCode ?? $position->isoCode ?? '', ['CN', 'TW', 'HK', 'MO']) || $position->countryName === 'Local';
+                            $data['location'] = $isChinaOrLocal ?
                                 trim(($position->regionName ?? '') . ' ' . ($position->cityName ?? '')) :
                                 ($position->countryName ?? '未知区域');
                             
diff --git a/resources/views/chat/partials/user-actions.blade.php b/resources/views/chat/partials/user-actions.blade.php
index 86ae0fb..4797e42 100644
--- a/resources/views/chat/partials/user-actions.blade.php
+++ b/resources/views/chat/partials/user-actions.blade.php
@@ -332,23 +332,23 @@
 
                 {{-- 详细信息区 (等级高看等级低，或自己看自己时才有这些字段) --}}
                 <div x-show="userInfo.exp_num !== undefined"
-                    style="margin-top: 12px; display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 8px;">
+                    style="margin-top: 12px; display: flex; flex-direction: row; gap: 8px;">
                     <!-- 经验 -->
                     <div
-                        style="background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 8px; padding: 6px 0; display: flex; flex-direction: column; align-items: center; justify-content: center;">
+                        style="flex: 1; background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 6px; padding: 6px 0; display: flex; flex-direction: column; align-items: center; justify-content: center;">
                         <span style="color: #64748b; font-size: 11px; margin-bottom: 2px;">经验</span>
                         <span x-text="userInfo.exp_num"
                             style="font-weight: 700; color: #4f46e5; font-size: 14px;"></span>
                     </div>
                     <!-- 金币 -->
                     <div
-                        style="background: #fdfae8; border: 1px solid #fef08a; border-radius: 8px; padding: 6px 0; display: flex; flex-direction: column; align-items: center; justify-content: center;">
+                        style="flex: 1; background: #fdfae8; border: 1px solid #fef08a; border-radius: 6px; padding: 6px 0; display: flex; flex-direction: column; align-items: center; justify-content: center;">
                         <span style="color: #b45309; font-size: 11px; margin-bottom: 2px;">金币</span>
                         <span x-text="userInfo.jjb" style="font-weight: 700; color: #d97706; font-size: 14px;"></span>
                     </div>
                     <!-- 魅力 -->
                     <div
-                        style="background: #fdf2f8; border: 1px solid #fbcfe8; border-radius: 8px; padding: 6px 0; display: flex; flex-direction: column; align-items: center; justify-content: center;">
+                        style="flex: 1; background: #fdf2f8; border: 1px solid #fbcfe8; border-radius: 6px; padding: 6px 0; display: flex; flex-direction: column; align-items: center; justify-content: center;">
                         <span style="color: #be185d; font-size: 11px; margin-bottom: 2px;">魅力</span>
                         <span x-text="userInfo.meili" style="font-weight: 700; color: #db2777; font-size: 14px;"></span>
                     </div>