diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 59f117b82..4791fffc1 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -80,8 +80,12 @@ export const useUserStore = defineStore("pure-user", { return new Promise((resolve, reject) => { getLogin(data) .then(data => { - if (data.code === 0) setToken(data.data); - resolve(data); + if (data.code === 0) { + setToken(data.data); + resolve(data); + } else { + reject(data.message); + } }) .catch(error => { reject(error); @@ -106,6 +110,8 @@ export const useUserStore = defineStore("pure-user", { if (data.code === 0) { setToken(data.data); resolve(data); + } else { + reject(data.message); } }) .catch(error => { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4e0522374..b95d924ef 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -73,23 +73,21 @@ const onLogin = async (formEl: FormInstance | undefined) => { username: ruleForm.username, password: ruleForm.password }) - .then(res => { - if (res.code === 0) { - // 获取后端路由 - return initRouter().then(() => { - disabled.value = true; - router - .push(getTopMenu(true).path) - .then(() => { - message(t("login.pureLoginSuccess"), { type: "success" }); - }) - .finally(() => (disabled.value = false)); - }); - } else { - message(t("login.pureLoginFail"), { type: "error" }); - } + .then(async () => { + // 获取后端路由 + await initRouter(); + disabled.value = true; + router.push(getTopMenu(true).path).then(() => { + message(t("login.pureLoginSuccess"), { type: "success" }); + }); }) - .finally(() => (loading.value = false)); + .catch(_err => { + message(t("login.pureLoginFail"), { type: "error" }); + }) + .finally(() => { + disabled.value = false; + loading.value = false; + }); } }); }; diff --git a/src/views/permission/page/index.vue b/src/views/permission/page/index.vue index 21125e4fc..33d80516d 100644 --- a/src/views/permission/page/index.vue +++ b/src/views/permission/page/index.vue @@ -1,4 +1,5 @@