wangguoyu 2 周之前
父節點
當前提交
a29aaabfe3
共有 2 個文件被更改,包括 36 次插入33 次删除
  1. 24 20
      pages/login/index.vue
  2. 12 13
      pages/study/index.vue

+ 24 - 20
pages/login/index.vue

@@ -37,8 +37,8 @@
 		<tel-dialog ref="telDialogRef" @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
 		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
 			:notClose="true" :content="tipContent"></tipMiddleDialog>
-		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :showTip="true"
-			:notClose="true" :content="tipContentAndroid">
+		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+			:showTip="true" :notClose="true" :content="tipContentAndroid">
 		</tipMiddleDialog>
 	</view>
 </template>
@@ -100,7 +100,7 @@
 	const telDialogRef = ref(null);
 	let telDialogFlag = ref(false);
 	let showAppleLogin = ref(false);
-	let wxFlag = ref(true);
+	let wxFlag = ref(true);
 	let ykFlag = ref(true);
 
 	const version = config.appInfo.version;
@@ -152,7 +152,7 @@
 		} else {
 			initDownload(updateUrl.value)
 			// 处理 Android/HarmonyOS 设备
-	/*		const {
+			/*		const {
 				brand
 			} = systemInfo;
 			const androidPackage = 'com.llisoft.ezy'; // 安卓包名
@@ -208,7 +208,7 @@
 		getVersion({}).then(res => {
 			if (version != res.data.version) {
 				updateUrl.value = res.data.updateUrl
-		
+
 				if (systemInfo.platform == 'ios') {
 					tipDialogRef.value.handleShow();
 				} else {
@@ -218,21 +218,25 @@
 					//  url: res.data.updateUrl
 					// })
 				}
-			} else {
-				if(systemInfo.platform == 'ios'){
-					// 游客模式 新增 tishen字段 用于苹果审核
-					if(cacheManager.get("youkeTishen")){
-						cacheManager.remove('youkeTishen')
-					}
-					if (res.data.tishen.toString() == 'true') {
-						cacheManager.set('youkeTishen', res.data.tishen)
-						ykFlag.value = true
-					}else{
-						ykFlag.value = false
-					}
-				}else{
-						ykFlag.value = true
-				}
+			} else {
+				if (systemInfo.platform == 'ios') {
+					// 游客模式 新增 tishen字段 用于苹果审核
+					if (cacheManager.get("youkeTishen")) {
+						cacheManager.remove('youkeTishen')
+					}
+					if (res.data.tishen.toString() == 'true') {
+						cacheManager.set('youkeTishen', res.data.tishen)
+						ykFlag.value = true
+					} else {
+						ykFlag.value = false
+					}
+				} else {
+					if (cacheManager.get("youkeTishen")) {
+						cacheManager.remove('youkeTishen')
+					}
+					cacheManager.set('youkeTishen', res.data.tishen)
+					ykFlag.value = true
+				}
 
 			}
 		})

+ 12 - 13
pages/study/index.vue

@@ -228,13 +228,11 @@
 
 				}
 			} else {
-				// 游客模式 新增 tishen字段 用于苹果审核
-				if(cacheManager.get("youkeTishen")){
-					cacheManager.remove('youkeTishen')
-				}
-				if (res.data.tishen.toString() == 'true') {
-					cacheManager.set('youkeTishen', res.data.tishen)
+				// 游客模式 新增 tishen字段 用于苹果审核
+				if (cacheManager.get("youkeTishen")) {
+					cacheManager.remove('youkeTishen')
 				}
+				cacheManager.set('youkeTishen', res.data.tishen)
 				init(options)
 			}
 		})
@@ -727,12 +725,12 @@
 
 	function listClick(data, data2, index) {
 		//console.log('data', data); // 节内容
-		//	console.log('data2', data2); //章内容
-			const authCode = getUserIdentity();
-		if(cacheManager.get("youkeTishen").toString() =='true' &&authCode =='Visitor'){
-				chooseMethodListClickForTishen(data, data2, index)
-		}else{
-				chooseMethodListClick(data, data2, index)
+		//	console.log('data2', data2); //章内容
+		const authCode = getUserIdentity();
+		if (cacheManager.get("youkeTishen").toString() == 'true' && authCode == 'Visitor') {
+			chooseMethodListClickForTishen(data, data2, index)
+		} else {
+			chooseMethodListClick(data, data2, index)
 		}
 	}
 
@@ -752,7 +750,8 @@
 				goLookShipin(data, index)
 			}
 		}
-	}
+	}
+
 	function chooseMethodListClick(data, data2, index) {
 
 		console.log('data', data); // 节内容