Authored by happyhour7

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

@@ -2,23 +2,7 @@ @@ -2,23 +2,7 @@
2 <div class="related-posts"> 2 <div class="related-posts">
3 <h2>新品播报</h2> 3 <h2>新品播报</h2>
4 <ul class="postslist clearfix"> 4 <ul class="postslist clearfix">
5 - {{# postList}}  
6 - <li>  
7 - <a href="{{url}}" target="_blank">  
8 - <div class="pic">  
9 - <img src="{{src}}" alt="">  
10 - {{# isVideo}}  
11 - <span class="play-icon"></span>  
12 - {{/ isVideo}}  
13 - <span class="arrow-bottom girl-{{channel}}-arrow"></span>  
14 - </div>  
15 - <div class="post-title">  
16 - <h4>{{title}}</h4>  
17 - <p>{{subtitle}}</p>  
18 - </div>  
19 - </a>  
20 - </li>  
21 - {{/ postList}} 5 + {{> detail/related_post}}
22 </ul> 6 </ul>
23 <a href="javascript:;" class="load-more"></a> 7 <a href="javascript:;" class="load-more"></a>
24 </div> 8 </div>
  1 +<script id="side-related-posts" type="x-tmpl-mustache">
1 {{# relatedPost}} 2 {{# relatedPost}}
2 <div class="side-related-posts"> 3 <div class="side-related-posts">
3 <h2>热播</h2> 4 <h2>热播</h2>
4 <ul class="side-postslist"> 5 <ul class="side-postslist">
5 - {{# postList}}  
6 - <li>  
7 - <a class="clearfix" href="{{url}}">  
8 - <div class="pic">  
9 - <img src="{{src}}" alt="">  
10 - {{# isVideo}}  
11 - <span class="play-icon"></span>  
12 - {{/ isVideo}}  
13 - </div>  
14 - <div class="post-title">  
15 - <h4>{{title}}</h4>  
16 - <p>{{subtitle}}</p>  
17 - </div>  
18 - </a>  
19 - </li>  
20 - {{/ postList}} 6 + {{> detail/related_post}}
21 </ul> 7 </ul>
22 </div> 8 </div>
23 {{/ relatedPost}} 9 {{/ relatedPost}}
  10 +</script>
  1 +{{# postList}}
  2 +<li>
  3 + <a href="{{url}}" target="_blank">
  4 + <div class="pic">
  5 + <img src="{{src}}" alt="">
  6 + {{# isVideo}}
  7 + <span class="play-icon"></span>
  8 + {{/ isVideo}}
  9 + <span class="arrow-bottom girl-{{channel}}-arrow"></span>
  10 + </div>
  11 + <div class="post-title">
  12 + <h4>{{title}}</h4>
  13 + <p>{{subtitle}}</p>
  14 + </div>
  15 + </a>
  16 +</li>
  17 +{{/ postList}}
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'], function(detail) { 3 + seajs.use(['js/channel/detail', 'js/public'], function(detail) {
4 if (detail) { 4 if (detail) {
5 detail.init(); 5 detail.init();
6 } 6 }
  7 +
  8 +
7 }); 9 });
8 </script> 10 </script>
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/magazine'], function(magazine) { 3 + seajs.use(['js/channel/magazine', 'js/public'], function(magazine) {
4 if (magazine) { 4 if (magazine) {
5 magazine.init(); 5 magazine.init();
6 } 6 }