Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into...

yangan

2024-05-30 29014207a8882df16d4372ef20e0d79e6e5df6d1

 pages/login/userPassword.vue

@@ -20,9 +20,13 @@
               prefixIconStyle="font-size: 22px;color: #909399"></u--input>
         </view>
      </view>
      <view class="loginBtn"><u-button type="primary"
      <view class="loginBtn">
      <u-button type="primary"
            :text="btnText == 1 ? '绑定' : '登录'"
            @click="submit()"></u-button></view>
            @click="submit()"
            :loading="submitLoading">
      </u-button>
    </view>
   </view>
</template>

@@ -46,7 +50,8 @@
            // username: '13333333332',// 司机
            password: '',
            remember: true,
            baseUrl: ''
            baseUrl: '',
            submitLoading: false
         };
      },
      methods: {
@@ -67,6 +72,7 @@
            }
            let grant_type = 'password';
            //登录接口
            this.submitLoading = true
            await apiLoginPassword({
                  username: this.username,
                  password: this.password,
@@ -77,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);
@@ -85,13 +92,15 @@
                        //查询用户详细信息并储存
                        this.$reqGet('getUserEntity')
                           .then(res => {
                    console.log(res,'登录信息----------')
                              this.$u.toast('登录成功');
                              this.setUserTabbar(res.data.type);
                              uni.setStorageSync('roleType', res.data.type);
                              uni.setStorageSync("userId", res.data.userId)
                              uni.setStorageSync("carNo", res.data.carNo)
                              uni.setStorageSync("userInfo", res.data)
                              setCustomerId(res.data.customerid);
                              setName(res.name);
                              setName(res.data.name);
                              uni.hideLoading();
                              //跳转页面
                              this.$nextTick(() => {
@@ -99,6 +108,7 @@
                              });
                           })
                           .catch(err => {
                              this.submitLoading = false
                              this.$u.toast('登录异常！');
                              console.log(err);
                           });
@@ -129,10 +139,11 @@
                        });
                     }
                  }
               })
               .catch(e => {
               }).catch(e => {
                  this.submitLoading = false
                  this.$u.toast(e);
               });

         }
      }
   };
@@ -144,4 +155,10 @@
   .dengluBtn {
      margin-top: 80rpx;
   }
</style>
  /* #ifdef H5 */
  .loginBtn{
    width: 80%;
    margin: 0 auto;
  }
  /* #endif */
</style>