From f44cb0bd854384b25783bf89f7cefbc6e33687c8 Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Sat, 5 Nov 2022 00:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E5=92=8C=E5=A4=A7=E5=9B=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/components/chat/ChatGroup.vue   | 12 ++++++------
 im-ui/src/components/chat/ChatPrivate.vue |  2 +-
 im-ui/src/components/chat/MessageItem.vue |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/im-ui/src/components/chat/ChatGroup.vue b/im-ui/src/components/chat/ChatGroup.vue
index 8f28ad8..149e857 100644
--- a/im-ui/src/components/chat/ChatGroup.vue
+++ b/im-ui/src/components/chat/ChatGroup.vue
@@ -2,7 +2,7 @@
 	<el-container class="r-chat-box">
 		<el-header height="60px">
 			<span>{{title}}</span>
-			<span class="btn-side el-icon-more" @click="showSide=!showSide"></span>
+			<span title="群聊信息" class="btn-side el-icon-more" @click="showSide=!showSide"></span>
 		</el-header>
 		<el-container>
 			<el-container class="content-box">
@@ -19,20 +19,20 @@
 				</el-main>
 				<el-footer height="25%" class="im-chat-footer">
 					<div class="chat-tool-bar">
-						<div class="el-icon-service"></div>
-						<div>
-							<file-upload action="/api/image/upload" :maxSize="5*1024*1024" :fileTypes="['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
+						<div title="表情" class="el-icon-service" @click="$message.error('还不支持发表情符号呢')"></div>
+						<div title="发送图片" >
+							<file-upload action="/api/image/upload" :maxSize="5*1024*1024" :fileTypes="['image/jpeg', 'image/png', 'image/jpg', 'image/webp','image/gif']"
 							 @before="handleImageBefore" @success="handleImageSuccess" @fail="handleImageFail">
 								<i class="el-icon-picture-outline"></i>
 							</file-upload>
 						</div>
-						<div>
+						<div title="发送文件">
 							<file-upload action="/api/file/upload" :maxSize="10*1024*1024" @before="handleFileBefore" @success="handleFileSuccess"
 							 @fail="handleFileFail">
 								<i class="el-icon-wallet"></i>
 							</file-upload>
 						</div>
-						<div class="el-icon-chat-dot-round"></div>
+						<div title="聊天记录" class="el-icon-chat-dot-round"></div>
 					</div>
 					<textarea v-model="sendText" ref="sendBox" class="send-text-area" @keydown.enter="sendTextMessage()"></textarea>
 					<div class="im-chat-send">
diff --git a/im-ui/src/components/chat/ChatPrivate.vue b/im-ui/src/components/chat/ChatPrivate.vue
index d49f246..a2caa7e 100644
--- a/im-ui/src/components/chat/ChatPrivate.vue
+++ b/im-ui/src/components/chat/ChatPrivate.vue
@@ -18,7 +18,7 @@
 			<div class="chat-tool-bar">
 				<div class="el-icon-service"></div>
 				<div>
-					<file-upload action="/api/image/upload" :maxSize="5*1024*1024" :fileTypes="['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
+					<file-upload action="/api/image/upload" :maxSize="5*1024*1024" :fileTypes="['image/jpeg', 'image/png', 'image/jpg','image/webp', 'image/gif']"
 					 @before="handleImageBefore" @success="handleImageSuccess" @fail="handleImageFail">
 						<i class="el-icon-picture-outline"></i>
 					</file-upload>
diff --git a/im-ui/src/components/chat/MessageItem.vue b/im-ui/src/components/chat/MessageItem.vue
index ae01832..5bd3138 100644
--- a/im-ui/src/components/chat/MessageItem.vue
+++ b/im-ui/src/components/chat/MessageItem.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="im-msg-item" :class="{'im-chat-mine':mine}">
 		<div class="head-image">
-			<head-image :url="headImage"></head-image>
+			<head-image :url="headImage" :id="msgInfo.sendId"></head-image>
 		</div>
 		<div class="im-msg-content">
 			<div class="im-msg-top">