diff --git a/Cunkebao/src/pages/pc/ckbox/main.ts b/Cunkebao/src/pages/pc/ckbox/main.ts index ddf98dce..3a75ec00 100644 --- a/Cunkebao/src/pages/pc/ckbox/main.ts +++ b/Cunkebao/src/pages/pc/ckbox/main.ts @@ -17,7 +17,11 @@ import { import { useUserStore } from "@/store/module/user"; -import { KfUserListData } from "@/pages/pc/ckbox/data"; +import { + KfUserListData, + ContractData, + weChatGroup, +} from "@/pages/pc/ckbox/data"; import { WechatGroup } from "./api"; const { login2 } = useUserStore.getState(); @@ -30,9 +34,16 @@ export const chatInitAPIdata = async () => { //获取联系人列表 asyncContractList(contractList); + //获取群列表 + const groupList = await getAllGroupList(); + + await asyncWeChatGroup(groupList); + // 提取不重复的wechatAccountId组 - const uniqueWechatAccountIds: number[] = - getUniqueWechatAccountIds(contractList); + const uniqueWechatAccountIds: number[] = getUniqueWechatAccountIds( + contractList, + groupList, + ); //获取控制终端列表 const kfUserList: KfUserListData[] = @@ -41,11 +52,6 @@ export const chatInitAPIdata = async () => { //获取用户列表 await asyncKfUserList(kfUserList); - //获取群列表 - const groupList = await getAllGroupList(); - - await asyncWeChatGroup(groupList); - //获取标签列表 const countLables = await getCountLables(); await asyncCountLables(countLables); @@ -209,7 +215,10 @@ export const getAllContactList = async () => { }; // 提取不重复的wechatAccountId组 -export const getUniqueWechatAccountIds = contacts => { +export const getUniqueWechatAccountIds = ( + contacts: ContractData[], + groupList: weChatGroup[], +) => { if (!contacts || !Array.isArray(contacts) || contacts.length === 0) { return []; } diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts index 696ba0bd..6025102c 100644 --- a/Cunkebao/src/store/module/weChat/weChat.ts +++ b/Cunkebao/src/store/module/weChat/weChat.ts @@ -54,7 +54,7 @@ export const useWeChatStore = create()( }; if ("chatroomId" in contact && contact.chatroomId) { - params.wechatChatroomId = contact.chatroomId; + params.wechatChatroomId = contact.id; } else { params.wechatFriendId = contact.id; }