From 096f20975de2f1fa98b5a2d2378ef998bb9a489b Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 12 Nov 2023 16:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E8=81=8A@=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GroupServiceImpl.java        |  1 -
 im-ui/src/components/chat/ChatItem.vue        |  1 -
 im-ui/src/components/chat/ChatMessageItem.vue |  2 +-
 im-ui/src/store/chatStore.js                  |  1 -
 im-ui/src/view/Group.vue                      | 11 ++--
 im-uniapp/App.vue                             |  1 -
 im-uniapp/components/chat-item/chat-item.vue  | 63 +++++++++++++------
 .../chat-message-item/chat-message-item.vue   | 10 +--
 .../components/friend-item/friend-item.vue    |  8 +--
 .../components/group-item/group-item.vue      |  8 +--
 im-uniapp/pages/chat/chat-box.vue             |  4 +-
 im-uniapp/store/chatStore.js                  | 23 +++++--
 12 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java
index 623d64f..d8597d3 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java
@@ -76,7 +76,6 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         groupMember.setUserId(user.getId());
         groupMember.setAliasName(StringUtils.isEmpty(vo.getAliasName())?session.getNickName():vo.getAliasName());
         groupMember.setRemark(StringUtils.isEmpty(vo.getRemark())?group.getName():vo.getRemark());
-        groupMember.setHeadImage(user.getHeadImageThumb());
         groupMemberService.save(groupMember);
 
         vo.setId(group.getId());
