wangxy 2 hónapja
szülő
commit
00df774fc4

+ 1 - 1
components/listCard/kaoshiCard.vue

@@ -113,7 +113,7 @@
 	
 	function checkKaoshi(item) {
 		uni.navigateTo({
-			url: `/pages/client/Kaoshi/exam?ksId=${item.ksId}&zhuapai=${activeks.value.zhuapai}&from=shouye`
+			url: `/pages/client/Kaoshi/exam?ksId=${item.ksId}&zhuapai=${activeks.value.zhuapai}&userKaozhengId=${activeks.value.userKaozhengId}&from=shouye`
 		})
 	}
 	

+ 3 - 1
components/videoPlay/videoPlay.vue

@@ -34,6 +34,7 @@
 				this.playAuth = options.playAuth;
 				this.videoId = options.videoId;
 				this.seekTime = options.seekTime;
+				this.setSeekTime(options.seekTime)
 				const isPlay = options.isPlay || false;
 				if(isPlay) {
 					this.playCount++
@@ -96,7 +97,8 @@
 			},
 			seekTimeFun(newValue, oldValue, ownerInstance, instance) {
 				if (newValue) {
-					this.player.seek(newValue)
+					this.player && this.player.seek(newValue)
+					console.log('已设置时间',newValue)
 				}
 			},
 			playAli() {

+ 4 - 1
pages/client/Kaoshi/exam.vue

@@ -144,6 +144,7 @@
 	onLoad((option) => {
 		data.ksId = option.ksId;
 		data.zhuapai = option.zhuapai;
+		data.userKaozhengId = option.userKaozhengId;
 		data.from = option.from;
 		if (data.zhuapai && data.zhuapai != 0) {
 			// 考试前确认摄像头
@@ -184,6 +185,7 @@
 		StListForSearch: [],
 		from: '',
 		hisId: '',
+		userKaozhengId: ''
 	})
 	
 	const markDB = ref([]);
@@ -691,7 +693,8 @@
 
 	function initKaoshi() {
 		ksApi.getClientKsStart({
-			ksId: data.ksId
+			ksId: data.ksId,
+			userKaozhengId: data.userKaozhengId
 		}).then(res => {
 			const {
 				ksId,

+ 1 - 1
pages/client/Kaoshi/list.vue

@@ -162,7 +162,7 @@
 		}, '', window.location.href);
 		// #endif
 		uni.navigateTo({
-			url: `/pages/client/Kaoshi/exam?ksId=${item.ksId}&zhuapai=${activeks.value.zhuapai}&from=kaoshiList`
+			url: `/pages/client/Kaoshi/exam?ksId=${item.ksId}&zhuapai=${activeks.value.zhuapai}&userKaozhengId=${activeks.value.userKaozhengId}&from=kaoshiList`
 		})
 	}
 

+ 2 - 3
pages/client/Kecheng/study.vue

@@ -105,7 +105,6 @@
 			},
 			sectionPlayerProgress(progress) {
 				let sectionPage = getKechengSectionPageFromHistory(this.operId);
-				console.log('sectionPage',sectionPage)
 				let maxProcess = this.list[sectionPage.iChapter].jieList[sectionPage.iSection].kejianList.find(it1=>it1.kjId == sectionPage.kjId).maxProcess;
 				// 更新缓存进度
 				this.list[sectionPage.iChapter].jieList[sectionPage.iSection].kejianList.find(it1=>it1.kjId == sectionPage.kjId).curProcess = progress;
@@ -181,7 +180,6 @@
 					return;
 				}
 				this.curPlayData = data;
-				
 				const {
 					zhangIndex,
 					jieIndex
@@ -195,10 +193,11 @@
 				kechengApi.getVideoAuth({
 					videoId: data.url
 				}).then(res => {
+					const progress = data.curProcess || 0;
 					this.$refs.videoRef.init({
 						videoId: data.url,
 						playAuth: res.data,
-						seekTime: '',
+						seekTime: data.duration * progress / 100,
 						isPlay: false
 					})
 

+ 1 - 1
pages/client/Kecheng/useKechengCache.js

@@ -199,7 +199,7 @@ export function useKechengTools() {
 			});
 		} else {
 			// 其他情况(音视频一秒一保存)
-			getTskcSave(optX).then(res => {
+			kcApi.getClientKechengSave(optX).then(res => {
 				if (res.code === 0) {
 					if (res.data.finish === true) {
 						uni.showToast({