Merge branch 'boe_0701_icon' into dev0515

src/views/study/coursenew.vue

@@ -1129,11 +1129,11 @@
 
       onPlayerPlay() {
         //console.log("开始播放");
-        if(this.contentData.contentType == 10){
-          if(this.contentData.status<2){
-            this.contentData.status = 2;
-          }
-        }
+        // if(this.contentData.contentType == 10){
+        //   if(this.contentData.status<2){
+        //     this.contentData.status = 2;
+        //   }
+        // }
         this.playerBoxShow = false;
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
@@ -1267,6 +1267,7 @@
       audioPlaying(item, currentTime) {
         //console.log("当前播放"+item);
         let intTime = parseInt(currentTime);
+        this.handleAudioTimeUpdate(intTime)
         //判断是否完成
         let completeType = this.curriculumData.completeSetup;
         let completeSecond = this.curriculumData.second;
@@ -1314,9 +1315,9 @@
       },
       audioPlay() {
         //console.log("开始播放");
-        if(this.contentData.contentType == 20 && this.contentData.status < 2){
-          this.contentData.status = 2;
-        }
+        // if(this.contentData.contentType == 20 && this.contentData.status < 2){
+        //   this.contentData.status = 2;
+        // }
         let $this = this;
         this.isAppendTime=true;
         this.appendStudyTime();//启动追加学习时长
@@ -1513,9 +1514,11 @@
         });
       },
       saveStudyInfo() {
-        if(this.isContentType != this.contentData.contentType){
-          //定时器产生的，不记录
-          return
+        if(this.isContentType){
+          if(this.isContentType != this.contentData.contentType){
+            //定时器产生的，不记录
+            return
+          }
         }
         //记录课件学习信息
         if (this.contentData.contentType >= 60) {
@@ -1773,8 +1776,12 @@
             status: 2,
             contentTotal: this.totalContent
           };
-          if(currentTime > 2 && this.trueFalse && this.contentData.contentType == 10){
-            apiStudy.studyContent(params)
+          if(currentTime > 2 && this.trueFalse){
+            apiStudy.studyContent(params).then(()=>{
+              if(this.contentData.status<2){
+                this.contentData.status = 2;
+              }
+            })
             this.trueFalse = false
           }
         // }