Merge branch 'dai-master'

src/views/course/TeacherList.vue

@@ -325,15 +325,16 @@ export default {
           // let routeData = this.$router.resolve({ path: '/course/detail?id='+item.id});
           // window.open(this.webBaseUrl+routeData.href, '_blank');
          // window.open(this.webBaseUrl + '/course/detail?id=' + item.id, '_blank');
-         this.$router.push({path:'/course/detail',query:{id:item.id}})
-        // }
+         //this.$router.push({path:'/course/detail',query:{id:item.id}})
+         this.$router.push({path:'/course/studyindex',query:{id:item.id}})
+         // }
       } else {
         // if (item.type == 10) {
         // //  window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
         //  this.$router.push({path:'/course/microPreview',query:{id:item.id}})
         // } else {
-      //    window.open(`${this.webBaseUrl}/course/rePreview?id=${item.id}`);
-       this.$router.push({path:'/course/rePreview',query:{id:item.id}})
+        //  window.open(`${this.webBaseUrl}/course/rePreview?id=${item.id}`);
+        this.$router.push({path:'/course/rePreview',query:{id:item.id}})
         // }
       }
     },

src/views/study/coursenew.vue

@@ -397,6 +397,8 @@
       this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
       this.courseId = this.$route.query.id;
       this.initContentId = this.$route.query.contentId;
+      this.stopStudyTime();//先关闭
+      this.cleanAppendTime();//
       this.loadData();
       //console.log(this.$xpage.constants.fileBaseUrl,'this.$xpage.constants.fileBaseUrl');
     },
@@ -436,6 +438,7 @@
       }
     },
     destroyed(){
+      this.cleanAppendTime();
       this.stopStudyTime();
     },
     methods: {
@@ -446,6 +449,12 @@
         //视频点定位，直接到播放的视频位置
          this.timer = new Date().getTime()
       },
+      //清空追加学习时长事件
+      cleanAppendTime(){
+         if(this.appendStudyOtherHandle){
+            window.clearTimeout(this.appendStudyOtherHandle);
+         }
+      },
       //非音视频课学习时长的增加,每一分钟保存一次
       appendStudyOtherTime() {
         //console.log('开始追加学习时长',this.isAppendTime);