m代码精简, 删除多余图片视频, 更新视频功能

api/question.js

@@ -25,4 +25,13 @@ export const addAnswer = (data) => {
 		url: 'small/questionAnswer/add',
 		data
 	})
+}
+
+/** 答题 */
+export const getAnswerByFreId = (data) => {
+	return $http({
+    method: 'POST',
+		url: 'small/questionAnswer/add',
+		data
+	})
 }

components/s-video/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" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" style="width: 100%;height: 100%;"></video>
+			<video ref="video_p" :initial-time="play_time" id="video_play" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 90%;"></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> -->
@@ -34,6 +34,8 @@
 		name: "s-video",
 		data() {
 			return {
+				isLoop: false,
+				play_time: 0,
 				videoHeight: 300,
 				videoObjList: [],
 				videoObj:{},
@@ -73,11 +75,10 @@
 			
 			this.videoContext = uni.createVideoContext("video_play");
 			this.videoContext.requestFullScreen();
-			this.getBindJson();
+			// this.getBindJson();
 		},
 		methods: {
 			videoEnded() {
-				debugger
 				this.auto = false;
 				this.question = true;
 				// 出答案
@@ -90,9 +91,9 @@
 					this.end = true;
 					this.answerList = [];
 					this.question = false;
-					uni.navigateTo({
-					  url: '/subpkg/complete/complete?questionFreId='+this.questionFreId+'&roleId='+this.jsonId
-					})
+					// uni.navigateTo({
+					//   url: '/subpkg/complete/complete?questionFreId='+this.questionFreId+'&roleId='+this.jsonId
+					// })
 				}
 			},
 			nextQuestion(outId, obj) {
@@ -100,32 +101,47 @@
 				if(2==outId) {
 					this.$api.addQuestionFre({
 						roleId : this.jsonId,
-						userId : this.userId
+						// userId : this.userId
+						userId : '007'
 					})
 						.then(res => {
 							this.questionFreId = res.data;
 						}).catch((e) => console.log(e)); //捕获异常
 				}
+				
+				var isCorrect = 0;
 				// 先提交所选答案
 				if(null!=obj) {
+					// 判断答题是否正确
+					if(this.correct == obj.channel.slice(0, 1)) {
+						isCorrect = 1
+					}
 					var param = {
 						answer : obj.channel,
 						ask : this.ask,
 						questionFreId : this.questionFreId,
 						questionId : this.preQuestionId,
-						correctAnswer : this.correct
+						correctAnswer : this.correct,
+						correct : isCorrect,
 					}
 					this.$api.addAnswer(param)
 						.then(res => {
 							console.log(res);
 						}).catch((e) => console.log(e)); //捕获异常
 				}
-				// 播放下一视频
-				this.hasNodeId(outId);
-				this.videoObj.videoUrl = uni.$http.baseUrl + this.videoObj.videoUrl
-				this.start = false;
-				this.question = false;
-				this.auto = true;
+				
+				// 答案错误则重播当前视频
+				if(isCorrect == 0 && 2 != outId) {
+					this.play_time = 0;
+					this.auto = true;
+				} else {
+					// 播放下一视频
+					this.hasNodeId(outId);
+					this.videoObj.videoUrl = uni.$http.baseUrl + this.videoObj.videoUrl
+					this.start = false;
+					this.question = false;
+					this.auto = true;
+				}
 			},
 			getBindJson() {
 				this.start = true;
@@ -154,7 +170,6 @@
 			getAnswer(outId) {
 				for(var i=0; i<this.videoObjList.length; i++) {
 					if(outId == this.videoObjList[i].nodeId) {
-						console.log(this.videoObjList[i])
 						this.answerList.push(this.videoObjList[i]);
 					}
 				}

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "zdxtDrillProgram",
-    "appid" : "",
+    "appid" : "__UNI__E147012",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -18,7 +18,8 @@
         },
         "modules" : {
             "Barcode" : {},
-            "Camera" : {}
+            "LivePusher" : {},
+            "VideoPlayer" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -26,26 +27,33 @@
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CAPTURE_SECURE_VIDEO_OUTPUT\"/>",
+                    "<uses-permission android:name=\"android.permission.CAPTURE_VIDEO_OUTPUT\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* ios打包配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* SDK配置 */

pages.json

@@ -149,7 +149,7 @@
 		},
 		{
 			"path" : "review/review",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "",
 				"enablePullDownRefresh" : false

pages/index/index.vue

@@ -92,7 +92,7 @@
 					}
 				})
 
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 			navClickHandler(item) {
 			  uni.navigateTo({

pages/my/my.vue

@@ -126,7 +126,7 @@
 				if (!res.success) return uni.$showMsg()
 				this.medalNum = res.data.length;
 				
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 			async getSwiperList() {
 
@@ -141,7 +141,7 @@
 					item.uploadPath = uni.$http.baseUrl + item.uploadPath
 					this.swiperList.push(item.uploadPath)
 				})
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 			async getFunctionList() {
 
@@ -154,7 +154,7 @@
 					item.uploadPath = uni.$http.baseUrl + item.uploadPath
 				})
 				this.functionList = res.data;
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 			showMedal(){
 				uni.navigateTo({

static/base_css.css

@@ -178,7 +178,7 @@ h3.contit span {
 	color: #0b68f7;
 }
 
-.ahome {
+/* .ahome {
 	background: url(/static/images/icon_home_2.png) no-repeat center top;
 }
 
@@ -208,7 +208,7 @@ h3.contit span {
 
 .amine:hover, .amine.curaf {
 	background: url(/static/images/icon_mine.png) no-repeat center top;
-}
+} */
 
 /*************** 场景　************************/
 
@@ -310,7 +310,7 @@ h3.contit span {
 	height: 36px;
 	line-height: 34px;
 	background-color: transparent;
-	background: #f6f7fe url(/static/images/icon_sou.png) no-repeat right 16px center;
+	/* background: #f6f7fe url(/static/images/icon_sou.png) no-repeat right 16px center; */
 	background-size: auto 50%;
 	box-sizing: border-box;
 	border: 1px solid rgba(0,0,0,.05);
@@ -404,7 +404,7 @@ h3.contit span {
 	width: 5rem;
 	height: 5rem;
 	overflow: hidden;
-	background: url(/static/images/hpic.jpg) no-repeat;
+	/* background: url(/static/images/hpic.jpg) no-repeat; */
 	background-size: cover;
 	background-position: center top;
 	border: 1px solid #fff;
@@ -469,7 +469,7 @@ h3.contit span {
 .mset li {
 	width: 100%;
 	/*height: 20%;*/
-	background: url(/static/images/arrow-r.png) no-repeat right 2% center;
+	/* background: url(/static/images/arrow-r.png) no-repeat right 2% center; */
 	background-size: auto 30%;
 	display: table;
 }
@@ -626,7 +626,7 @@ span.rigadd {
 	height: 1.25rem;
 	line-height: 20rem;
 	overflow: hidden;
-	background: url(/static/images/icon_60add.png) no-repeat top 28.5% center;
+	/* background: url(/static/images/icon_60add.png) no-repeat top 28.5% center; */
 	background-size: auto 75%;
 	border: 1px solid #ddd;
 	border-radius: 50%;

subpkg/about/about.vue

@@ -26,7 +26,7 @@
 					this.content = item.content
 				})
 				
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 		}
 	}

subpkg/agreement/agreement.vue

@@ -26,7 +26,7 @@
 					this.content = item.content
 				})
 				
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 		}
 	}

subpkg/complete/complete.vue

@@ -23,8 +23,8 @@
 		</view>
 		<view class="perinfo">
 		  <view class="myitem"> 
-			<span><button open-type="share"></button>炫耀一下</span> 
-			<span @click="review()">演练回顾</span> 
+			<span><button open-type="share"></button>炫耀一下</span>
+			<span @click="review()">演练回顾</span>
 			<span @click="reChallenge()">重新挑战</span> 
 		  </view>
 		</view>

subpkg/list/list.vue

@@ -65,7 +65,7 @@
 					this.swiperList.push(item.uploadPath)
 				})
 				
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 			async getSceneList() {
 				this.isloading = true
@@ -79,7 +79,7 @@
 				})
 				this.sceneList =[...this.sceneList,...res.rows]
 				this.total = res.total
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 			navClickHandler(item) {
 				if(item !== ""){

subpkg/medal/medal.vue

@@ -63,7 +63,7 @@
 						this.taskMedalList.push(item.iconPath)
 					})
 					
