From cf5016e7272f06cab24d4709ea2b81f48df93d61 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Thu, 22 Feb 2024 14:18:45 +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 | 20 +++++++++++++++++---
 pages.json                     |  8 ++++++++
 subpkg/practice/practice.vue   |  3 +--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/components/s-video/s-video.vue b/components/s-video/s-video.vue
index 8c182b7..2e7ccd2 100644
--- a/components/s-video/s-video.vue
+++ b/components/s-video/s-video.vue
@@ -25,6 +25,7 @@
 </template>
 
 <script>
+	import { mapMutations, mapState } from 'vuex'
 	export default {
 		name: "s-video",
 		data() {
@@ -41,6 +42,16 @@
 				preQuestionId: "",
 			};
 		},
+		computed: {
+		  ...mapState('m_user', ['userId'])
+		},
+		watch:{
+		   jsonId:{
+			   handler:function(){
+				   this.getBindJson();
+			   }
+		   }	
+		},
 		props:{
 			jsonId: {
 				type: String,
@@ -73,14 +84,17 @@
 					this.end = true;
 					this.answerList = [];
 					this.question = false;
+					uni.navigateTo({
+					  url: '/subpkg/complete/complete'
+					})
 				}
 			},
 			nextQuestion(outId, obj) {
 				// 点击开始后先增加题次
 				if(2==outId) {
 					this.$api.addQuestionFre({
-						roleId : "1",
-						userId : "123"
+						roleId : this.jsonId,
+						userId : this.userId
 					})
 						.then(res => {
 							this.questionFreId = res.data;
@@ -102,7 +116,7 @@
 				}
 				// 播放下一视频
 				this.hasNodeId(outId);
-				this.videoObj.videoUrl = 'http://localhost:85/'+this.videoObj.videoUrl
+				this.videoObj.videoUrl = uni.$http.baseUrl + this.videoObj.videoUrl
 				this.start = false;
 				this.question = false;
 				this.auto = true;
diff --git a/pages.json b/pages.json
index 560d811..6dfaa0a 100644
--- a/pages.json
+++ b/pages.json
@@ -130,6 +130,14 @@
 				"navigationBarTitleText" : "",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "complete/complete",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
 		}]
 	}],
 	"globalStyle": {
diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue
index aab7cee..1bf7aaa 100644
--- a/subpkg/practice/practice.vue
+++ b/subpkg/practice/practice.vue
@@ -13,13 +13,12 @@
 		data() {
 			return {
 				page: "",
-				jsonId: "d1d4007d09c24b84ab79fd9e7d2337c6",
+				jsonId: "",
 				roleId:"",
 			};
 		},
 		onLoad(options) {
 			this.jsonId = options.roleId
-			this.$emit('getJsonId',this.jsonId)
 		},
 		onReady() {
 			this.QR();