From 5d16a7a80e13968b5e9155c0ad45765afccf0208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Fri, 13 Jan 2023 10:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=A1=A8=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/public/config.js                     |  4 +-
 im/src/components/chat/panel/TalkPanel.vue | 19 +++----
 im/src/components/editor/MeEditor.vue      |  9 ++--
 im/src/utils/emojis.js                     | 17 +++---
 im/src/utils/functions.js                  | 60 +++++++++++-----------
 5 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/buyer/public/config.js b/buyer/public/config.js
index 2272ff76..201b6b4d 100644
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -3,8 +3,8 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
+    common: "http://192.168.0.113:8890",
+    buyer: "http://192.168.0.113:8898",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
   },
diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index 0a27aa92..f0adeb14 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -65,8 +65,8 @@
                       right: item.float == 'right',
                     }">
                     <div class="arrow"></div>
-
-                    <pre v-html="item.text" />
+                    <pre v-if="!emojistwo.includes(item.text)" v-html="item.text" />
+                    <pre v-if="emojistwo.includes(item.text)" v-html="textReplaceEmoji(item.text)" />
                   </div>
 
                   <div v-if="item.messageType == 'GOODS' && item.text != null" class="goodsStyle " :class="{
@@ -176,7 +176,7 @@
 </template>
 <script>
 import { textReplaceLink } from "@/utils/functions";
-import { textReplaceEmoji } from "@/utils/emojis";
+import { textReplaceEmoji, emojistwo } from "@/utils/emojis";
 import OtherLink from "@/components/chat/panel/OtherLink.vue";
 import { mapState, mapGetters } from "vuex";
 import TalkSearchRecord from "@/components/chat/TalkSearchRecord";
