From 6af789dd8307bacdc0e34d58c4acda9dea2c1697 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Sat, 11 Apr 2026 13:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/partials/user-actions.blade.php      | 62 +++++++++++--------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/resources/views/chat/partials/user-actions.blade.php b/resources/views/chat/partials/user-actions.blade.php
index e95db3f..f9e4954 100644
--- a/resources/views/chat/partials/user-actions.blade.php
+++ b/resources/views/chat/partials/user-actions.blade.php
@@ -622,34 +622,46 @@
                                     'color: deeppink' : '')"></span>
                         </h4>
 
-                        {{-- VIP + 在职职务：强制一行显示 --}}
+                        {{-- VIP + 在职职务：合并成一个胶囊，保证同一行 --}}
                         <div x-show="userInfo.vip?.Name || userInfo.position_name"
-                             style="display: inline-flex; align-items: center; gap: 6px; margin-top: 6px;
-            flex-wrap: nowrap; white-space: nowrap; overflow: hidden;">
+                             style="margin-top: 6px;">
 
-                            {{-- VIP 标签 --}}
-                            <div x-show="userInfo.vip?.Name"
-                                 style="display: inline-flex; align-items: center; gap: 4px;
-                width: fit-content; padding: 2px 10px;
-                background: #fff7ed; border: 1px solid #fdba74;
-                border-radius: 999px; font-size: 11px;
-                color: #ea580c; font-weight: bold;
-                flex: 0 0 auto; white-space: nowrap;">
-                                <span style="font-size: 12px;" x-text="userInfo.vip?.Icon"></span>
-                                <span x-text="userInfo.vip?.Name"></span>
-                            </div>
+    <span style="display: inline-flex;
+                 align-items: center;
+                 gap: 6px;
+                 padding: 2px 10px;
+                 border-radius: 999px;
+                 white-space: nowrap;
+                 width: fit-content;
+                 max-width: 100%;
+                 font-size: 11px;
+                 font-weight: bold;
+                 background: #faf5ff;
+                 border: 1px solid #d8b4fe;
+                 color: #7c3aed;">
 
-                            {{-- 在职职务标签 --}}
-                            <div x-show="userInfo.position_name"
-                                 style="display: inline-flex; align-items: center; gap: 4px;
-                width: fit-content; padding: 2px 10px;
-                background: #f3e8ff; border: 1px solid #d8b4fe;
-                border-radius: 999px; font-size: 11px;
-                color: #7c3aed; font-weight: bold;
-                flex: 0 0 auto; white-space: nowrap;">
-                                <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>
+        {{-- VIP --}}
+        <template x-if="userInfo.vip?.Name">
+            <span style="display: inline-flex; align-items: center; gap: 4px; color: #ea580c;">
+                <span x-text="userInfo.vip?.Icon || '👑'" style="font-size: 12px;"></span>
+                <span x-text="userInfo.vip?.Name"></span>
+            </span>
+        </template>
+
+        {{-- 分隔符：只有 VIP 和职务都存在时显示 --}}
+        <template x-if="userInfo.vip?.Name && userInfo.position_name">
+            <span style="color: #c4b5fd;">|</span>
+        </template>
+
+        {{-- 职务 --}}
+        <template x-if="userInfo.position_name">
+            <span style="display: inline-flex; align-items: center; gap: 4px; color: #7c3aed;">
+                <span x-text="userInfo.position_icon || '🎖️'" style="font-size: 12px;"></span>
+                <span x-text="(userInfo.department_name ? userInfo.department_name + ' · ' : '') + userInfo.position_name"></span>
+            </span>
+        </template>
+
+    </span>
                         </div>
 
                         <div style="font-size: 11px; color: #999; margin-top: 4px;">