修改levelId

pages/selectGradesTerms/index.vue

@@ -28,7 +28,6 @@
 		reactive,
 		toRefs,
 		computed,
-		nextTick
 	} from "vue";
 	import * as httpApi from "@/api/selectGradesTerms.js";
 	import {
@@ -40,10 +39,7 @@
 		findTreeNode
 	} from "@/utils/common.js"
 	import cacheManager from "@/utils/cacheManager.js"
-	import {
-		getCommonTree,
-		getIndexTree
-	} from "../../api/selectGradesTerms";
+  import {getDataFromStr} from "@/utils/common.js"
 
 	function useSelectGrade() {
 		const userCode = getUserIdentity();
@@ -86,8 +82,11 @@
 			httpApi.getIndexTree().then(res => {
 				data.xuekeData = res.data || [];
 				const {
-					levelId,
+					levelId: levelIdD,
 				} = cacheManager.get('auth');
+
+        let levelId = getDataFromStr(levelIdD)[0];
+
 				if (levelId) {
 					// LevelId 翻找根节点学科，执行选中高亮操作
 					const xuekeObj = findRootNode(data.xuekeData, levelId, 'levelId');
@@ -136,14 +135,10 @@
 			const subjectId = Product.subjectId;
 
 			if (userCode !== 'Visitor') {
-				const auth = cacheManager.get('auth');
 				cacheManager.updateObject('auth', {
 					typeId: typeId,
 					levelId: levelId,
 					subjectId: subjectId,
-					zhangId: data.activeProduct == auth.levelId && data.activeXueke == auth.cardId ? auth.zhangId :
-						0,
-					currentZhang: 0
 				})
 				// 通知岛重新调用接口
 				cacheManager.remove('zhangInfo')

pages/selectVersion/selectVersion.vue

@@ -29,11 +29,8 @@
 <script setup>
 	import {
 		reactive,
-		toRefs,
-		toRef,
 		computed,
 		nextTick,
-		ref,
 	} from "vue";
 	import * as httpApi from "@/api/selectGradesTerms.js";
 	import {
@@ -42,10 +39,7 @@
 		findTreeNode
 	} from "@/utils/common.js"
 	import cacheManager from "@/utils/cacheManager.js"
-	import {
-		getCommonTree,
-		getIndexTree
-	} from "../../api/selectGradesTerms";
+  import {getDataFromStr} from "@/utils/common.js"
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
@@ -75,7 +69,6 @@
 		levelId,
 		subjectId,
 		shangxiaId, // 上下册Id
-		shangxiaVersionId, // 上下册版本Id
 		typeId,
 		tipFlag
 	}) => {
@@ -83,10 +76,10 @@
 		if (userCode !== 'Visitor') {
 			initUserProducts();
 		} else {
-			data.levelId = levelId;
+			data.levelId = getDataFromStr(levelId)[0];
 			data.subjectId = subjectId || 1;
 			data.shangxiaId = shangxiaId || 1; // 默认选中上册
-			data.shangxiaVersionId = shangxiaVersionId; // 默认选中上册
+			data.shangxiaVersionId = getDataFromStr(levelId)[1]; // 默认选中上册
 			data.typeId = typeId;
 			data.activeTipFlag = tipFlag || '0';
 			initVisitProducts();
@@ -140,10 +133,14 @@
 	function goDAOToStudy() {
 		const userCode = getUserIdentity();
 		if (userCode !== 'Visitor') {
-			const auth = cacheManager.get('auth');
+      const {
+        levelId: levelIdD,
+      } = cacheManager.get('auth');
+
+      let levelId = getDataFromStr(levelIdD)[0];
 			cacheManager.updateObject('auth', {
 				// 修改上下册+版本字段
-				zhangId: data.shangxiaVersionId,
+        levelId: levelId+','+data.shangxiaVersionId,
 			})
 			// 通知岛重新调用接口
 			cacheManager.remove('zhangInfo')
@@ -161,17 +158,19 @@
 	
 
 	function initUserProducts() {
-		const {
-			levelId,
-		} = cacheManager.get('auth');
+
+    const {
+      levelId: levelIdD,
+    } = cacheManager.get('auth');
+
+    let levelId = getDataFromStr(levelIdD)[0];
+
 		data.levelId = levelId;
 		httpApi.getUserZhangList({
 			levelId: data.levelId
 		}).then(res => {
 			data.allList = res.data || [];
-			const {
-				zhangId,
-			} = cacheManager.get('auth');
+			let	zhangId = getDataFromStr(levelIdD)[1]
 			if (zhangId) {
 				// LevelId 翻找根节点学科，执行选中高亮操作
 				const obj1 = findRootNode(data.allList, zhangId, 'id');

utils/common.js

@@ -133,4 +133,9 @@ export function findTreeNode(tree, targetId, childrenKey = 'children', idKey = '
 		}
 	}
 	return null;
+}
+
+
+export function getDataFromStr(strdata) {
+	return strdata.split(',')
 }