From ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:15 +0800
Subject: [PATCH] Merge branch 'release/v1.1.3发布'
---
uniapp/pages/login/wxlogin.vue | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 71207f4..5a53652 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/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);
@@ -86,7 +108,6 @@
// 涓嶆樉绀轰竴閿櫥褰曢�夐」锛堟垨缃伆锛�
// 鏍规嵁閿欒淇℃伅鍒ゆ柇澶辫触鍘熷洜锛屽鏈夐渶瑕佸彲灏嗛敊璇彁浜ょ粰缁熻鏈嶅姟鍣�
console.log(res)
- console.log(res.errMsg)
}
})
},
@@ -107,10 +128,8 @@
}).catch(err=>{
// 澶勭悊閿欒
console.log(err)
- uni.hideLoading();
-
+ that.isother=true;
that.$alert('鑾峰彇鎵嬫満鍙风爜澶辫触锛岃浣跨敤鍏朵粬鏂瑰紡鐧诲綍')
-
setTimeout(function(){
univerifyManager.close();
},2000);
@@ -129,6 +148,9 @@
{
"normalColor":"#F73314",
"highlightColor":"#F73314"
+ },
+ "privacyTerms":{
+ "defaultCheckBoxState":false
}
},
@@ -141,6 +163,7 @@
if(res.errCode==30002)
{//鍒囨崲鐧诲綍鏂瑰紡
that.isother=true;
+ univerifyManager.close();
}
else
{
@@ -149,6 +172,7 @@
univerifyManager.close();
},2000);
}
+
that.isother=true;
}
})
@@ -178,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'
})
--
Gitblit v1.9.3