Преглед на файлове

修改全局路由跳转配置

lm преди 1 седмица
родител
ревизия
0a39765b0f
променени са 2 файла, в които са добавени 18 реда и са изтрити 7 реда
  1. 1 1
      src/baseComponents/useHandleMoveUpAndDown.ts
  2. 17 6
      src/router/index.ts

+ 1 - 1
src/baseComponents/useHandleMoveUpAndDown.ts

@@ -19,7 +19,7 @@ export function useHandleMoveUpAndDown(moveableList: Ref, rowHeight: number = 42
         if(endYPointer > startYPointer.value){
             // 下移层数
             moveNum =   Math.ceil((endYPointer - startYPointer.value) / rowHeight)
-            let maxLength = moveableList.value.length
+            let maxLength = moveableList.value.length - 1
             if(moveNum > 0){
                 // 删除当前位置数据
                 moveableList.value.splice(currentIndex,1)

+ 17 - 6
src/router/index.ts

@@ -80,20 +80,31 @@ router.beforeEach(async(to,from,next)=>{
   if (to.path === '/') {
     // const token = localStorage.getItem('token')
     // 查询用户信息
-    const token = to?.query?.token
-    const userType = to?.query?.loginRole   // 'student' : 'teacher'
-    
+
+    // const token = to?.query?.token
+    // const userType = to?.query?.loginRole   // 'student' : 'teacher'
+
+    const token = localStorage.getItem('token')
+    const userType = localStorage.getItem('loginRole')  // 'student' : 'teacher'
+
     if(token){
-      localStorage.setItem('token',token)
-      localStorage.setItem('loginRole',userType)
+      // localStorage.setItem('token',token)
+      // localStorage.setItem('loginRole',userType)
       
-      let userInfoRes = await  getUserInfo()
+      let userInfoRes = undefined
+      try{
+        userInfoRes = await  getUserInfo()
+      }catch{}
       console.log("获取用户信息返回",userInfoRes)
       if (userInfoRes?.code === 200) {
         // 存储用户信息到 localStorage 或 Pinia
         localStorage.setItem('userInfo', JSON.stringify(userInfoRes.data))
         next('/main')
         return
+      }else{
+        localStorage.removeItem('token')
+        localStorage.removeItem('userInfo')
+        localStorage.removeItem('loginRole')
       }
     }
   }