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

components/questionJiexi/questionJiexi.vue

@@ -1,33 +1,34 @@
 <template>
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-		mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
-		<view class="ezy-dajx-page">
-			<view class="icon-title-navBar-box">
-				<view @click="handleBack" class="nav-bar-icon"></view>
-				<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>
-					<!-- <view class="slfx-content"> {{data.answer}}</view> -->
-
-					<!-- 视频讲解 -->
-					<view class="spjj-title"></view>
-					<view class="spjj-video-box">
-						<!-- 这里放视频 ↓ -->
-						<view class="spjj-video" ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
-							:change:playAuth="renderScript.receiveMsg" 
-							 :seekTime="seekTime"
-							:change:seekTime="renderScript.seekTimeFun">
+	<view>
+		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
+			mask-background-color="rgba(255, 255, 255, 0.6);" class="ezy-popup-width-all">
+			<view class="ezy-dajx-page">
+				<view class="icon-title-navBar-box">
+					<view @click="handleBack" class="nav-bar-icon"></view>
+					<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>
+						<!-- <view class="slfx-content"> {{data.answer}}</view> -->
+		
+						<!-- 视频讲解 -->
+						<view class="spjj-title"></view>
+						<view class="spjj-video-box">
+							<!-- 这里放视频 ↓ -->
+							<view class="spjj-video" ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
+								:change:playAuth="renderScript.receiveMsg" 
+								 :seekTime="seekTime"
+								:change:seekTime="renderScript.seekTimeFun">
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-
-	</uni-popup>
+		</uni-popup>
+	</view>
 </template>
 <script>
 	import {

components/wSwiper/wSwiper.vue

@@ -22,7 +22,6 @@
 
 	const props = defineProps({
 		swiperHeight: { // swiper的高度
-			required: true,
 			type: Number,
 			default: 0
 		},

pages/study/index.vue

@@ -245,28 +245,28 @@ import { toast } from "../../utils/common";
 			url: `/pages/unitTest/index?jieId=${data.jieId}&zhangId=${zhangId}&nianji=${nianji}&xueqi=${xueqi}`
 		})
 	}
-	function goLookShipin(data) {
-		data.videoId = 'b997f16cb9cb474cb93526cff77d8801'
+	function goLookShipin(data) {
+
 		data.progressMarkers = [{
 		    offset: 30,
 		    isCustomized: true,
 		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/9A3F562E595E4764AD1DD546FA52C6E5-6-2.png',
 		    title: '变式1',
-		    time: '04:01-07:50',
+		    time: '00:00:30',
 		    describe: 'test string',
 		   }, {
-		    offset: 150,
+		    offset: 120,
 		    isCustomized: true,
 		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/1E7F402241CD4C0F94AD2BBB5CCC3EC7-6-2.png',
 		    title: '变式2',
-		    time: '04:05-07:50',
+		    time: '00:02:00',
 		    describe: 'test string',
 		   }, {
-		    offset: 250,
+		    offset: 300,
 		    isCustomized: true,
 		    coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
 		    title: '变式3',
-		    time: '04:07-07:50',
+		    time: '00:05:00',
 		    describe: 'test string',
 		   }]
 		data.zhangId = infoData.zhangId