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

 {{> layout/writer_header320}}
 {{> layout/writer_header320}}
 <div class="comment">
 <div class="comment">
     <h2 class="about-h2">意见反馈</h2>
     <h2 class="about-h2">意见反馈</h2>
-
-    <div class="comments-box feedback">
-
+    <div class="about-body feedback-body">
+        <div class="comments-box feedback"></div>
     </div>
     </div>
 </div>
 </div>
+{{> common/comment}}
+{{> common/third_login}}
 {{> layout/footer320}}
 {{> layout/footer320}}

@@ -6,9 +6,12 @@
     <h3 class="share-h3">{{subTitle}}</h3>
     <h3 class="share-h3">{{subTitle}}</h3>
 
 
     <p>
     <p>
-        <a href="{{channelLink}}">{{channel}}</a>
-        <a href="{{twoChannelLink}}">{{twoChannel}}</a>
-        {{time}}
+        {{# author}}
+        <a class="detail_author" href="{{links}}" target="_blank">{{name}}</a>
+        {{/ author}}
+        <a href="{{channelLink}}">{{channel}}</a>&nbsp;|&nbsp;
+        <a href="{{twoChannelLink}}">{{twoChannel}}</a>&nbsp;|&nbsp;
+        <span time="{{time}}" class="time-format"></span>
     </p>
     </p>
 
 
     <div class="media">
     <div class="media">
@@ -50,11 +53,11 @@
 {{# tags}}
 {{# tags}}
 <div class="tags">
 <div class="tags">
     <ul>
     <ul>
-        {{# tagsItem}}
+        {{# tagItem}}
         <li>
         <li>
             <a href="{{link}}" target="_blank">{{name}}</a>
             <a href="{{link}}" target="_blank">{{name}}</a>
         </li>
         </li>
-        {{/ tagsItem}}
+        {{/ tagItem}}
     </ul>
     </ul>
 </div>
 </div>
 {{/ tags}}
 {{/ tags}}
@@ -106,6 +109,7 @@
     <h2>相关推荐</h2>
     <h2>相关推荐</h2>
     <ul></ul>
     <ul></ul>
 </div>
 </div>
+{{> default/download320}}
 {{> default/share320}}
 {{> default/share320}}
 {{> layout/footer320}}
 {{> layout/footer320}}
 
 

@@ -6,7 +6,7 @@
         <ul class="swiper-wrapper">
         <ul class="swiper-wrapper">
             {{#bannerItem}}
             {{#bannerItem}}
             <li class="swiper-slide">
             <li class="swiper-slide">
-                <a href="{{href}}">
+                <a href="{{link}}">
                     <img src="{{img}}" alt="banner"/>
                     <img src="{{img}}" alt="banner"/>
                 </a>
                 </a>
             </li>
             </li>

@@ -5,8 +5,8 @@
         <ul class="swiper-wrapper">
         <ul class="swiper-wrapper">
             {{#bannerItem}}
             {{#bannerItem}}
             <li class="swiper-slide">
             <li class="swiper-slide">
-                <a href="{{href}}">
-                    <img src="{{img}}" alt="banner"/>
+                <a href="{{link}}">
+                    <img src="{{img}}" alt=""/>
                 </a>
                 </a>
             </li>
             </li>
             {{/bannerItem}}
             {{/bannerItem}}

@@ -87,3 +87,12 @@
     });
     });
 </script>
 </script>
 {{/ detail}}
 {{/ detail}}
+
+{{# about}}
+<script type="text/javascript">
+    seajs.use(['js/common','js/channel/feedback'], function (common,feedback) {
+        common.init();
+        feedback.init();
+    });
+</script>
+{{/ about}}

 <!--download-->
 <!--download-->
-{{#app}}
 <div class="home-download">
 <div class="home-download">
     <div>
     <div>
         <span class="app-icon"></span>
         <span class="app-icon"></span>
@@ -9,7 +8,7 @@
         <h3>No Fashion,No Life!</h3>
         <h3>No Fashion,No Life!</h3>
 
 
         <p>线上周刊，带你览遍世界仙踪</p>
         <p>线上周刊，带你览遍世界仙踪</p>
-        <a href="#" class="down-btn" data-ios="{{girl.ios}}" data-android="{{girl.android}}">下载客户端</a>
+        <a href="#" class="down-btn" data-ios="https://itunes.apple.com/cn/app/yoho!-girls-no-fashion-no/id918398578?mt=8&down.myapp.com" data-android="http://app.yoho.cn/install/YohoGirl_YOHO.apk">下载客户端</a>
     </div>
     </div>
     <div>
     <div>
         <span class="app-icon"></span>
         <span class="app-icon"></span>
@@ -19,7 +18,6 @@
         <h3>We love to Play & Learn</h3>
         <h3>We love to Play & Learn</h3>
 
 
         <p>线上周刊，潮流百科生活指南</p>
         <p>线上周刊，潮流百科生活指南</p>
-        <a href="#" class="down-btn" data-ios="{{boy.ios}}" data-android="{{boy.android}}">下载客户端</a>
+        <a href="#" class="down-btn" data-ios="https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&down.myapp.com" data-android="http://yoho-apps.qiniudn.com/YohoBoys.apk">下载客户端</a>
     </div>
     </div>
 </div>
 </div>
-{{/app}}

 <div class="detail-title">
 <div class="detail-title">
     <h1>{{title}}</h1>
     <h1>{{title}}</h1>
     <h2>{{subtitle}}</h2>
     <h2>{{subtitle}}</h2>
-    <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
+    {{#if author}}
+        <p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;<span class="detail-time" _time="{{time}}"></span></p>
+    {{^}}
+        <p class="detail-category">{{class}}&nbsp;|&nbsp;<span class="detail-time" _time="{{time}}"></span></p>
+    {{/if}}
+    
 </div>
 </div>

@@ -36,6 +36,6 @@
     <!--header-->
     <!--header-->
     <header class="girl-header">
     <header class="girl-header">
         <span class="header-logo">Logo</span>
         <span class="header-logo">Logo</span>
-        <span class="header-back">search</span>
+        <span class="header-back" onclick="history.go(-1);"></span>
         <span class="header-share">share</span>
         <span class="header-share">share</span>
     </header>
     </header>