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

pages/study/index.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="ezy-study-page">
-		<view class="study-school-year">{{gradeTerm}}</view>
+		<view class="study-school-year" @click="clickGradeTerm">{{gradeTerm}}</view>
 		<view class="ezy-study-wrap">
 			<view class="chapter-box" @click="handleCheckCatalogue">{{infoData.numberStr}}</view>
 			<view class="chapter-title-box">{{infoData.zhangName}}</view>
 			<view>
 				<view class="brand-item" v-for="(item,index) in infoData.jieList" :key="index" @click="listClick(item)"
-				:class= "index ==0?'brand-active':''">
-				<view class="brand-icon" v-if="index ==0">1</view>
-				<view class="brand-lock" v-else></view>
-				<view class="brand-content">{{item.jieName}}</view>
+					:class="index ==0?'brand-active':''">
+					<view class="brand-icon" v-if="index ==0">1</view>
+					<view class="brand-lock" v-else></view>
+					<view class="brand-content">{{item.jieName}}</view>
 				</view>
 			</view>
-			
+
 		</view>
 
 		<!-- <uni-button  style="margin-top: 200px;display: block;" @click="goKaoshi">goKaoshi</uni-button>
@@ -127,13 +127,18 @@
 			gradeTerm.value = translateData(res.data);
 			recordZhangJie()
 		})
-	}
-	function getZhangInfo() {
-		let req = {
+	}
+
+	function getZhangInfo(data) {
+		let req = data ? {
+			nianji: selectZhang.value.nianji,
+			xueqi: selectZhang.value.xueqi,
+			zhangId: selectZhang.value.zhangId,
+		} : {
 			nianji: routeParams.value.nianji,
-			xueqi: routeParams.value.xueqi,
+			xueqi: routeParams.value.xueqi,
 			zhangId: routeParams.value.zhangId,
-		}
+		};
 		userZhangInfo(req).then(res => {
 			infoData.jieList = res.data.jieList
 			infoData.haveFlag = res.data.haveFlag
@@ -155,6 +160,7 @@
 	function handleChangeZhang(data) {
 		console.log("章", data);
 		selectZhang.value = data;
+		getZhangInfo(true)
 	}
 
 	function goKaoshi() {
@@ -168,10 +174,10 @@
 
 	function listClick(data) {
 
-		data.videoId = 'b997f16cb9cb474cb93526cff77d8801'
-		data.progressMarkers = []
-		data.zhangId = infoData.zhangId
-		data.nianji = infoData.nianji
+		data.videoId = 'b997f16cb9cb474cb93526cff77d8801'
+		data.progressMarkers = []
+		data.zhangId = infoData.zhangId
+		data.nianji = infoData.nianji
 		data.xueqi = infoData.xueqi
 		const pageData = {
 			//	videoId:data.videoId,
@@ -215,7 +221,7 @@
 			}],
 		}
 		uni.navigateTo({
-			//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
+			//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
 			url: '/pages/study/lookShipin?studyData=' + JSON.stringify(data)
 		})
 	}
@@ -224,8 +230,10 @@
 		catalogueRef.value.showPopup();
 	}
 
-	function goBack() {
-		uni.navigateBack()
+	function clickGradeTerm() {
+		uni.navigateTo({
+			url: '/pages/selectGradesTerms/index'
+		})
 	}
 
 	function eggBtn() {