From 883cd94a5e71b8e395b3e9a736691ff04167e781 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sat, 4 Mar 2023 15:02:11 +0800 Subject: [PATCH] no message --- .../assets/js/pages/manage/components/DialogGroupInfo.vue | 2 -- .../assets/js/pages/manage/components/DialogRespond.vue | 2 -- resources/assets/js/pages/manage/messenger.vue | 3 --- resources/assets/js/store/actions.js | 5 ++++- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue index 62602a5e5..ffb12be2b 100644 --- a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue +++ b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue @@ -248,14 +248,12 @@ export default { return } this.openIng = true - this.$store.dispatch("showSpinner", 600) this.$store.dispatch("openDialogUserid", userid).then(_ => { this.$emit("on-close") }).catch(({msg}) => { $A.modalError(msg) }).finally(_ => { this.openIng = false - this.$store.dispatch("hiddenSpinner") }); } } diff --git a/resources/assets/js/pages/manage/components/DialogRespond.vue b/resources/assets/js/pages/manage/components/DialogRespond.vue index f75635095..bddc385a7 100644 --- a/resources/assets/js/pages/manage/components/DialogRespond.vue +++ b/resources/assets/js/pages/manage/components/DialogRespond.vue @@ -36,14 +36,12 @@ export default { return } this.openIng = true - this.$store.dispatch("showSpinner", 600) this.$store.dispatch("openDialogUserid", userid).then(_ => { this.$emit("on-close") }).catch(({msg}) => { $A.modalError(msg) }).finally(_ => { this.openIng = false - this.$store.dispatch("hiddenSpinner") }); } } diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 4ae620572..96fd8cd5e 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -545,11 +545,8 @@ export default { this.dialogKey = ""; // if ($A.isJson(dialogId) && $A.leftExists(dialogId.dialog_id, "u:")) { - this.$store.dispatch("showSpinner", 300) this.$store.dispatch("openDialogUserid", $A.leftDelete(dialogId.dialog_id, "u:")).catch(({msg}) => { $A.modalError(msg) - }).finally(_ => { - this.$store.dispatch("hiddenSpinner") }) } else { this.$store.dispatch("openDialog", dialogId) diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index ad4bb4d89..53b847724 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -2290,6 +2290,7 @@ export default { resolve(dialog); return; } + dispatch("showSpinner", 600) dispatch("call", { url: 'dialog/open/user', data: { @@ -2302,7 +2303,9 @@ export default { }).catch(e => { console.warn(e); reject(e); - }); + }).finally(_ => { + dispatch("hiddenSpinner") + }) }); },