diff --git a/im-ui/src/api/emotion.js b/im-ui/src/api/emotion.js
index 86af031..c14c015 100644
--- a/im-ui/src/api/emotion.js
+++ b/im-ui/src/api/emotion.js
@@ -16,8 +16,9 @@ let textToImg = (emoText) => {
 	let word = emoText.replace(/\#|\;/gi, '');
 	let idx = emoTextList.indexOf(word);
 	if(idx==-1){
-		return "";
+		return emoText;
 	}
+	return emoText;
 	let url = require(`@/assets/emoji/${idx}.gif`);
 	return `<img src="${url}" style="width:40px;height:40px;vertical-align:bottom;"/>`
 }
diff --git a/im-uniapp/common/emotion.js b/im-uniapp/common/emotion.js
index 178909a..06b509a 100644
--- a/im-uniapp/common/emotion.js
+++ b/im-uniapp/common/emotion.js
@@ -18,7 +18,7 @@ let textToImg = (emoText) => {
 	let word = emoText.replace(/\#|\;/gi, '');
 	let idx = emoTextList.indexOf(word);
 	if (idx == -1) {
-		return "";
+		return emoText;
 	}
 	let path = textToPath(emoText);
 	// #ifdef MP
diff --git a/im-uniapp/components/chat-item/chat-item.vue b/im-uniapp/components/chat-item/chat-item.vue
index 8e0deee..19f2e6b 100644
--- a/im-uniapp/components/chat-item/chat-item.vue
+++ b/im-uniapp/components/chat-item/chat-item.vue
@@ -9,7 +9,7 @@
 				{{ chat.showName}}
 			</view>
 			<view class="chat-content">
-				<view class="chat-content-text" v-html="$emo.transform(chat.lastContent)"></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>