Merge branch 'master' of http://121.42.53.174:3000/luyanan/touchwave

xiuz

src/permission.js

      NProgress.done()
    } else {
      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
        console.log(5555)
        // console.log(5555)
        store.dispatch('GetUserInfo').then(res => { // 拉取user_info
          const roles = [res.data.type.toString()]
          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
          })
        })
      } else {
        console.log(4444)
        // console.log(4444)
        if (hasPermission(store.getters.roles, to.meta.roles)) {
          next()
        }

src/views/layout/components/TopNavbar.vue

      'roles'
    ])
  },
  watch:{
  watch: {
    '$route'(to, from) {
      if (this.$route.path === '/') {
        this.showName = ''