Merge branch 'develop/steels' into feature/steels/yangan

yangan

2024-06-28 3fef62b03c16aa69c109c355150cdb698b777feb

 pages/login/userPassword.vue

@@ -25,6 +25,7 @@
      <view class="loginBtn"><u-button type="primary"
            :text="btnText == 1 ? '绑定' : '登录'"
            @click="submit()"
        :loading="submitLoading"
            ></u-button></view>
   </view>
</template>
@@ -49,7 +50,8 @@
            // username: '13333333332',// 司机
            password: '',
            remember: true,
            baseUrl: ''
            baseUrl: '',
        submitLoading: false
         };
      },
      methods: {
@@ -70,6 +72,7 @@
            }
            let grant_type = 'password';
            //登录接口
        this.submitLoading = true
            await apiLoginPassword({
                  username: this.username,
                  password: this.password,
@@ -80,6 +83,7 @@
                  setToken(res.access_token);
                  setRefreshToken(res.refresh_token);
                  if (this.btnText == 0) {
              this.submitLoading = false
                     if (res.code != 1) {
                        // 登陆成功，存储相关信息
                        setToken(res.access_token);
@@ -91,14 +95,22 @@
                              this.$u.toast('登录成功');
                              this.setUserTabbar(res.data.type);
                              uni.setStorageSync('roleType', res.data.type);
                    uni.setStorageSync("userId", res.data.userId)
                    uni.setStorageSync("userInfo", res.data)
                              setCustomerId(res.data.customerid);
                              setUserId(res.data.userId);
                              setName(res.name);
                              uni.hideLoading();
                              //跳转页面
                              this.$nextTick(() => {
                                 redirectHome();
                              });
                    if(res.data.forcePassword == 1) {  //forcePassword为1强制修改密码
                      uni.navigateTo({
                        url: `/pages/login/resetPassword/resetPassword?userInfo=${JSON.stringify(res.data)}`
                      })
                    }else {
                      //跳转页面
                      this.$nextTick(() => {
                        redirectHome();
                      });
                    }
                           })
                           .catch(err => {
                              this.$u.toast('登录异常！');
@@ -133,6 +145,7 @@
                  }
               })
               .catch(e => {
            this.submitLoading = false
                  this.$u.toast(e);
               });
         }
@@ -154,4 +167,4 @@
         letter-spacing: 10rpx;
      }
   }
</style>
</style>