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/videocomment.wxml

@@ -12,7 +12,7 @@
             </cover-view>
         </cover-view>
     </cover-view>
-    <!-- transformOssVideofyM3u8 -->
+    <!--  transformOssVideofyM3u8-->
     <!-- transformOssVideofy -->
     <view class="imageView">
         <video

src/pages/interactcommentplay/index.js

@@ -515,6 +515,9 @@ Page({
           this.data.intervaltimestamp = 0;
           this.data.playdurationtime = 0;
           this.innerAudioContext.stop();
+          if (this.data.type == 2) {
+            this.videoContext.pause();
+          }
           this.setData({
             audioStorage,
             // medalgivenarr: [],