From a6b0dbb24f29aca34c8e94fc9a794ac455e497d9 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 6 Apr 2025 19:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=8C=96=E6=98=B5=E7=A7=B0=E3=80=81?=
 =?UTF-8?q?=E5=BC=B1=E5=8C=96=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/pages/common/user-info.vue       |  6 +++---
 im-uniapp/pages/friend/friend-add.vue      | 10 +++++-----
 im-web/src/components/common/UserInfo.vue  |  4 ++--
 im-web/src/components/friend/AddFriend.vue | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/im-uniapp/pages/common/user-info.vue b/im-uniapp/pages/common/user-info.vue
index cb34f8f..0db26a7 100644
--- a/im-uniapp/pages/common/user-info.vue
+++ b/im-uniapp/pages/common/user-info.vue
@@ -9,17 +9,17 @@
 				<view class="info-item">
 					<view class="info-primary">
 						<text class="info-username">
-							{{ userInfo.userName }}
+							{{ userInfo.nickName }}
 						</text>
 						<text v-show="userInfo.sex == 0" class="iconfont icon-man" color="darkblue"></text>
 						<text v-show="userInfo.sex == 1" class="iconfont icon-girl" color="darkred"></text>
 					</view>
 					<view class="info-text">
 						<text class="label-text">
-							昵称:
+							用户名:
 						</text>
 						<text class="content-text">
-							{{ userInfo.nickName }}
+							{{ userInfo.userName }}
 						</text>
 					</view>
 					<view class="info-text">
diff --git a/im-uniapp/pages/friend/friend-add.vue b/im-uniapp/pages/friend/friend-add.vue
index 72b45e0..8956e21 100644
--- a/im-uniapp/pages/friend/friend-add.vue
+++ b/im-uniapp/pages/friend/friend-add.vue
@@ -14,11 +14,11 @@
 						<head-image :id="user.id" :name="user.nickName" :online="user.online"
 							:url="user.headImage"></head-image>
 						<view class="user-info">
-							<view class="user-name">
-								<view>{{ user.userName }}</view>
+							<view class="nick-name">
+								<view>{{ user.nickName }}</view>
 								<uni-tag v-if="user.status == 1" circle type="error" text="已注销" size="small"></uni-tag>
 							</view>
-							<view class="nick-name">{{ `昵称:${user.nickName}`}}</view>
+							<view class="user-name">用户名:{{ `${user.userName}`}}</view>
 						</view>
 						<view class="user-btns">
 							<button type="primary" v-show="!isFriend(user.id)" size="mini"
@@ -113,7 +113,7 @@ export default {
 				white-space: nowrap;
 				overflow: hidden;
 
-				.user-name {
+				.nick-name {
 					display: flex;
 					flex: 1;
 					font-size: $im-font-size-large;
@@ -128,7 +128,7 @@ export default {
 					}
 				}
 
-				.nick-name {
+				.user-name {
 					display: flex;
 					font-size: $im-font-size-smaller;
 					color: $im-text-color-lighter;
diff --git a/im-web/src/components/common/UserInfo.vue b/im-web/src/components/common/UserInfo.vue
index 38d6ac6..a7fb3d9 100644
--- a/im-web/src/components/common/UserInfo.vue
+++ b/im-web/src/components/common/UserInfo.vue
@@ -7,8 +7,8 @@
 						radius="10%" @click.native="showFullImage()"> </head-image>
 				</div>
 				<div>
-					<el-descriptions :column="1" :title="user.userName" class="user-info-items">
-						<el-descriptions-item label="昵称">{{ user.nickName }}
+					<el-descriptions :column="1" :title="user.nickName" class="user-info-items">
+						<el-descriptions-item label="用户名">{{ user.userName }}
 						</el-descriptions-item>
 						<el-descriptions-item label="签名">{{ user.signature }}
 						</el-descriptions-item>
diff --git a/im-web/src/components/friend/AddFriend.vue b/im-web/src/components/friend/AddFriend.vue
index 9400a2a..0077988 100644
--- a/im-web/src/components/friend/AddFriend.vue
+++ b/im-web/src/components/friend/AddFriend.vue
@@ -12,13 +12,13 @@
 						<head-image :name="user.nickName" :url="user.headImage" :online="user.online"></head-image>
 					</div>
 					<div class="add-friend-text">
-						<div class="text-user-name">
-							<div>{{ user.userName }}</div>
+						<div class="nick-name">
+							<div>{{ user.nickName }}</div>
 							<div :class="user.online ? 'online-status  online' : 'online-status'">{{
 								user.online ? "[在线]" :"[离线]"}}</div>
 						</div>
-						<div class="text-nick-name">
-							<div>昵称:{{ user.nickName }}</div>
+						<div class="user-name">
+							<div>用户名:{{ user.userName }}</div>
 						</div>
 					</div>
 					<el-button type="success" size="mini" v-show="!isFriend(user.id)"
@@ -111,7 +111,7 @@ export default {
 			flex-shrink: 0;
 			overflow: hidden;
 
-			.text-user-name {
+			.nick-name {
 				display: flex;
 				flex-direction: row;
 				font-weight: 600;
@@ -128,7 +128,7 @@ export default {
 				}
 			}
 
-			.text-nick-name {
+			.user-name {
 				display: flex;
 				flex-direction: row;
 				font-size: 12px;