Authored by unknown

Merge branch 'develop' into test

@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 {{# header}} 7 {{# header}}
8 {{> detail/detail_title}} 8 {{> detail/detail_title}}
9 {{/ header}} 9 {{/ header}}
10 - <div class="detail-body"> 10 + <div class="detail-body" id="{{id}}">
11 {{# content}} 11 {{# content}}
12 {{> detail/trail_content}} 12 {{> detail/trail_content}}
13 {{/ content}} 13 {{/ content}}
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 {{# header}} 7 {{# header}}
8 {{> detail/detail_title}} 8 {{> detail/detail_title}}
9 {{/ header}} 9 {{/ header}}
10 - <div class="detail-body"> 10 + <div class="detail-body" id="{{id}}">
11 {{# content}} 11 {{# content}}
12 {{> detail/trail_content}} 12 {{> detail/trail_content}}
13 {{/ content}} 13 {{/ content}}
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 {{# like}} 8 {{# like}}
9 <a class="user-like {{# isLike}}like{{/ isLike}}" href="javascript:;"> 9 <a class="user-like {{# isLike}}like{{/ isLike}}" href="javascript:;">
10 <span class="iconfont">&#xe600;</span> 10 <span class="iconfont">&#xe600;</span>
11 - <b class="like-num">{{#if num}}{{num}}{{/if}}</b> 11 + <b class="like-num">{{num}}</b>
12 </a> 12 </a>
13 {{/ like}} 13 {{/ like}}
14 </div> 14 </div>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 {{# like}} 8 {{# like}}
9 <a class="user-like" href="javascript:;"> 9 <a class="user-like" href="javascript:;">
10 <span class="iconfont">&#xe600;</span> 10 <span class="iconfont">&#xe600;</span>
11 - <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{#if num}}{{num}}{{/if}}</b> 11 + <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{num}}</b>
12 </a> 12 </a>
13 {{/ like}} 13 {{/ like}}
14 </div> 14 </div>
1 <script type="text/javascript" charset="utf-8"> 1 <script type="text/javascript" charset="utf-8">
2 //详情页面JS 2 //详情页面JS
3 - seajs.use(['js/channel/detail-trial', 'js/public']); 3 + seajs.use(['js/public', 'js/channel/detail-trial']);
4 </script> 4 </script>