wangguoyu 4 часов назад
Родитель
Сommit
8eb02fa6c1
1 измененных файлов с 11 добавлено и 7 удалено
  1. 11 7
      pages/Login/clientIndex.vue

+ 11 - 7
pages/Login/clientIndex.vue

@@ -18,11 +18,12 @@
 							@click="agreeBtn('ystk')" class="agreement-text">《诚祥学隐私政策》</view>,如您同意,请勾选后开始使用
 							@click="agreeBtn('ystk')" class="agreement-text">《诚祥学隐私政策》</view>,如您同意,请勾选后开始使用
 					</view>
 					</view>
 				</view>
 				</view>
-				<button v-show="isAgreedTuceng" hover-class="none" @click="tucengClick" class="phone-green-btn wechat-auth-btn" type="default">
+				<button v-show="isAgreedTuceng" hover-class="none" @click="tucengClick"
+					class="phone-green-btn wechat-auth-btn" type="default">
 					微信一键登录
 					微信一键登录
 				</button>
 				</button>
-				<button v-show="!isAgreedTuceng" hover-class="none" class="phone-green-btn wechat-auth-btn" type="default" open-type="getPhoneNumber"
-					@getphonenumber="onWechatAuth">
+				<button v-show="!isAgreedTuceng" hover-class="none" class="phone-green-btn wechat-auth-btn"
+					type="default" open-type="getPhoneNumber" @getphonenumber="onWechatAuth">
 					微信一键登录
 					微信一键登录
 				</button>
 				</button>
 				<view class="qtdl-btn"><text class="qtdl-text" @click="handleChangeFangshi">其他登录</text></view>
 				<view class="qtdl-btn"><text class="qtdl-text" @click="handleChangeFangshi">其他登录</text></view>
@@ -68,8 +69,9 @@
 	const store = useIsCanBack();
 	const store = useIsCanBack();
 
 
 	onLoad((options) => {
 	onLoad((options) => {
-		console.log('options.from',options);
-		if(options.from == 'my'){
+		console.log('options.from', options);
+		getAllImg();
+		if (options.from == 'my') {
 			fromAppShare.value = true
 			fromAppShare.value = true
 			return false
 			return false
 		}
 		}
@@ -105,7 +107,7 @@
 				}
 				}
 			})
 			})
 		})
 		})
-		getAllImg();
+
 	})
 	})
 
 
 	function handleChange() {
 	function handleChange() {
@@ -113,12 +115,14 @@
 		isAgreedTuceng.value = !isAgreedTuceng.value
 		isAgreedTuceng.value = !isAgreedTuceng.value
 
 
 	}
 	}
-	function tucengClick (){
+
+	function tucengClick() {
 		if (!isAgreed.value) {
 		if (!isAgreed.value) {
 			toast('请先阅读并同意用户协议和隐私政策')
 			toast('请先阅读并同意用户协议和隐私政策')
 			return // 直接返回,不执行后面的授权逻辑
 			return // 直接返回,不执行后面的授权逻辑
 		}
 		}
 	}
 	}
+
 	function agreeBtn(code) {
 	function agreeBtn(code) {
 		if (code === 'yhxy') {
 		if (code === 'yhxy') {
 			uni.navigateTo({
 			uni.navigateTo({