From 25a5ef7e2f5813fd0cd6ec6e93998b1d46c9a72e Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Wed, 21 Feb 2024 10:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=94=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/s-video/s-video.vue | 7 ++++---
 subpkg/practice/practice.vue   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/s-video/s-video.vue b/components/s-video/s-video.vue
index be16001..8c182b7 100644
--- a/components/s-video/s-video.vue
+++ b/components/s-video/s-video.vue
@@ -3,12 +3,11 @@
 		<view style="position:relative;width:100%;" :style="{'height':videoHeight+'px'}">
 			<video id="video_play" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" style="width: 100%;height: 100%;"></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">
-					<h2>答案填充</h2>
-					<p @click="nextQuestion(item.outs[0], item)" v-for="(item, index) in answerList">答题{{item.channel}}后跳转下一视频</p>
+					<h2>请选择</h2>
+					<p @click="nextQuestion(item.outs[0], item)" v-for="(item, index) in answerList">{{item.channel}}</p>
 				</view>
 			</view>
 			<view class="popup-layer-back" v-if="start">
@@ -60,11 +59,13 @@
 			this.getBindJson();
 		},
 		methods: {
+		
 			videoEnded() {
 				this.auto = false;
 				this.question = true;
 				// 出答案
 				if(this.videoObj.outs.length>0) {
+					this.answerList =[];
 					for(var i=0; i<this.videoObj.outs.length; i++) {
 						this.getAnswer(this.videoObj.outs[i])
 					}
diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue
index f7d9efa..aab7cee 100644
--- a/subpkg/practice/practice.vue
+++ b/subpkg/practice/practice.vue
@@ -13,12 +13,13 @@
 		data() {
 			return {
 				page: "",
-				jsonId: "6215c8757e8947c8aae0fd0b3d2d503b",
+				jsonId: "d1d4007d09c24b84ab79fd9e7d2337c6",
 				roleId:"",
 			};
 		},
 		onLoad(options) {
-			this.roleId = options.roleId
+			this.jsonId = options.roleId
+			this.$emit('getJsonId',this.jsonId)
 		},
 		onReady() {
 			this.QR();