Merge remote-tracking branch 'origin/master'

xiangpei

2024-04-26 cf91288ecebb860a48f885261fb3620059fbfb16

 src/views/login.vue

@@ -191,9 +191,9 @@
              this.loginInfo = loginInfo.user
              //如果返回为1正常跳转
              if (this.loginInfo.firstLogin == 1) {
                this.$router.push({ path: "/" }).catch(() => { });
                return;
                this.$router.push({ path: this.redirect || "/" }).catch(() => { });
                // this.$router.push({ path: "/" }).catch(() => { });
                // return;
                this.$router.push({ path: this.redirect || "/screen" }).catch(() => { });
              } else {
                localStorage.setItem('firstLogin', 0)
              }