From c30b5181050ae2b324a486da68762f3a6414c385 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Sat, 11 Apr 2026 13:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20=E4=BC=9A=E5=91=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserController.php       |  4 +-
 .../chat/partials/user-actions.blade.php      | 37 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6987cf7..73a1328 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -106,7 +106,9 @@ class UserController extends Controller
             ])
             ->values()
             ->all();
-        $data['vipName'] = $targetUser->vipName();
+        $data['vip']['Name'] = $targetUser->vipName();
+        $data['vip']['Icon'] = $targetUser->vipIcon();
+
 
         // 拥有封禁IP（level_banip）或踢人以上权限的管理，可以查看IP和归属地
         $levelBanIp = (int) Sysparam::getValue('level_banip', '15');
diff --git a/resources/views/chat/partials/user-actions.blade.php b/resources/views/chat/partials/user-actions.blade.php
index 223bb7a..862158f 100644
--- a/resources/views/chat/partials/user-actions.blade.php
+++ b/resources/views/chat/partials/user-actions.blade.php
@@ -621,19 +621,32 @@
                                 :style="userInfo.sex === '男' ? 'color: blue' : (userInfo.sex === '女' ?
                                     'color: deeppink' : '')"></span>
                         </h4>
-                        {{-- 在职职务标签（有职务时才显示） --}}
-                        <div x-show="userInfo.position_name"
-                            style="display: inline-flex; align-items: center; gap: 3px; margin-top: 3px; padding: 2px 8px; background: #f3e8ff; border: 1px solid #d8b4fe; border-radius: 20px; font-size: 11px; color: #7c3aed; font-weight: bold;">
-                            <span x-text="userInfo.position_icon" style="font-size: 13px;"></span>
-                            <span
-                                x-text="(userInfo.department_name ? userInfo.department_name + ' · ' : '') + userInfo.position_name"></span>
-                        </div>
-                        <div x-show="userInfo.vipName"
-                             style="display: inline-flex; align-items: center; gap: 3px; margin-top: 3px; padding: 2px 8px; background: #f3e8ff; border: 1px solid #d8b4fe; border-radius: 20px; color: #7c3aed; font-weight: bold;">
-                            <span x-text="userInfo.vipName" style="font-size: 13px;"></span>
-                            <span
-                                x-text="(userInfo.vipName"></span>
+
+                        {{-- VIP + 在职职务：同一行显示，外框宽度自适应内容 --}}
+                        <div x-show="userInfo.vip.Name || userInfo.position_name"
+                             style="display: flex; align-items: center; gap: 6px; margin-top: 6px; flex-wrap: wrap;">
+
+                            {{-- VIP 标签 --}}
+                            <div x-show="userInfo.vip.Name"
+                                 style="display: inline-flex; align-items: center; gap: 4px; width: fit-content; max-width: 100%;
+                padding: 2px 10px; background: #fff7ed; border: 1px solid #fdba74;
+                border-radius: 999px; font-size: 11px; color: #ea580c; font-weight: bold;
+                white-space: nowrap; flex: 0 0 auto;">
+                                <span style="font-size: 12px;"x-text="userInfo.vip.Icon"></span>
+                                <span x-text="userInfo.vip.Name"></span>
+                            </div>
+
+                            {{-- 在职职务标签 --}}
+                            <div x-show="userInfo.position_name"
+                                 style="display: inline-flex; align-items: center; gap: 4px; width: fit-content; max-width: 100%;
+                padding: 2px 10px; background: #f3e8ff; border: 1px solid #d8b4fe;
+                border-radius: 999px; font-size: 11px; color: #7c3aed; font-weight: bold;
+                white-space: nowrap; flex: 0 0 auto;">
+                                <span x-text="userInfo.position_icon || '🎖️'" style="font-size: 12px;"></span>
+                                <span x-text="(userInfo.department_name ? userInfo.department_name + ' · ' : '') + userInfo.position_name"></span>
+                            </div>
                         </div>
+
                         <div style="font-size: 11px; color: #999; margin-top: 4px;">
                             加入: <span x-text="userInfo.created_at"></span>
                         </div>