From 7ee4a6b37ef629566309209a1e702a23973f622c Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Wed, 6 Mar 2024 15:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=BB=83=E5=9B=9E=E9=A1=BE,=20?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BB=93=E7=AE=97=E8=8E=B7=E5=8F=96=E5=8B=8B?=
 =?UTF-8?q?=E7=AB=A0,=20=E8=A7=86=E9=A2=91=E7=82=B9=E5=87=BB=E6=9A=82?=
 =?UTF-8?q?=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/s-video/s-video.vue |  38 ++++-
 static/images/start.png        | Bin 0 -> 5420 bytes
 subpkg/complete/complete.vue   | 268 +++++++++++++++++++--------------
 subpkg/practice/practice.vue   |   8 +-
 subpkg/role/role.vue           |   2 +-
 5 files changed, 192 insertions(+), 124 deletions(-)
 create mode 100644 static/images/start.png

diff --git a/components/s-video/s-video.vue b/components/s-video/s-video.vue
index 67c34c0..d1ccdc1 100644
--- a/components/s-video/s-video.vue
+++ b/components/s-video/s-video.vue
@@ -1,7 +1,10 @@
 <template>
 	<view class="video-wrapper" id="video-container">
+		<view class="marsk" @click="playVideo" v-if="showLayer">
+			<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="true" :src="videoObj.videoUrl" @ended="videoEnded()"
+			<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: 90%;"></video>
 			<video id="video_play" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
 
@@ -68,6 +71,7 @@
 				isOk: false,
 				isError: false,
 				resCheck: false,
+				showLayer: false,
 			};
 		},
 		computed: {
@@ -84,6 +88,10 @@
 			jsonId: {
 				type: String,
 				default: "",
+			},
+			sceneId: {
+				type: String,
+				default: "",
 			}
 		},
 		created() {
@@ -118,10 +126,12 @@
 		},
 		methods: {
 			playVideo() {
-				// this.videoContext.play();
+				this.showLayer = false;
+				this.videoContext.play();
 			},
 			stopPlay() {
-				// this.videoContext.pause();
+				this.showLayer = true;
+				this.videoContext.pause();
 			},
 			videoEnded() {
 				this.auto = false;
@@ -140,7 +150,7 @@
 						this.question = false;
 						uni.navigateTo({
 							url: '/subpkg/complete/complete?questionFreId=' + this.questionFreId + '&roleId=' +
-								this.jsonId
+								this.jsonId + '&sceneId=' + this.sceneId
 						})
 					} else {
 						// 不为空表示答题错误展示返回重新选择
@@ -277,7 +287,7 @@
 					this.question = false;
 					uni.navigateTo({
 						url: '/subpkg/complete/complete?questionFreId=' + this.questionFreId + '&roleId=' + this
-							.jsonId
+							.jsonId + '&sceneId=' + this.sceneId
 					})
 				}
 			}
@@ -286,6 +296,22 @@
 </script>
 
 <style>
+	/* 设置弹出层 */
+	.marsk {
+		position: absolute;
+		z-index: 999;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .35);
+	}
+	.animg {
+		position:absolute;
+		top:0;left:0;right:0;bottom:0;
+		margin:auto;
+		width: 100px;
+		height: 100px;
+	}
+	
 	/* 首先设置背景层 */
 	.popup-layer-back {
 		position: absolute;
@@ -324,7 +350,7 @@
 
 	.popup-layer .anitem .antxt {
 		position: absolute;
-		top: 60%;
+		top: 30%;
 		width: 100%;
 		font-size: 1.2rem;
 	}
diff --git a/static/images/start.png b/static/images/start.png
new file mode 100644
index 0000000000000000000000000000000000000000..f696e0efcdbe7d9614ec99946867c382e9953b41
GIT binary patch
literal 5420
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
JQqeN>zX0WpB**{&

literal 0
HcmV?d00001

diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index 7341104..2051988 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -68,7 +68,7 @@
 		</view>
 	</view>
 	</view>
-	
+
 </template>
 
 <script>
@@ -79,6 +79,7 @@
 			   "questionFreId":"59088ceb55644b03b8d0c7d48d2f7d39",
 			   "roleId":"5f96b1baae1a47fbb17215a5dc46f5ce",
 			   "userId":"",
+			   "sceneId": "",
 			   questionList: [],
 			   recordList: [],
 			   "ask":"",
@@ -89,9 +90,6 @@
 			   "showShare":false,
 			};
 		},
