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

components/catalogue/catalogue.vue

@@ -13,7 +13,9 @@
 								<!-- 章名 -->
 								<text class="collapse-name">{{item.zhangName}}</text>
 								<!-- 锁 -->
-								<view class="collapse-lock" v-if="index!=0"></view>
+								<template>
+									<view class="collapse-lock" v-if="index!=0"></view>
+								</template>
 							</view>
 					</template>
 					<view class="collapse-content-box">
@@ -45,7 +47,7 @@
 		nianji: {
 			type: [String, Number],
 		},
-		xueqi: {
+		xueke: {
 			type: [String, Number],
 		}
 	})
@@ -58,9 +60,6 @@
 	const list = ref([]); // 章节
 	const activeCollapse = ref('');
 
-	const popup_background_color = `rgba(0,0,0,0.2)`; // 【弹出框模态层背景颜色】
-
-
 	/**
 	 * @summary 展示弹窗 暴露函数
 	 */

components/catalogue/useCatalogue.js

@@ -13,17 +13,17 @@ import * as httpCatalogue from "@/api/catalogue.js"
 
 export function useCatalogue(props) {
 	const data = reactive({
-		xueqi: null,
+		xueke: null,
 		nianji: null
 	})
 
 	data.nianji = props.nianji;
-	data.xueqi = props.xueqi;
+	data.xueke = props.xueke;
 
 	async function getCatalogue() {
 		return await catchError(httpCatalogue.getCatalogue({
 			nianji: +data.nianji,
-			xueqi: +data.xueqi
+			cardId: +data.xueke
 		}));
 	}
 

components/points/uni-points.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="score-btn-box">
 				<view @click="checkAnswer" class="ckst-btn"></view>
-				<view @click="goStudyContinue" class="jxxx-btn"></view>
+				<view @click="goStudyContinue" v-if="showContinue" class="jxxx-btn"></view>
 			</view>
 		</view>
 	</uni-popup>
@@ -19,6 +19,14 @@
 		ref,
 		reactive
 	} from "vue"
+	
+	const props = defineProps({
+		showContinue: {
+			type: Boolean,
+			default: true
+		}
+	})
+	
 	const popupRef = ref(null)
 	const popup_background_color = `rgba(0,0,0,0.2)`; // 【弹出框模态层背景颜色】
 

pages/study/index.vue

@@ -31,7 +31,7 @@
 		<!-- 蛋 -->
 		<egg-dialog ref="eggDialogRef" @eggBtn="eggBtn"></egg-dialog>
 
-		<catalogue ref="catalogueRef" :nianji="routeParams.nianji" :xueqi="routeParams.xueqi"
+		<catalogue ref="catalogueRef" :nianji="routeParams.nianji" :xueke="routeParams.xueke"
 			@change-zhang="handleChangeZhang"></catalogue>
 		<CustomTabBar></CustomTabBar>
 
@@ -82,7 +82,7 @@
 		haveFlag: '',
 		nianji: '',
 		number: '',
-		xueqi: '',
+		xueke: '',
 		zhangId: '',
 		zhangName: '',
 		numberStr: '',
@@ -139,11 +139,11 @@
 	function getCommonZhang(data) {
 		let req = data ? {
 			nianji: selectZhang.value.nianji,
-			xueqi: selectZhang.value.xueqi,
+			xueke: selectZhang.value.xueke,
 			zhangId: selectZhang.value.zhangId,
 		} : {
 			nianji: routeParams.value.nianji,
-			xueqi: routeParams.value.xueqi,
+			xueke: routeParams.value.xueke,
 			zhangId: routeParams.value.zhangId,
 		};
 		getCommonZhangInfo(req).then(res => {
@@ -152,14 +152,14 @@
 			infoData.nianji = res.data.nianji
 			infoData.number = res.data.number
 			infoData.numberStr = res.data.numberStr
-			infoData.xueqi = res.data.xueqi
+			infoData.xueke = res.data.xueke
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
 			gradeTerm.value = translateData(res.data);
 			useTabBarHistory().setTabBarStorage({
 				nianji: res.data.nianji,
 				zhangId: res.data.zhangId,
-				xueqi: res.data.xueqi
+				xueke: res.data.xueke
 			})
 			cacheManager.set("zhangJieCacheInfo", res.data)
 		})
@@ -191,10 +191,10 @@
 				onSwipeLeft();
 			} else if (distanceX < 0) {
 				onSwipeRight();
-			}
+			}
 			isSliding.value = false
