Merge branch 'dev' of gitlab.33.cn:chenqikuai/fns_front_2 into dev

src/db/ContactPersonService.ts

-import { iContact } from '@/service/UserService/types'
+import {  iContact2 } from '@/service/UserService/types'
 import { MyAppDatabase } from './index'
 
 export default class ContactPersonService {
   static instance: ContactPersonService
-  private contactPerson: Dexie.Table<iContact, number>
+  private contactPerson: Dexie.Table<iContact2, number>
   static getInstance() {
     if (!ContactPersonService.instance) {
       ContactPersonService.instance = new ContactPersonService()
@@ -16,7 +16,7 @@ export default class ContactPersonService {
     this.contactPerson = db.contactPerson
   }
 
-  save(list: iContact[]) {
+  save(list: iContact2[]) {
     return this.contactPerson.bulkAdd(list)
   }
 

src/db/index.ts

 import Dexie from 'dexie'
 import { DisplayMessage } from '@/store/messagesStore'
-import { iContact, iUserinfo } from '@/service/UserService/types'
+import { iContact, iContact2, iUserinfo } from '@/service/UserService/types'
 
 export interface iChatMessage extends DisplayMessage {
   masterId: string // 这条消息展示在谁的页面上
@@ -18,7 +18,7 @@ export interface iChatListCard {
 export class MyAppDatabase extends Dexie {
   chatMessage: Dexie.Table<iChatMessage, number>
   chatListCard: Dexie.Table<iChatListCard, number>
-  contactPerson: Dexie.Table<iContact, number>
+  contactPerson: Dexie.Table<iContact2, number>
   userInfo: Dexie.Table<iUserinfo, number>
 
   constructor() {
@@ -28,7 +28,7 @@ export class MyAppDatabase extends Dexie {
       chatMessage:
         '++id, content, from, uuid, state, uploadProgress, type, datetime, hideDatetime, logid, masterId, readed',
       chatListCard: '++id, masterId, targetId, unreadMsgCount, content, inChat',
-      contactPerson: '++id, addr, bank, phone, user_name',
+      contactPerson: '++id, addr, bank, phone, user_name, out_let_name',
       userInfo: '++id, created_at, phone, remark, user_name, uuid, addr',
     })
 

src/service/UserService/index.ts

@@ -18,7 +18,10 @@ class UserService {
   }
 
   staffInfo(data: { addrs: string[] }) {
-    return baseAxios<{ total: number; item: iContact[] }>({
+    return baseAxios<{
+      total: number
+      item: (iContact & { out_let_name: string })[]
+    }>({
       url: '/user/staff_info',
       method: 'get',
       params: data,

src/service/UserService/types.ts

@@ -5,6 +5,8 @@ export interface iContact {
   user_name: string
 }
 
+export type iContact2 = iContact & { out_let_name: string }
+
 export interface iUserinfo {
   addr: string
   created_at: number

src/utils/displayName.ts

@@ -50,7 +50,11 @@ export const getDisplayNamesFromAddress = async (
 
   return addressList.map((item) => {
     const msg = fullList.find((i: any) => i?.addr === item)
-    return msg?.user_name || msg?.phone
+    if (msg?.out_let_name) {
+      return msg?.out_let_name + '客服经理'
+    } else {
+      return msg?.phone
+    }
   })
 }
 
@@ -99,6 +103,6 @@ export const getMsgFromAddress = async (
 
   return addressList.map((item) => {
     const msg = fullList.find((i: any) => i?.addr === item)
-    return msg;
+    return msg
   })
 }

src/views/withMenu/ChatList/index.vue

@@ -29,7 +29,7 @@
         v-if="isChatListEmpty"
         class="empty text-center fixed w-full top-1/2 transform -translate-y-1/2 -mt-6"
     >
-        <img src="@/assets/img/empty.png" class="mb-5" alt />
+        <img src="@/assets/img/empty.png" class="mb-5"  />
         <div class="no-chat mb-2.5">暂无聊天</div>
         <div v-if="userType === eRole.user" class="tip">咨询客户经理后，可以在这里快捷查看消息哦！</div>
         <div v-else-if="userType === eRole.staff" class="tip">客户咨询后，可以在这里快捷查看消息哦！</div>