From 86202d0c137503a9dff9d719eaf9ef05dac6caa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E8=AE=AD?=
 <zhangjiaxun-xf@bestpay.com.cn>
Date: Tue, 20 Oct 2026 18:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F:=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8C=BA=E6=94=B9=E4=B8=BA=E6=98=B5=E7=A7=B0=E5=9C=A8=E5=B7=A6?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=9C=A8=E5=8F=B3=EF=BC=8C=E7=BC=A9=E5=B0=8F?=
 =?UTF-8?q?=E9=A1=B6=E6=A0=8F=E5=8F=B3=E4=BE=A7=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/main/components/header-bar/header-bar.less | 3 ++-
 src/components/main/components/user/user.less             | 6 +++---
 src/components/main/components/user/user.vue              | 2 +-
 src/components/main/main.less                             | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/main/components/header-bar/header-bar.less b/src/components/main/components/header-bar/header-bar.less
index c245d19..b655513 100644
--- a/src/components/main/components/header-bar/header-bar.less
+++ b/src/components/main/components/header-bar/header-bar.less
@@ -5,7 +5,8 @@
   .custom-content-con{
     float: right;
     height: auto;
-    padding-right: 20px;
+    // 顶栏内容紧贴右缘，留 6px 呼吸间距即可
+    padding-right: 6px;
     line-height: 64px;
     & > *{
       float: right;
diff --git a/src/components/main/components/user/user.less b/src/components/main/components/user/user.less
index efbdff9..b8a93cb 100644
--- a/src/components/main/components/user/user.less
+++ b/src/components/main/components/user/user.less
@@ -3,7 +3,7 @@
     cursor: pointer;
     display: inline-block;
     vertical-align: middle;
-    padding: 4px 10px;
+    padding: 4px 6px 4px 10px;
     border-radius: 20px;
     transition: background .18s;
     &:hover{
@@ -21,12 +21,12 @@
     &:hover .user-avatar{
       transform: scale(1.06);
     }
-    // 姓名：常规字重，与头像平衡
+    // 昵称在左、头像在右；昵称右侧留 8px 与头像分隔
     .user-nick{
       font-size: 14px;
       font-weight: 500;
       color: #3d4a66;
-      margin-left: 8px;
+      margin-right: 8px;
       vertical-align: middle;
     }
   }
diff --git a/src/components/main/components/user/user.vue b/src/components/main/components/user/user.vue
index 20b8486..420f7b5 100644
--- a/src/components/main/components/user/user.vue
+++ b/src/components/main/components/user/user.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="user-avator-dropdown">
     <Dropdown @on-click="handleClick">
-      <Avatar :key="userAvator" :src="userAvator || undefined" class="user-avatar" :style="avatarStyle">{{ avatarText }}</Avatar>
       <span class="user-nick">{{ nickname }}</span>
+      <Avatar :key="userAvator" :src="userAvator || undefined" class="user-avatar" :style="avatarStyle">{{ avatarText }}</Avatar>
       <DropdownMenu slot="list">
         <DropdownItem name="personal-center">个人中心</DropdownItem>
         <DropdownItem name="logout" style="color: #ed4014" divided>退出登录</DropdownItem>
diff --git a/src/components/main/main.less b/src/components/main/main.less
index 2f9f986..ccd67d5 100644
--- a/src/components/main/main.less
+++ b/src/components/main/main.less
@@ -32,7 +32,8 @@
   }
   .header-con{
     background: #fff;
-    padding: 0 20px;
+    // 左侧留 20px 给折叠按钮，右侧贴边（用户区自带 6px 呼吸间距）
+    padding: 0 0 0 20px;
     width: 100%;
   }
   .main-layout-con{