Merge branch 'develop' into test

@@ -7,7 +7,7 @@
     {{# header}}
         {{> detail/detail_title}}
     {{/ header}}
-    <div class="detail-body">
+    <div class="detail-body" id="{{id}}">
         {{# content}}
             {{> detail/trail_content}}
         {{/ content}}

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

 <script type="text/javascript" charset="utf-8">
-    seajs.use(['js/channel/review', 'js/public'], function() {});
+    seajs.use(['js/public','js/channel/review'], function() {});
 </script>
\ No newline at end of file