diff --git a/YiJi-admin/src/router/index.js b/YiJi-admin/src/router/index.js index d48e095..236f2a8 100644 --- a/YiJi-admin/src/router/index.js +++ b/YiJi-admin/src/router/index.js @@ -303,12 +303,14 @@ router.beforeEach((to, from, next) => { CheckMenuAuth({ url: NewUrl }).then(res => { - if (res.status) { + if (res && res.status) { next(); } else { - ElMessage.error(res.msg) - next('/'); + ElMessage.error(res?.msg || '权限验证失败') + next('/login') } + }).catch(() => { + next('/login') }) } }) diff --git a/YiJi-admin/src/tools/axios.js b/YiJi-admin/src/tools/axios.js index e27fd90..e3603af 100644 --- a/YiJi-admin/src/tools/axios.js +++ b/YiJi-admin/src/tools/axios.js @@ -26,6 +26,7 @@ axios.interceptors.response.use( if (res.code !== 200) { if (res.code == 10001) { //token验证出错 window.location.href = "./#/login" + return } if (res.code == 10002) { //token验证超时 //console.log(response.config); diff --git a/YiJi-admin/src/views/Login.vue b/YiJi-admin/src/views/Login.vue index 353b0cc..ed59a2c 100644 --- a/YiJi-admin/src/views/Login.vue +++ b/YiJi-admin/src/views/Login.vue @@ -21,7 +21,7 @@ 登录您的账户 - @@ -79,6 +79,7 @@ let login = () => { //登录 if (username.value == '' || pwd.value == '') return ElMessage.error('用户名和密码不能为空') + if (username.value.length < 4) return ElMessage.error('账号长度不能少于4位') let data = { //传参 username: hunxiao(username.value), password: hunxiao(pwd.value) ,