diff --git a/src/components/user/ContactModal.vue b/src/components/user/ContactModal.vue index 7c59f1a..7ffe1ea 100644 --- a/src/components/user/ContactModal.vue +++ b/src/components/user/ContactModal.vue @@ -50,7 +50,7 @@ const onLoadContact = () => { if (res.code == 200) { let list = res.data.items || [] - items.value = list.filter((item: any) => item.talk_type !== 1 && item.receiver_id !== 2).map((item: any) => { + items.value = list.filter((item: any) => ((item.talk_type === 1 && item.receiver_id !== 2) || item.talk_type !== 1)).map((item: any) => { return { ...item, checked: false diff --git a/src/event/talk.js b/src/event/talk.js index d6ffba9..1286c5f 100644 --- a/src/event/talk.js +++ b/src/event/talk.js @@ -112,7 +112,12 @@ class Talk extends Base { //群成员被移出时,需要热更新会话列表 await useTalkStore().loadTalkList() } else { - return this.addTalkItem() + // 如果发送者ID为2,则为聊天助手,不在pc端处理,不创建会话 + if ((this.talk_type === 1 && this.receiver_id !== 2) || this.talk_type !== 1) { + return this.addTalkItem() + } else { + return + } } } @@ -277,6 +282,7 @@ class Talk extends Base { * 更新对话列表记录 */ updateTalkItem() { + console.error("触发了更新") useTalkStore().updateMessage({ index_name: this.getIndexName(), msg_text: this.getTalkText(), diff --git a/src/store/modules/talk.ts b/src/store/modules/talk.ts index 6c04967..a3885c8 100644 --- a/src/store/modules/talk.ts +++ b/src/store/modules/talk.ts @@ -168,7 +168,7 @@ export const useTalkStore = defineStore('talk', { if (resp.code == 200) { // 将服务器返回的会话列表转换为应用所需格式 - const serverItems = resp.data.items.filter((item: any) => item.talk_type !== 1 && item.receiver_id !== 2).map((item: any) => { + const serverItems = resp.data.items.filter((item: any) => ((item.talk_type === 1 && item.receiver_id !== 2) || item.talk_type !== 1)).map((item: any) => { const value = formatTalkItem(item) const draft = useEditorDraftStore().items[value.index_name] diff --git a/src/views/message/inner/IndexSider.vue b/src/views/message/inner/IndexSider.vue index ad054c5..01f5809 100644 --- a/src/views/message/inner/IndexSider.vue +++ b/src/views/message/inner/IndexSider.vue @@ -773,9 +773,9 @@ const getDepPoisUser = () => { } $request.HTTP.components.postDataByParams(url, params).then((res) => { // console.log(res) - if (res.status === 0 && Array.isArray(res.data.data)) { - state.addressBookData = res.data.data || [] - state.addressBookTotal = res.data.count + if (res.code === 200) { + state.addressBookData = res?.data?.data || [] + state.addressBookTotal = res?.data?.count || 0 } }) // let params = {