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

common/styles/global/pages.scss

@@ -2017,6 +2017,7 @@
 		.right-icon.disabled::after{transform: rotate(180deg);}
 		.change-dy-content{
 			width: 76%;margin: 0 auto;font-size: 32rpx;color: #3fa5ff;line-height: 1.6;
+			min-height: 100rpx;
 		}
 	}
 	
@@ -2133,9 +2134,11 @@
 // 看视频
 .ezy-ksp-page{
 	.ksp-body{
-		position: relative;z-index: 1;
+		position: relative;z-index: 1;margin: 20rpx 0 0;
 	}
-	.ksp-video-box{}
+	/* .ksp-video-box{
+		width: 100%;height: 423rpx;
+	} */
 	.ksp-item-list{
 		width: 96%;margin: 0 auto;
 		background-color: #5894f6;

pages/xinshuxue/lookShipin.vue

@@ -4,7 +4,7 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{jieInfo.jieIntro}}</text>
 		</view>
-		
+		<view class="ksp-body">
 		<!-- <view class="ezy-video-box course-video-box">
 			<view ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
 				:change:playAuth="renderScript.receiveMsg" :videoId="videoId" :change:videoId="renderScript.videoIdFun"
@@ -13,30 +13,31 @@
 				:change:seekTime="renderScript.seekTimeFun" class="ezy-video">
 			</view>
 		</view> -->
-		<videoPlayVue ref="c1" v-show="showA" :key="1" cId="wgy-player-test" :videoId1="videoId" :progressMarkers1="progressMarkers" :playAuth1="playAuth" 
-		:hideFlag1="hideFlag"   :seek-time1="seekTime" class="ksp-video-box"></videoPlayVue>
-		<videoPlayVue ref="c2" v-show="showB" :key="2" cId="wgy-player-test2" :videoId1="videoId2" :progressMarkers1="progressMarkers2" :playAuth1="playAuth2"
-		:hideFlag1="hideFlag2" :seek-time1="seekTime2" class="ksp-video-box"
-		></videoPlayVue>
-		<!-- 核心基础题 -->
-		<view class="ksp-item-list">
-			<view>核心基础题</view>
-			<view class="ksp-item-box" v-for="(item,index) in jieInfo.jiedianList1" :key="index" @click="markersClick(item)">
-				<icon class="ksp-icon"></icon>
-				<view>
-					<view class="ksp-title">{{item.name}}</view>
-					<view class="ksp-title">{{item.time1}}-{{item.time2}}</view>
+			<videoPlayVue ref="c1" v-show="showA" :key="1" cId="wgy-player-test" :videoId1="videoId" :progressMarkers1="progressMarkers" :playAuth1="playAuth" 
+			:hideFlag1="hideFlag"   :seek-time1="seekTime" class="ksp-video-box"></videoPlayVue>
+			<videoPlayVue ref="c2" v-show="showB" :key="2" cId="wgy-player-test2" :videoId1="videoId2" :progressMarkers1="progressMarkers2" :playAuth1="playAuth2"
+			:hideFlag1="hideFlag2" :seek-time1="seekTime2" class="ksp-video-box"
+			></videoPlayVue>
+			<!-- 核心基础题 -->
+			<view class="ksp-item-list">
+				<view>核心基础题</view>
+				<view class="ksp-item-box" v-for="(item,index) in jieInfo.jiedianList1" :key="index" @click="markersClick(item)">
+					<icon class="ksp-icon"></icon>
+					<view>
+						<view class="ksp-title">{{item.name}}</view>
+						<view class="ksp-title">{{item.time1}}-{{item.time2}}</view>
+					</view>
 				</view>
 			</view>
-		</view>
-		<!-- 能力提升题 -->
-		<view class="ksp-item-list">
-			<view>能力提升题</view>
-			<view class="ksp-item-box" v-for="(item,index) in jieInfo.jiedianList2" :key="index" @click="markersClick2(item)">
-				<icon class="ksp-icon"></icon>
-				<view>
-					<view class="ksp-title">{{item.name}}</view>
-					<view class="ksp-title">{{item.time1}}-{{item.time2}}</view>
+			<!-- 能力提升题 -->
+			<view class="ksp-item-list">
+				<view>能力提升题</view>
+				<view class="ksp-item-box" v-for="(item,index) in jieInfo.jiedianList2" :key="index" @click="markersClick2(item)">
+					<icon class="ksp-icon"></icon>
+					<view>
+						<view class="ksp-title">{{item.name}}</view>
+						<view class="ksp-title">{{item.time1}}-{{item.time2}}</view>
+					</view>
 				</view>
 			</view>
 		</view>