From cb7d1d920739091a0b8cd1d17e003c1d87920407 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 18 Mar 2024 10:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=87=AA=E5=8A=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=9C=80=E5=90=8E=E4=B8=80=E5=B8=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/s-video/res-s-video.vue | 16 ++++++++++++++--
 components/s-video/s-video.vue     | 19 +++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/components/s-video/res-s-video.vue b/components/s-video/res-s-video.vue
index 00139d9..a97d52b 100644
--- a/components/s-video/res-s-video.vue
+++ b/components/s-video/res-s-video.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="video-wrapper" id="video-container">
 		<view style="position:relative;width:100%;" :style="{'height':videoHeight+'px'}">
-			<video id="video_play" :controls="false" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
+			<video id="video_play" :controls="false" :src="videoObj.videoUrl" @ended="videoEnded()" @loadedmetadata="onMetadataLoaded" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
 			<view class="question"></view>
 			<view class="popup-layer-back" v-if="!start" v-show="question">
 				<!-- <view class="popup-layer-close" @click="question=false">关闭</view> -->
@@ -23,6 +23,7 @@
 				</view>
 			</view> -->
 			<view class="popup-layer-back" v-show="resCheck">
+				<view><image style="position: absolute; top: 20%; left: 10%;" src="/static/images/fail.gif"></image></view>
 				<view class="popup-layer" style="color: red;" @click="toResVideo()">
 					<view class="anitem1">
 						<image class="animg1" src="/static/videos/skin_bg_v1.png"></image>
@@ -63,6 +64,7 @@
 				isOk: false,
 				isError: false,
 				resCheck: false,
+				isResVideo: false,
 			};
 		},
 		computed: {
@@ -153,6 +155,14 @@
 				this.auto = true;
 				this.resCheck = false;
 				this.resVideoUrl = "";
+				this.isResVideo = true;
+			},
+			onMetadataLoaded(event) {
+				if(this.isResVideo) {
+					this.isResVideo = false;
+					const duration = event.detail.duration;
+					this.videoContext.seek(duration);
+				}
 			},
 			nextQuestion(outId, obj) {
 				// 点击开始后先增加题次
@@ -210,7 +220,9 @@
 					that.isError = false;
 					that.isOk = false;
 					that.hasNodeId(outId);
-					that.videoObj.videoUrl = uni.$http.baseUrl + that.videoObj.videoUrl
+					if(!that.videoObj.videoUrl.includes("http")) {
+						that.videoObj.videoUrl = uni.$http.baseUrl + that.videoObj.videoUrl
+					}
 
 					// 用于记录上一个视频
 					if(null==obj) {
diff --git a/components/s-video/s-video.vue b/components/s-video/s-video.vue
index 7f7d2f2..bec6bc6 100644
--- a/components/s-video/s-video.vue
+++ b/components/s-video/s-video.vue
@@ -4,10 +4,10 @@
 			<image class="animg" src="/static/images/start.png"></image>
 		</view>
 		<view style="position:relative;width:100%;" :style="{'height':videoHeight+'px'}">
-			<video id="video_play" @click="stopPlay" :controls="false" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
+			<video id="video_play" @click="stopPlay" :src="videoObj.videoUrl" @ended="videoEnded()" @loadedmetadata="onMetadataLoaded" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
 			<view class="question"></view>
 			<view class="popup-layer-back" v-if="!start" v-show="question">
-				<!-- <view class="popup-layer-close" @click="question=false">关闭</view> -->
+				<!-- <view class="popup-layer-close" @click="question=false">关闭</view> :controls="false" -->
 				<view class="popup-layer">
 					<!-- <h2>请选择</h2> -->
 					<view class="anitem1">
@@ -75,6 +75,7 @@
 				isError: false,
 				resCheck: false,
 				showLayer: false,
+				isResVideo: false,
 			};
 		},
 		computed: {
@@ -171,6 +172,14 @@
 				this.auto = true;
 				this.resCheck = false;
 				this.resVideoUrl = "";
+				this.isResVideo = true;
+			},
+			onMetadataLoaded(event) {
+				if(this.isResVideo) {
+					this.isResVideo = false;
+					const duration = event.detail.duration;
+					this.videoContext.seek(duration);
+				}
 			},
 			nextQuestion(outId, obj) {
 				// 点击开始后先增加题次
@@ -230,8 +239,10 @@
 					that.isError = false;
 					that.isOk = false;
 					that.hasNodeId(outId);
-					that.videoObj.videoUrl = uni.$http.baseUrl + that.videoObj.videoUrl
-
+					if(!that.videoObj.videoUrl.includes("http")) {
+						that.videoObj.videoUrl = uni.$http.baseUrl + that.videoObj.videoUrl
+					}
+				
 					// 用于记录上一个视频
 					if (null == obj) {
 						that.resVideoUrl = that.videoObj.videoUrl;