Merge branch 'sj-dev-v10' of git.server:wangxuelai/wechatapp.shangjiadao.com into onlineclass_lvtz

src/pages/websiteindex/onlineclassroomplay.js

@@ -307,6 +307,12 @@ Page({
   changeCourse(e){
     const { item, index } = e.currentTarget.dataset;
     const { onlinesubcourses } = this.data;
+    if(onlinesubcourses.find(ele => item.id == ele.id).isAction){
+      this.setData({
+        catlogDailogShow: false
+      })
+      return
+    }
     onlinesubcourses.forEach(ele=>{
       if(ele.id == item.id){
         ele.isAction = true;
@@ -320,6 +326,16 @@ Page({
       catlogDailogShow: false
     })
     this.onlinecoursesdetailGet()
+    if (this.videoContext) {
+      this.videoContext.stop();
+    }
+    this.innerAudioContext.pause();
+    this.setData({
+      audioStorage: {
+
+      }
+    })
+    clearInterval(this.data.voiceInterval);
   },
   clickVideo(){
     if(this.data.videoStatus.isPlay){
@@ -537,7 +553,6 @@ Page({
     this.curAudioValue = value;
     this.innerAudioContext.obeyMuteSwitch = false;
     this.innerAudioContext.onTimeUpdate(function(e){
-      console.log(e)
       if(this.voiceIntervalPlayOn){
         return
       }
@@ -568,12 +583,11 @@ Page({
       clearInterval(that.data.voiceInterval);
       that.voiceIntervalPlay(value);
     })
-    this.innerAudioContext.seek(audioStorage[value].currentTime)
+    this.innerAudioContext.seek(audioStorage[value].currentTime);
     this.innerAudioContext.play();
     this.setData({
       audioStorage,
     })
-  
   },
   pausevoice(e) {
     const {