Merge remote-tracking branch 'origin/2025鹅状元dev' into 2025鹅状元dev

common/styles/global/pages.scss

@@ -2075,7 +2075,7 @@
 // 单词详情- 学
 .words-xue-box{
 	text-align: center;
-	.words-xue-body{height: calc(100vh - 380rpx - var(--status-bar-height));overflow-y: auto;}
+	.words-xue-body{height: calc(100vh - 390rpx - var(--status-bar-height));overflow-y: auto;}
 	.word-block-box{
 		text{min-width: 50rpx;height: 50rpx;line-height: 48rpx;font-size: 26rpx;margin: 12rpx 0;
 		padding: 0 10rpx;box-sizing: border-box;border-radius: 8rpx;
@@ -2138,7 +2138,7 @@
 // 单词详情-拼
 .words-pin-box{
 	display: flex;flex-direction: column;padding: 10rpx;box-sizing: border-box;
-	height: calc(100vh - 380rpx - var(--status-bar-height));
+	height: calc(100vh - 390rpx - var(--status-bar-height));
 	.pin-body-box{flex: 1;overflow-y: auto;}
 	// 拼读 +选择
 	.pin-words-box{
@@ -2194,7 +2194,7 @@
 // 单词详情-读
 .words-du-box{
 	display: flex;flex-direction: column;padding: 10rpx;box-sizing: border-box;
-	height: calc(100vh - 380rpx - var(--status-bar-height));
+	height: calc(100vh - 390rpx - var(--status-bar-height));
 	.du-body-box{flex: 1;text-align: center;}
 	.du-yb-play-box{margin: 56rpx 0 42rpx;}
 	.du-words-explain-box{margin-top: 24rpx;}
@@ -2222,7 +2222,7 @@
 // 单词详情-选
 .words-xuan-box{
 	display: flex;flex-direction: column;padding: 10rpx;box-sizing: border-box;
-	height: calc(100vh - 380rpx - var(--status-bar-height));
+	height: calc(100vh - 390rpx - var(--status-bar-height));
 	.xuan-body-box{flex: 1;overflow-y: auto;text-align: center;}
 	.show-words-box{
 		width: 100%;overflow: hidden;word-wrap: break-word;word-break: break-all;
@@ -2258,7 +2258,7 @@
 // 单词详情-背
 .words-bei-box{
 	display: flex;flex-direction: column;text-align: center;
-	height: calc(100vh - 380rpx - var(--status-bar-height));
+	height: calc(100vh - 390rpx - var(--status-bar-height));
 	// 答案
 	.words-answer-box{
 		min-width: 420rpx;max-width: 90%;height: 120rpx;line-height: 120rpx;margin: 64rpx auto 0;

pages/study/lookShipinNew.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="ezy-course-page" :style="{backgroundImage: 'url(' + courseBjFun() + ')'}">
 		<view class="icon-title-navBar-box">
-			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<view @click="goBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{shipinTitle}}</text>
 		</view>
 		<view class="ezy-video-box course-video-box">
@@ -132,7 +132,7 @@
 					toast('数据错误,缓存丢失/ jieId丢失')
 					return false
 				}
-				
+
 				const curZhangId = cacheManager.get('zhangInfo').curZhangId;
 				const resZhangList = cacheManager.get('zhangInfo').zhangList;
 				const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
@@ -158,8 +158,8 @@
 				this.progressMarkers = this.pageData.jiedianList || []
 				this.getLive(); //获取播放凭证
 			},
-			
-	
+
+
 			playEnd(data) {
 				console.log('data', data);
 				console.log('111111');
@@ -198,7 +198,25 @@
 				plus.screen.unlockOrientation();
 				// #endif
 				this.$refs.popupRef.close();
-				this.goUpPage()
+
+
+				if (!cacheManager.get('auth')) {
+					uni.redirectTo({
+						url: '/pages/study/index?levelId=' + this.levelId + '&typeId=' + this.typeId +
+							'&subjectId=' +
+							this.subjectId + '&tipFlag=' + this.tipFlag
+					})
+				} else {
+					uni.redirectTo({
+						url: `/pages/study/index`
+
+					})
+
+				}
+
+
+
+
 			},
 			goNext() {
 				// #ifdef APP-PLUS
@@ -232,7 +250,7 @@
 						})
 					} else if (this.pageData.lastFlag == 1 && this.pageData.type == 1) {
 						// 当前是本章最后一节，并且是 视频 切换下一章
-						this.goUpPage()
+						this.goNextZhang()
 					} else {
 						uni.redirectTo({
 							//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
@@ -271,7 +289,7 @@
 					this.seekTime = data.offset
 				});
 			},
-			goUpPage() {
+			goNextZhang() {
 				if (!cacheManager.get('auth')) {
 					uni.redirectTo({
 						url: '/pages/study/index?levelId=' + this.levelId + '&typeId=' + this.typeId +
@@ -279,14 +297,26 @@
 							this.subjectId + '&tipFlag=' + this.tipFlag
 					})
 				} else {
-					uni.redirectTo({
-						url: `/pages/study/index`
+					let zhang = this.cacheZhangInfo.zhangList[this.cacheCurrentZhangIndex]
+					if (zhang.zhangId == this.pageData.nextZhangId) {
+						cacheManager.updateObject('zhangInfo', {
+							curZhangId: zhang.zhangId
+						})
+						// 证明他是这个章最后一个
+						uni.redirectTo({
+							url: `/pages/study/index`
 
-					})
+						})
+					} else {
+						let zhang = this.cacheZhangInfo.zhangList[this.cacheCurrentZhangIndex + 1]
+						cacheManager.updateObject('zhangInfo', {
+							curZhangId: zhang.zhangId
+						})
+						uni.redirectTo({
+							url: '/pages/study/lookShipinNew?jieId=' + zhang.jieList[0].jieId
+						})
+					}
 				}
-
-
-
 			},
 			goPayPage() {
 				let zhangInfoLocal = cacheManager.get('zhangInfo')