From c7705bbca5b55d25f7862bf9ecee02ce991a983d Mon Sep 17 00:00:00 2001 From: lzhe <lzhe@example.com> Date: 星期五, 17 五月 2024 11:36:28 +0800 Subject: [PATCH] 1 --- src/utils/request.js | 1 + src/views/login/components/passwordForm.vue | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index e680a48..9beddba 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -166,6 +166,7 @@ }).then((response) => { resolve(response.data); }).catch((error) => { + resolve(error.data); reject(error); }) }) diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 9703717..382bc97 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -65,8 +65,11 @@ grant_type: "password", scope: "all" } + var isToken = false; await this.$HTTP.postJ("/api/blade-auth/oauth/token?" + this.$TOOL.qsStringify(data)).then(res => { + this.islogin = false; if (res.user_id) { + isToken = true; //鑾峰彇token this.$TOOL.cookie.set("TOKEN", res.access_token, { expires: this.form.autologin ? 24 * 60 * 60 : 0 @@ -76,15 +79,15 @@ res.dashboard = "0"; res.userId = "1"; this.$TOOL.data.set("USER_INFO", res); - this.islogin = false; } else { this.$message({ showClose: true, - message: res.error_description, + message: res.msg, type: 'error' }); } }) + if(!isToken) return; //鑾峰彇鑿滃崟 await this.$HTTP.get("/api/blade-system/menu/routes?" + this.$TOOL.qsStringify({ "appCode": "CPS" })).then(res => { if (res.data.length == 0) { -- Gitblit v1.9.3