-		computed: {
-			...mapState('m_user', ['userId'])
-		},
 		//分享到好友
 		 onShareAppMessage(res) {
 		    if (res.from === 'button') {// 来自页面内分享按钮
@@ -103,12 +101,12 @@
 		    }
 		},
 		//分享到朋友圈
-		 onShareTimeline(res) {
-		    return {
-		      title: "快来和我一起答题吧",
-		      type: 0,
-		      summary: "",
-		    };
+		onShareTimeline(res) {
+			return {
+				title: "快来和我一起答题吧",
+				type: 0,
+				summary: "",
+			};
 		},
 		onLoad(options) {
 			this.timer = setTimeout(() => {
@@ -118,11 +116,16 @@
 			}, 5000)
 			//this.roleId = options.roleId
 			//this.questionFreId = options.questionFreId
+			this.sceneId = options.sceneId;
 			this.getQuestionList()
 			this.getRecordList()
+			this.editUserMedal();
+		},
+		computed: {
+			...mapState('m_user', ['userId'])
 		},
 		methods: {
-			async share(){
+			async share() {
 				await uni.share({
 					title: "快来和我一起答题吧",
 					type: 0,
@@ -131,18 +134,20 @@
 						console.log('分享成功')
 					}
 				})
-			}, 
+			},
 			async getQuestionList() {
 				const {
 					data: res
-				} = await uni.$http.post('/small/questionAnswer/listAll',{questionFreId:this.questionFreId})
+				} = await uni.$http.post('/small/questionAnswer/listAll', {
+					questionFreId: this.questionFreId
+				})
 				if (!res.success) return uni.$showMsg()
-		        this.questionList = res.data
-				if (this.questionList.length !=0) {
+				this.questionList = res.data
+				if (this.questionList.length != 0) {
 					this.ask = this.questionList[0].ask;
 					this.answer = this.questionList[0].answer;
 				}
-				
+
 				//uni.$showMsg('数据请求成功！')
 			},
 			async getRecordList() {
@@ -150,37 +155,52 @@
 					data: res
 				} = await uni.$http.post('/small/questionFre/listAll',{roleId:this.roleId,userId:this.userId})
 				if (!res.success) return uni.$showMsg()
+				this.recordList = res.data
+
+				//uni.$showMsg('数据请求成功！')
+			},
+			async editUserMedal() {
+				const {
+					data: res
+				} = await uni.$http.post('/small/wechat/editUserMedal', {
+					medal: this.sceneId,
+					guid: "2752c89b6ca843558991f888f8949da2",
+					// guid: this.userId,
+				})
+				if (!res.success) return uni.$showMsg()
+				// this.recordList = res.data
+
 			    this.recordList = res.data
-				
+
 				//uni.$showMsg('数据请求成功！')
 			},