@@ -233,6 +233,7 @@ export default {
     return {
       // 记录加载相关参数
       textReplaceEmoji,
+      emojistwo,
       textReplaceLink,
       loadRecord: {
         status: 0,
@@ -387,7 +388,6 @@ export default {
 
     // 回车键发送消息回调事件
     submitSendMessage (content) {
-      console.log("发送", content);
       const record = {
         operation_type: "MESSAGE",
         to: this.params.receiver_id,
@@ -396,6 +396,9 @@ export default {
         context: content,
         talk_id: this.params.talkId,
       };
+      // if (record.messageType == 'MESSAGE"') {
+      //   record.text = this.textReplaceEmoji(record.content)
+      // }
       SocketInstance.emit("event_talk", record);
 
       this.$store.commit("UPDATE_TALK_ITEM", {
@@ -415,8 +418,6 @@ export default {
         text: content,
         float: "right",
       };
-
-      console.log("insterChat", insterChat);
       // console.log("插入对话记录",'')
       // 插入对话记录
       this.$store.commit("PUSH_DIALOGUE", insterChat);
@@ -500,9 +501,9 @@ export default {
           if (item.messageType == 'GOODS') {
             item.text = JSON.parse(item.text)
           }
-          if (item.messageType == '"MESSAGE"') {
-            item.text = textReplaceEmoji(item.text)
-          }
+          // if (item.messageType == 'MESSAGE"') {
+          //   item.text = this.textReplaceEmoji(item.text)
+          // }
           if (item.messageType == 'ORDER') {
             item.text = JSON.parse(item.text)
           }
diff --git a/im/src/components/editor/MeEditor.vue b/im/src/components/editor/MeEditor.vue
index 742163c3..345297ba 100644
--- a/im/src/components/editor/MeEditor.vue
+++ b/im/src/components/editor/MeEditor.vue
@@ -89,9 +89,9 @@
     <MeEditorFileManage ref="filesManager" v-model="filesManager.isShow" />
 
     <MeEditorVote v-if="vote.isShow" @close="
-  () => {
-    this.vote.isShow = false;
-  }
+      () => {
+        this.vote.isShow = false;
+      }
     " />
   </div>
 </template>
@@ -308,7 +308,6 @@ export default {
 
     // 选中表情包回调事件
     selecteEmoticon (data) {
-      console.log(data);
       if (data.type == 1) {
         let value = this.editorText;
         let el = this.$refs.textarea;
@@ -330,8 +329,6 @@ export default {
         }
       } else {
         const { talk_type, receiver_id } = this.$store.state.dialogue;
-        console.log(talk_type);
-        console.log(receiver_id);
         ServeSendEmoticon({
           talk_type,
           receiver_id,
diff --git a/im/src/utils/emojis.js b/im/src/utils/emojis.js
index 5a71fe7e..937f8529 100644
--- a/im/src/utils/emojis.js
+++ b/im/src/utils/emojis.js
@@ -110,8 +110,8 @@ const emojis = {
 };
 
 /**
- * 符号表情
- */
+* 符号表情
+*/
 const symbol = [
   "😠", "😩", "😲", "😞", "😵", "😰", "😒", "😍", "😤", "😜", "😝", "😋", "😘", "😚", "😷",
   "😳", "😃", "😅", "😆", "😁", "😂", "😊", "☺", "😄", "😢",
@@ -121,19 +121,17 @@ const symbol = [
 ];
 
 const emojisKeys = Object.keys(emojis);
-
 export const emojiList = {
   symbol,
   emojis
 }
 
 const regEmoji = emojisKeys.map((value) => '|\\' + value).join('').replace('|', '')
-
 /**
- * 替换表情文字
- * 
- * @param {String} content 需要替换的字符串
- */
+* 替换表情文字
+* 
+* @param {String} content 需要替换的字符串
+*/
 export function textReplaceEmoji (content) {
   if (!content) {
     return ""
@@ -141,4 +139,5 @@ export function textReplaceEmoji (content) {
   return content.replace(new RegExp(`(${regEmoji})`, 'gi'), ($0, $1) => {
     return emojis[$1];
   });
-}
\ No newline at end of file
+}
+export const emojistwo = Object.keys(emojis)
\ No newline at end of file
diff --git a/im/src/utils/functions.js b/im/src/utils/functions.js
index 9e39260e..a466d7a6 100644
--- a/im/src/utils/functions.js
+++ b/im/src/utils/functions.js
@@ -7,7 +7,7 @@ import config from "@/config/config";
  *
  * @param {Object} datetime
  */
-export function formatTime(datetime) {
+export function formatTime (datetime) {
   if (datetime == null) return "";
 
   datetime = datetime.replace(/-/g, "/");
@@ -60,7 +60,7 @@ export function formatTime(datetime) {
  *
  * @param {String} value 文件大小(字节)
  */
-export function formatSize(value) {
+export function formatSize (value) {
   if (null == value || value == "") {
     return "0";
   }
@@ -77,7 +77,7 @@ export function formatSize(value) {
  *
  * @param {String} fileName
  */
-export function getFileExt(fileName) {
+export function getFileExt (fileName) {
   let ext = fileName.split(".");
   ext = ext[ext.length - 1]; // 获取文件后缀名
   return ext;
@@ -88,7 +88,7 @@ export function getFileExt(fileName) {
  * @param {String} imgsrc
  * @param {String} name
  */
-export function downloadIamge(imgsrc, name) {
+export function downloadIamge (imgsrc, name) {
   //下载图片地址和图片名
   let image = new Image();
   // 解决跨域 Canvas 污染问题
@@ -114,7 +114,7 @@ export function downloadIamge(imgsrc, name) {
  *
  * @param {String} imgsrc 例如图片名： D8x5f13a53dbc4b9_350x345.png
  */
-export function getImageInfo(imgsrc) {
+export function getImageInfo (imgsrc) {
   let data = {
     width: 0,
     height: 0,
@@ -138,14 +138,14 @@ export function getImageInfo(imgsrc) {
  *
  * @param {Number} cr_id
  */
-export function download(cr_id) {
+export function download (cr_id) {
   let api = config.BASE_API_URL;
   let token = getToken();
   try {
     let link = document.createElement("a");
     link.href = `${api}/download/user-chat-file?cr_id=${cr_id}&token=${token}`;
     link.click();
-  } catch (e) {}
+  } catch (e) { }
 }
 
 /**
@@ -155,7 +155,7 @@ export function download(cr_id) {
  * @param {String} cFormat
  * @returns {String | null}
  */
-export function parseTime(time, cFormat) {
+export function parseTime (time, cFormat) {
   if (arguments.length === 0) {
     return null;
   }
@@ -205,7 +205,7 @@ export function parseTime(time, cFormat) {
  *
  * @param {String} str
  */
-export function trim(str, type = null) {
+export function trim (str, type = null) {
   if (type) {
     return str.replace(/(^\s*)|(\s*$)/g, "");
   } else if (type == "l") {
@@ -221,19 +221,19 @@ export function trim(str, type = null) {
  * @param {String} url
  * @returns {Object}
  */
-export function param2Obj(url) {
+export function param2Obj (url) {
   const search = url.split("?")[1];
 
   if (!search) return {};
 
   return JSON.parse(
     '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, " ") +
-      '"}'
+    decodeURIComponent(search)
+      .replace(/"/g, '\\"')
+      .replace(/&/g, '","')
+      .replace(/=/g, '":"')
+      .replace(/\+/g, " ") +
+    '"}'
   );
 }
 
@@ -241,7 +241,7 @@ export function param2Obj(url) {
  * @param {Object} json
  * @returns {Array}
  */
-export function param(json) {
+export function param (json) {
   if (!json) return "";
   return cleanArray(
     Object.keys(json).map((key) => {
@@ -256,7 +256,7 @@ export function param(json) {
  * @param {Array} actual
  * @returns {Array}
  */
-export function cleanArray(actual) {
+export function cleanArray (actual) {
   const newArray = [];
   for (let i = 0; i < actual.length; i++) {
     if (actual[i]) {
@@ -271,7 +271,7 @@ export function cleanArray(actual) {
  * @param {HTMLElement} element
  * @param {String} className
  */
-export function toggleClass(element, className) {
+export function toggleClass (element, className) {
   if (!element || !className) {
     return;
   }
@@ -295,7 +295,7 @@ export function toggleClass(element, className) {
  * @param {String} cls
  * @returns {Boolean}
  */
-export function hasClass(ele, cls) {
+export function hasClass (ele, cls) {
   return !!ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
 }
 
@@ -305,7 +305,7 @@ export function hasClass(ele, cls) {
  * @param {HTMLElement} elm
  * @param {String} cls
  */
-export function addClass(ele, cls) {
+export function addClass (ele, cls) {
   if (!hasClass(ele, cls)) ele.className += " " + cls;
 }
 
@@ -315,7 +315,7 @@ export function addClass(ele, cls) {
  * @param {HTMLElement} elm
  * @param {String} cls
  */
-export function removeClass(ele, cls) {
+export function removeClass (ele, cls) {
   if (hasClass(ele, cls)) {
     const reg = new RegExp("(\\s|^)" + cls + "(\\s|$)");
     ele.className = ele.className.replace(reg, " ");
@@ -328,7 +328,7 @@ export function removeClass(ele, cls) {
  * @param {String} src
  * @param {Number} width
  */
-export function imgZoom(src, width = 200) {
+export function imgZoom (src, width = 200) {
   const info = getImageInfo(src);
 
   if (info.width < width) {
@@ -350,7 +350,7 @@ export function imgZoom(src, width = 200) {
  * @export
  * @returns
  */
-export function getSelection() {
+export function getSelection () {
   return window.getSelection
     ? window.getSelection().toString()
     : document.selection.createRange().text;
@@ -386,7 +386,7 @@ export const copyTextToClipboard = (value, callback) => {
  *
  * @param {String} phone  手机号
  */
-export function hidePhone(phone) {
+export function hidePhone (phone) {
   return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
 }
 
@@ -395,7 +395,7 @@ export function hidePhone(phone) {
  *
  * @param {Object} datetime
  */
-export function beautifyTime(datetime = "") {
+export function beautifyTime (datetime = "") {
   if (datetime == null) {
     return "";
   }
@@ -446,7 +446,7 @@ export function beautifyTime(datetime = "") {
   return `${minutes}分钟前`;
 }
 
-export function getSort(fn) {
+export function getSort (fn) {
   return function (a, b) {
     let ret = 0;
 
@@ -465,7 +465,7 @@ export function getSort(fn) {
  *
  * @param {*} arr
  */
-export function getMutipSort(arr) {
+export function getMutipSort (arr) {
   return function (a, b) {
     let tmp;
     let i = 0;
@@ -484,7 +484,7 @@ export function getMutipSort(arr) {
  * @param {String} text 文本
  * @param {String} color 超链接颜色
  */
-export function textReplaceLink(text, color = "#409eff") {
+export function textReplaceLink (text, color = "#409eff") {
   let exp =
     /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi;
   return text.replace(
@@ -501,7 +501,7 @@ export function textReplaceLink(text, color = "#409eff") {
  * @param {*} immediate
  * @returns
  */
-export function debounce(func, wait, immediate) {
+export function debounce (func, wait, immediate) {
   let timeout;
 
   return function () {