Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-05-29 de7390c66ef3e3fe316e804495a78d05a01f0160

 src/router/index.js

@@ -29,13 +29,17 @@
    next() // 跳转
  } else if (token && to.name === LOGIN_PAGE_ROUTE_NAME) {
    // 已登录且要跳转的页面是登录页
    next({
      name: homeRouterName // 跳转到homeName页
    })
    // next({
    //   name: homeRouterName // 跳转到homeName页
    // })
    console.log(homeRouterName)
    next()
  } else if (!token) {
    next({
      name: LOGIN_PAGE_ROUTE_NAME // 跳转到登录页
    })
    // next({
    //   name: LOGIN_PAGE_ROUTE_NAME // 跳转到登录页
    // })
    console.log(LOGIN_PAGE_ROUTE_NAME)
    next()
  } else {
    next()
  }