-			backIndex(){
+			backIndex() {
 				uni.switchTab({
-				  url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			},
-			shareUser(){
+			shareUser() {
 				this.showShare = true
 				this.showLayer = true
 			},
-			reChallenge(){
+			reChallenge() {
 				uni.navigateTo({
-				 url: '/subpkg/rechallenge/rechallenge?questionFreId='+this.questionFreId
+					url: '/subpkg/rechallenge/rechallenge?questionFreId=' + this.questionFreId
 				})
 			},
-			review(){
+			review() {
 				uni.navigateTo({
-				 url: '/subpkg/review/review?questionFreId='+this.questionFreId
+					url: '/subpkg/review/review?questionFreId=' + this.questionFreId
 				})
 			},
-			closeShare(){
+			closeShare() {
 				this.showShare = false
 				this.showLayer = false
 			},
 			itemClickHandler(item) {
-				if(item !== ""){
-					this.ask= item.ask
-					this.answer= item.answer
+				if (item !== "") {
+					this.ask = item.ask
+					this.answer = item.answer
 					this.showAnlysisc = true
 				}
 			},
@@ -190,7 +210,7 @@
 
 <style lang="scss">
 	@import url("@/static/base_css.css");
-	
+
 	/* 设置弹出层 */
 	.marsk {
 		// display: none;
@@ -200,7 +220,9 @@
 		height: 100%;
 		background-color: rgba(0, 0, 0, .5);
 	}
-	.popup-layer, .popup-share {
+
+	.popup-layer,
+	.popup-share {
 		//display: none;
 		position: absolute;
 		top: 45%;
@@ -212,16 +234,17 @@
 		padding: 30rpx;
 		z-index: 9999;
 	}
-	
+
 	.popup-layer .animg {
 		width: 100%;
 		height: 100%;
 	}
-	
+
 	.popup-share {
 		height: 500rpx;
 		background-color: #e4eafe;
 		border-radius: 30rpx;
+
 		.medimg {
 			position: absolute;
 			top: -15%;
@@ -229,23 +252,31 @@
 			transform: translate(-50%, -10%);
 			width: 300rpx;
 			height: 230rpx;
+
 			image {
 				width: 100%;
 				height: 100%;
 			}
 		}
+
 		.congrat {
 			margin: 25% auto 10%;
 			color: #ff6b08;
 			font-size: 40rpx;
 			text-align: center;
 		}
+
 		.myitem {
-		    margin: 0;
-		    width: 33%;
+			margin: 0;
+			width: 33%;
 		}
 	}
-	
+
+	.mainwrap3 {
+		top: 56rpx;
+		overflow-y: auto;
+	}
+
 	.title {
 		margin: 50rpx 0;
 		color: #333;
@@ -253,17 +284,18 @@
 		font-weight: bold;
 		text-align: center;
 	}
-	
+
 	.question-wrap {
 		position: relative;
 		width: 100%;
 	}
+
 	.question-list {
-	  /*display: flex;
+		/*display: flex;
 	  justify-content: space-around;*/
-	  margin: 0 2%;
-	  
-	  .question-item {
+		margin: 0 2%;
+
+		.question-item {
 			display: inline-block;
 			margin: 2% 1.5%;
 			padding: 1% 3%;
@@ -275,115 +307,123 @@
 			color: #fff;
 			font-size: 40rpx;
 			font-weight: bold;
-			text-align: center;	
+			text-align: center;
 		}
-	    .erritem {
+
+		.erritem {
 			background-color: #fb3737;
-		}	
+		}
 	}
-   .answer-content {
-	   //display: none;
-	   position: absolute;
-	   z-index: 100; 
-	   margin: 2% 3%;
-	   padding: 2%;
-	   width: 90%;
-	   height: 400rpx;
-	   background: #fff;
-	   border: 1px solid #18c569;
-	   border-radius: 10px;
-   }
-   
-   .qucont {
-	   margin: 1% 0 3% 0;
-	   color: #000;
-	   font-family: 30rpx;
-	   font-weight: bold;
-   }
-   
-   .corans {
-	   color: #18c569;
-	   font-weight: bold;
-	   label {
-		  font-size: 36rpx;  
-	   }
-   }
-   
-   .youans {
-	   margin: 2% 0;
-	   color: #999;
-   }
-   
-   .analys {
-       margin: 3% 0;
-	   
-	   label {
-		  font-size: 36rpx; 
-		  font-weight: bold;
-	   }
-	   view {
-		   color: #666;
-		   line-height: 1.75;
-	   }
-   }
-   
-   .question-record {
-		margin: 6% 3% 10%;
+
+	.answer-content {
+		//display: none;
+		position: relative;
+		z-index: 100;
+		margin: 2% 3%;
+		padding: 2%;
+		width: 90%;
+		min-height: 400rpx;
+		background: #fff;
+		border: 1px solid #18c569;
+		border-radius: 10px;
+	}
+
+	.qucont {
+		margin: 1% 0 3% 0;
+		color: #000;
+		font-family: 30rpx;
+		font-weight: bold;
+	}
+
+	.corans {
+		color: #18c569;
+		font-weight: bold;
+
+		label {
+			font-size: 36rpx;
+		}
+	}
+
+	.youans {
+		margin: 2% 0;
+		color: #999;
+	}
+
+	.analys {
+		margin: 3% 0;
+
+		label {
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+
+		view {
+			color: #666;
+			line-height: 1.5;
+		}
+	}
+
+	.question-record {
+		margin: 3% 3% 5%;
 		width: 94%;
-		height: 45%;
+		height: 25%;
 		overflow: hidden;
+
 		label {
-		  font-size: 32rpx; 
+		  font-size: 32rpx;
 		  font-weight: bold;
-		  line-height: 2;  
+		  line-height: 2;
 		}
+
 		.list {
 			width: 100%;
 			height: calc(100% - 80rpx);
 			line-height: 1.75;
 			overflow-y: auto;
+
 			.item {
 				margin: 2% 0;
 				border-bottom: 1px dotted #ddd;
 			}
 		}
-   }
-   .backIndex {
-       margin: 2% auto;
-       width: 86%;
-	   button {
-		   background-color: #1367fe !important;
-		   border-radius: 50rpx !important;
-		   color: #fff !important;
-	   }
-   }
-   
-   .perinfo {
+	}
+
+	.backIndex {
+		margin: 2% auto;
+		width: 86%;
+
+		button {
+			background-color: #1367fe !important;
+			border-radius: 50rpx !important;
+			color: #fff !important;
+		}
+	}
+
+	.perinfo {
 		display: flex;
 		margin: 5% 0;
 		width: 100%;
 		justify-content: center;
 	}
-   
-   .myitem {
+
+	.myitem {
 		margin: 3% 8%;
 		width: 15%;
 		text-align: center;
 		font-size: 0.8rem;
 		color: #666;
 	}
-   
-   .myitem > view > label {
+
+	.myitem>view>label {
 		display: block;
 		position: relative;
 		margin: 20rpx auto;
 		width: 100rpx;
 		height: 100rpx;
+
 		image {
 			width: 100%;
 			height: 100%;
 		}
-   }
-   
-
-</style>
+	}
+</style>
\ No newline at end of file
diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue
index af7528c..02f243a 100644
--- a/subpkg/practice/practice.vue
+++ b/subpkg/practice/practice.vue
@@ -1,10 +1,10 @@
 <template>
 		<view class="wrap">
-			<!-- <view class="video-wrapper" id="video-container"></view> 
+			<!-- <view class="video-wrapper" id="video-container"></view>
 			<view class="stabar"></view>-->
 			<view class="secbar"> <label class="back" @click="back()"></label></view>
 			<view class="mainwrap3">
-				<view class="role_wrap"><sVideo :jsonId="jsonId"></sVideo></view>
+				<view class="role_wrap"><sVideo :jsonId="jsonId" :sceneId="sceneId"></sVideo></view>
 			</view>
 		</view>
 </template>
@@ -18,10 +18,12 @@
 				page: "",
 				jsonId: "",
 				roleId:"",
+				sceneId:"",
 			};
 		},
 		onLoad(options) {
-			this.jsonId = options.roleId
+			this.jsonId = options.roleId;
+			this.sceneId = options.sceneId;
 		},
 		onReady() {
 			this.QR();
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index a8a5ecc..60c489e 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -110,7 +110,7 @@
 				  return uni.$showMsg('请先选择一个角色')
 			  }
 			  uni.navigateTo({
-			    url: '/subpkg/practice/practice?roleId='+this.roleId
+			    url: '/subpkg/practice/practice?roleId='+this.roleId+'&sceneId='+this.sceneId
 			    //url: '/subpkg/practice/respractice?roleId='+this.roleId
 			  })
 			},