Merge remote-tracking branch 'origin/2025鹅状元dev' into 2025鹅状元dev

pages/study/index.vue

@@ -285,22 +285,12 @@
 				})
 			}
 			if (!cacheManager.get('zhangInfo')) {
-				console.log('不实用换葱');
+				console.log('无zhangInfo缓存');
 				chooseMethodNoCache()
 			} else {
-				console.log('shiyonghuancun');
+				console.log('使用缓存Zhanginfo');
 				chooseMethodUseCache()
 			}
-
-			// // 已登录付费未支付选择返回 -> 恢复弹窗
-			// if (options && options.studyWithCatalgue) {
-			// 	// 展开弹窗
-			// 	nextTick(() => {
-			// 		catalogueRef.value.showPopup({
-			// 			zhangId: infoData.zhangId
-			// 		});
-			// 	})
-			// }
 		} else {
 			chooseMethodYouke(options)
 		}
@@ -312,7 +302,6 @@
 			getZhangInfoNewYingyu()
 		} else {
 			// 之前 旧的岛 数学英语 和新的数学
-
 			getZhangInfo()
 		}
 	}
@@ -417,21 +406,13 @@
 		}
 		userZhangInfo(req).then(res => {
 			cacheManager.set('zhangInfo', res.data)
-			let zhang = cacheManager.get('zhangInfo').zhangList.findIndex(zhang => zhang.zhangId == localAuth
-				.value.zhangId);
-			console.log('zhang', zhang);
-
-			if (zhang != -1) {
-				cacheManager.updateObject('auth', {
-					currentZhang: zhang
-				})
-			} else {
-				const zhangIndex = findZhangindex(cacheManager.get('zhangInfo'))
-				console.log(zhangIndex);
-				cacheManager.updateObject('auth', {
-					currentZhang: zhangIndex
-				})
-			}
+			const curZhangId = res.data.curZhangId;
+			const resZhangList = res.data.zhangList;
+			const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
+			console.log('index', index);
+			cacheManager.updateObject('auth', {
+				currentZhang: index
+			})
 			nextTick(() => {
 				translateData(res.data)
 				zhangList.value = res.data.zhangList
@@ -691,17 +672,17 @@
 	function chooseMethodListClick(data, data2, index) {
 
 		console.log('data', data); // 节内容
-		 console.log('data2', data2); //章内容
+		console.log('data2', data2); //章内容
 		const authCode = getUserIdentity();
 
 		if (currentProduct.value == 2 && typeId.value == 1) {
-		//	const isFirst = data.jieName == data2.jieList[0].jieName
-			if (!cacheManager.get('auth') && data.number !=1) {
+			//	const isFirst = data.jieName == data2.jieList[0].jieName
+			if (!cacheManager.get('auth') && data.number != 1) {
 				youkeDialogRef.value.handleShow();
 				return false;
 			}
 			// console.log('authCode', authCode);
-			if (!(authCode == 'VIP' || data.number ==1)) {
+			if (!(authCode == 'VIP' || data.number == 1)) {
 				goPayDialogRef.value.handleShow();
 				return false
 			}

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,19 +1,19 @@
 {
-  "hash": "9089c2c2",
-  "configHash": "5978ec27",
+  "hash": "09b26b97",
+  "configHash": "d5858f9f",
   "lockfileHash": "32571fb3",
-  "browserHash": "e7ddfcd6",
+  "browserHash": "d09af41c",
   "optimized": {
     "uview-plus": {
       "src": "../../../../../node_modules/uview-plus/index.js",
       "file": "uview-plus.js",
-      "fileHash": "d88180c2",
+      "fileHash": "fe99ea43",
       "needsInterop": false
     },
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "9b180fa3",
+      "fileHash": "44ce76a2",
       "needsInterop": true
     }
   },