Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unatt...

yangan

2024-11-11 4e517dc54e1e3e5e5b543383c321161de351272e

 pages/login/userPassword.vue

@@ -106,7 +106,9 @@
            remember: true,
            inpType:true,
            baseUrl: '',
            submitLoading: false
            submitLoading: false,
            weXinisLoginFlag:[1,2,3], //微信
            H5IsLoginFlag:[5,6], //h5
         };
      },
      methods: {
@@ -151,6 +153,8 @@
                  if (this.btnText == 0) {
                     this.submitLoading = false
                     if (res.code != 1) {
							

                        // 登陆成功，存储相关信息
                        setToken(res.access_token);
                        setRefreshToken(res.refresh_token);
@@ -159,6 +163,22 @@
                        this.$reqGet('getUserEntity')
                           .then(res => {
                    console.log(res,'登录信息----------')
                                    //#ifdef MP-WEIXIN
                        if(this.H5IsLoginFlag.includes(res.data.type)) {
                           this.$u.toast('当前角色请前往h5页面登录')
                           return ;

                        }
                        //#endif
                        // #ifdef H5
                        if(this.weXinisLoginFlag.includes(res.data.type)) {
                           console.log('触发登录角色')
                           this.$u.toast('当前角色请前往小程序登录')
                           return ;

                        }
                        //#endif

                              this.$u.toast('登录成功');
                              if(this.isJizhu.length){ //记住密码
                                 uni.setStorageSync('remberPassWord',{
@@ -172,6 +192,7 @@
                                 });
                              }
                              this.setUserTabbar(res.data.type);
                              uni.setStorageSync('productIds',res.data.productIds)
                              uni.setStorageSync('roleType', res.data.type);
                              uni.setStorageSync("userId", res.data.userId)
                              uni.setStorageSync("carNo", res.data.carNo)
@@ -213,9 +234,7 @@
                           if (res.code) {
                              uni.setStorageSync('bindcode', res.code);
                           }
                        }
                     });
                     if (uni.getStorageSync('bindcode')) {
                           if (uni.getStorageSync('bindcode')) {
                        this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('bindcode') },
                           'params').then(res => {
                           uni.hideLoading();
@@ -229,6 +248,9 @@
                           }
                        });
                     }
                        }
                     });
						
                  }
               }).catch(e => {
                  this.submitLoading = false