1

pages/study/index.vue

@@ -38,8 +38,8 @@
 			@dao-tip-close="daoTipClose"></dao-tip-dialog>
 		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' @confirm-btn="BanbenConfirmBtn" :title="tipTitle"
 			:content="tipContentVersion"></tipMiddleDialog>
-    <tip-dialog ref="tipDialogRef2" :closeFlag='false'  :title="tipTitle"
-                     :content="tipContentVersionAndroid"></tip-dialog>
+		<tip-dialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle"
+			:content="tipContentVersionAndroid"></tip-dialog>
 	</view>
 </template>
 <script setup>
@@ -65,7 +65,7 @@
 		nextTick,
 		getCurrentInstance,
 		onMounted,
-    computed
+		computed
 	} from "vue";
 	import {
 		onLoad
@@ -93,7 +93,7 @@
 		getUserIdentity
 	} from "@/utils/common";
 	import cacheManager from "@/utils/cacheManager.js";
-  import TipDialog from "../../components/dialog/tipDialog";
+	import TipDialog from "../../components/dialog/tipDialog";
 	const tipContent = '是否前往开通付费？'; //当前产品	
 	const goPayDialogRef = ref(null);
 	const youkeDialogRef = ref(null);
@@ -137,10 +137,10 @@
 
 	const version = config.appInfo.version;
 	const tipDialogRef = ref(null);
-  const tipDialogRef2 = ref(null);
+	const tipDialogRef2 = ref(null);
 	const tipTitle = '升级提醒';
-  const tipContentVersion = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！';
-  const tipContentVersionAndroid = '您的APP不是最新版本，部分功能不能使用，请到应用商店升级至最新版本！'
+	const tipContentVersion = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！';
+	const tipContentVersionAndroid = '您的APP不是最新版本，部分功能不能使用，请到应用商店升级至最新版本！'
 
 	onLoad((options) => {
 		init(options);
@@ -170,13 +170,13 @@
 	function getLoginInit() {
 		getVersion({}).then(res => {
 			if (version != res.data.version) {
-        const systemInfo = uni.getSystemInfoSync();
-        if (systemInfo.platform == 'ios') {
-          tipDialogRef.value.handleShow();
-        } else {
-          tipDialogRef2.value.handleShow();
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.platform == 'ios') {
+					tipDialogRef.value.handleShow();
+				} else {
+					tipDialogRef2.value.handleShow();
 
-        }
+				}
 			}
 		})
 	}
@@ -262,6 +262,7 @@
 					zhangId: infoData.zhangId
 				})
 			} else {
+				debugger
 				// 旧的数学 英语 新的数学
 				infoData.zhangId = cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
 				cacheManager.updateObject('auth', {
@@ -292,15 +293,15 @@
 				chooseMethodUseCache()
 			}
 
-			// 已登录付费未支付选择返回 -> 恢复弹窗
-			if (options.studyWithCatalgue) {
-				// 展开弹窗
-				nextTick(() => {
-					catalogueRef.value.showPopup({
-						zhangId: infoData.zhangId
-					});
-				})
-			}
+			// // 已登录付费未支付选择返回 -> 恢复弹窗
+			// if (options && options.studyWithCatalgue) {
+			// 	// 展开弹窗
+			// 	nextTick(() => {
+			// 		catalogueRef.value.showPopup({
+			// 			zhangId: infoData.zhangId
+			// 		});
+			// 	})
+			// }
 		} else {
 			chooseMethodYouke(options)
 		}
@@ -324,7 +325,7 @@
 			zhangList.value = cacheManager.get('zhangInfo').zhangList[0].zList
 			zhangName.value = cacheManager.get('zhangInfo').zhangList[0].zhangName
 			current.value = cacheManager.get('auth').currentZhang
-			zid.value = cacheManager.get('zhangInfo').zhangList[0].zList[cacheManager.get('auth').currentZhang].zid
+			zid.value = cacheManager.get('zhangInfo').zhangList[0].zList[cacheManager.get('auth').currentZhang].zhangZid
 			infoData.zhangId = cacheManager.get('zhangInfo').zhangList[0].zhangId
 			recordZhangJie()
 		} else {
@@ -377,14 +378,14 @@
 					currentZhang: 0
 				})
 			}
-	
+
 
 			nextTick(() => {
 				translateData(res.data)
 				zhangList.value = res.data.zhangList[0].zList
 				zhangName.value = res.data.zhangList[0].zhangName
 				current.value = cacheManager.get('auth').currentZhang
-				zid.value = res.data.zhangList[0].zList[cacheManager.get('auth').currentZhang].zid
+				zid.value = res.data.zhangList[0].zList[cacheManager.get('auth').currentZhang].zhangZid
 				infoData.zhangId = res.data.zhangList[0].zhangId
 				recordZhangJie()
 			})
@@ -515,7 +516,10 @@
 				currentDuration.value = 500
 			})
 		}, 100)
-		//	init()
+		if (currentProduct.value == 2 && typeId.value == 1) {
+			cacheManager.remove('zhangInfo')
+		}
+		init()
 	}
 
 	function goKaoshi(data) {