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

@@ -7,11 +7,13 @@
 
     <p>
         <a href="{{channelLink}}">{{channel}}</a>
-        <a href="{{tagLink}}">{{tag}}</a>
+        <a href="{{twoChannelLink}}">{{twoChannel}}</a>
         {{time}}
     </p>
 
-   <!-- <div class="media">
+    <div class="media">
+        <!--大图轮播-->
+        {{# coverSwiper}}
         <div class="detail-banner swiper-container">
             <ul class="swiper-wrapper">
                 {{#banner}}
@@ -22,16 +24,28 @@
             </ul>
             <div class="detail-switch">3/5</div>
         </div>
-    </div>-->
+        {{/ coverSwiper}}
+        <!--只有一张封面图-->
+        {{^ coverSwiper}}
+        {{# coverPic}}
+        <img src="{{img}}"/>
+        {{/ coverPic}}
+        {{/ coverSwiper}}
+
+        <!--翻转、变脸、视频-->
+        {{# coverEffect}}
+        <div>{{{html}}}</div>
+        {{/ coverEffect}}
+    </div>
     <!--内容-->
-    {{# content}}
-        {{> detail/detail_video320}}
-        {{> detail/detail_slide320}}
-        {{> detail/detail_img320}}
-    {{/ content}}
-    <div class="detail-text" cover-url="{{coverUrl}}"></div>
-    <!--标签-->
-    <div class="tags">
+    <div class="detail-text" cover-url="{{coverUrl}}">
+        {{{detailStr}}}
+    </div>
+</div>
+{{/detail}}
+
+<!--标签-->
+<div class="tags">
     <ul>
         {{#tags}}
         <li>
@@ -39,16 +53,16 @@
         </li>
         {{/tags}}
     </ul>
-    </div>
 </div>
-{{/detail}}
+
 <div class="comment">
     <ul class="statslist stats-btn">
         <li class="wow">
             <div>
                 <span>
                     <i style="display: inline;">4</i>
-                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/smile-mobile.png" alt="" style="display: none;">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/smile-mobile.png" alt=""
+                         style="display: none;">
                 </span>
             </div>
         </li>
@@ -56,7 +70,8 @@
             <div>
                 <span>
                     <i style="display: inline;">1</i>
-                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/nothing-mobile.png" alt="" style="display: none;">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/nothing-mobile.png" alt=""
+                         style="display: none;">
                 </span>
             </div>
         </li>
@@ -64,19 +79,26 @@
             <div>
                 <span>
                     <i style="display: inline;">2</i>
-                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/bad-mobile.png" alt="" style="display: none;">
+                    <img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/bad-mobile.png" alt=""
+                         style="display: none;">
                 </span>
             </div>
         </li>
         <li class="comments">
             <div>
-                <span class="comment-num" id="comment-num"><img src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/comment-mobile.png"></span>
+                <span class="comment-num" id="comment-num"><img
+                        src="http://cmsres.test.yoho.cn/res/new/boys/images/mobile/comment-mobile.png"></span>
             </div>
         </li>
     </ul>
-    <div class="comments-box" cid="1295" ctype="1" cc="101" ctwoc="101001"><ul class="comments-list"></ul><div class="comment-textarea"><textarea placeholder="说点什么..." cid="1295"></textarea><div class="login-status clearfix">
+    {{# comment}}
+    <div class="comments-box" data-id="{{id}}" data-type="{{type}}" data-c="{{c}}" data-twoc="{{twoc}}">
+        <ul class="comments-list"></ul>
+        <div class="comment-textarea"><textarea placeholder="说点什么..."></textarea>
+
+            <div class="login-status clearfix">
                 <div class="userimg">
-            <img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
+                    <img src="{{userImg}}" alt="">
                     <i></i>
                 </div>
                 <div class="userinfo" style="display: none;">
@@ -86,6 +108,45 @@
                 <div class="publish">
                     <a class="publish-btn" href="javascript:;">Publish</a>
                 </div>
-    </div></div></div>
+            </div>
+        </div>
+    </div>
+    {{/ comment}}
+</div>
+
+
+<div class="detail-page">
+    <span class="detail-prev">
+        <a href="{{prevLink}}" title="{{prevTitle}}" onclick="prevOrNextClickEvent();">上一篇</a>
+    </span>
+    <span class="detail-next">
+        <a href="{{nextLink}}" title="{{nextTitle}}" onclick="prevOrNextClickEvent();">下一篇</a>
+    </span>
+</div>
+
+
+<div class="recomment">
+    <h2>相关推荐</h2>
+    <ul></ul>
 </div>
 {{> layout/footer320}}
+
+
+<script id="related-tpl" type="x-tmpl-mustache">
+\{{#relatedPost}}
+    <li>
+        <a href="\{{link}}" target="_blank" onclick="relatedClickEvent();">
+            <div class="content-pic">
+                <img src="\{{cover}}" alt="" />
+                \{{#isVideo}}
+                    <span class="video-icon"></span>
+                \{{/isVideo}}
+            </div>
+            <div class="content-text">
+                <h2>\{{title}}</h2>
+                <h3>\{{subtitle}}</h3>
+            </div>
+        </a>
+    </li>
+\{{/relatedPost}}
+</script>
\ No newline at end of file

@@ -84,3 +84,13 @@
 
 </script>
 {{/ writer320_js}}
+
+
+{{# detail}}
+<script type="text/javascript">
+    seajs.use(['js/common','js/channel/detail'], function (common,detail) {
+        common.init();
+        detail.init();
+    });
+</script>
+{{/ detail}}
\ No newline at end of file