-					uni.$showMsg('数据请求成功！')
+					// uni.$showMsg('数据请求成功！')
 				},
 				async getMyMedalList() {
 				
@@ -77,7 +77,7 @@
 						this.myMedalList.push(item.iconPath)
 					})
 					
-					uni.$showMsg('数据请求成功！')
+					// uni.$showMsg('数据请求成功！')
 				},
 				taskMedal(){
 					this.showMedal = true

subpkg/messageInfo/messageInfo.vue

@@ -26,7 +26,7 @@
 			if (!res.success) return uni.$showMsg()
 					
 			this.content = res.data.content
-			uni.$showMsg('数据请求成功！')
+			// uni.$showMsg('数据请求成功！')
 		},
 		}
 	}

subpkg/privacy/privacy.vue

@@ -26,7 +26,7 @@
 					this.content = item.content
 				})
 				
-				uni.$showMsg('数据请求成功！')
+				// uni.$showMsg('数据请求成功！')
 			},
 		}
 	}

subpkg/role/role.vue

@@ -165,7 +165,7 @@
 	display: inline-block;
 	margin: 0 auto;
 	padding: 2% 8% 2% 3%;
-	background: #a6c5fd url(/static/images/arrow-b.png) no-repeat right 10% center;
+	// background: #a6c5fd url(/static/images/arrow-b.png) no-repeat right 10% center;
 	background-size: auto 40%;
 	border-radius: 8px;
 	color: #2e6ddd;
@@ -246,7 +246,7 @@
 	right: 1rem;
 	width: 1.75rem;
 	height: 1.75rem;
-	background: url(/static/images/icon_60add.png) no-repeat;
+	// background: url(/static/images/icon_60add.png) no-repeat;
 	background-size: 100%;
 	transform: rotateZ(45deg);
 }