Merge branch 'release/v1.1.3发布'

zhaojs

2023-06-30 ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae

 uniapp/pages/login/wxlogin.vue

@@ -4,7 +4,7 @@
      <view class="pageContent borderBox colCen">
         <image class="applogo" :src="appInfo.logo" mode="aspectFill"></image>

         <view class="wxlogoBtn rowCenCen" @tap="wxlogin()" v-if="haswxlogin">
         <view class="wxlogoBtn rowCenCen" @tap="wxlogin()" v-if="supportWx">
            <image class="logoIcon" src="../../static/images/mine/wxwhite.png" mode=""></image>
            <view>微信一键登录</view>
         </view>
@@ -47,19 +47,41 @@
            isread: false,
            haswxlogin: false,
            isSupportMob:false,
            isother:false
            isother:false,
            supportWx:true
         }
      },
      onLoad() {
         this.appInfo = uni.getStorageSync('appInfo')
         console.log(this.appInfo.iosExamine)
         console.log(getApp().globalData.ifwt)
         //this.haswxlogin = this.appInfo.iosExamine ? false : (getApp().globalData.ifwt == 1 ? true : false)
         this.haswxlogin = getApp().globalData.ifwt == 1 ? true :false;
         this.checkSupportWx();
         this.isSupportMoblie();
      },
      methods: {
         ...mapMutations(['login']),
         checkSupportWx()
         {
            // #ifdef APP-PLUS
             if (plus.os.name == 'iOS') {
               if (plus.runtime.isApplicationExist({
                     action: 'weixin://'
                  }) && plus.runtime.isApplicationExist({
                     action: 'taobao://'
                  })) {
                  this.supportWx = true //是否安装微信和淘宝 1代表安装
               } else {
                  this.supportWx = false
               }
            } else {
               if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
                     action: 'weixin://'
                  })) {
                  this.supportWx = true //是否安装微信 1代表安装
               } else {
                  this.supportWx = false
               }
            }
            // #endif
         },
         backHome() {
            var pages = getCurrentPages();
            console.log(pages.length);
@@ -126,6 +148,9 @@
                  {
                     "normalColor":"#F73314",
                     "highlightColor":"#F73314"
                  },
                  "privacyTerms":{
                     "defaultCheckBoxState":false
                  }
                  
                 },
@@ -138,6 +163,7 @@
                     if(res.errCode==30002)
                     {//切换登录方式
                        that.isother=true;
                        univerifyManager.close();
                     }
                     else
                     {
@@ -146,6 +172,7 @@
                           univerifyManager.close();
                        },2000);
                     }
							
                     that.isother=true;
                  }
               })
@@ -175,11 +202,11 @@
                     url: './setInviteCode'
                  })
               }
               else if (e.data.userinfo.isPwd == 'N') {
               /* else if (e.data.userinfo.isPwd == 'N') {
                  uni.redirectTo({
                     url: './setPass'
                  })
               } else {
               } */ else {
                  uni.switchTab({
                     url: '../index/index'
                  })