1

pages/study/index.vue

@@ -4,23 +4,24 @@
 			class="ezy-study-swiper" :class="'ezy-study-swiper'+ currentProduct">
 			<swiper-item v-for="(item,index) in zhangList" :key="index">
 				<!-- 	旧的数学 -->
-								<shuxueZhangjie v-if="currentProduct ==1&&typeId==2" @clickGradeTerm="clickGradeTerm"
+				<shuxueZhangjie v-if="currentProduct ==1&&typeId==2" @clickGradeTerm="clickGradeTerm"
 					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
 					:options="item" :youkeImage="youkeImage">
 				</shuxueZhangjie>
 				<!-- 	旧的英语 -->
-								<yingyuZhangjie v-if="currentProduct ==2&&typeId==2" @clickGradeTerm="clickGradeTerm"
+				<yingyuZhangjie v-if="currentProduct ==2&&typeId==2" @clickGradeTerm="clickGradeTerm"
 					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
 					:options="item" :youkeImage="youkeImage">
 				</yingyuZhangjie>
 				<!-- 	新的数学 -->
-							<shuxueNewZhangjie v-if="currentProduct ==1&&typeId==1" @clickGradeTerm="clickGradeTerm"
+				<shuxueNewZhangjie v-if="currentProduct ==1&&typeId==1" @clickGradeTerm="clickGradeTerm"
 					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
 					:options="item" :youkeImage="youkeImage">
 				</shuxueNewZhangjie>
 				<!-- 	新的英语（人教版等等） -->
-				<yingyuNewZhangjie @clickGradeTerm="clickGradeTerm" @handleCheckCatalogue="handleCheckCatalogue(item)"
-					@listClick="listClick" :gradeTerm='gradeTerm' :options="item" :youkeImage="youkeImage">
+				<yingyuNewZhangjie v-if="currentProduct ==2&&typeId==1" @clickGradeTerm="clickGradeTerm"
+					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
+					:options="item" :youkeImage="youkeImage">
 				</yingyuNewZhangjie>
 			</swiper-item>
 		</swiper>
@@ -251,11 +252,6 @@
 			} else {
 				console.log('shiyonghuancun');
 				chooseMethodUseCache()
-				translateData(cacheManager.get('zhangInfo'))
-				zhangList.value = cacheManager.get('zhangInfo').zhangList
-				current.value = cacheManager.get('auth').currentZhang
-				infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
-				recordZhangJie()
 			}
 
 			// 已登录付费未支付选择返回 -> 恢复弹窗
@@ -291,15 +287,29 @@
 	}
 
 	function chooseMethodUseCache() {
-
+		// 新的英语 （人教版 之类的 新结构）
+		if (currentProduct.value == 2 && typeId.value == 1) {
+			translateData(cacheManager.get('zhangInfo'))
+			zhangList.value = cacheManager.get('zhangInfo').zhangList[0].zList
+			current.value = cacheManager.get('auth').currentZhang
+			infoData.zhangId = cacheManager.get('zhangInfo').zhangList[0].zhangId
+			recordZhangJie()
+		} else {
+			// 之前 旧的岛 数学英语 和新的数学
+			translateData(cacheManager.get('zhangInfo'))
+			zhangList.value = cacheManager.get('zhangInfo').zhangList
+			current.value = cacheManager.get('auth').currentZhang
+			infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
+			recordZhangJie()
+		}
 	}
 	// 新的英语 （人教版 之类的 新结构）
 	function getZhangInfoNewYingyu(data) {
 		let req = {
 			levelId: localAuth.value.levelId,
-		//	levelId: 31,
-				zhangId:localAuth.value.zhangId
-		//	zhangId: 195
+			//	levelId: 31,
+			zhangId: localAuth.value.zhangId
+			//	zhangId: 195
 		}
 		userZhangInfo(req).then(res => {
 			cacheManager.set('zhangInfo', res.data)