wgy文件

pages/login/index.vue

@@ -18,7 +18,7 @@
 							:checked="indexData.isAgreed" />
 					</checkbox-group>
 					<view class="agreement-text-box">
-						我已阅读并同意<view class="agreement-text" @click="agreeBtn('yhxy')">《鹅状元用户协议》</view>和<view
+						登录注册代表您已同意<view class="agreement-text" @click="agreeBtn('yhxy')">《鹅状元用户协议》</view>和<view
 							@click="agreeBtn('ystk')" class="agreement-text">《鹅状元隐私政策》</view>
 					</view>
 				</view>
@@ -26,7 +26,7 @@
 			</view>
 			<view class="bottom-btn-box">
 				<view class="yk-btn" @click="ykBtn"></view>
-				<view class="wx-btn" @click="wxLoginClick"></view>
+				<view v-if="wxFlag" class="wx-btn" @click="wxLoginClick"></view>
 				<view class="apple-btn" v-if="showAppleLogin" @click="appleLoginClick"></view>
 			</view>
 		</view>
@@ -34,7 +34,6 @@
 		<agree-dialog ref="agreeDialogRef" @confirm-btn="confirmBtn"></agree-dialog>
 		<agree-dialog ref="agreeYkDialog" @confirm-btn="ykConfirmBtn"></agree-dialog>
 		<tel-dialog ref="telDialogRef" @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
-		<agree-first-dialog ref="agreeFirstDialogRef" @first-confirm-btn="firstConfirmBtn"></agree-first-dialog>
 	</view>
 </template>
 
@@ -50,7 +49,6 @@
 	} from '@dcloudio/uni-app';
 	import agreeContentDialog from './agreeContentDialog.vue';
 	import agreeDialog from './agreeDialog.vue'
-	import agreeFirstDialog from './agreeFirstDialog.vue'
 	import {
 		wxLogin,
 	} from "@/api/login.js"
@@ -76,18 +74,18 @@
 	const agreeYkDialog = ref(null);
 	const telDialogRef = ref(null);
 	let telDialogFlag = ref(false);
-	let showAppleLogin = ref(false);
-	const agreeFirstDialogRef = ref(null);
+	let showAppleLogin = ref(false);
+	let wxFlag = ref(true);
 
 	onLoad((options) => {
-		showAppleLogin.value = isIOS13OrAbove();
-		
-		// 没有缓存显示用户协议弹窗
-		if (!cacheManager.get('firstAgreeDialog')) {
-			nextTick(() => {
-				agreeFirstDialogRef.value.handleShow();
-			}) 
+		showAppleLogin.value = isIOS13OrAbove();
+		if(plus.runtime.isApplicationExist({ pname: 'com.tencent.mm', action: 'weixin://' })) {
+				console.log('111',"已安装微信");
+					wxFlag.value = true
+		}else{
+			wxFlag.value = false
 		}
+		console.log('showAppleLogin.value',showAppleLogin.value);
 	})
 
 	const getYzmBtn = () => {
@@ -169,12 +167,6 @@
 		}
 		agreeContentDialogRef.value.handleShow();
 	};
-	
-	const firstConfirmBtn = () => {
-		cacheManager.set('firstAgreeDialog', {
-			firstAgreeDialog: 'has'
-		})
-	}
 
 	const handleAgreementChange = (event) => {
 		if (event.detail.value[0] === 'agree') {
@@ -323,7 +315,7 @@
 			}
 		})
 		} else {
-			toast("未安装微信,请安装微信进行登录！")
+			toast("请重启应用重试")
 			return false
 		}
 	}