From 4ac3c2382e0733685f7612f8e9ca4e85d15c1411 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:55:00 +0800
Subject: [PATCH] Merge branch 'hotfix/苹果审核修改'
---
uniapp/pages/login/wxlogin.vue | 139 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 132 insertions(+), 7 deletions(-)
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 3eaa859..511649a 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -4,13 +4,20 @@
<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>
- <view class="goaccount rowCenCen" @tap="goaccount()">
+ <view v-if="isSupportMob" class="goaccount rowCenCen" @tap="mobileLogin()">
+ <view>鏈満鎵嬫満鍙蜂竴閿櫥褰�/娉ㄥ唽</view>
+ </view>
+ <view v-else class="goaccount rowCenCen" @tap="goaccount()">
<view>鎵嬫満鍙风櫥褰�/娉ㄥ唽</view>
</view>
+ <view style="margin-top: 20px;" v-if="isother" @tap="goaccount()">
+ 鎵嬫満鍙风櫥褰�/娉ㄥ唽
+ </view>
+
</view>
<view class="bottom-fixed colCen">
@@ -28,6 +35,7 @@
mapMutations
} from 'vuex';
import titleBar from '../../components/backTitlebar.vue'
+ const univerifyManager = uni.getUniverifyManager();
export default {
components: {
titleBar
@@ -37,18 +45,43 @@
appInfo: '',
ifPasslogin: false,
isread: false,
- haswxlogin: false
+ haswxlogin: false,
+ isSupportMob: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);
@@ -62,6 +95,98 @@
})
}
},
+ isSupportMoblie()
+ {
+ var that=this;
+ uni.preLogin({
+ provider: 'univerify',
+ success(){ //棰勭櫥褰曟垚鍔�
+ // 鏄剧ず涓�閿櫥褰曢�夐」
+ that.isSupportMob=true;
+ },
+ fail(res){ // 棰勭櫥褰曞け璐�
+ // 涓嶆樉绀轰竴閿櫥褰曢�夐」锛堟垨缃伆锛�
+ // 鏍规嵁閿欒淇℃伅鍒ゆ柇澶辫触鍘熷洜锛屽鏈夐渶瑕佸彲灏嗛敊璇彁浜ょ粰缁熻鏈嶅姟鍣�
+ console.log(res)
+ }
+ })
+ },
+ doMobileLogin(mobRes)
+ {
+ var that=this;
+ uniCloud.callFunction({
+ name: 'getPhoneNumber', // 浣犵殑浜戝嚱鏁板悕绉�
+ data: {
+ 'access_token': mobRes.access_token, // 瀹㈡埛绔竴閿櫥褰曟帴鍙ｈ繑鍥炵殑access_token
+ 'openid': mobRes.openid // 瀹㈡埛绔竴閿櫥褰曟帴鍙ｈ繑鍥炵殑openid
+ }
+ }).then(res => {
+ console.log(res)
+ that.targetToIndex(res.result.data);
+ // 鐧诲綍鎴愬姛锛屽彲浠ュ叧闂竴閿櫥褰曟巿鏉冪晫闈簡
+ univerifyManager.close();
+ }).catch(err=>{
+ // 澶勭悊閿欒
+ console.log(err)
+ that.isother=true;
+ that.$alert('鑾峰彇鎵嬫満鍙风爜澶辫触锛岃浣跨敤鍏朵粬鏂瑰紡鐧诲綍')
+ setTimeout(function(){
+ univerifyManager.close();
+ },2000);
+
+ })
+ },
+ mobileLogin()
+ {
+ var that=this;
+ if (this.isread) {
+ univerifyManager.login({
+ provider: 'univerify',
+ univerifyStyle: { // 鑷畾涔夌櫥褰曟鏍峰紡
+ "fullScreen":false,
+ "authButton":
+ {
+ "normalColor":"#F73314",
+ "highlightColor":"#F73314"
+ },
+ "privacyTerms":{
+ "defaultCheckBoxState":false
+ }
+
+ },
+ success(res){ // 鐧诲綍鎴愬姛
+ console.log(res.authResult);
+ that.doMobileLogin(res.authResult);
+ },
+ fail(res){ // 鐧诲綍澶辫触
+ console.log(res)
+ if(res.errCode==30002)
+ {//鍒囨崲鐧诲綍鏂瑰紡
+ that.isother=true;
+ univerifyManager.close();
+ }
+ else
+ {
+ that.$alert('鑾峰彇鎵嬫満鍙风爜澶辫触锛岃浣跨敤鍏朵粬鏂瑰紡鐧诲綍')
+ setTimeout(function(){
+ univerifyManager.close();
+ },2000);
+ }
+
+ that.isother=true;
+ }
+ })
+
+ }
+ else
+ {
+ uni.showToast({
+ title: '璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��',
+ icon: "none",
+ })
+ }
+
+ },
targetToIndex(e)
{
var that = this;
--
Gitblit v1.9.3