登录提示问题

client/src/components/beforeEnter/Before.js

@@ -10,8 +10,9 @@ export default class Before {
   async update (to, from, next) {
     if (to.name === 'studentHelp' || to.name === 'teacherHelp') {
       next()
-    } else if (to.name !== 'login-normal' && to.name !== 'login-code' && to.name !== 'login-forget' && to.name) { // 所有登录页 不进行登录校验
-      const isLogin = await this.isLogin()
+    } else if (to.name !== 'login-normal' && to.name !== 'login-code' && to.name !== 'login-forget') { // 所有登录页 不进行登录校验
+      let isLogin
+      to.redirectedFrom ? next({ path: '/login/index?rd=' + encodeURIComponent(to.fullPath) }) : isLogin = await this.isLogin()
       if (isLogin) {
         next()
       } else {
@@ -25,7 +26,6 @@ export default class Before {
   /* 获取用户信息 */
   isLogin () {
     if (window.G.UserInfo) return true
-    debugger
     return cAction.Other.getInfo().then(res => {
       window.G.UserInfo = res
       return true