From 5feb7179dc8b55cf94900247c6035bf46e54e4bb Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Mon, 14 Apr 2025 00:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81=E5=9B=BE?=
 =?UTF-8?q?=E6=96=87=E3=80=81=E6=96=87=E4=BB=B6=E6=97=B6=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/pages/chat/chat-box.vue         | 10 ++++---
 im-uniapp/pages/common/user-info.vue      | 21 ++++----------
 im-uniapp/pages/mine/mine-edit.vue        |  4 +--
 im-uniapp/pages/mine/mine.vue             | 35 ++++++++++-------------
 im-web/src/components/chat/ChatBox.vue    | 14 +++++----
 im-web/src/components/setting/Setting.vue |  2 +-
 6 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index d5d90eb..3626bf7 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -418,6 +418,7 @@ export default {
 			this.moveChatToTop();
 			// 借助file对象保存
 			file.msgInfo = msgInfo;
+			file.chat = this.chat;
 			// 滚到最低部
 			this.scrollToBottom();
 			return true;
@@ -430,13 +431,13 @@ export default {
 				msgInfo.loadStatus = 'ok';
 				msgInfo.id = m.id;
 				this.isReceipt = false;
-				this.chatStore.insertMessage(msgInfo, this.chat);
+				this.chatStore.insertMessage(msgInfo, file.chat);
 			})
 		},
 		onUploadImageFail(file, err) {
 			let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
 			msgInfo.loadStatus = 'fail';
-			this.chatStore.insertMessage(msgInfo, this.chat);
+			this.chatStore.insertMessage(msgInfo, file.chat);
 		},
 		onUploadFileBefore(file) {
 			// 检查是否被封禁
@@ -469,6 +470,7 @@ export default {
 			this.moveChatToTop();
 			// 借助file对象保存
 			file.msgInfo = msgInfo;
+			file.chat = this.chat;
 			// 滚到最低部
 			this.scrollToBottom();
 			return true;
@@ -486,13 +488,13 @@ export default {
 				msgInfo.loadStatus = 'ok';
 				msgInfo.id = m.id;
 				this.isReceipt = false;
-				this.chatStore.insertMessage(msgInfo, this.chat);
+				this.chatStore.insertMessage(msgInfo, file.chat);
 			})
 		},
 		onUploadFileFail(file, res) {
 			let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
 			msgInfo.loadStatus = 'fail';
-			this.chatStore.insertMessage(msgInfo, this.chat);
+			this.chatStore.insertMessage(msgInfo, file.chat);
 		},
 		onDeleteMessage(msgInfo) {
 			uni.showModal({
diff --git a/im-uniapp/pages/common/user-info.vue b/im-uniapp/pages/common/user-info.vue
index 0db26a7..47e4ca7 100644
--- a/im-uniapp/pages/common/user-info.vue
+++ b/im-uniapp/pages/common/user-info.vue
@@ -8,28 +8,18 @@
 
 				<view class="info-item">
 					<view class="info-primary">
-						<text class="info-username">
-							{{ userInfo.nickName }}
-						</text>
+						<text class="info-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.userName }}
-						</text>
+						<text class="label-text">用户名:</text>
+						<text class="content-text">	{{ userInfo.userName }}</text>
 					</view>
 					<view class="info-text">
 						<view>
-							<text class="label-text">
-								签名:
-							</text>
-							<text class="content-text">
-								{{ userInfo.signature }}
-							</text>
+							<text class="label-text">签名:</text>
+							<text class="content-text">	{{ userInfo.signature }} </text>
 						</view>
 					</view>
 				</view>
@@ -183,6 +173,7 @@ export default {
 			.content-text {
 				font-size: $im-font-size-small;
 				color: $im-text-color-light;
+				margin-left: 10rpx;
 			}
 
 			.info-primary {
diff --git a/im-uniapp/pages/mine/mine-edit.vue b/im-uniapp/pages/mine/mine-edit.vue
index c0d9517..164c92d 100644
--- a/im-uniapp/pages/mine/mine-edit.vue
+++ b/im-uniapp/pages/mine/mine-edit.vue
@@ -9,7 +9,7 @@
 				</image-upload>
 			</view>
 			<view class="form-item">
-				<view class="label">账号</view>
+				<view class="label">用户名</view>
 				<view class="value">{{userInfo.userName}}</view>
 			</view>
 			<view class="form-item">
@@ -25,7 +25,7 @@
 			</view>
 			<view class="form-item">
 				<view class="label">个性签名</view>
-				<textarea class="signature" maxlength="128" auto-height v-model="userInfo.signature"
+				<textarea class="signature" maxlength="64" auto-height v-model="userInfo.signature"
 					:style="{'text-align': signTextAlign}" @linechange="onLineChange"
 					placeholder="编辑个性签名,展示我的独特态度"></textarea>
 			</view>
diff --git a/im-uniapp/pages/mine/mine.vue b/im-uniapp/pages/mine/mine.vue
index d6c2c2d..266e73a 100644
--- a/im-uniapp/pages/mine/mine.vue
+++ b/im-uniapp/pages/mine/mine.vue
@@ -6,31 +6,24 @@
 				<head-image :name="userInfo.nickName" :url="userInfo.headImage" :size="160"></head-image>
 				<view class="info-item">
 					<view class="info-primary">
-						<text class="info-username">
-							{{ userInfo.userName }}
+						<text class="nick-name">
+							{{ 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 }}
-						</text>
+						<text class="label-text">用户名:</text>
+						<text class="content-text">	{{ userInfo.userName }}	</text>
 					</view>
 					<view class="info-text">
 						<view>
-							<text class="label-text">
-								签名:
-							</text>
-							<text class="content-text">
-								{{ userInfo.signature }}
-							</text>
+							<text class="label-text">签名:</text>
+							<text class="content-text">	{{ userInfo.signature }}</text>
 						</view>
 					</view>
 				</view>
+				<uni-icons class="info-arrow" type="right" size="16"></uni-icons>
 			</view>
 		</uni-card>
 		<bar-group>
@@ -75,19 +68,18 @@ export default {
 			return this.userStore.userInfo;
 		}
 	}
-
-
 }
 </script>
 
 <style scoped lang="scss">
 .mine {
 	.content {
-		//height: 200rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 20rpx;
+		padding: 10rpx;
+		padding-right: 30rpx;
+		overflow: hidden;
 
 		.info-item {
 			display: flex;
@@ -110,14 +102,17 @@ export default {
 			.content-text {
 				font-size: $im-font-size-small;
 				color: $im-text-color-light;
-			}
+				margin-left: 10rpx;
+				word-break: break-all;
+				overflow: hidden;
+			}	
 
 			.info-primary {
 				display: flex;
 				align-items: center;
 				margin-bottom: 10rpx;
 
-				.info-username {
+				.nick-name {
 					font-size: $im-font-size-large;
 					font-weight: 600;
 				}
diff --git a/im-web/src/components/chat/ChatBox.vue b/im-web/src/components/chat/ChatBox.vue
index 5996d4a..dd3ea6f 100644
--- a/im-web/src/components/chat/ChatBox.vue
+++ b/im-web/src/components/chat/ChatBox.vue
@@ -162,13 +162,13 @@ export default {
 				msgInfo.loadStatus = 'ok';
 				msgInfo.id = m.id;
 				this.isReceipt = false;
-				this.$store.commit("insertMessage", [msgInfo, this.chat]);
+				this.$store.commit("insertMessage", [msgInfo, file.chat]);
 			})
 		},
 		onImageFail(e, file) {
 			let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
 			msgInfo.loadStatus = 'fail';
-			this.$store.commit("insertMessage", [msgInfo, this.chat]);
+			this.$store.commit("insertMessage", [msgInfo, file.chat]);
 		},
 		onImageBefore(file) {
 			// 被封禁提示
@@ -204,6 +204,7 @@ export default {
 			this.scrollToBottom();
 			// 借助file对象保存
 			file.msgInfo = msgInfo;
+			file.chat = this.chat;
 		},
 		onFileSuccess(url, file) {
 			let data = {
@@ -219,13 +220,13 @@ export default {
 				msgInfo.id = m.id;
 				this.isReceipt = false;
 				this.refreshPlaceHolder();
-				this.$store.commit("insertMessage", [msgInfo, this.chat]);
+				this.$store.commit("insertMessage", [msgInfo, file.chat]);
 			})
 		},
 		onFileFail(e, file) {
 			let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
 			msgInfo.loadStatus = 'fail';
-			this.$store.commit("insertMessage", [msgInfo, this.chat]);
+			this.$store.commit("insertMessage", [msgInfo, file.chat]);
 		},
 		onFileBefore(file) {
 			// 被封禁提示
@@ -261,6 +262,7 @@ export default {
 			this.scrollToBottom();
 			// 借助file对象透传
 			file.msgInfo = msgInfo;
+			file.chat = this.chat;
 		},
 		onCloseSide() {
 			this.showSide = false;
@@ -511,7 +513,7 @@ export default {
 			this.$http({
 				url: url,
 				method: 'put'
-			}).then(() => { })
+			}).then(() => {})
 		},
 		loadReaded(fId) {
 			this.$http({
@@ -691,7 +693,7 @@ export default {
 		chat: {
 			handler(newChat, oldChat) {
 				if (newChat.targetId > 0 && (!oldChat || newChat.type != oldChat.type ||
-					newChat.targetId != oldChat.targetId)) {
+						newChat.targetId != oldChat.targetId)) {
 					if (this.chat.type == "GROUP") {
 						this.loadGroup(this.chat.targetId);
 					} else {
diff --git a/im-web/src/components/setting/Setting.vue b/im-web/src/components/setting/Setting.vue
index 8445969..6002227 100644
--- a/im-web/src/components/setting/Setting.vue
+++ b/im-web/src/components/setting/Setting.vue
@@ -21,7 +21,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="个性签名">
-        <el-input type="textarea" v-model="userInfo.signature" :rows="3"></el-input>
+        <el-input type="textarea" v-model="userInfo.signature" :rows="3" maxlength="64"></el-input>
       </el-form-item>
     </el-form>