diff --git a/src/router/guards/permission-guard.js b/src/router/guards/permission-guard.js index b41d391..3b73054 100644 --- a/src/router/guards/permission-guard.js +++ b/src/router/guards/permission-guard.js @@ -9,7 +9,7 @@ import { useAuthStore } from '@/store' import api from '@/api' -const WHITE_LIST = ['/login', '/404', '/role-select'] +const WHITE_LIST = ['/login', '/404'] export function createPermissionGuard(router) { router.beforeEach(async (to) => { const authStore = useAuthStore() diff --git a/src/router/guards/tab-guard.js b/src/router/guards/tab-guard.js index a599e9b..0050455 100644 --- a/src/router/guards/tab-guard.js +++ b/src/router/guards/tab-guard.js @@ -8,7 +8,7 @@ import { useTabStore } from '@/store' -export const EXCLUDE_TAB = ['/404', '/403', '/login', '/role-select'] +export const EXCLUDE_TAB = ['/404', '/403', '/login'] export function createTabGuard(router) { router.afterEach((to) => { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5a2c302..1a20e23 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -104,42 +104,30 @@ import { throttle, lStorage } from '@/utils' import { useStorage } from '@vueuse/core' import api from './api' -import { useUserStore, useAuthStore } from '@/store' +import { useAuthStore } from '@/store' import { initUserAndPermissions } from '@/router' -const userStore = useUserStore() const authStore = useAuthStore() const router = useRouter() const route = useRoute() const title = import.meta.env.VITE_TITLE -const isLogined = computed(() => { - return authStore.accessToken && userStore.roles -}) - const loginInfo = ref({ username: '', password: '', }) -function initLoginInfo() { - const localLoginInfo = lStorage.get('loginInfo') - if (localLoginInfo) { - loginInfo.value.username = localLoginInfo.username || '' - loginInfo.value.password = localLoginInfo.password || '' - } -} const captchaUrl = ref('') const initCaptcha = throttle(() => { captchaUrl.value = '/api/auth/captcha?' + Date.now() }, 500) -if (isLogined.value) { - router.push({ path: '/role-select', query: route.query }) -} else { - initLoginInfo() - initCaptcha() +const localLoginInfo = lStorage.get('loginInfo') +if (localLoginInfo) { + loginInfo.value.username = localLoginInfo.username || '' + loginInfo.value.password = localLoginInfo.password || '' } +initCaptcha() function quickLogin() { loginInfo.value.username = 'admin'