Merge remote-tracking branch 'origin/sj-dev-v6' into wxl-develop

business/pages/circleindex/index.wxss

@@ -683,7 +683,7 @@ page{
     height: 26rpx;
     /* padding: 0 0 30rpx 30rpx; */
 }
-.operatebox  .icon_copy{
+.operatebox .icon_copy{
     width: 100%;
     height: 100%;
 }

dist/w-countdown/index.js

@@ -162,4 +162,4 @@ WussComponent({
       }
     }
   },
-});
\ No newline at end of file
+});

src/components/clockitemv2/index.wxml

@@ -190,8 +190,8 @@
                 <button form-type="submit" class="createidbutton">生成form</button>
             </form> -->
             <image class="iconimg {{clock.had_like ? 'fingureuporedicon' : ''}}" src="{{imageRoot}}2c/clockdetail/{{clock.had_like ? 'redheart' : 'heart'}}.png?{{imageVersion}}" ></image>
-            <text class="btnname" style="{{clock.had_like ? 'color:#FF6161' : ''}}"  >赞</text>
-            <!-- <text class="btnname {{clock.had_like == 1 ? 'fingurecount':''}}"  wx:if="{{clock.likes.total > 0}}">赞{{clock.likes.total}}</text> -->
+            <!-- <text class="btnname" style="{{clock.had_like ? 'color:#FF6161' : ''}}"  >赞</text> -->
+            <text class="btnname" style="{{clock.had_like ? 'color:#FF6161' : ''}}"  wx:if="{{clock.likes.total > 0}}">赞{{clock.likes.total}}</text>
         </view>
         <view class="btn assess-btn" data-cid="{{clock.id}}" bindtap="goEvaluate">
             <form report-submit="true" bindsubmit="formIdCreate" class="createidform">

src/pages/clockdetail/shareclock.wxml

@@ -13,7 +13,6 @@
             <button open-type="share"></button>       
         </view>  
     </view>
-      
 </view>
 <scoregetfeedback
     sid="{{circleInfo.school_id}}"