diff --git a/im-ui/src/components/chat/ChatItem.vue b/im-ui/src/components/chat/ChatItem.vue
index 0815f0f..3d49fe6 100644
--- a/im-ui/src/components/chat/ChatItem.vue
+++ b/im-ui/src/components/chat/ChatItem.vue
@@ -80,7 +80,6 @@
 				return this.$date.toTimeText(this.chat.lastSendTime, true)
 			},
 			atText() {
-				console.log(this.chat.atMe)
 				if (this.chat.atMe) {
 					return "[有人@我]"
 				} else if (this.chat.atAll) {
diff --git a/im-ui/src/components/chat/ChatMessageItem.vue b/im-ui/src/components/chat/ChatMessageItem.vue
index d76917a..c152261 100644
--- a/im-ui/src/components/chat/ChatMessageItem.vue
+++ b/im-ui/src/components/chat/ChatMessageItem.vue
@@ -251,7 +251,7 @@
 							width: 0;
 							height: 0;
 							border-style: solid dashed dashed;
-							border-color: rgb(235, 235, 245) transparent transparent;
+							border-color: white transparent transparent;
 							overflow: hidden;
 							border-width: 10px;
 						}
diff --git a/im-ui/src/store/chatStore.js b/im-ui/src/store/chatStore.js
index 01afdcb..9ad646b 100644
--- a/im-ui/src/store/chatStore.js
+++ b/im-ui/src/store/chatStore.js
@@ -123,7 +123,6 @@ export default {
 			}
 		},
 		insertMessage(state, msgInfo) {
-
 			// 获取对方id或群id
 			let type = msgInfo.groupId ? 'GROUP' : 'PRIVATE';
 			let targetId = msgInfo.groupId ? msgInfo.groupId : msgInfo.selfSend ? msgInfo.recvId : msgInfo.sendId;
diff --git a/im-ui/src/view/Group.vue b/im-ui/src/view/Group.vue
index 820728f..d0d088a 100644
--- a/im-ui/src/view/Group.vue
+++ b/im-ui/src/view/Group.vue
@@ -36,7 +36,7 @@
 								:url="activeGroup.headImage"
 								:name="activeGroup.remark">
 							</head-image>
-							<el-button class="send-btn" icon="el-icon-chat-dot-round" type="primary" @click="onSendMessage()">发消息</el-button>
+							<el-button class="send-btn" icon="el-icon-chat-dot-round" type="primary" @click="onSendMessage()">发送消息</el-button>
 						</div>
 						<el-form class="group-form" label-width="130px" :model="activeGroup" :rules="rules"
 							ref="groupForm">
@@ -65,7 +65,7 @@
 						</el-form>
 					</div>
 					<el-divider content-position="center"></el-divider>
-					<el-scrollbar style="height:400px;">
+					<el-scrollbar style="height:200px;">
 						<div class="group-member-list">
 							<div v-for="(member) in groupMembers" :key="member.id">
 								<group-member v-show="!member.quit" class="group-member" :member="member"
@@ -134,8 +134,6 @@
 						name: o.value,
 						remark: o.value,
 						aliasName: userInfo.name,
-						headImage: userInfo.headImage,
-						headImageThumb: userInfo.headImageThumb,
 						ownerId: userInfo.id
 					}
 					this.$http({
@@ -328,8 +326,7 @@
 			}
 
 			.group-container {
-				padding: 50px;
-
+				padding: 20px;
 				.group-info {
 					display: flex;
 					padding: 5px 20px;
@@ -337,7 +334,7 @@
 					.group-form {
 						flex: 1;
 						padding-left: 40px;
-						max-width: 800px;
+						max-width: 700px;
 					}
 
 					.avatar-uploader {
diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 715f6ac..2bcdacc 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -249,7 +249,6 @@
 			}
 		},
 		onLaunch() {
-
 			// 登录状态校验
 			if (uni.getStorageSync("loginInfo")) {
 				// 初始化
diff --git a/im-uniapp/components/chat-item/chat-item.vue b/im-uniapp/components/chat-item/chat-item.vue
index 19f2e6b..3ae1a97 100644
--- a/im-uniapp/components/chat-item/chat-item.vue
+++ b/im-uniapp/components/chat-item/chat-item.vue
@@ -1,16 +1,18 @@
 <template>
 	<view class="chat-item" @click="showChatBox()">
 		<view class="left">
-			<head-image  :url="chat.headImage" :name="chat.showName" :size="100"></head-image>
+			<head-image :url="chat.headImage" :name="chat.showName" :size="90"></head-image>
 			<view v-if="chat.unreadCount>0" class="unread-text">{{chat.unreadCount}}</view>
 		</view>
 		<view class="chat-right">
 			<view class="chat-name">
-				{{ chat.showName}}
+				<view class="chat-name-text">{{chat.showName}}</view>
+				<view class="chat-time">{{$date.toTimeText(chat.lastSendTime)}}</view>
 			</view>
 			<view class="chat-content">
+				<view class="chat-at-text">{{atText}}</view>
+				<view class="chat-send-name" v-show="chat.sendNickName">{{chat.sendNickName+':&nbsp;'}}</view>
 				<rich-text class="chat-content-text" :nodes="$emo.transform(chat.lastContent)"></rich-text>
-				<view class="chat-time">{{$date.toTimeText(chat.lastSendTime)}}</view>
 			</view>
 		</view>
 	</view>
@@ -36,19 +38,29 @@
 					url: "/pages/chat/chat-box?chatIdx=" + this.index
 				})
 			}
+		},
+		computed: {
+			atText() {
+				if (this.chat.atMe) {
+					return "[有人@我]"
+				} else if (this.chat.atAll) {
+					return "[@全体成员]"
+				}
+				return "";
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	.chat-item {
-		height: 120rpx;
+		height: 100rpx;
 		display: flex;
 		margin-bottom: 2rpx;
 		position: relative;
-		padding-left: 30rpx;
+		padding: 10rpx;
+		padding-left: 20rpx;
 		align-items: center;
-		padding-right: 10rpx;
 		background-color: white;
 		white-space: nowrap;
 
@@ -87,23 +99,16 @@
 			overflow: hidden;
 
 			.chat-name {
-				font-size: 30rpx;
-				font-weight: 600;
-				line-height: 60rpx;
-				white-space: nowrap;
-				overflow: hidden;
-			}
-
-			.chat-content {
 				display: flex;
+				line-height: 50rpx;
+				height: 50rpx;
 
-				.chat-content-text {
+				.chat-name-text {
 					flex: 1;
-					font-size: 28rpx;
+					font-size: 30rpx;
+					font-weight: 600;
 					white-space: nowrap;
 					overflow: hidden;
-					line-height: 50rpx;
-					text-overflow: ellipsis;
 				}
 
 				.chat-time {
@@ -114,6 +119,28 @@
 					overflow: hidden;
 				}
 			}
+
+			.chat-content {
+				display: flex;
+				line-height: 44rpx;
+				.chat-at-text {
+					color: #c70b0b;
+					font-size: 24rpx;
+				}
+
+				.chat-send-name {
+					font-size: 26rpx;
+				}
+
+				.chat-content-text {
+					flex: 1;
+					font-size: 28rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					line-height: 50rpx;
+					text-overflow: ellipsis;
+				}
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue
index dad63a1..c627bc6 100644
--- a/im-uniapp/components/chat-message-item/chat-message-item.vue
+++ b/im-uniapp/components/chat-message-item/chat-message-item.vue
@@ -231,7 +231,7 @@
 						line-height: 60rpx;
 						margin-top: 10rpx;
 						padding: 10rpx 20rpx;
-						background-color: #ebebf5;
+						background-color: white;
 						border-radius: 10rpx;
 						color: #333;
 						font-size: 30rpx;
@@ -239,17 +239,17 @@
 						display: block;
 						word-break: break-all;
 						white-space: pre-line;
-						box-shadow: 2px 2px 2px #c0c0f0;
+						box-shadow: 1px 1px 1px  #c0c0f0;
 
 						&:after {
 							content: "";
 							position: absolute;
 							left: -20rpx;
 							top: 26rpx;
-							width: 0;
-							height: 0;
+							width: 6rpx;
+							height: 6rpx;
 							border-style: solid dashed dashed;
-							border-color: #ebebf5 transparent transparent;
+							border-color: white transparent transparent;
 							overflow: hidden;
 							border-width: 18rpx;
 						}
diff --git a/im-uniapp/components/friend-item/friend-item.vue b/im-uniapp/components/friend-item/friend-item.vue
index 8ad8eaf..ea528b1 100644
--- a/im-uniapp/components/friend-item/friend-item.vue
+++ b/im-uniapp/components/friend-item/friend-item.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="friend-item" @click="showFriendInfo()">
 		<head-image :name="friend.nickName" :online="friend.online" :url="friend.headImage"
-			:size="100"></head-image>
+			:size="90"></head-image>
 		<view class="friend-info">
 			<view class="friend-name">{{ friend.nickName}}</view>
 			<view class="friend-online">
@@ -37,13 +37,13 @@
 
 <style scope lang="scss">
 	.friend-item {
-		height: 120rpx;
+		height: 100rpx;
 		display: flex;
 		margin-bottom: 1rpx;
 		position: relative;
-		padding-left: 30rpx;
+		padding: 10rpx;
+		padding-left: 20rpx;
 		align-items: center;
-		padding-right: 10rpx;
 		background-color: white;
 		white-space: nowrap;
 
diff --git a/im-uniapp/components/group-item/group-item.vue b/im-uniapp/components/group-item/group-item.vue
index 4bd0fca..69581fe 100644
--- a/im-uniapp/components/group-item/group-item.vue
+++ b/im-uniapp/components/group-item/group-item.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="group-item" @click="showGroupInfo()">
 		<head-image :name="group.remark"
-			:url="group.headImage" :size="100"></head-image>
+			:url="group.headImage" :size="90"></head-image>
 		<view class="group-name">
 			<view>{{ group.remark}}</view>
 		</view>
@@ -31,13 +31,13 @@
 
 <style scope lang="scss">
 	.group-item {
-		height: 120rpx;
+		height: 100rpx;
 		display: flex;
 		margin-bottom: 1rpx;
 		position: relative;
-		padding-left: 30rpx;
+		padding: 10rpx;
+		padding-left: 20rpx;
 		align-items: center;
-		padding-right: 10rpx;
 		background-color: white;
 		white-space: nowrap;
 		&:hover {
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index 58e63ad..af562d5 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -527,8 +527,6 @@
 					right: 30rpx;
 				}
 			}
-
-
 		}
 
 
@@ -538,7 +536,7 @@
 			border: #dddddd solid 1px;
 			overflow: hidden;
 			position: relative;
-			background-color: white;
+			background-color: #f8f8f8;
 
 			.scroll-box {
 				height: 100%;
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index c961c26..85a7b99 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -70,6 +70,8 @@ export default {
 				if (state.chats[idx].type == chatInfo.type &&
 					state.chats[idx].targetId == chatInfo.targetId) {
 					state.chats[idx].unreadCount = 0;
+					state.chats[idx].atMe = false;
+					state.chats[idx].atAll = false; 
 				}
 			}
 			this.commit("saveToStorage");
@@ -127,7 +129,6 @@ export default {
 					break;
 				}
 			}
-			
 			// 会话列表内容
 			if(!state.loadingPrivateMsg && !state.loadingPrivateMsg){
 				if (msgInfo.type == MESSAGE_TYPE.IMAGE) {
@@ -140,11 +141,23 @@ export default {
 					chat.lastContent = msgInfo.content;
 				}
 				chat.lastSendTime = msgInfo.sendTime;
+				chat.sendNickName = msgInfo.sendNickName;
 			}
+			
 			// 未读加1
 			if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED) {
 				chat.unreadCount++;
 			}
+			// 是否有人@我
+			if(!msgInfo.selfSend && chat.type=="GROUP" && msgInfo.atUserIds){
+				let userId = userStore.state.userInfo.id;
+				if(msgInfo.atUserIds.indexOf(userId)>=0){
+					chat.atMe = true;
+				}
+				if(msgInfo.atUserIds.indexOf(-1)>=0){
+					chat.atAll = true;
+				}
+			}
 			// 记录消息的最大id
 			if (msgInfo.id && type == "PRIVATE" && msgInfo.id > state.privateMsgMaxId) {
 				state.privateMsgMaxId = msgInfo.id;
@@ -267,10 +280,10 @@ export default {
 				groupMsgMaxId: state.groupMsgMaxId,
 				chats: state.chats
 			}
-			// uni.setStorage({
-			// 	key: key,
-			// 	data: chatsData
-			// })
+			uni.setStorage({
+				key: key,
+				data: chatsData
+			})
 		},
 		clear(state) {
 			state.chats = [];