Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

陈泽平

2021-05-31 ff68d386c8f03f67045b4e6b176fc86dc2f7a597

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

 src/router/index.js

@@ -21,9 +21,10 @@
  const token = getToken()
  if (!token && to.name !== LOGIN_PAGE_ROUTE_NAME) {
    // 未登录且要跳转的页面不是登录页
    next({
    /* next({
      name: LOGIN_PAGE_ROUTE_NAME // 跳转到登录页
    })
    }) */
    next() // 跳转
  } else if (!token && to.name === LOGIN_PAGE_ROUTE_NAME) {
    // 未登陆且要跳转的页面是登录页
    next() // 跳转