tMerge branch 'master' of http://1.14.104.71:10880/root/his_user_miniapp

pages_course/video.vue

@@ -15,6 +15,7 @@
 			@ended="getEnded" 
 			@fullscreenchange="fullscreenchange"
 			@controlstoggle="controlstoggle"
+			@waiting="getWaiting"
 			:title="courseInfo.title"
 			style="width: 100%;height: 420rpx;" 
 			:poster="poster"  
@@ -315,7 +316,7 @@
 				answerPopup: false,
 				sortLink:"",
 				// 课程是否过期
-				isExpire: true,
+				isExpire: false,
 				menuButtonLeft: 281,
 				menuButtonH: 45,
 				timer: null,
@@ -500,9 +501,12 @@
 				that.playDurationSeek = 0
 			},
 			videoErrorCallback(e) {
-				this.clearIntegral()
 				this.errorCount++
 				if (this.errorCount > 3) return
+				if (this.interval != null) {
+					clearInterval(this.interval)
+				}
+				this.clearIntegral()
 				console.log(e)
 				this.getErrMsg(e.target.errMsg)
 				this.getH5CourseVideoDetails('error')
@@ -520,6 +524,9 @@
 				this.isEnded = true
 				this.getFinishCourseVideo()
 			},
+			getWaiting() {
+				this.getErrMsg('','waiting')
+			},
 			fullscreenchange(event) {
 				this.isfull = event.detail.fullScreen
 			},
@@ -991,13 +998,14 @@
 				}
 				getInternetTraffic(param)
 			},
-			getErrMsg(err) {
+			getErrMsg(err,type) {
 				let msgerr = {
+					errType: type || 'error',
 					videoUrl: this.videoUrl,
 					lineIndex: this.lineIndex,
 					errTime: new Date(),
 					ip: this.ip,
-					errMsg: err
+					errMsg: err || ''
 				}
 				getErrMsg({
 					msg: JSON.stringify(msgerr)