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/components/clockitem/index.js

@@ -97,20 +97,20 @@ Component({
       } = e.currentTarget;
       const cid = dataset.cid;
       let imgOrVideo = JSON.parse(this.data.clock.video).length;
-      if(imgOrVideo > 0){
-        if (this.data.clock.review && this.data.clock.review[1] && this.data.clock.review[1].method == 2) {
-          wx.navigateTo({
-            url: `/business/pages/commenteditor/imagelistshow?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
-          })
-          return;
-        }
-        if (this.data.clock.review && this.data.clock.review[1] &&  this.data.clock.review[1].method == 1) {
-          wx.navigateTo({
-            url: `/business/pages/commenteditor/index?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
-          })
-          return;
-        }
-      }else{
+      let imageArr = JSON.parse(this.data.clock.video).filter((ele) => ele.type == 'image');
+      if (this.data.clock.review && this.data.clock.review[1] && this.data.clock.review[1].method == 2) {
+        wx.navigateTo({
+          url: `/business/pages/commenteditor/imagelistshow?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
+        })
+        return;
+      }
+      if (this.data.clock.review && this.data.clock.review[1] &&  this.data.clock.review[1].method == 1) {
+        wx.navigateTo({
+          url: `/business/pages/commenteditor/index?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
+        })
+        return;
+      }
+      if(imageArr.length == 0){
         wx.navigateTo({
           url: `/business/pages/commenteditor/index?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
         })

business/pages/commenteditor/imagelistshow.wxml

@@ -15,7 +15,9 @@
                     </view>
                     <image class="sign-img" mode="aspectFill" src="{{filter.videoPoster(imageitem.src, 'image/resize,w_640/format,jpg/quality,q_50')}}"></image>
                 </block>
-                <image wx:if="{{hasReviewedWork[imageitem.src]}}" class="hascomment" src="{{imageRoot}}2b/commenteditor/hascomment.png?{{imageVersion}}"></image>
+                <block  wx:if="{{hasReviewedWork[imageitem.src]}}">
+                    <image  class="hascomment" src="{{imageRoot}}2b/commenteditor/hascomment.png?{{imageVersion}}"></image>
+                </block>
             </view>
         </view>
     </view>

business/pages/commenteditor/imagelistshow.wxss

@@ -69,6 +69,7 @@
 .imageitem .sign-img {
     width: 346rpx;
     height: 460rpx;
+    position: absolute;
 }
 .imageischeck {
     position: absolute;