-		}else{
-			console.log(11111);
+		}else{
+			console.log(11111);
 		}
 	}
 
@@ -205,7 +205,7 @@
 			nianji: routeParams.value.nianji,
 			userId: JSON.parse(getAuth()).userId,
 			zhangId: infoData.zhangId,
-			xueqi: routeParams.value.xueqi,
+			xueke: routeParams.value.xueke,
 
 		}
 		userLocate(req).then(res => {
@@ -216,7 +216,7 @@
 	function getCommonZhangFirst() {
 		let req = {
 			nianji: routeParams.value.nianji,
-			xueqi: routeParams.value.xueqi,
+			xueke: routeParams.value.xueke,
 
 		}
 		getCommonZhangFirstInfo(req).then(res => {
@@ -225,14 +225,14 @@
 			infoData.nianji = res.data.nianji
 			infoData.number = res.data.number
 			infoData.numberStr = res.data.numberStr
-			infoData.xueqi = res.data.xueqi
+			infoData.xueke = res.data.xueke
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
 			gradeTerm.value = translateData(res.data);
 			useTabBarHistory().setTabBarStorage({
 				nianji: res.data.nianji,
 				zhangId: res.data.zhangId,
-				xueqi: res.data.xueqi
+				xueke: res.data.xueke
 			})
 			cacheManager.set("zhangJieCacheInfo", res.data)
 		})
@@ -241,7 +241,7 @@
 	function getZhangFirst() {
 		let req = {
 			nianji: routeParams.value.nianji,
-			xueqi: routeParams.value.xueqi,
+			xueke: routeParams.value.xueke,
 
 		}
 		userZhangFirstInfo(req).then(res => {
@@ -250,7 +250,7 @@
 			infoData.nianji = res.data.nianji
 			infoData.number = res.data.number
 			infoData.numberStr = res.data.numberStr
-			infoData.xueqi = res.data.xueqi
+			infoData.xueke = res.data.xueke
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
 			gradeTerm.value = translateData(res.data);
@@ -258,7 +258,7 @@
 			useTabBarHistory().setTabBarStorage({
 				nianji: res.data.nianji,
 				zhangId: res.data.zhangId,
-				xueqi: res.data.xueqi
+				xueke: res.data.xueke
 			})
 		})
 	}
@@ -266,11 +266,11 @@
 	function getZhangInfo(data) {
 		let req = data ? {
 			nianji: selectZhang.value.nianji,
-			xueqi: selectZhang.value.xueqi,
+			xueke: selectZhang.value.xueke,
 			zhangId: selectZhang.value.zhangId,
 		} : {
 			nianji: routeParams.value.nianji,
-			xueqi: routeParams.value.xueqi,
+			xueke: routeParams.value.xueke,
 			zhangId: routeParams.value.zhangId,
 		};
 		userZhangInfo(req).then(res => {
@@ -279,7 +279,7 @@
 			infoData.nianji = res.data.nianji
 			infoData.number = res.data.number
 			infoData.numberStr = res.data.numberStr
-			infoData.xueqi = res.data.xueqi
+			infoData.xueke = res.data.xueke
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
 			gradeTerm.value = translateData(res.data);
@@ -287,13 +287,13 @@
 			useTabBarHistory().setTabBarStorage({
 				nianji: res.data.nianji,
 				zhangId: res.data.zhangId,
-				xueqi: res.data.xueqi
+				xueke: res.data.xueke
 			})
 		})
 	}
 
 	function translateData(data) {
-		return gradeMapping[data.nianji] + termMapping[data.xueqi]
+		return gradeMapping[data.nianji] + termMapping[data.xueke]
 	}
 
 	function handleChangeZhang(data) {
@@ -305,9 +305,9 @@
 	function goKaoshi(data) {
 		let zhangId = selectZhang.value ? selectZhang.value.zhangId : infoData.zhangId;
 		let nianji = routeParams.value.nianji;
-		let xueqi = routeParams.value.xueqi;
+		let xueke = routeParams.value.xueke;
 		uni.navigateTo({
-			url: `/pages/unitTest/index?jieId=${data.jieId}&zhangId=${zhangId}&nianji=${nianji}&xueqi=${xueqi}`
+			url: `/pages/unitTest/index?jieId=${data.jieId}&zhangId=${zhangId}&nianji=${nianji}&xueke=${xueke}`
 		})
 	}
 
@@ -337,7 +337,7 @@
 		}]
 		data.zhangId = infoData.zhangId
 		data.nianji = infoData.nianji
-		data.xueqi = infoData.xueqi
+		data.xueke = infoData.xueke
 		const pageData = {
 			//	videoId:data.videoId,
 			videoId: 'b997f16cb9cb474cb93526cff77d8801',
@@ -419,7 +419,7 @@
 
 	function clickGradeTerm() {
 		uni.navigateTo({
-			url: `/pages/selectGradesTerms/index?&nianji=${routeParams.value.nianji}&xueqi=${routeParams.value.xueqi}`,
+			url: `/pages/selectGradesTerms/index?&nianji=${routeParams.value.nianji}&xueke=${routeParams.value.xueke}`,
 		})
 	}
 

pages/unitTest/index.vue

@@ -11,8 +11,8 @@
 				<template v-slot:default="{item}">
 					<view class="body" v-if="item.mta_show">
 						<danxuan :question="item" v-if="item.type == '1'"></danxuan>
-			  <!-- <panduan :question="item" v-if="item.type == '2'"></panduan> -->
-			  <!-- <tiankong :question="item" v-if="item.type == '3'"></tiankong> -->
+						<panduan :question="item" v-if="item.type == '2'"></panduan>
+						<tiankong :question="item" v-if="item.type == '3'"></tiankong>
 					</view>
 				</template>
 			</w-swiper>
@@ -28,10 +28,10 @@
 
 		<!-- 答卷 -->
 		<chengji ref="chengjiRef" :list="list" :jieId="jieId" :zhangId="zhangId"
-			:nianji="nianji" :xueqi="xueqi"></chengji>
+			:nianji="nianji" :xueke="xueke"></chengji>
 
 		<!-- 分数弹窗 -->
-		<uniPointsVue ref="uniPointsRef" @checkAnswer="checkAnswer" @goStudy="goStudyContinue"></uniPointsVue>
+		<uniPointsVue ref="uniPointsRef" @checkAnswer="checkAnswer" @goStudy="goStudyContinue" :showContinue="zhangType== 'last'"></uniPointsVue>
 	</view>
 
 </template>
@@ -70,8 +70,9 @@
 		zhangId,
 		jieId,
 		nianji,
-		xueqi,
+		xueke,
 		showTishi,
+		zhangType,
 
 		handleSubmit,
 		initPage,
@@ -87,24 +88,22 @@
 	}
 	// 继续学习
 	async function goStudyContinue() {
-		handleBack();
-		
 		// 设置 从单元测试 到 岛 的路由参数
 		
-		/* const [err, data] = await catchError(httpUnit.getnextZhangInfo({
+		const [err, data] = await catchError(httpUnit.getnextZhangInfo({
 			nianji: nianji.value,
-			xueqi: xueqi.value,
+			cardId: xueke.value,
 			zhangId:  zhangId.value
 		}))
 		
 		uni.navigateTo({
-			url: `/pages/study/index?nianji=${nianji.value}&xueqi=${xueqi.value}&zhangId=${data.zhangId}`
-		}) */
+			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${data.zhangId}`
+		})
 	}
 	
 	function handleBack() {
 		uni.navigateTo({
-			url: `/pages/study/index?nianji=${nianji.value}&xueqi=${xueqi.value}&zhangId=${zhangId.value}`
+			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${zhangId.value}`
 		})
 	}
 	

pages/unitTest/useUnit.js

@@ -21,6 +21,7 @@ function useJifen() {
 		rightAnswer: 0, // 答对
 		wrongAnswer: 0, // 答错
 		jifen: 0, // 积分
+		zhangType: '' // 当前章类型  'last' 代表最后一章，最后一章无继续
 	})
 
 	function updateJifen({rightAnswer,wrongAnswer,jifen}) {
@@ -46,17 +47,17 @@ export function useExam() {
 		jieId: null, // 节Id
 		zhangId: null,
 		nianji: null,
-		xueqi: null,
+		xueke: null,
 	})
 	
 	onLoad((options) => {
 		const {
-			jieId,zhangId,nianji,xueqi
+			jieId,zhangId,nianji,xueke
 		} = options;
 		data.jieId = jieId; // 需要路由参数 节Id
 		data.zhangId = zhangId;// 需要路由参数 章Id
 		data.nianji = nianji; // 需要年纪Id 来执行返回页面
-		data.xueqi = xueqi; // 需要年纪Id 来执行返回页面
+		data.xueke = xueke; // 需要年纪Id 来执行返回页面
 	
 		
 		// 初始化页面数据