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

# Conflicts:
#	pages/chanpinXuanze/banben.vue

common/styles/global/components.scss

@@ -93,15 +93,15 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 // 两个元素
 .icon-title-navBar-box{
 	display: flex;align-items: center;justify-content: center;
-	padding: calc(36rpx + var(--status-bar-height)) 20rpx 36rpx;box-sizing: border-box;position: relative;
+	padding: calc(6rpx + var(--status-bar-height)) 20rpx 16rpx;box-sizing: border-box;position: relative;
 	
 	.nav-bar-title{
-		font-size: 36rpx;height: 63rpx;line-height: 63rpx;color: #fff;
+		font-size: 34rpx;height: 63rpx;line-height: 63rpx;color: #fff;
 		max-width: 70%;position: relative;z-index: 1;
 	}
 	.nav-bar-icon{
 		width: 100rpx;height: 100rpx;display: flex;align-items: center;
-		position: absolute;left: 0;top: calc(14rpx + var(--status-bar-height));z-index: 1;
+		position: absolute;left: 0;top: calc( var(--status-bar-height) - 12rpx);z-index: 1;
 	}
 	.nav-bar-icon::before{
 		width: 24rpx;height: 38rpx;content: '';display: block;margin-left: 24rpx;

common/styles/global/pages.scss

@@ -851,6 +851,9 @@
 	padding-top:var(--status-bar-height);display: flex;flex-direction: column;
 	@include ezy-no-repeat-cover(top);
 	.shiti-frame-box{overflow-y: auto;}
+	.dajx-video-box{
+		width: 95%;
+	}
 	.dajx-content-box{
 		width: 615rpx;flex: 1;z-index: 2;margin: 0 auto;overflow-y: auto;
 		.slfx-title,.spjj-title{
@@ -2134,17 +2137,25 @@
 
 // 看视频
 .ezy-ksp-page{
-	.ksp-body{position: relative;z-index: 1;}
+	width: 100%;height: 100vh;display: flex;flex-direction: column;
+	.ksp-tab-box{
+		display: flex;justify-content: space-evenly;border-bottom: 1rpx solid #b7defd;margin-bottom: 32rpx;
+		.tab-item{color: #9a9a9a;font-size: 34rpx;padding: 16rpx 24rpx;}
+		.active{color: #5895f7;border-bottom: 4rpx solid #1684fc;}
+	}
+	.ksp-page-body{
+		// display: flex;
+	}
 	.ksp-video-box{
-		width: 100%;height: 423rpx;
+		width: 95%;height: 423rpx;padding: 8px;box-sizing: border-box;border-radius: 16rpx;margin: 0 auto 32rpx;
 		.prism-big-play-btn{
-			width: 90rpx;height: 90rpx;
-			background-image: url("@/static/images/xuexi/video-play-btn.png");
+			width: 100rpx;height: 100rpx;opacity: 0.8;
+			background-image: url("@/static/images/xuexi/play-btn.png");
 		}
 	}
 	.ksp-item-list{
 		width: 95%;margin: 0 auto 32rpx;border-radius: 16rpx;position: relative;
-		background-color: #5894f6;padding: 32rpx 0 1rpx;box-sizing: border-box;
+		background-color: #5894f6;padding: 20rpx 0 1rpx;box-sizing: border-box;
 		overflow: hidden;box-shadow: 0 0rpx 12rpx rgba(100, 159, 241, 0.4);
 	}
 	.ksp-item-list::before{
@@ -2152,7 +2163,16 @@
 		background-image: url("@/static/images/xuexi/ksp-item-top-bj.png");
 		position: absolute;left: 0;right: 0;top: 0;z-index: 1;
 	}
-	.item-title{color: #fff;font-size: 36rpx;margin:0 0 24rpx 24rpx;position: relative;z-index: 2;}
+	.list-head{
+		display: flex;align-items: center;justify-content: space-between;
+		position: relative;z-index: 2;padding:0  24rpx 24rpx;
+		.list-title{color: #fff;font-size: 36rpx;}
+		.list-btn{
+			width: 210rpx;height: 72rpx;@include ezy-no-repeat-cover;
+			background-image: url("@/static/images/xuexi/ksp-video-play.png");
+		}
+	}
+	
 	.ksp-item-box{
 		width: 670rpx;height: 150rpx;margin: 0 auto 24rpx;padding-left: 24rpx;
 		display: flex;align-items: center;box-sizing: border-box;z-index: 2;position: relative;

pages/chanpinMy/aboutPage.vue

@@ -40,9 +40,10 @@
 	
 	// 关于我们
 	function handleBack(){
-		uni.redirectTo({
+		/* uni.redirectTo({
 			url: '/pages/chanpinMy/myInfo'
-		});
+		}); */
+		uni.navigateBack()
 	}
 	
 	onLoad((options) => {

pages/chanpinMy/my.vue

@@ -111,7 +111,7 @@
 	}
 	
 	function yingyongshezhi() {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: '/pages/chanpinMy/myInfo'
 		})
 	}

pages/chanpinMy/myInfo.vue

@@ -41,8 +41,7 @@
 				</view>
 		</view>
 		</view>
-		<CustomTabBar  :currentTabNumber="3">
-		</CustomTabBar>
+		<!-- <CustomTabBar  :currentTabNumber="3"> </CustomTabBar> -->
 		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
 		<tip-small-dialog ref="zhuxiaoDialogRef" @confirm-btn="zhuxiaoBtn" :content="zhuxiaoContent"></tip-small-dialog>
 		<tel-dialog @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
@@ -72,7 +71,7 @@
 		getFilePolicy,
 		updataHead
 	} from '@/api/my.js'
-	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
+	// import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import {
 		onLoad,onShow
 	} from '@dcloudio/uni-app';
@@ -120,9 +119,10 @@
 	}
 
 	function handleBack() {
-		uni.redirectTo({
-			url: '/pages/chanpinMy/my'
-		})
+		// uni.redirectTo({
+		// 	url: '/pages/chanpinMy/my'
+		// })
+		uni.navigateBack()
 	}
 
 	function headClick() {
@@ -323,7 +323,7 @@
 	}
 	// 关于我们
 	function aboutClick() {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: '/pages/chanpinMy/aboutPage'
 		});
 	}

pages/chanpinXuanze/banben.vue

@@ -28,7 +28,7 @@
 				</view>
 			</template>
 		</view>
-		<CustomTabBar :currentTabNumber="0"></CustomTabBar>
+		<!-- <CustomTabBar :currentTabNumber="0"></CustomTabBar> -->
 	</view>
 </template>
 
@@ -36,7 +36,7 @@
 	import {reactive} from "vue";
 	import {onLoad} from "@dcloudio/uni-app"
 	import * as shuxueHttp from "@/api/chanpinShuxue.js"
-  import CustomTabBar from "@/components/custom-tabbar/custom-tabbar.vue";
+  // import CustomTabBar from "@/components/custom-tabbar/custom-tabbar.vue";
 	import cacheManager from "@/utils/cacheManager.js";
 	const data = reactive({
 		dengjiId: null,
@@ -58,9 +58,21 @@
 	  if (cacheManager.get('xuexi-shuxue')) {
 	  	cacheManager.remove("xuexi-shuxue")
 	  }
-    uni.rediresctTos({
+ /*   uni.redirectTo({
       url: `/pages/chanpinneirong/index?banbenId=${item.id}&danyuanId=1&customType=3&chanpinId=${item.chanpinId}&dengjiId=${item.dengjiId}`
-    })
+    }) */
+	const opt = {
+		banbenId: item.id,
+		danyuanId:1, // 测试需要固定为 1
+		chanpinId:item.chanpinId,
+		dengjiId: item.dengjiId
+	}
+	// 跳转
+	uni.switchTab({
+		url: "/pages/chanpinneirong/index"
+	})
+
+
   }
 
 	onLoad((options) => {

pages/chanpinneirong/index.vue

@@ -5,43 +5,49 @@
 			<text class="nav-bar-title">学习</text>
 		</view>
 		<view class="ezy-page-body xuexi-page-body">
-			<view class="change-dy-box">
+			<view class="xxjl-card-box">
 				<!-- 显示内容 -->
-				<view class="change-dy-content">
-					<view>{{ banbenInfo.chanpinName }}</view>
-					<view>
-						<text>等级</text>
-						<text>{{banbenInfo.dengjiName}}</text>
-					</view>
-					<view>
-						<text>版本</text>
-						<text>{{banbenInfo.name}}</text>
-					</view>
-					<view>
-						<text>单元</text>
-						<text>{{banbenInfo.curDanyuanName}}</text>
-					</view>
-					<view>
-						<text>课程</text>
-						<text>{{banbenInfo.curKechengName}}</text>
-					</view>
-					<view>
-						<view class="xx-progress-box">
-							<view>当前学习进度</view>
-							<progress :percent="curProcess" class="xx-progress" stroke-width="10"
-								backgroundColor="#3c7dfd" activeColor="#ffd11c" />
+				<view class="card-body-box">
+					<img :src="banbenInfo.cover" />
+					<view class="body-right">
+						<view>{{ banbenInfo.chanpinName }}</view>
+						<view>
+							<text>等级</text>
+							<text>{{banbenInfo.dengjiName}}</text>
+						</view>
+						<view>
+							<text>版本</text>
+							<text>{{banbenInfo.name}}</text>
+						</view>
+						<view>
+							<text>单元</text>
+							<text>{{banbenInfo.curDanyuanName}}</text>
+						</view>
+						<view>
+							<text>课程</text>
+							<text>{{banbenInfo.curKechengName}}</text>
 						</view>
-						<view class="jxxx-btn" @click="handlePlay(banbenInfo,'jixu')">继续学习</view>
 					</view>
 				</view>
+				<view class="card-progress-box">
+					<view class="xx-progress-box">
+						<view>学习进度</view>
+						<progress :percent="curProcess" class="xx-progress" stroke-width="10"
+							backgroundColor="#3c7dfd" activeColor="#ffd11c" />
+					</view>
+					<view class="jxxx-btn" @click="handlePlay(banbenInfo,'jixu')">继续学习</view>
+				</view>
 			</view>
 			<view class="xx-scroll-body">
 				<view class="xx-item-list">
+					<view class="xx-item-title">— 以下为当前等级课程目录 —</view>
 					<view v-for="danyuanItem in danyuanList" :key="danyuanItem.danyuanId">
-						<view @click="handleClickDanyuan">
-							<view>L{{danyuanItem.danyuanId}}</view>
-							<view>{{danyuanItem.danyuanName}}</view>
-							<view>{{danyuanItem.danyuanIntro}}</view>
+						<view class="item-dy-box" @click="handleClickDanyuan">
+							<view class="dy-left-box">L{{danyuanItem.danyuanId}}</view>
+							<view class="dy-right-box">
+								<view class="dy-name">{{danyuanItem.danyuanName}}</view>
+								<view>{{danyuanItem.danyuanIntro}}</view>
+							</view>
 						</view>
 						<view class="xx-item-box" v-for="jieItem in danyuanItem.jieList" :key="jieItem.jieId"
 							@click="handlePlay(jieItem,'play')">

pages/xinshuxue/components/danyuanInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+		<uni-popup ref="popupRef" :animation="true" :is-mask-click="false"
 			mask-background-color="rgba(255, 255, 255, 0.1);" type="bottom">
 			<view class="xuexi-dagang-page">
 				<view class="dagang-title">

pages/xinshuxue/components/danyuanMulu.vue

@@ -1,64 +0,0 @@
-<template>
-	<view>
-		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-			mask-background-color="rgba(255, 255, 255, 0.1);" type="bottom">
-			<view class="xuexi-dyml-page">
-				<!-- 头部 -->
-				<view class="dyml-title">
-					<text>单元目录</text>
-					<icon @click="goUpPage"></icon>
-				</view>
-				<!-- 目录 -->
-				<view class="xuexi-dyml-body">
-					<view class="dyml-item-box" v-for="item in list" @click="handleSelect(item)" :key="item.danyuanId">
-						<text class="dy-num">{{item.danyuanName}}</text>
-						<text class="dy-title">{{item.intro}}</text>
-						<icon></icon>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref
-	} from 'vue';
-
-	const list = ref([]);
-	const popupRef = ref(null)
-	const emits = defineEmits(['close', 'select'])
-	import * as httpApi from "@/api/chanpinShuxue.js";
-
-	function goUpPage() {
-		popupRef.value.close();
-		emits('close')
-	}
-
-	function showPopup(banbenId) {
-		list.value = [];
-		httpApi.getShuxueChanpinDanyuanMulu({
-			banbenId
-		}).then(res => {
-			list.value = res.data;
-			popupRef.value.open();
-		})
-	}
-
-	function closePopup() {
-		popupRef.value.close();
-	}
-
-	function handleSelect(item) {
-		emits('select', item)
-		closePopup();
-	}
-
-	defineExpose({
-		showPopup
-	})
-</script>
-
-<style>
-</style>

pages/xinshuxue/components/questionJiexi.vue

@@ -8,22 +8,19 @@
 					<view class="nav-bar-title">单元测试</view>
 				</view>
 				<view class="shiti-frame-box">
-					<view class="dajx-content-box">
-						<!-- 思路分析 -->
-						<!-- <view class="slfx-title"></view> -->
-						<!-- <view class="slfx-content"> {{data.answer}}</view> -->
-						<!-- <rich-text class="slfx-content" :nodes="data.answer"></rich-text> -->
-
-						<!-- 视频讲解 -->
-						<view class="spjj-title"></view>
-						<view class="ezy-video-box">
-							<!-- 这里放视频 ↓ -->
-							<view class="ezy-video" ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
-								:change:playAuth="renderScript.receiveMsg" :videoId="videoId"
-								:change:videoId="renderScript.videoIdFun" :hideFlag="hideFlag"
-								:change:hideFlag="renderScript.hideFlagFun" :seekTime="seekTime"
-								:change:seekTime="renderScript.seekTimeFun">
-							</view>
+					<!-- 思路分析 -->
+					<!-- <view class="slfx-title"></view> -->
+					<!-- <view class="slfx-content"> {{data.answer}}</view> -->
+					<!-- <rich-text class="slfx-content" :nodes="data.answer"></rich-text> -->
+					<!-- 视频讲解 -->
+					<view class="spjj-title"></view>
+					<view class="ezy-video-box dajx-video-box">
+						<!-- 这里放视频 ↓ -->
+						<view class="ezy-video" ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
+							:change:playAuth="renderScript.receiveMsg" :videoId="videoId"
+							:change:videoId="renderScript.videoIdFun" :hideFlag="hideFlag"
+							:change:hideFlag="renderScript.hideFlagFun" :seekTime="seekTime"
+							:change:seekTime="renderScript.seekTimeFun">
 						</view>
 					</view>
 				</view>

pages/xinshuxue/lookShipin.vue

@@ -4,47 +4,48 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{jieInfo.jieIntro}}</text>
 		</view>
-		<view class="ksp-body">
-			<view>
-				<view @click="handleSelectHexinti">核心基础题</view>
-				<view @click="handleSelectNengliTishengti">能力提升题</view>
+		<view class="ezy-page-body">
+			<view class="ksp-tab-box">
+				<view class="tab-item" :class="{active: this.showA}" @click="handleSelectHexinti">核心基础题</view>
+				<view class="tab-item" :class="{active: this.showB}" @click="handleSelectNengliTishengti">能力提升题</view>
 			</view>
-			<!-- 核心基础题 -->
-			<videoPlayVue ref="c1" v-show="showA" :key="1" :videoId1="videoId" :progressMarkers1="progressMarkers"
-				:playAuth1="playAuth" :hideFlag1="hideFlag" :seek-time1="seekTime" class="ksp-video-box"
-				@playEnd="playEnd"></videoPlayVue>
-			<view class="ksp-item-list" v-show="showA">
-				<view class="item-title">核心基础题</view>
-				<view class="ksp-item-box" v-for="(item,index) in jieInfo.jiedianList1" :key="index"
-					>
-					<icon class="ksp-icon"></icon>
-					<view>
-						<view class="ksp-title">{{item.name}}</view>
-						<view @click="markersClick(item)">视频讲解</view>
+			<view class="ksp-scroll-view">
+				<!-- 核心基础题 -->
+				<videoPlayVue ref="c1" v-show="showA" :key="1" :videoId1="videoId" :progressMarkers1="progressMarkers"
+					:playAuth1="playAuth" :hideFlag1="hideFlag" :seek-time1="seekTime" class="ksp-video-box"
+					@playEnd="playEnd"></videoPlayVue>
+				<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList1" :key="index" v-show="showA">
+					<view class="list-head">
+						<view class="list-title">{{item.name}}</view>
+						<view class="list-btn" @click="markersClick(item)"></view>
+					</view>
+					<view class="list-body">
 						<!-- <view class="ksp-title">课程位置：{{item.time1}}-{{item.time2}}</view> -->
 						<rich-text :nodes="item.title"></rich-text>
 					</view>
 				</view>
-			</view>
-			<!-- 能力提升题 -->
-			<template v-if="!!videoId2">
-				<videoPlayVue2 ref="c2" v-show="showB" :key="2" :videoId1="videoId2"
-					:progressMarkers1="progressMarkers2" :playAuth1="playAuth2" :hideFlag1="hideFlag2"
-					:seek-time1="seekTime2" class="ksp-video-box" @playEnd="playEnd"></videoPlayVue2>
-				<view class="ksp-item-list" v-show="showB">
-					<view class="item-title">能力提升题</view>
-					<view class="ksp-item-box" v-for="(item,index) in jieInfo.jiedianList2" :key="index"
-						>
-						<icon class="ksp-icon"></icon>
-						<view>
-							<view class="ksp-title">{{item.name}}</view>
-							<view @click="markersClick2(item)">视频讲解</view>
+				<!-- 能力提升题 -->
+				<template v-if="!!videoId2">
+					<videoPlayVue2 ref="c2" v-show="showB" :key="2" :videoId1="videoId2"
+						:progressMarkers1="progressMarkers2" :playAuth1="playAuth2" :hideFlag1="hideFlag2"
+						:seek-time1="seekTime2" class="ksp-video-box" @playEnd="playEnd"></videoPlayVue2>
+					<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList2" :key="index" v-show="showB">
+						<view class="list-head">
+							<view class="list-title">{{item.name}}</view>
+							<view class="list-btn" @click="markersClick2(item)"></view>
+						</view>
+						<view class="list-body" >
 							<!-- <view class="ksp-title">课程位置：{{item.time1}}-{{item.time2}}</view> -->
 							<rich-text :nodes="item.title"></rich-text>
 						</view>
 					</view>
+				</template>
+				<!-- 无数据 -->
+				<view class="ezy-no-sj" v-else>
+					<icon></icon>
+					<text>暂无数据</text>
 				</view>
-			</template>
+			</view>
 		</view>
 		<!-- 弹窗 -->
 		<tishiDlVue ref="popupRef"></tishiDlVue>