Merge branch 'wxl-develop' of git.server:wangxuelai/wechatapp.shangjiadao.com…

Merge branch 'wxl-develop' of git.server:wangxuelai/wechatapp.shangjiadao.com into imagecomment_lvtz

business/pages/commenteditor/imagecomment.js

@@ -168,10 +168,8 @@ Page({
           his.setData({
             voiceuploading: false
           })
-          wx.showModal({
-            title: '提示',
-            content: '录音上传失败',
-            showCancel: false 
+          wx.showToast({
+            title: '录音上传失败',
           })
         }
       }).catch((err) => {
@@ -179,10 +177,8 @@ Page({
           voiceuploading: false
         })
         this.data.audioStatus.upload = false;
-        wx.showModal({
-          title: '提示',
-          content: '录音上传失败',
-          showCancel: false 
+        wx.showToast({
+          title: '录音上传失败',
         })
       });
     })
@@ -553,7 +549,6 @@ Page({
     }
     this.recorderManager.resume();
     this.data.timeBetween2points += (new Date().getTime() - this.data.pausebtnTouchTime);
-    console.log(this.data.timeBetween2points, 'this.data.timeBetween2points');
     that.setData({
       step: 2,
       ispainting: true,
@@ -574,7 +569,9 @@ Page({
   //播放声音
   gopreview () {
     if(!this.data.audioCanPlay){
-      console.log('请稍后。。')
+      wx.showToast({
+        title: '录音上传中...'
+      })
       return
     }
     let that = this;
@@ -601,7 +598,6 @@ Page({
     let that = this;
     let drawTrail = [];
     this.data.startPlaytimeStamp = new Date().getTime();
-
     this.innerAudioContext.src = audioorigin(this.data.audioInfo.src);
     this.innerAudioContext.play();
     this.innerAudioContext.obeyMuteSwitch = false;

business/pages/commenteditor/imagelistshow.js

@@ -75,7 +75,7 @@ Page({
       if (code == 200) {
         data.video_parse = JSON.parse(data.video);
         this.setData({
-          videoArray: data.video_parse,
+          videoArray: data.video_parse.filter((ele) => ele.type == 'image'),
         })
       }
     }).catch(() => {