Merge branch 'master' into pre

components/message.vue

@@ -363,7 +363,11 @@
             }
             }
 
 
             // 系统推送的消息或老用户（一般是客服，eid为负数），默认为客服发送
             // 系统推送的消息或老用户（一般是客服，eid为负数），默认为客服发送
-            if (this.messageBody && +this.messageBody.eid <= 0) {
+            if (
+                this.messageBody &&
+                this.messageBody.eid &&
+                +this.messageBody.eid <= 0
+            ) {
                 return true;
                 return true;
             }
             }
 
 

utils/chat-info.ts

 import Chat from "../xim";
 import Chat from "../xim";
-import { orderService } from '../service/order';
+import { orderService } from "../service/order";
 
 
 export type ChatInfo = {
 export type ChatInfo = {
     [eid: string]: any;
     [eid: string]: any;
@@ -10,7 +10,8 @@ const chatInfo: ChatInfo = {};
 export const getChatModel = () => chatInfo;
 export const getChatModel = () => chatInfo;
 
 
 const loadingKeys = new Set<string>();
 const loadingKeys = new Set<string>();
-let waitingAction: { key: string; resolve: (d: ChatModelInfoData) => void }[] = [];
+let waitingAction: { key: string; resolve: (d: ChatModelInfoData) => void }[] =
+    [];
 
 
 export interface ChatModelInfoData {
 export interface ChatModelInfoData {
     uniplatId: string | number;
     uniplatId: string | number;
@@ -25,7 +26,10 @@ function buildCache() {
     if (!model2DetailNameMapping.size) {
     if (!model2DetailNameMapping.size) {
         // 用户端默认不使用chat内置的detailName（这个专属于服务端），所以这里加一层内置转换
         // 用户端默认不使用chat内置的detailName（这个专属于服务端），所以这里加一层内置转换
         if (!Chat.isBackend()) {
         if (!Chat.isBackend()) {
-            model2DetailNameMapping.set(orderService.generalOrder, orderService.generalOrderDefaultDetailName);
+            model2DetailNameMapping.set(
+                orderService.generalOrder,
+                orderService.generalOrderDefaultDetailName
+            );
         }
         }
     }
     }
 }
 }
@@ -57,12 +61,6 @@ export async function getChatModelInfo(
                 data: d,
                 data: d,
             } as ChatModelInfoData);
             } as ChatModelInfoData);
         }
         }
-        return Promise.resolve({
-            uniplatId: 0,
-            chat_id: 0,
-            uniplat_version: 0,
-            data: d,
-        });
     }
     }
 
 
     loadingKeys.add(key);
     loadingKeys.add(key);
@@ -71,7 +69,7 @@ export async function getChatModelInfo(
         .detail(id + "", detail)
         .detail(id + "", detail)
         .query();
         .query();
     const data = info;
     const data = info;
-    chatInfo[key] = data;
+    info && info.row.UniplatChatId && (chatInfo[key] = data);
     loadingKeys.delete(key);
     loadingKeys.delete(key);
 
 
     const o = (
     const o = (