From 594737af3a2eccf7892134f2c4162c5a4749c5af Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Thu, 9 Nov 2023 22:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/api/emotion.js                     | 3 ++-
 im-uniapp/common/emotion.js                  | 2 +-
 im-uniapp/components/chat-item/chat-item.vue | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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>