修改新版英语

pages/selectGradesTerms/index.vue

@@ -151,10 +151,11 @@
 					subjectId: subjectId,
 					zhangId: data.activeProduct == auth.levelId && data.activeXueke == auth.cardId ? auth.zhangId :
 						0,
+					currentZhang: 0		
 				})
 				// 通知岛重新调用接口
 				cacheManager.remove('daoPageCache')
-				if (subjectId == 2) {
+				if (subjectId == 2 && typeId == 1) {
 					// 新版英语跳转版本章选择页面
 					uni.redirectTo({
 						url: `/pages/selectVersion/selectVersion`
@@ -199,7 +200,7 @@
 				if (auth.subjectId == 2 && auth.typeId == 1) {
 					// 新版英语
 					uni.redirectTo({
-						url: `/selectVersion/selectVersion`
+						url: `/pages/selectVersion/selectVersion`
 					})
 					return;
 				}

pages/selectVersion/selectVersion.vue

@@ -96,10 +96,6 @@
 	function handleBack() {
 		const userCode = getUserIdentity();
 		if (userCode !== 'Visitor') {
-			if (!data.activeProduct) {
-				return;
-			}
-			const auth = cacheManager.get('auth');
 			uni.redirectTo({
 				url: `/pages/selectGradesTerms/index`
 			})
@@ -165,17 +161,21 @@
 	
 
 	function initUserProducts() {
+		const {
+			levelId,
+		} = cacheManager.get('auth');
+		data.levelId = levelId;
 		httpApi.getUserZhangList({
 			levelId: data.levelId
 		}).then(res => {
 			data.allList = res.data || [];
 			const {
-				levelId,
+				zhangId,
 			} = cacheManager.get('auth');
-			if (levelId) {
+			if (zhangId) {
 				// LevelId 翻找根节点学科，执行选中高亮操作
-				const obj1 = findRootNode(data.allList, shangxiaId, 'shangxiaId');
-				const obj2 = findTreeNode(data.allList, shangxiaId, 'children', 'shangxiaId');
+				const obj1 = findRootNode(data.allList, zhangId, 'id');
+				const obj2 = findTreeNode(data.allList, zhangId, 'children', 'id');
 				data.shangxiaVersionId = obj2.id;
 				data.shangxiaId = obj1.id;