修改levelId

pages/selectGradesTerms/index.vue

@@ -85,12 +85,13 @@
 					levelId: levelIdD,
 				} = cacheManager.get('auth');
 
-        let levelId = getDataFromStr(levelIdD)[0];
+				let levelId = getDataFromStr(levelIdD)[0];
 
 				if (levelId) {
 					// LevelId 翻找根节点学科，执行选中高亮操作
-					const xuekeObj = findRootNode(data.xuekeData, levelId, 'levelId');
-					const productObj = findTreeNode(data.xuekeData, levelId, 'children','levelId');
+					const xuekeObj = findRootNode(data.xuekeData, +levelId, 'levelId');
+					const productObj = findTreeNode(data.xuekeData, +levelId, 'children','levelId');
+					console.log('productObj',productObj,data.xuekeData,levelId)
 					data.activeProduct = productObj.id;
 					data.activeXueke = xuekeObj.id;
 				} else {

pages/selectVersion/selectVersion.vue

@@ -13,7 +13,8 @@
 				<scroll-view scroll-y="true" class="select-version-body" :scroll-into-view="data.scrollTop">
 					<view class="version-content-box">
 						<!-- 产品 -->
-						<view v-for="item in list" :key="item.id" :id="`s_${item.id}`" @click="handleSelectVersion(item)"
+						<view v-for="item in list" :key="item.id" :id="`s_${item.id}`"
+							@click="handleSelectVersion(item)"
 							:class="[ 'version-item', {'active': item.id == data.shangxiaVersionId} ]">
 							<view class="version-item-border">{{item.lable}}</view>
 						</view>
@@ -39,7 +40,9 @@
 		findTreeNode
 	} from "@/utils/common.js"
 	import cacheManager from "@/utils/cacheManager.js"
-  import {getDataFromStr} from "@/utils/common.js"
+	import {
+		getDataFromStr
+	} from "@/utils/common.js"
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
@@ -55,13 +58,13 @@
 		shangxiaId: 1, // 上下册
 		shangxiaVersionId: null, // 当前版本
 	})
-	
+
 	const list = computed(() => {
 		if (!data.allList.length) {
 			return []
 		}
 		const d_id = data.shangxiaId;
-	
+
 		return data.allList.find(item => item.id == d_id).children
 	})
 
@@ -128,20 +131,25 @@
 		}
 		goDAOToStudy();
 	}
-	
+
 	// 跳转 岛 学习
 	function goDAOToStudy() {
 		const userCode = getUserIdentity();
 		if (userCode !== 'Visitor') {
-      const {
-        levelId: levelIdD,
-      } = cacheManager.get('auth');
-
-      let levelId = getDataFromStr(levelIdD)[0];
+			const {
+				levelId: levelIdD,
+			} = cacheManager.get('auth');
+
+			let levelId = getDataFromStr(levelIdD)[0];
+			
+			console.log('levelId',levelId,data.shangxiaVersionId,levelId + ',' + data.shangxiaVersionId)
+			
 			cacheManager.updateObject('auth', {
 				// 修改上下册+版本字段
-        levelId: levelId+','+data.shangxiaVersionId,
+				levelId: levelId + ',' + data.shangxiaVersionId,
 			})
+			
+			
 			// 通知岛重新调用接口
 			cacheManager.remove('zhangInfo')
 			uni.redirectTo({
@@ -153,24 +161,24 @@
 				url: `/pages/study/index?levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.activeTipFlag}&youkeZhangId=${data.shangxiaVersionId}`
 			})
 		}
-	
+
 	}
-	
+
 
 	function initUserProducts() {
 
-    const {
-      levelId: levelIdD,
-    } = cacheManager.get('auth');
+		const {
+			levelId: levelIdD,
+		} = cacheManager.get('auth');
 
-    let levelId = getDataFromStr(levelIdD)[0];
+		let levelId = getDataFromStr(levelIdD)[0];
 
 		data.levelId = levelId;
 		httpApi.getUserZhangList({
 			levelId: data.levelId
 		}).then(res => {
 			data.allList = res.data || [];
-			let	zhangId = getDataFromStr(levelIdD)[1]
+			let zhangId = getDataFromStr(levelIdD)[1]
 			if (zhangId) {
 				// LevelId 翻找根节点学科，执行选中高亮操作
 				const obj1 = findRootNode(data.allList, zhangId, 'id');
@@ -197,8 +205,6 @@
 			data.allList = res.data || [];
 		})
 	}
-
-
 </script>
 
 <style>

utils/common.js

@@ -137,5 +137,8 @@ export function findTreeNode(tree, targetId, childrenKey = 'children', idKey = '
 
 
 export function getDataFromStr(strdata) {
-	return strdata.split(',')
+	if (!strdata) {
+		return []
+	}
+	return strdata.toString().split(',')
 }