Merge branch 'develop' into test

@@ -6,9 +6,9 @@
     <a class="end-btn" href="javascript:;">活动已结束</a>
     <a class="end-btn" href="javascript:;">活动已结束</a>
     {{/if}}
     {{/if}}
     {{# like}}
     {{# like}}
-    <a class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" href="javascript:;" data-cid="{{cid}}">
+    <a class="user-like" href="javascript:;">
         <span class="iconfont">&#xe600;</span>
         <span class="iconfont">&#xe600;</span>
-        <b>{{#if num}}{{num}}{{/if}}</b>
+        <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{num}}</b>
     </a>
     </a>
     {{/ like}}
     {{/ like}}
 </div>
 </div>

@@ -11,4 +11,4 @@
         <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{num}}</b>
         <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{num}}</b>
     </a>
     </a>
     {{/ like}}
     {{/ like}}
-</div>
+</div>