登录后push添加catch防止出现检查错误
This commit is contained in:
		
							parent
							
								
									8988d0b4ab
								
							
						
					
					
						commit
						4f33da2a3f
					
				@ -23,28 +23,18 @@ router.beforeEach((to, from, next) => {
 | 
				
			|||||||
          // 拉取user_info
 | 
					          // 拉取user_info
 | 
				
			||||||
          const roles = res.roles
 | 
					          const roles = res.roles
 | 
				
			||||||
          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
 | 
					          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
 | 
				
			||||||
          // 测试 默认静态页面
 | 
					 | 
				
			||||||
          // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
 | 
					 | 
				
			||||||
            // 根据roles权限生成可访问的路由表
 | 
					            // 根据roles权限生成可访问的路由表
 | 
				
			||||||
            router.addRoutes(accessRoutes) // 动态添加可访问路由表
 | 
					            router.addRoutes(accessRoutes) // 动态添加可访问路由表
 | 
				
			||||||
            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
 | 
					            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
 | 
				
			||||||
          })
 | 
					          })
 | 
				
			||||||
        })
 | 
					        }).catch(err => {
 | 
				
			||||||
          .catch(err => {
 | 
					            store.dispatch('LogOut').then(() => {
 | 
				
			||||||
            store.dispatch('FedLogOut').then(() => {
 | 
					 | 
				
			||||||
              Message.error(err)
 | 
					              Message.error(err)
 | 
				
			||||||
              next({ path: '/' })
 | 
					              next({ path: '/' })
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
          })
 | 
					          })
 | 
				
			||||||
      } else {
 | 
					      } else {
 | 
				
			||||||
        next()
 | 
					        next()
 | 
				
			||||||
        // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
 | 
					 | 
				
			||||||
        // if (hasPermission(store.getters.roles, to.meta.roles)) {
 | 
					 | 
				
			||||||
        //   next()
 | 
					 | 
				
			||||||
        // } else {
 | 
					 | 
				
			||||||
        //   next({ path: '/401', replace: true, query: { noGoBack: true }})
 | 
					 | 
				
			||||||
        // }
 | 
					 | 
				
			||||||
        // 可删 ↑
 | 
					 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  } else {
 | 
					  } else {
 | 
				
			||||||
 | 
				
			|||||||
@ -126,12 +126,9 @@ export default {
 | 
				
			|||||||
            Cookies.remove("password");
 | 
					            Cookies.remove("password");
 | 
				
			||||||
            Cookies.remove('rememberMe');
 | 
					            Cookies.remove('rememberMe');
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
          this.$store
 | 
					          this.$store.dispatch("Login", this.loginForm).then(() => {
 | 
				
			||||||
            .dispatch("Login", this.loginForm)
 | 
					            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
 | 
				
			||||||
            .then(() => {
 | 
					          }).catch(() => {
 | 
				
			||||||
              this.$router.push({ path: this.redirect || "/" });
 | 
					 | 
				
			||||||
            })
 | 
					 | 
				
			||||||
            .catch(() => {
 | 
					 | 
				
			||||||
            this.loading = false;
 | 
					            this.loading = false;
 | 
				
			||||||
            this.getCode();
 | 
					            this.getCode();
 | 
				
			||||||
          });
 | 
					          });
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user