diff --git a/components.d.ts b/components.d.ts index 0dae289..5202040 100644 --- a/components.d.ts +++ b/components.d.ts @@ -30,6 +30,8 @@ declare module 'vue' { LoginMessage: typeof import('./src/components/talk/message/LoginMessage.vue')['default'] Message: typeof import('./src/components/x-message/message/index.vue')['default'] MixedMessage: typeof import('./src/components/talk/message/MixedMessage.vue')['default'] + NButton: typeof import('naive-ui')['NButton'] + NIcon: typeof import('naive-ui')['NIcon'] PageAnimation: typeof import('./src/components/page-animation/index.vue')['default'] RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/App.vue b/src/App.vue index db49d9c..acd16a7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,12 +11,12 @@ const userStore = useUserStore() const root = document.documentElement root.style.setProperty('--statusBarHeight', `${statusBarHeight.value}px`) const handleWebview = () => { - let statusBarHeight = window?.plus?.navigator?.getStatusbarHeight() + let statusBarHeight_ = window?.plus?.navigator?.getStatusbarHeight() const webview = plus.webview.currentWebview() - webview.setStyle({ - top: statusBarHeight, - bottom: 0, - }) + // webview.setStyle({ + // top: statusBarHeight_, + // bottom: 0, + // }) // console.log(webview) token.value = webview.token } diff --git a/src/pages/chatSettings/components/selectMemberByAlphabet.vue b/src/pages/chatSettings/components/selectMemberByAlphabet.vue index faf7093..99cc23e 100644 --- a/src/pages/chatSettings/components/selectMemberByAlphabet.vue +++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue @@ -684,6 +684,8 @@ const confirmSelectMembers = () => { resp.then(({ code, data }) => { console.log(data) if (code == 200) { + // console.error(-selectedUserIds.split(',').length) + emits('updateSelectedMembersNum', -selectedUserIds.split(',').length) useDialogueStore().updateGroupMembers() groupStore.ServeGroupDetail() } else { diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index b593797..a6c48c8 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -262,7 +262,9 @@ onLoad(async (options) => { console.log(options.groupId) state.groupId = Number(options.groupId) await groupStore.ServeGroupDetail() - await groupStore.ServeGetGroupNotices() + if (dialogueParams.type === 2) { + await groupStore.ServeGetGroupNotices() + } } if (options.sessionId) { state.sessionId = Number(options.sessionId) diff --git a/src/pages/chooseByDeps/index.vue b/src/pages/chooseByDeps/index.vue index c75b162..e99187f 100644 --- a/src/pages/chooseByDeps/index.vue +++ b/src/pages/chooseByDeps/index.vue @@ -2,8 +2,11 @@