Merge branch 'zcwy-master' into 'master'

视频加进度

See merge request !119

src/views/study/coursenew.vue

@@ -1392,7 +1392,8 @@
         });
       },
       progress(val) { 
-        this.sendEventProgress = val
+        const progressValue = parseFloat(val) * 100;
+        this.sendEventProgress = Number(progressValue.toFixed(2));
        },
       saveStudyDuration(duration) { //保存本地存储的学习时长
         if (duration > 0) {
@@ -1411,7 +1412,9 @@
               "aname":this.userInfo.name,//当前人的姓名
               "status": 1, //状态
               "contentId": this.contentData.id,
-              "progress": this.sendEventProgress,
+            }
+            if(this.resType == 10){
+              postData.progress = this.sendEventProgress;
             }
             //静默处理
             apiStat.sendEvent(postData).then(rs=>{