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

@@ -2,7 +2,7 @@
     <span class="content-item-detail-a-img">
         <a href="{{link}}" target="_blank" class="link" title="{{title}}">
             <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;">
-            <span class="arrow-bottom girl-channel-arrow{{# channelClass}}-{{.}}{{/ channelClass}}"></span>
+            <span class="arrow-bottom girl-channel-arrow{{# channelType}}-{{.}}{{/ channelType}}"></span>
         </a>
         <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
     </span>
@@ -19,7 +19,7 @@
         {{/ subChannel}}
         <span></span>
     </span>
-    <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a>
-    <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a>
+    <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelType}}-{{.}}{{/ channelType}}" _title="{{title}}">{{title}}</a>
+    <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelType}}-{{.}} content-item-detail-subtitle-style{{/ channelType}}" _title="{{subtitle}}">{{subtitle}}</a>
     <a href="{{link}}" target="_blank" class="content-item-detail content-item-detail-detail" len="{{detailLength}}" _title="{{detail}}"></a>
 </div>
\ No newline at end of file

-<div class="home-item-public {{# borderClass}}home-item-border{{/ borderClass}} {{# channelClass}}content-{{.}}{{/ channelClass}}">
+<div class="home-item-public {{# borderClass}}home-item-border{{/ borderClass}} {{# channelType}}content-{{.}}{{/ channelType}}">
     <a href="{{link}}" target="_blank" class="img-link" title="{{title}}">
         <img class="img lazy" data-original="{{img}}" alt="{{title}}"/>
         <span class="arrow-bottom girl-channel-arrow"></span>

@@ -5,14 +5,14 @@
         <span class='pop-img-container swiper-wrapper'>
             {{# pop}}
             <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
-                <img src='{{img}}' class='img'/>
-                <a class='title'_title='{{title}}'>{{title}}</a>
+                <a><img src='{{img}}' class='img'/></a>
+                <a href='{{link}}' class='title'_title='{{title}}'>{{title}}</a>
                 <span class='date default-pop-date' _time='{{time}}'>
                 {{#if channelClass}}
-                    <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
+                    <a target="_blank" href='{{link}}' class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
                 {{/if}}
                 </span>
-                <a class='detail' _title='{{detail}}'>{{detail}}</a>
+                <a class='detail' href='{{link}}' _title='{{detail}}'>{{detail}}</a>
             </span>
             {{/ pop}}
         </span>

@@ -5,14 +5,14 @@
         <span class='pop-img-container swiper-wrapper'>
             {{# pop}}
             <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
-                <img src='{{img}}' class='img'/>
-                <a class='title'_title='{{title}}'>{{title}}</a>
+                <a><img src='{{img}}' class='img'/></a>
+                <a href='{{link}}' class='title'_title='{{title}}'>{{title}}</a>
                 <span class='date default-pop-date' _time='{{time}}'>
                 {{#if channelClass}}
-                    <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
+                    <a target="_blank" href='{{link}}' class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
                 {{/if}}
                 </span>
-                <a class='detail' _title='{{detail}}'>{{detail}}</a>
+                <a class='detail' href='{{link}}' _title='{{detail}}'>{{detail}}</a>
             </span>
             {{/ pop}}
         </span>

-{{> layout/header_jian }}
+{{> layout/header_fan }}
 {{> default/channel_banner}}
 <!--六个小电视-->
 <div class="tv-area">
@@ -71,4 +71,4 @@
         </div>
     </div>
 </div>
-{{> layout/footer_jian }}
\ No newline at end of file
+{{> layout/footer_fan }}
\ No newline at end of file

@@ -29,6 +29,7 @@
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
                 <li class="jianfan"><a class="unchoosen"  href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
+
             </ul>
         </div>
 

@@ -7,11 +7,6 @@
             <p><span>{{date}} </span> | {{title}}</p>
             <p class="price">RMB15</p>
         </div>
-        {{# buyUrl}}
-        <div class="mags-buy">
-            <a target="_blank" href="{{url}}" class="buy-btn">立即購買</a>
-        </div>
-        {{/ buyUrl}} 
     </div>
     <div class="mags-slide">
         <div class="slide-box swiper-container">