diff --git a/resources/assets/js/components/SearchBox.vue b/resources/assets/js/components/SearchBox.vue index ee45df3d1..1457ed26e 100755 --- a/resources/assets/js/components/SearchBox.vue +++ b/resources/assets/js/components/SearchBox.vue @@ -227,7 +227,6 @@ export default { case 'contact': this.$store.dispatch("openDialogUserid", item.id).then(_ => { this.onHide() - this.goForward({name: 'manage-messenger', params: {dialogAction: 'dialog'}}) }).catch(({msg}) => { $A.modalError(msg || this.$L('打开会话失败')) }); diff --git a/resources/assets/js/components/UserAvatar/index.vue b/resources/assets/js/components/UserAvatar/index.vue index 60d4d5167..d2c85a6fa 100755 --- a/resources/assets/js/components/UserAvatar/index.vue +++ b/resources/assets/js/components/UserAvatar/index.vue @@ -182,9 +182,7 @@ export default { }, openDialog() { - this.$store.dispatch("openDialogUserid", this.userid).then(_ => { - this.goForward({name: 'manage-messenger'}) - }).catch(({msg}) => { + this.$store.dispatch("openDialogUserid", this.userid).catch(({msg}) => { $A.modalError(msg) }); }, diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index 532b5a019..2496299e7 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -636,28 +636,26 @@ export default { }) if (dialogId) { this.$store.dispatch("openDialog", dialogId) - this.aibotShow = false; - } else { - this.aibotDialogSearchLoad = type; - this.$store.dispatch("call", { - url: 'users/search/ai', - data: {type}, - }).then(({data}) => { - this.$store.dispatch("openDialogUserid", data.userid).then(_ => { - if (this.windowOrientation == 'landscape') { - this.goForward({ name: 'manage-messenger' }) - } - this.aibotShow = false; - }).catch(({ msg }) => { - $A.modalError(msg) - }).finally(_ => { - this.aibotDialogSearchLoad = ''; - }); - }).catch(({msg}) => { - this.aibotDialogSearchLoad = ''; - $A.messageError(msg || '机器人暂未开启'); - }); + this.aibotShow = false + return } + // + this.aibotDialogSearchLoad = type; + this.$store.dispatch("call", { + url: 'users/search/ai', + data: {type}, + }).then(({data}) => { + this.$store.dispatch("openDialogUserid", data.userid).then(_ => { + this.aibotShow = false; + }).catch(({ msg }) => { + $A.modalError(msg) + }).finally(_ => { + this.aibotDialogSearchLoad = ''; + }); + }).catch(({msg}) => { + this.aibotDialogSearchLoad = ''; + $A.messageError(msg || '机器人暂未开启'); + }); }, // 会议 onMeeting(name) { diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index c86d09506..909b78195 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -522,7 +522,6 @@ export default { } else if (this.$parent.$options.name === "Modal") { this.$parent.close() } - this.goForward({name: 'manage-messenger'}) }).catch(({msg}) => { $A.modalError(msg) }); diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue index 8df7129a0..c2b0321be 100644 --- a/resources/assets/js/pages/manage/components/DialogItem.vue +++ b/resources/assets/js/pages/manage/components/DialogItem.vue @@ -219,9 +219,7 @@ export default { onOpenDialog(userid) { if (this.dialogData.type == 'group' || ![this.dialogData.dialog_user?.userid, this.userId].includes(userid)) { - this.$store.dispatch("openDialogUserid", userid).then(_ => { - this.goForward({name: 'manage-messenger'}) - }).catch(({msg}) => { + this.$store.dispatch("openDialogUserid", userid).catch(({msg}) => { $A.modalError(msg) }); } diff --git a/resources/assets/js/pages/manage/components/DialogView/index.vue b/resources/assets/js/pages/manage/components/DialogView/index.vue index 618eb866a..5ca607532 100644 --- a/resources/assets/js/pages/manage/components/DialogView/index.vue +++ b/resources/assets/js/pages/manage/components/DialogView/index.vue @@ -505,9 +505,7 @@ export default { }, openDialog(userid) { - this.$store.dispatch("openDialogUserid", userid).then(_ => { - this.goForward({name: 'manage-messenger'}) - }).catch(({msg}) => { + this.$store.dispatch("openDialogUserid", userid).catch(({msg}) => { $A.modalError(msg) }); },