Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-20 e8acc5b07f200d20137171d9aec084040cab5709

 src/views/login.vue

@@ -149,6 +149,7 @@
  watch: {
    $route: {
      handler: function(route) {
        console.log(route);
        this.redirect = route.query && route.query.redirect;
      },
      immediate: true
@@ -198,7 +199,9 @@
              this.loginInfo = loginInfo.user
              //如果返回为1正常跳转
              if(this.loginInfo.firstLogin == 1){
                this.$router.push({ path: "/screen" }).catch(()=>{});
                this.$router.push({ path: "/" }).catch(()=>{});
                return;
                this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
              } else {
                 localStorage.setItem('firstLogin',0)
              }