diff --git a/im-ui/src/api/emotion.js b/im-ui/src/api/emotion.js
index 1588729..c391496 100644
--- a/im-ui/src/api/emotion.js
+++ b/im-ui/src/api/emotion.js
@@ -19,12 +19,22 @@ let textToImg = (emoText) => {
 		return emoText;
 	}
 	let url = require(`@/assets/emoji/${idx}.gif`);
-	return `<img src="${url}" style="width:40px;height:40px;vertical-align:bottom;"/>`
+	return `<img src="${url}" style="width:35px;height:35px;vertical-align:bottom;"/>`
 }
 
+let textToUrl = (emoText) => {
+	let word = emoText.replace(/\#|\;/gi, '');
+	let idx = emoTextList.indexOf(word);
+	if(idx==-1){
+		return "";
+	}
+	let url = require(`@/assets/emoji/${idx}.gif`);
+	return url;
+}
 
 export default {
 	emoTextList,
 	transform,
-	textToImg
+	textToImg,
+	textToUrl
 }
diff --git a/im-ui/src/api/wssocket.js b/im-ui/src/api/wssocket.js
index ef2a237..e89988d 100644
--- a/im-ui/src/api/wssocket.js
+++ b/im-ui/src/api/wssocket.js
@@ -20,7 +20,6 @@ let connect = (wsurl,accessToken) => {
 			} else if (sendInfo.cmd == 1) {
 				// 重新开启心跳定时
 				heartCheck.reset();
-				console.log("")
 			} else {
 				// 其他消息转发出去
 				console.log("收到消息:",sendInfo);  
diff --git a/im-ui/src/components/chat/ChatAtBox.vue b/im-ui/src/components/chat/ChatAtBox.vue
new file mode 100644
index 0000000..858cbbf
--- /dev/null
+++ b/im-ui/src/components/chat/ChatAtBox.vue
@@ -0,0 +1,162 @@
+<template>
+	<el-scrollbar v-show="show" ref="scrollBox" class="group-member-choose"
+		:style="{'left':pos.x+'px','top':pos.y-300+'px'}">
+		<div v-for="(member,idx) in showMembers" :key="member.id">
+			<div  class="member-item"
+				:class="idx==activeIdx?'active':''" @click="onSelectMember(member)">
+				<div class="member-avatar">
+					<head-image :size="30" :name="member.aliasName" :url="member.headImage"> </head-image>
+				</div>
+				<div class="member-name">
+					<div>{{member.aliasName}}</div>
+				</div>
+			</div>
+		</div>
+	</el-scrollbar>
+</template>
+
+<script>
+	import HeadImage from '../common/HeadImage.vue';
+
+	export default {
+		name: "chatAtBox",
+		components: {
+			HeadImage
+		},
+		props: {
+			searchText: {
+				type: String,
+				default: ""
+			},
+			members: {
+				type: Array
+			}
+		},
+		data() {
+			return {
+				show: false,
+				pos: {
+					x: 0,
+					y: 0
+				},
+				activeIdx: 0,
+				showMembers:[]
+			};
+		},
+		methods: {
+			init(){
+				this.activeIdx = 0;
+				this.$refs.scrollBox.wrap.scrollTop = 0;
+				this.showMembers=[];
+				this.members.forEach((m)=>{
+					if(m.aliasName.startsWith(this.searchText)){
+						this.showMembers.push(m);
+					}
+				})
+			},
+			open(pos) {
+				this.show = true;
+				this.pos = pos;
+				this.init();
+			},
+			close() {
+				this.show = false;
+			},
+			moveUp() {
+				if (this.activeIdx > 0) {
+					this.activeIdx--;
+					this.scrollToActive()
+				}
+			},
+			moveDown() {
+				console.log(this.activeIdx)
+				if (this.activeIdx < this.showMembers.length - 1) {
+					this.activeIdx++;
+					this.scrollToActive()
+				}
+			},
+			select() {
+				this.onSelectMember(this.showMembers[this.activeIdx])
+			},
+			scrollToActive() {
+				console.log(this.$refs.scrollBox.wrap)
+				if (this.activeIdx * 35 - this.$refs.scrollBox.wrap.clientHeight > this.$refs.scrollBox.wrap.scrollTop) {
+					this.$refs.scrollBox.wrap.scrollTop += 140;
+					if (this.$refs.scrollBox.wrap.scrollTop > this.$refs.scrollBox.wrap.scrollHeight) {
+						this.$refs.scrollBox.wrap.scrollTop = this.$refs.scrollBox.wrap.scrollHeight
+					}
+				}
+
+				if (this.activeIdx * 35 < this.$refs.scrollBox.wrap.scrollTop) {
+					this.$refs.scrollBox.wrap.scrollTop -= 140;
+					if (this.$refs.scrollBox.wrap.scrollTop < 0) {
+						this.$refs.scrollBox.wrap.scrollTop = 0;
+					}
+				}
+
+
+			},
+			onSelectMember(member) {
+				this.$emit("select", member);
+				this.show = false;
+			}
+		},
+		watch: {
+			searchText: {
+				handler(newText, oldText) {
+					this.init();
+				}
+			}
+		}
+
+	}
+</script>
+
+<style scoped lang="scss">
+	.group-member-choose {
+		position: fixed;
+		width: 200px;
+		height: 300px;
+		border: 1px solid #b4b4b4;
+		border-radius: 5px;
+		background-color: #f5f5f5;
+		box-shadow: 0px 0px 10px #ccc;
+
+		.member-item {
+			display: flex;
+			height: 35px;
+			margin-bottom: 1px;
+			position: relative;
+			padding-left: 10px;
+			align-items: center;
+			padding-right: 5px;
+			background-color: #fafafa;
+			white-space: nowrap;
+
+			&:hover {
+				background-color: #eeeeee;
+			}
+
+			&.active {
+				background-color: #eeeeee;
+			}
+
+
+			.member-avatar {
+				width: 30px;
+				height: 30px;
+			}
+
+			.member-name {
+				padding-left: 10px;
+				height: 100%;
+				text-align: left;
+				line-height: 35px;
+				white-space: nowrap;
+				overflow: hidden;
+				font-size: 14px;
+				font-weight: 600;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue
index 5fd5e1e..57e6b69 100644
--- a/im-ui/src/components/chat/ChatBox.vue
+++ b/im-ui/src/components/chat/ChatBox.vue
@@ -1,79 +1,88 @@
 <template>
-	<el-container class="chat-box">
-		<el-header height="60px">
-			<span>{{title}}</span>
-			<span title="群聊信息" v-show="this.chat.type=='GROUP'" class="btn-side el-icon-more"
-				@click="showSide=!showSide"></span>
-		</el-header>
-		<el-main style="padding: 0;">
-			<el-container>
-				<el-container class="content-box">
-					<el-main class="im-chat-main" id="chatScrollBox" @scroll="handleScroll">
-						<div class="im-chat-box">
-							<ul>
-								<li v-for="(msgInfo,idx) in chat.messages" :key="idx">
-									<chat-message-item v-show="idx>=showMinIdx" :mine="msgInfo.sendId == mine.id" :headImage="headImage(msgInfo)"
-										:showName="showName(msgInfo)" :msgInfo="msgInfo" @delete="deleteMessage"
-										@recall="recallMessage">
-									</chat-message-item>
-								</li>
-							</ul>
-						</div>
-					</el-main>
-					<el-footer height="240px" class="im-chat-footer">
-						<div class="chat-tool-bar">
-							<div title="表情" class="icon iconfont icon-biaoqing" ref="emotion"
-								@click="switchEmotionBox()">
+	<div class="chat-box" @click="closeRefBox()">
+		<el-container>
+			<el-header height="60px">
+				<span>{{title}}</span>
+				<span title="群聊信息" v-show="this.chat.type=='GROUP'" class="btn-side el-icon-more"
+					@click="showSide=!showSide"></span>
+			</el-header>
+			<el-main style="padding: 0;">
+				<el-container>
+					<el-container class="content-box">
+						<el-main class="im-chat-main" id="chatScrollBox" @scroll="onScroll">
+							<div class="im-chat-box">
+								<ul>
+									<li v-for="(msgInfo,idx) in chat.messages" :key="idx">
+										<chat-message-item v-show="idx>=showMinIdx" :mine="msgInfo.sendId == mine.id"
+											:headImage="headImage(msgInfo)" :showName="showName(msgInfo)"
+											:msgInfo="msgInfo" @delete="deleteMessage" @recall="recallMessage">
+										</chat-message-item>
+									</li>
+								</ul>
 							</div>
-							<div title="发送图片">
-								<file-upload :action="imageAction" :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 title="发送文件">
-								<file-upload :action="fileAction" :maxSize="10*1024*1024" @before="handleFileBefore"
-									@success="handleFileSuccess" @fail="handleFileFail">
-									<i class="el-icon-wallet"></i>
-								</file-upload>
-							</div>
-							<div title="发送语音" class="el-icon-microphone" @click="showVoiceBox()">
-							</div>
-							<div title="视频聊天" v-show="chat.type=='PRIVATE'" class="el-icon-phone-outline"
-								@click="showVideoBox()">
-							</div>
-							<div title="聊天记录" class="el-icon-chat-dot-round" @click="showHistoryBox()"></div>
-						</div>
-						<div class="send-content-area">
-							<textarea v-show="!sendImageUrl" v-model="sendText" ref="sendBox" class="send-text-area"
-								:disabled="lockMessage" @keydown.enter="sendTextMessage()" @paste="handlePaste"
-								placeholder="温馨提示:可以粘贴截图到这里了哦~"></textarea>
-
-							<div v-show="sendImageUrl" class="send-image-area">
-								<div class="send-image-box">
-									<img class="send-image" :src="sendImageUrl" />
-									<span class="send-image-close el-icon-close" title="删除"
-										@click="removeSendImage()"></span>
+						</el-main>
+						<el-footer height="240px" class="im-chat-footer">
+							<div class="chat-tool-bar">
+								<div title="表情" class="icon iconfont icon-biaoqing" ref="emotion"
+									@click.stop="showEmotionBox()">
+								</div>
+								<div title="发送图片">
+									<file-upload :action="imageAction" :maxSize="5*1024*1024"
+										:fileTypes="['image/jpeg', 'image/png', 'image/jpg', 'image/webp','image/gif']"
+										@before="onImageBefore" @success="onImageSuccess"
+										@fail="onImageFail">
+										<i class="el-icon-picture-outline"></i>
+									</file-upload>
+								</div>
+								<div title="发送文件">
+									<file-upload :action="fileAction" :maxSize="10*1024*1024" @before="onFileBefore"
+										@success="onFileSuccess" @fail="onFileFail">
+										<i class="el-icon-wallet"></i>
+									</file-upload>
 								</div>
+								<div title="发送语音" class="el-icon-microphone" @click="showVoiceBox()">
+								</div>
+								<div title="视频聊天" v-show="chat.type=='PRIVATE'" class="el-icon-phone-outline"
+									@click="showVideoBox()">
+								</div>
+								<div title="聊天记录" class="el-icon-chat-dot-round" @click="showHistoryBox()"></div>
 							</div>
-							<div class="send-btn-area">
-								<el-button type="primary" size="small" @click="handleSendMessage()">发送</el-button>
+							<div class="send-content-area">
+								<div contenteditable="true" v-show="!sendImageUrl" ref="editBox" class="send-text-area"
+									:disabled="lockMessage" @paste.prevent="onEditorPaste"
+									@compositionstart="onEditorCompositionStart"
+									@compositionend="onEditorCompositionEnd" @input="onEditorInput"
+									placeholder="温馨提示:可以粘贴截图到这里了哦~" @blur="onEditBoxBlur()"
+									@keydown.down="onKeyDown" @keydown.up="onKeyUp" @keydown.enter.prevent="onKeyEnter">
+								</div>
+
+								<div v-show="sendImageUrl" class="send-image-area">
+									<div class="send-image-box">
+										<img class="send-image" :src="sendImageUrl" />
+										<span class="send-image-close el-icon-close" title="删除"
+											@click="removeSendImage()"></span>
+									</div>
+								</div>
+								<div class="send-btn-area">
+									<el-button type="primary" size="small" @click="sendMessage()">发送</el-button>
+								</div>
 							</div>
-						</div>
-					</el-footer>
+						</el-footer>
+					</el-container>
+					<el-aside class="chat-group-side-box" width="300px" v-show="showSide">
+						<chat-group-side :group="group" :groupMembers="groupMembers" @reload="loadGroup(group.id)">
+						</chat-group-side>
+					</el-aside>
 				</el-container>
-				<el-aside class="chat-group-side-box" width="300px" v-show="showSide">
-					<chat-group-side :group="group" :groupMembers="groupMembers" @reload="loadGroup(group.id)">
-					</chat-group-side>
-				</el-aside>
-			</el-container>
-		</el-main>
-		<emotion v-show="showEmotion" :pos="emoBoxPos" @emotion="handleEmotion"></Emotion>
-		<chat-voice :visible="showVoice" @close="closeVoiceBox" @send="handleSendVoice"></chat-voice>
-		<chat-history :visible="showHistory" :chat="chat" :friend="friend" :group="group" :groupMembers="groupMembers"
-			@close="closeHistoryBox"></chat-history>
-	</el-container>
+			</el-main>
+			<emotion ref="emoBox" @emotion="onEmotion"></Emotion>
+			<chat-at-box ref="atBox" :members="groupMembers" :search-text="atSearchText"
+				@select="onAtSelect"></chat-at-box>
+			<chat-voice :visible="showVoice" @close="closeVoiceBox" @send="onSendVoice"></chat-voice>
+			<chat-history :visible="showHistory" :chat="chat" :friend="friend" :group="group"
+				:groupMembers="groupMembers" @close="closeHistoryBox"></chat-history>
+		</el-container>
+	</div>
 </template>
 
 <script>
@@ -83,6 +92,7 @@
 	import Emotion from "../common/Emotion.vue";
 	import ChatVoice from "./ChatVoice.vue";
 	import ChatHistory from "./ChatHistory.vue";
+	import ChatAtBox from "./ChatAtBox.vue"
 
 	export default {
 		name: "chatPrivate",
@@ -92,7 +102,8 @@
 			ChatGroupSide,
 			Emotion,
 			ChatVoice,
-			ChatHistory
+			ChatHistory,
+			ChatAtBox
 		},
 		props: {
 			chat: {
@@ -104,28 +115,142 @@
 				friend: {},
 				group: {},
 				groupMembers: [],
-				sendText: "",
 				sendImageUrl: "",
 				sendImageFile: "",
 				showVoice: false, // 是否显示语音录制弹窗
 				showSide: false, // 是否显示群聊信息栏
-				showEmotion: false, // 是否显示emoji表情
-				emoBoxPos: { // emoji表情弹出位置
-					x: 0,
-					y: 0
-				},
 				showHistory: false, // 是否显示历史聊天记录
 				lockMessage: false, // 是否锁定发送，
-				showMinIdx: 0 // 下标低于showMinIdx的消息不显示，否则页面会很卡
+				showMinIdx: 0, // 下标低于showMinIdx的消息不显示，否则页面会很卡
+				atSearchText: "",
+				focusNode: null, // 缓存光标所在节点
+				focusOffset: null, // 缓存光标所在节点位置
+				zhLock: false // 解决中文输入法触发英文的情况
 			}
 		},
 		methods: {
-			handlePaste(e) {
+			closeRefBox() {
+				this.$refs.emoBox.close();
+				this.$refs.atBox.close();
+			},
+			onKeyDown() {
+				if (this.$refs.atBox.show) {
+					this.$refs.atBox.moveDown()
+				}
+			},
+			onKeyUp() {
+				if (this.$refs.atBox.show) {
+					this.$refs.atBox.moveUp()
+				}
+			},
+			onKeyEnter() {
+				if (this.$refs.atBox.show) {
+					// 键盘操作不会自动修正焦点，需要手动修正,原因不详
+					this.focusOffset += this.atSearchText.length;
+					this.$refs.atBox.select();
+				} else {
+					this.sendMessage();
+				}
+			},
+			onEditBoxBlur() {
+				let selection = window.getSelection()
+				// 记录光标位置
+				this.focusNode = selection.focusNode;
+				this.focusOffset = selection.focusOffset;
+			},
+			onEditorInput(e) {
+				// 如果触发 @
+				if (this.chat.type == "GROUP" && !this.zhLock) {
+					if (e.data == '@') {
+						// 打开选择弹窗
+						this.showAtBox(e);
+					} else {
+						let selection = window.getSelection()
+						let range = selection.getRangeAt(0)
+						this.focusNode = selection.focusNode;
+						// 截取@后面的名称作为过滤条件
+						let stIdx = this.focusNode.textContent.lastIndexOf('@');
+						this.atSearchText = this.focusNode.textContent.substring(stIdx + 1);
+					}
+				}
+
+			},
+			onEditorCompositionStart() {
+				this.zhLock = true;
+			},
+			onEditorCompositionEnd(e) {
+				this.zhLock = false;
+				this.onEditorInput(e);
+			},
+			showAtBox(e) {
+				this.atSearchText = "";
+				let selection = window.getSelection()
+				let range = selection.getRangeAt(0)
+				// 记录光标所在位置
+				this.focusNode = selection.focusNode;
+				this.focusOffset = selection.focusOffset;
+				// 光标所在坐标
+				let pos = range.getBoundingClientRect();
+				this.$refs.atBox.open({
+					x: pos.x,
+					y: pos.y
+				})
+			},
+			onAtSelect(member) {	
+				let range = window.getSelection().getRangeAt(0)
+				// 选中输入的 @xx 符
+				range.setStart(this.focusNode, this.focusOffset - 1 -this.atSearchText.length)
+				range.setEnd(this.focusNode, this.focusOffset)
+				range.deleteContents()
+				// 创建元素节点
+				let element = document.createElement('SPAN')
+				element.className = "at"
+				element.dataset.id = member.userId;
+				element.contentEditable = 'false'
+				element.innerText = `@${member.aliasName}`
+				range.insertNode(element)
+				// 光标移动到末尾
+				range.collapse()
+				// 插入空格
+				let textNode = document.createTextNode('\u00A0');
+				range.insertNode(textNode)
+				range.collapse()
+				this.atSearchText = "";
+				this.$refs.editBox.focus()
+			},
+			createSendText() {
+				let sendText = ""
+				this.$refs.editBox.childNodes.forEach((node) => {
+					if (node.nodeName == "#text") {
+						sendText += node.textContent;
+					} else if (node.nodeName == "SPAN") {
+						sendText += node.innerText;
+					} else if (node.nodeName == "IMG") {
+						sendText += node.dataset.code;
+					}
+				})
+				return sendText;
+			},
+			createAtUserIds() {
+				let ids = [];
+				this.$refs.editBox.childNodes.forEach((node) => {
+					if (node.nodeName == "SPAN") {
+						ids.push(node.dataset.id);
+					}
+				})
+				return ids;
+			},
+			onEditorPaste(e) {
+				
 				let txt = event.clipboardData.getData('Text')
 				if (typeof(txt) == 'string') {
-					this.sendText += txt
+					let range = window.getSelection().getRangeAt(0)
+					let textNode = document.createTextNode(txt);
+					range.insertNode(textNode)
+					range.collapse();	
+					
 				}
-				const items = (event.clipboardData || window.clipboardData).items
+				let items = (event.clipboardData || window.clipboardData).items
 				if (items.length) {
 					for (let i = 0; i < items.length; i++) {
 						if (items[i].type.indexOf('image') !== -1) {
@@ -140,7 +265,7 @@
 				this.sendImageUrl = "";
 				this.sendImageFile = null;
 			},
-			handleImageSuccess(data, file) {
+			onImageSuccess(data, file) {
 				let msgInfo = JSON.parse(JSON.stringify(file.msgInfo || file.raw.msgInfo));
 				msgInfo.content = JSON.stringify(data);
 				this.$http({
@@ -153,12 +278,12 @@
 					this.$store.commit("insertMessage", msgInfo);
 				})
 			},
-			handleImageFail(e, file) {
+			onImageFail(e, file) {
 				let msgInfo = JSON.parse(JSON.stringify(file.msgInfo || file.raw.msgInfo));
 				msgInfo.loadStatus = 'fail';
 				this.$store.commit("insertMessage", msgInfo);
 			},
-			handleImageBefore(file) {
+			onImageBefore(file) {
 				let url = URL.createObjectURL(file);
 				let data = {
 					originUrl: url,
@@ -184,7 +309,7 @@
 				// 借助file对象保存
 				file.msgInfo = msgInfo;
 			},
-			handleFileSuccess(url, file) {
+			onFileSuccess(url, file) {
 				let data = {
 					name: file.name,
 					size: file.size,
@@ -202,13 +327,12 @@
 					this.$store.commit("insertMessage", msgInfo);
 				})
 			},
-			handleFileFail(e, file) {
-
+			onFileFail(e, file) {
 				let msgInfo = JSON.parse(JSON.stringify(file.raw.msgInfo));
 				msgInfo.loadStatus = 'fail';
 				this.$store.commit("insertMessage", msgInfo);
 			},
-			handleFileBefore(file) {
+			onFileBefore(file) {
 				let url = URL.createObjectURL(file);
 				let data = {
 					name: file.name,
@@ -234,34 +358,47 @@
 				// 借助file对象透传
 				file.msgInfo = msgInfo;
 			},
-			handleCloseSide() {
+			onCloseSide() {
 				this.showSide = false;
 			},
-			handleScrollToTop() {
+			onScrollToTop() {
 				// 多展示10条信息
 				this.showMinIdx = this.showMinIdx > 10 ? this.showMinIdx - 10 : 0;
 			},
-			handleScroll(e) {
+			onScroll(e) {
 				let scrollElement = e.target
 				let scrollTop = scrollElement.scrollTop
-				if (scrollTop < 30 ) { // 在顶部,不滚动的情况
+				if (scrollTop < 30) { // 在顶部,不滚动的情况
 					// 多展示20条信息
 					this.showMinIdx = this.showMinIdx > 20 ? this.showMinIdx - 20 : 0;
 				}
 			},
-			switchEmotionBox() {
-				this.showEmotion = !this.showEmotion;
+			showEmotionBox() {
 				let width = this.$refs.emotion.offsetWidth;
 				let left = this.$elm.fixLeft(this.$refs.emotion);
 				let top = this.$elm.fixTop(this.$refs.emotion);
-				this.emoBoxPos.y = top;
-				this.emoBoxPos.x = left + width / 2;
+				this.$refs.emoBox.open({
+					x: left + width / 2,
+					y: top
+				})
+
 			},
-			handleEmotion(emoText) {
-				this.sendText += emoText;
-				this.showEmotion = false;
+			onEmotion(emoText) {
 				// 保持输入框焦点
-				this.$refs.sendBox.focus();
+				this.$refs.editBox.focus();
+				let range = window.getSelection().getRangeAt(0);
+				// 插入光标所在位置
+				range.setStart(this.focusNode, this.focusOffset)
+				let element = document.createElement('IMG')
+				element.className = "emo"
+				element.dataset.code = emoText;
+				element.contentEditable = 'true'
+				element.setAttribute("src", this.$emo.textToUrl(emoText));
+				// 选中元素节点
+				range.insertNode(element)
+				// 光标移动到末尾
+				range.collapse()
+
 			},
 			showVoiceBox() {
 				this.showVoice = true;
@@ -281,7 +418,7 @@
 			closeHistoryBox() {
 				this.showHistory = false;
 			},
-			handleSendVoice(data) {
+			onSendVoice(data) {
 				let msgInfo = {
 					content: JSON.stringify(data),
 					type: 3
@@ -300,7 +437,7 @@
 					msgInfo.status = this.$enums.MESSAGE_STATUS.UNSEND;
 					this.$store.commit("insertMessage", msgInfo);
 					// 保持输入框焦点
-					this.$refs.sendBox.focus();
+					this.$refs.editBox.focus();
 					// 滚动到底部
 					this.scrollToBottom();
 					// 关闭录音窗口
@@ -314,7 +451,7 @@
 					msgInfo.recvId = targetId;
 				}
 			},
-			handleSendMessage() {
+			sendMessage() {
 				if (this.sendImageFile) {
 					this.sendImageMessage();
 				} else {
@@ -323,7 +460,7 @@
 			},
 			sendImageMessage() {
 				let file = this.sendImageFile;
-				this.handleImageBefore(this.sendImageFile);
+				this.onImageBefore(this.sendImageFile);
 				let formData = new FormData()
 				formData.append('file', file.raw || file)
 				this.$http.post("/image/upload", formData, {
@@ -331,21 +468,25 @@
 						'Content-Type': 'multipart/form-data'
 					}
 				}).then((data) => {
-					this.handleImageSuccess(data, file);
+					this.onImageSuccess(data, file);
 				}).catch((res) => {
-					this.handleImageSuccess(res, file);
+					this.onImageSuccess(res, file);
 				})
 				this.sendImageFile = null;
 				this.sendImageUrl = "";
-				this.$nextTick(() => this.$refs.sendBox.focus());
+				this.$nextTick(() => this.$refs.editBox.focus());
 				this.scrollToBottom();
 			},
 			sendTextMessage() {
-				if (!this.sendText.trim()) {
+				let sendText = this.createSendText();
+				// 清空输入框
+				this.$refs.editBox.innerHTML = "";
+				if (!sendText.trim()) {
 					return
 				}
+				this.$refs.editBox.cle
 				let msgInfo = {
-					content: this.sendText,
+					content: sendText,
 					type: 0
 				}
 				// 填充对方id
@@ -356,7 +497,6 @@
 					method: 'post',
 					data: msgInfo
 				}).then((id) => {
-					this.sendText = "";
 					msgInfo.id = id;
 					msgInfo.sendTime = new Date().getTime();
 					msgInfo.sendId = this.$store.state.userStore.userInfo.id;
@@ -366,17 +506,10 @@
 				}).finally(() => {
 					// 解除锁定
 					this.lockMessage = false;
-					// 保持输入框焦点
-					this.$nextTick(() => this.$refs.sendBox.focus());
-					// 滚动到底部
 					this.scrollToBottom();
+					this.resetEditor();
 				});
-				const e = window.event || arguments[0];
-				if (e.key === 'Enter' || e.code === 'Enter' || e.keyCode === 13) {
-					e.returnValue = false;
-					e.preventDefault();
-					return false;
-				}
+
 			},
 			deleteMessage(msgInfo) {
 				this.$confirm('确认删除消息?', '删除消息', {
@@ -467,6 +600,13 @@
 					return msgInfo.sendId == this.mine.id ? this.mine.headImageThumb : this.chat.headImage
 				}
 			},
+			resetEditor(){
+				this.sendImageUrl = "";
+				this.sendImageFile = null;
+				this.$refs.editBox.innerHTML = "";
+				this.$refs.editBox.foucs();
+				
+			},
 			scrollToBottom() {
 				this.$nextTick(() => {
 					let div = document.getElementById("chatScrollBox");
@@ -511,18 +651,14 @@
 						}
 						// 滚到底部
 						this.scrollToBottom();
-						this.sendText = "";
 						this.showSide = false;
 						// 消息已读
 						this.readedMessage()
 						// 初始状态只显示30条消息
 						let size = this.chat.messages.length;
 						this.showMinIdx = size > 30 ? size - 30 : 0;
-						
-						// 保持输入框焦点
-						this.$nextTick(() => {
-							this.$refs.sendBox.focus();
-						})
+						// 重置输入框
+						this.resetEditor();
 					}
 				},
 				immediate: true
@@ -538,13 +674,15 @@
 		},
 		mounted() {
 			let div = document.getElementById("chatScrollBox");
-			div.addEventListener('scroll', this.handleScroll)
+			div.addEventListener('scroll', this.onScroll)
 		}
 	}
 </script>
 
 <style lang="scss">
 	.chat-box {
+		position: relative;
+		width: 100%;
 		background: white;
 		border: #dddddd solid 1px;
 
@@ -631,7 +769,19 @@
 					color: black;
 					background-color: #f8f8f8 !important;
 					outline-color: rgba(83, 160, 231, 0.61);
+					text-align: left;
+					line-height: 30 px;
 
+					.at {
+						color: blue;
+						font-weight: 600;
+					}
+
+					.emo {
+						width: 30px;
+						height: 30px;
+						vertical-align: bottom;
+					}
 				}
 
 				.send-image-area {
diff --git a/im-ui/src/components/common/Emotion.vue b/im-ui/src/components/common/Emotion.vue
index 128ccd4..0866810 100644
--- a/im-ui/src/components/common/Emotion.vue
+++ b/im-ui/src/components/common/Emotion.vue
@@ -1,9 +1,10 @@
 <template>
-	<div class="emotion-mask" @click="$emit('emotion','')">
+	<div  v-show="show" @click="close()">
 		<div class="emotion-box" :style="{'left':x+'px','top':y+'px'}">
 			<el-scrollbar style="height:250px">
 				<div class="emotion-item-list">
-					<div class="emotion-item" v-for="(emoText, i) in $emo.emoTextList" :key="i" @click="clickHandler(emoText)" v-html="$emo.textToImg(emoText)">
+					<div class="emotion-item" v-for="(emoText, i) in $emo.emoTextList" :key="i"
+						@click="clickHandler(emoText)" v-html="$emo.textToImg(emoText)">
 					</div>
 				</div>
 			</el-scrollbar>
@@ -14,18 +15,26 @@
 <script>
 	export default {
 		name: "emotion",
-		props: {
-			pos: {
-				type: Object
-			}
-		},
 		data() {
-			return {}
+			return {
+				show: false,
+				pos: {
+					x: 0,
+					y: 0
+				}
+			}
 		},
 		methods: {
 			clickHandler(emoText) {
 				let emotion = `#${emoText};`
 				this.$emit('emotion', emotion)
+			},
+			open(pos) {
+				this.pos = pos;
+				this.show = true;
+			},
+			close() {
+				this.show = false;
 			}
 		},
 		computed: {
@@ -39,16 +48,8 @@
 	}
 </script>
 <style scoped lang="scss">
-	.emotion-mask {
-		position: fixed;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		width: 100%;
-		height: 100%;
-	}
 	
+
 	.emotion-box {
 		position: fixed;
 		width: 500px;
@@ -57,7 +58,8 @@
 		border: 1px solid #b4b4b4;
 		border-radius: 5px;
 		background-color: #f5f5f5;
-		box-shadow: 0px 0px  10px #ccc;	
+		box-shadow: 0px 0px 10px #ccc;
+
 		.emotion-item-list {
 			display: flex;
 			flex-wrap: wrap;
@@ -66,21 +68,21 @@
 				text-align: center;
 				cursor: pointer;
 				padding: 5px;
-			
+
 			}
 		}
 
 		&:after {
-		    content: "";
-		    position: absolute;
-		    left: 185px;
-		    bottom: -30px;
-		    width: 0;
-		    height: 0;
-		    border-style: solid dashed dashed;
-		    border-color: #f5f5f5 transparent transparent;
-		    overflow: hidden;
-		    border-width: 15px;
+			content: "";
+			position: absolute;
+			left: 185px;
+			bottom: -30px;
+			width: 0;
+			height: 0;
+			border-style: solid dashed dashed;
+			border-color: #f5f5f5 transparent transparent;
+			overflow: hidden;
+			border-width: 15px;
 		}
 	}
-</style>
+</style>
\ No newline at end of file