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

business/pages/calendarthemeeditor/index.js

@@ -734,7 +734,7 @@ Page({
       }
     })
     this.innerAudioContext.seek(audioStorage[value].currentTime)
-    this.innerAudioContext.play();
+    this.innerAudioContext.play()
     this.innerAudioContext.onError((e)=>{
       const { actPalyaudioValue, audioStorage} = this.data
       audioStorage[actPalyaudioValue].isWaiting = false;

business/pages/themeeditor/index.js

@@ -112,10 +112,52 @@ Page({
       {type: 5,label:"今日练字作业",title: '请各位同学认真查看今日要练习的作业，并跟着练习'}
     ],
     currentMockType: 0,
-    successDailogShow: false
+    successDailogShow: false,
+    actPalyaudioValue: ''
   },
   onLoad: function(options) { // Do some initialize when page load.
+    const that = this;
     this.innerAudioContext = wx.createInnerAudioContext(); // 当前页面唯一的一个音频容器
+    this.innerAudioContext.onWaiting((e)=>{
+      const { actPalyaudioValue, audioStorage} = this.data
+      if(audioStorage[actPalyaudioValue].isWaiting){
+        return
+      }
+      audioStorage[actPalyaudioValue].isWaiting = true
+      that.setData({
+        audioStorage,
+      })
+      setTimeout((e)=>{
+        this.data.audioStorage[actPalyaudioValue].isWaiting = false;
+        this.setData({
+          audioStorage: this.data.audioStorage
+        })
+      },5000)
+    })
+    this.innerAudioContext.onTimeUpdate((e) => {
+      const { actPalyaudioValue, audioStorage} = this.data
+      if (audioStorage[actPalyaudioValue].isWaiting) {
+        clearInterval(that.data.voiceInterval);
+        that.voiceIntervalPlay(actPalyaudioValue);
+        audioStorage[actPalyaudioValue].isWaiting = false
+        that.setData({
+          audioStorage,
+        })
+      }
+    })
+    this.innerAudioContext.onError((e)=>{
+      const { actPalyaudioValue, audioStorage} = this.data
+      audioStorage[actPalyaudioValue].isWaiting = false;
+      audioStorage[actPalyaudioValue].play = false;
+      wx.showToast({
+        title: '音频播放出错啦',
+        icon: 'none',
+        duration: 2000
+      })
+      that.setData({
+        audioStorage,
+      })
+    });
     const {
       id,
       tid,
@@ -612,60 +654,22 @@ Page({
         audioStorage[value].play = true;
       }
     }
-    this.innerAudioContext.onWaiting((e)=>{
-      const { actPalyaudioValue, audioStorage} = this.data
-      if(audioStorage[actPalyaudioValue].isWaiting){
-        return
-      }
-      audioStorage[actPalyaudioValue].isWaiting = true
-      that.setData({
-        audioStorage,
-      })
-      setTimeout((e)=>{
-        this.data.audioStorage[actPalyaudioValue].isWaiting = false;
-        this.setData({
-          audioStorage: this.data.audioStorage
-        })
-      },5000)
-    })
-    this.innerAudioContext.onTimeUpdate((e) => {
-      const { actPalyaudioValue, audioStorage} = this.data
-      if (audioStorage[actPalyaudioValue].isWaiting) {
-        clearInterval(that.data.voiceInterval);
-        that.voiceIntervalPlay(actPalyaudioValue);
-     
-        audioStorage[actPalyaudioValue].isWaiting = false
-        that.setData({
-          audioStorage,
-        })
-      }
-    })
-    this.innerAudioContext.onCanplay((e)=>{
-      const { actPalyaudioValue, audioStorage} = this.data
-      if (audioStorage[actPalyaudioValue].isWaiting) {
-        clearInterval(that.data.voiceInterval);
-        that.voiceIntervalPlay(actPalyaudioValue);
-        audioStorage[actPalyaudioValue].isWaiting = false
-        that.setData({
-          audioStorage,
-        })
-      }
-    })
+    
+    // this.innerAudioContext.onCanplay((e)=>{
+    //   const { actPalyaudioValue, audioStorage} = this.data
+    //   if (audioStorage[actPalyaudioValue].isWaiting) {
+    //     clearInterval(that.data.voiceInterval);
+    //     that.voiceIntervalPlay(actPalyaudioValue);
+    //     audioStorage[actPalyaudioValue].isWaiting = false
+    //     that.setData({
+    //       audioStorage,
+    //     })
+    //   }
+    // })
+    console.log(audioStorage[value].currentTime, 'audioStorage[value].currentTime');
     this.innerAudioContext.seek(audioStorage[value].currentTime)
     this.innerAudioContext.play();
-    this.innerAudioContext.onError((e)=>{
-      const { actPalyaudioValue, audioStorage} = this.data
-      audioStorage[actPalyaudioValue].isWaiting = false;
-      audioStorage[actPalyaudioValue].play = false;
-      wx.showToast({
-        title: '音频播放出错啦',
-        icon: 'none',
-        duration: 2000
-      })
-      that.setData({
-        audioStorage,
-      })
-    });
+    
     //that.voiceIntervalPlay(value);
     that.setData({
       audioStorage,

src/components/clockitemv2/index.js

@@ -112,7 +112,10 @@ Component({
     fingureAnimation:false,
   },
   created () {
-
+    // console.log(LocalStorage.getItem('visitor'), "LocalStorage.getItem('visitor')")
+    // this.setData({
+    //   visitor: LocalStorage.getItem('visitor'),
+    // })
   },
   attached () {
   },
@@ -123,6 +126,9 @@ Component({
   // 最后一次单击事件点击发生时间
   lastTapTime: 0, 
   ready () {
+    this.setData({
+      visitor: LocalStorage.getItem('visitor'),
+    })
     // const customerId = LocalStorage.getItem('visitor') && LocalStorage.getItem('visitor').studentId;
     const customerId = app.globalData.currentSchoolStudentId;
     this.setData({