Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/custom-tabbar/custom-tabbar.vue

@@ -12,10 +12,10 @@ export default {
   data() {
     return {
       tabList: [
-        {iconPath: 'static/images/tabbar/unselect/plan-sj.png',path:'/pages/study/index' },
+        {iconPath: 'static/images/tabbar/unselect/plan-sj.png',path:`/pages/study/index?zhangId=${this.$state.zhangId}&nianji=${this.$state.nianji}&xueqi=${this.$state.xueqi}` },
         {iconPath: 'static/images/tabbar/unselect/develop-sj.png',path:'/pages/study/index' },
         {iconPath: 'static/images/tabbar/unselect/partner-sj.png',path:'/pages/study/index' },
-        {iconPath: 'static/images/tabbar/unselect/my-sj.png',path:'/pages/my/index' },
+        {iconPath: 'static/images/tabbar/unselect/my-sj.png',path:`/pages/my/index?zhangId=${this.$state.zhangId}&nianji=${this.$state.nianji}&xueqi=${this.$state.xueqi}` },
         // 更多 Tab 项...
       ]
     };
@@ -48,7 +48,11 @@ export default {
 	      const tabBarPages = ['/pages/study/index', '/pages/study/index','/pages/study/index','/pages/my/index'];
 	      return tabBarPages.includes(path);
 	    }
+  },
+  created() {
+  	console.log(this.$state);
   }
+  
 }
 </script>
 

pages/study/index.vue

@@ -41,7 +41,8 @@
 	} from "@/api/learnPlan.js"
 	import {
 		reactive,
-		ref,
+		ref,
+		getCurrentInstance,
 		onMounted
 	} from "vue";
 	import {
@@ -84,7 +85,10 @@
 	};
 	const routeParams = ref(null);
 
-	onLoad((options) => {
+	onLoad((options) => {
+		
+	//	 appContext.config.globalProperties.$state
+		   // const state = appContext.config.globalProperties.$state;
 		console.log(options)
 		// 获取路由参数
 		routeParams.value = options;
@@ -93,13 +97,21 @@
 			getZhangFirst()
 		} else {
 			getZhangInfo()
-		}
-		// 调用定位章节 （后台记录）
+		}
 
+		// 设置全局变量
+		setGlobalData(options)
 		// 蛋
 		// eggDialogRef.value.eggShow();
 	})
-
+
+	function setGlobalData(data){
+		console.log(data);
+		const { appContext } = getCurrentInstance();
+		appContext.config.globalProperties.$state.xueqi = data.xueqi
+		appContext.config.globalProperties.$state.nianji = data.nianji
+		appContext.config.globalProperties.$state.zhangId = data.zhangId
+	}
 	function recordZhangJie() {
 		let req = {
 			nianji: routeParams.value.nianji,
@@ -164,15 +176,16 @@
 	function handleChangeZhang(data) {
 		console.log("章", data);
 		selectZhang.value = data;
-		getZhangInfo(true)
+		getZhangInfo(true)
+		setGlobalData(data)
 	}
 
-	function goKaoshi() {
+	function goKaoshi(data) {
 		let zhangId = selectZhang.value ? selectZhang.value.zhangId : infoData.zhangId;
 		let nianji = routeParams.value.nianji;
 		let xueqi = routeParams.value.xueqi;
 		uni.navigateTo({
-			url: `/pages/unitTest/index?jieId=1&zhangId=${zhangId}&nianji=${nianji}&xueqi=${xueqi}`
+			url: `/pages/unitTest/index?jieId=${data.jieId}&zhangId=${zhangId}&nianji=${nianji}&xueqi=${xueqi}`
 		})
 	}
 	function goLookShipin(data) {
@@ -274,7 +287,7 @@
 	function listClick(data,index) {
 		if(index ==infoData.jieList.length-1){
 			// 最后一项
-			goKaoshi()
+			goKaoshi(data)
 		}else{
 			goLookShipin(data)
 		}

pages/unitTest/index.vue

@@ -62,7 +62,6 @@
 
 	const {setStudyStorage} = useStudyRouteParams();
 	
-	const showTishi = ref(true);
 
 	const {
 		count,
@@ -76,9 +75,11 @@
 		jieId,
 		nianji,
 		xueqi,
+		showTishi,
 
 		handleSubmit,
-		initPage
+		initPage,
+		handleCloseTishi
 	} = useExam();
 
 	const uniPointsRef = ref(null);
@@ -99,13 +100,13 @@
 		}))
 		
 		uni.navigateTo({
-			url: `/pages/study/index?nianji=${nianji.value}&xueqi=${xueqi.value}&zhangId=${data.zhangId}&jieId=${jieId.value}`
+			url: `/pages/study/index?nianji=${nianji.value}&xueqi=${xueqi.value}&zhangId=${data.zhangId}`
 		})
 	}
 	
 	function handleBack() {
 		uni.navigateTo({
-			url: `/pages/study/index?nianji=${nianji.value}&xueqi=${xueqi.value}&zhangId=${zhangId.value}&jieId=${jieId.value}`
+			url: `/pages/study/index?nianji=${nianji.value}&xueqi=${xueqi.value}&zhangId=${zhangId.value}`
 		})
 	}
 	
@@ -113,16 +114,7 @@
 		current.value = index;
 	}
 	
-	// 大鹅关闭追加缓存 --- 单独针对当前手机的缓存提示
-	function handleCloseTishi() {
-		uni.setStorageSync('isShowTishi','has');
-		showTishi.value = false;
-	}
-	// 大鹅显示追加缓存 --- 单独针对当前手机的缓存提示
-	function handleShowTishi() {
-		const isNotShow = Boolean(uni.getStorageSync('isShowTishi'));
-		showTishi.value = !isNotShow;
-	}
+
 </script>
 
 <style lang="scss" scoped>

pages/unitTest/useUnit.js

@@ -36,8 +36,8 @@ function useJifen() {
 }
 
 export function useExam() {
+	const {	showTishi, handleCloseTishi, handleShowTishi} = useTishiLeftRight()
 	const {rightAnswer,wrongAnswer,jifen, updateJifen} = useJifen();
-	
 	const data = reactive({
 		count: 0, // 已答题数
 		total: 0, // 总题数
@@ -94,6 +94,8 @@ export function useExam() {
 		formatListToUse(cList)
 		data.list = cList;
 		data.total = cList.length;
+		
+		handleShowTishi();
 	}
 
 	// 交卷
@@ -116,14 +118,39 @@ export function useExam() {
 	}
 
 
+
 	return {
 		...toRefs(data),
 		rightAnswer,
 		wrongAnswer,
 		jifen,
+		showTishi,
 
 		handleSubmit,
-		initPage
+		initPage,
+		handleCloseTishi,
+		handleShowTishi
 	}
 }
 
+// 提示信息显示隐藏
+function useTishiLeftRight() {
+	
+	const showTishi = ref(false);
+	// 大鹅关闭追加缓存 --- 单独针对当前手机的缓存提示
+	function handleCloseTishi() {
+		uni.setStorageSync('isShowTishi','has');
+		showTishi.value = false;
+	}
+	// 大鹅显示追加缓存 --- 单独针对当前手机的缓存提示
+	function handleShowTishi() {
+		const isNotShow = Boolean(uni.getStorageSync('isShowTishi'));
+		showTishi.value = !isNotShow;
+	}
+	
+	return {
+		showTishi,
+		handleCloseTishi,
+		handleShowTishi
+	}
+}