xiongzhu il y a 2 ans
Parent
commit
ae50c39099
2 fichiers modifiés avec 4 ajouts et 2 suppressions
  1. 3 1
      src/router/permission.ts
  2. 1 1
      src/store/modules/user/index.ts

+ 3 - 1
src/router/permission.ts

@@ -1,9 +1,11 @@
 import { fetchMy } from '@/api'
 import type { Router } from 'vue-router'
 import { useUserStore, useUserMemberStore } from '@/store'
+import { useBasicLayout } from '@/hooks/useBasicLayout'
 
 export function setupPageGuard(router: Router) {
     router.beforeEach(async (to, from, next) => {
+        const { isMobile } = useBasicLayout()
         const userStore = useUserStore()
         const userMemberStore = useUserMemberStore()
         if (to.meta.public) {
@@ -15,7 +17,7 @@ export function setupPageGuard(router: Router) {
                 await userStore.fetch()
                 next()
             } catch (error) {
-                next({ name: 'login' })
+                next({ name: isMobile ? 'home' : 'login' })
             }
         } else if (!userMemberStore.userMember.planId) {
             try {

+ 1 - 1
src/store/modules/user/index.ts

@@ -6,7 +6,7 @@ import { useAuthStore } from '../auth'
 import { useUserMemberStore } from '../memberShip'
 
 export const useUserStore = defineStore('user-store', {
-    state: (): UserState => getLocalState(),
+    state: (): UserState => defaultSetting(),
     actions: {
         setUserInfo(userInfo: Partial<UserInfo>) {
             this.userInfo = { ...this.userInfo, ...userInfo }