Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -47,7 +47,7 @@ router.beforeEach((to, from, next) => {
   // console.log('_token', _token)
   // console.log('userInfo', userInfo)
   // console.log('menu', menu)
-  if ((token && token !== _token) || (_token && (routers.length === 7 || !menu || !userInfo))) { //新用户登或重新登录
+  if ((token && token !== _token) || (_token && (routers.length === 9 || !menu || !userInfo))) { //新用户登或重新登录
     console.log('拉取用户数据')
     store.dispatch('LoginByToken', token || _token).then(res => {
       // const {