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

-{{> layout/header_jian }}
-{{> default/channel_banner}}
-<!--六个小电视-->
-<div class="tv-area">
-    {{# tvs}}
-    <span class="tv"> 
-        {{# link}}
-            <a class="tv-a"  href="{{link}}" target="_blank"></a>
-        {{/ link}}
-        {{^ link}}
-            <span class="tv-a"  href="{{link}}" target="_blank"></span>
-        {{/ link}}
-        <img class="tv-img" src="{{img}}" alt="{{alt}}"> 
-    </span>
-    {{/ tvs}}
-</div>
-<!--内容列表-->
-<div class="content clearfix">
-    {{# topItems}}
-        {{> default/default_item}}
-    {{/ topItems}}
-    <div class="right-advt">
-        {{# advert}}
-        <a class="link" href="{{link}}" target="_blank">
-            <img src="{{img}}" class="img" alt="{{alt}}"/>
-        </a>
-        {{/ advert}}
+{{# contentWithNothing}}
+    {{> default/index_with_nothing }}
+{{/ contentWithNothing}}
 
-        <div class="follow-us-default">
-            <div class="title">
-                {{# fanti}}
-                    Follow us
-                {{/ fanti}}
+{{# contentWithAdvert}}
+    {{> default/index_without_centerbanner}}
+{{/ contentWithAdvert}}
 
-                {{^ fanti}}
-                    关注我们
-                {{/ fanti}}
+{{# contentWithCenterBanner}}
+    {{> default/index_without_advert}}
+{{/ contentWithCenterBanner}}
 
-            </div>
-            <ul class="icons-content">
-                <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
-                <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>
-                <li class="li-weixin">
-                    <a class="icons weixin"></a>
-                    <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>
-                </li>
-                <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>
-                <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>
-            </ul>
-            <div class="follow-us-input-content">
-                <input type="text" value="" class="followus-input" placeholder="me@email.com">
-                <button class="button followus-button">订阅</button>
-            </div>
-        </div>
-    </div>
-    <!--中间的广告-->
-    {{> default/default_advt}}
-    <div class="bottom-item-container">
-        <!--下面的位置-->
-        {{# bottomItems}}
-            {{> default/default_item}}
-        {{/ bottomItems}}
-        {{> default/default_pop}}
-        
-        <div class="pager-content-default">
-            <span class="channel-index-pager">
-                {{# pager}}
-                    <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
-                {{/ pager}}
-            </span>
-        </div>
-    </div>
-</div>
-{{> layout/footer_jian }}
\ No newline at end of file
+{{# contentWithAll}}
+    {{> default/index_with_all}}
+{{/ contentWithAll}}

-{{> layout/header_fan}}
-{{> default/channel_banner}}
-<!--六个小电视-->
-<div class="tv-area">
-    {{# tvs}}
-    <span class="tv"> 
-        {{# link}}
-            <a class="tv-a"  href="{{link}}" target="_blank"></a>
-        {{/ link}}
-        {{^ link}}
-            <span class="tv-a"  href="{{link}}" target="_blank"></span>
-        {{/ link}}
-        <img class="tv-img" src="{{img}}" alt="{{alt}}"> 
-    </span>
-    {{/ tvs}}
-</div>
-<!--内容列表-->
-<div class="content clearfix">
-    {{# topItems}}
-        {{> default/default_item}}
-    {{/ topItems}}
-    <div class="right-advt">
-        {{# advert}}
-        <a class="link" href="{{link}}" target="_blank">
-            <img src="{{img}}" class="img" alt="{{alt}}"/>
-        </a>
-        {{/ advert}}
+{{# contentWithNothing}}
+    {{> default/index_with_nothing }}
+{{/ contentWithNothing}}
 
-        <div class="follow-us-default">
-            <div class="title">
-                {{# fanti}}
-                    Follow us
-                {{/ fanti}}
+{{# contentWithAdvert}}
+    {{> default/index_without_centerbanner}}
+{{/ contentWithAdvert}}
 
-                {{^ fanti}}
-                    关注我们
-                {{/ fanti}}
-            </div>
-            <ul class="icons-content">
-                <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
-                <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>
-                <li class="li-weixin">
-                    <a class="icons weixin"></a>
-                    <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>
-                </li>
-                <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>
-                <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>
-            </ul>
-            <div class="follow-us-input-content">
-                <input type="text" value="" class="followus-input" placeholder="me@email.com">
-                <button class="button followus-button">订阅</button>
-            </div>
-        </div>
-    </div>
-    <!--中间的广告-->
-    {{> default/default_advt}}
-    <div class="bottom-item-container">
-        <!--下面的位置-->
-        {{# bottomItems}}
-            {{> default/default_item}}
-        {{/ bottomItems}}
-        {{> default/default_pop}}
+{{# contentWithCenterBanner}}
+    {{> default/index_without_advert}}
+{{/ contentWithCenterBanner}}
 
-        <div class="pager-content-default">
-            <span class="channel-index-pager">
-                {{# pager}}
-                    <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
-                {{/ pager}}
-            </span>
-        </div>
-    </div>
-</div>
-{{> layout/footer_fan }}
\ No newline at end of file
+{{# contentWithAll}}
+    {{> default/index_with_all}}
+{{/ contentWithAll}}
\ No newline at end of file

 {{> layout/header_jian }}
-<div id="search-content">
+<div id="search-content" class="clearfix">
     <div class="search-content">
         <div class="search-input-content">
             <input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>

@@ -7,10 +7,17 @@
         <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
     </span>
     <span class="content-item-detail-subchannle" _time="{{time}}">
-        <a href="{{subChannelLink}}">
-            {{subChannel}}  
-        </a> 
-        &nbsp;/&nbsp;&nbsp;<span></span>
+        {{# channel}}
+        <a href="{{../channelLink}}">
+            {{.}}  
+        </a>&nbsp;/&nbsp;
+        {{/ channel}}
+        {{# subChannel}}
+        <a href="{{../subChannel}}">
+            {{.}}  
+        </a>&nbsp;/&nbsp;
+        {{/ 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>

+{{# WEnvironment}}
+    <script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
+{{/ WEnvironment}}
+
+{{^ WEnvironment}}
+    <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_hk.js"></script>
+    <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
+    <script type="text/javascript">
+        seajs.use("index");
+    </script>
+{{/ WEnvironment}}
\ No newline at end of file

@@ -10,7 +10,9 @@
                 <div class="wx-popup-hd">
                      <span>分享到微信朋友圈</span>
                 </div>
-                <div class="wx-popup-bd"></div>
+                <div class="wx-popup-bd">
+                    <img src="http://newgirls.test.yoho.cn/go/qrcode?text={{url}}">
+                </div>
                 <div class="wx-popup-ft">打開微信，點擊底部的“發現”，使用<br>“掃一掃”即可將網頁分享至朋友圈。</div>
             </div>
         </li>

@@ -2,9 +2,17 @@
     <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>
+        {{# isVideo}}<span class="video-icon-Fragment"></span>{{/ isVideo}}
     </a>
     <div class="item-text-area">
-        <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / </span>
+        <span class="item-date" _time="{{time}}">
+        {{# channel}}
+        <a class="channel" href="{{../channelURL}}" target="_blank">{{.}}</a> / 
+        {{/ channel}}
+        {{# subChannel}}
+        <a class="channel" href="{{../subChannelLink}}" target="_blank">{{.}}</a> / 
+        {{/ subChannel}}
+        </span>
         <a class="item-title" href="{{link}}" target="_blank"  _title="{{title}}">{{title}}</a>
         <a class="item-title" href="{{link}}" target="_blank"  _title="{{subtitle}}">{{subtitle}}</a>
         <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a>

-<div class='pop-container' {{# centerBanner}} style="border-top:0;"{{/centerBanner}}>
+
+<div class='pop-container' style="position:relative;">
     <span class='pop-text'>#POP</span>
     <div class="swiper-container3">
         <span class='pop-img-container swiper-wrapper'>
             {{# pop}}
-            <a class='pop-link swiper-slide' href="{{link}}" target="_blank">
+            <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
                 <img src='{{img}}' class='img'/>
-                <span class='title'_title='{{title}}'>{{title}}</span>
+                <a class='title'_title='{{title}}'>{{title}}</a>
                 <span class='date default-pop-date' _time='{{time}}'>
                 {{#if channelClass}}
-                    <a target="_blank" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
-                {{/if}}</span>
-                <span class='detail' _title='{{detail}}'>{{detail}}</span>
-            </a>
+                    <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
+                {{/if}}
+                </span>
+                <a class='detail' _title='{{detail}}'>{{detail}}</a>
+            </span>
             {{/ pop}}
         </span>
     </div>

-<div class='pop-container'  style='position:relative;'>
+
+<div class='pop-container' style="position:relative;">
     <span class='pop-text'>#POP</span>
     <div class="swiper-container3">
         <span class='pop-img-container swiper-wrapper'>
             {{# pop}}
-            <a class='pop-link swiper-slide' href="{{link}}" target="_blank">
+            <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
                 <img src='{{img}}' class='img'/>
-                <span class='title'_title='{{title}}'>{{title}}</span>
-                <span class='date' _title='{{date}}'>{{date}}</span>
-                <span class='detail' _title='{{detail}}'>{{detail}}</span>
-            </a>
+                <a 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;
+                {{/if}}
+                </span>
+                <a class='detail' _title='{{detail}}'>{{detail}}</a>
+            </span>
             {{/ pop}}
         </span>
     </div>

+{{> layout/header_jian }}
+{{> default/channel_banner}}
+<!--六个小电视-->
+<div class="tv-area">
+    {{# tvs}}
+    <span class="tv"> 
+        {{# link}}
+            <a class="tv-a"  href="{{link}}" target="_blank"></a>
+        {{/ link}}
+        {{^ link}}
+            <span class="tv-a"  href="{{link}}" target="_blank"></span>
+        {{/ link}}
+        <img class="tv-img" src="{{img}}" alt="{{alt}}"> 
+    </span>
+    {{/ tvs}}
+</div>
+<!--内容列表-->
+<div class="content clearfix">
+    {{# topItems}}
+        {{> default/default_item}}
+    {{/ topItems}}
+    <div class="right-advt">
+        {{# advert}}
+        <a class="link" href="{{link}}" target="_blank">
+            <img src="{{img}}" class="img" alt="{{alt}}"/>
+        </a>
+        {{/ advert}}
+        
+        <div class="follow-us-default">
+            <div class="title">
+                {{# fanti}}
+                    Follow us
+                {{/ fanti}}
+
+                {{^ fanti}}
+                    关注我们
+                {{/ fanti}}
+
+            </div>
+            <ul class="icons-content">
+                <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
+                <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>
+                <li class="li-weixin">
+                    <a class="icons weixin"></a>
+                    <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>
+                </li>
+                <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>
+                <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>
+            </ul>
+            <div class="follow-us-input-content">
+                <input type="text" value="" class="followus-input" placeholder="me@email.com">
+                <button class="button followus-button">订阅</button>
+            </div>
+        </div>
+    </div>
+    <!--中间的广告-->
+    {{> default/default_advt}}
+    <div class="bottom-item-container">
+        <!--下面的位置-->
+        {{# bottomItems}}
+            {{> default/default_item}}
+        {{/ bottomItems}}
+        {{> default/default_pop}}
+        
+        <div class="pager-content-default">
+            <span class="channel-index-pager">
+                {{# pager}}
+                    <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
+                {{/ pager}}
+            </span>
+        </div>
+    </div>
+</div>
+{{> layout/footer_jian }}
\ No newline at end of file

+{{> layout/header_jian }}
+{{> default/channel_banner}}
+<!--六个小电视-->
+<div class="tv-area">
+    {{# tvs}}
+    <span class="tv"> 
+        {{# link}}
+            <a class="tv-a"  href="{{link}}" target="_blank"></a>
+        {{/ link}}
+        {{^ link}}
+            <span class="tv-a"  href="{{link}}" target="_blank"></span>
+        {{/ link}}
+        <img class="tv-img" src="{{img}}" alt="{{alt}}"> 
+    </span>
+    {{/ tvs}}
+</div>
+<!--内容列表-->
+<div class="content clearfix">
+    {{# topItems}}
+        {{> default/default_item}}
+    {{/ topItems}}
+    <div class="right-advt">
+        {{# advert}}
+        <a class="link" href="{{link}}" target="_blank">
+            <img src="{{img}}" class="img" alt="{{alt}}"/>
+        </a>
+        {{/ advert}}
+        
+        <div class="follow-us-default">
+            <div class="title">
+                {{# fanti}}
+                    Follow us
+                {{/ fanti}}
+
+                {{^ fanti}}
+                    关注我们
+                {{/ fanti}}
+
+            </div>
+            <ul class="icons-content">
+                <li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
+                <li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina"></a></li>
+                <li class="li-weixin">
+                    <a class="icons weixin"></a>
+                    <a class="pop" style="display: none;"><img class="lazy bitmap" src="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" data-original="http://rescdn.yohoboys.com/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!girls" style="display: block;"></a>
+                </li>
+                <li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook"></a></li>
+                <li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst"></a></li>
+            </ul>
+            <div class="follow-us-input-content">
+                <input type="text" value="" class="followus-input" placeholder="me@email.com">
+                <button class="button followus-button">订阅</button>
+            </div>
+        </div>
+    </div>
+    <!--中间的广告-->
+    {{> default/default_advt}}
+    <div class="bottom-item-container">
+        <!--下面的位置-->
+        {{# bottomItems}}
+            {{> default/default_item}}
+        {{/ bottomItems}}
+        {{> default/default_pop}}
+        
+        <div class="pager-content-default">
+            <span class="channel-index-pager">
+                {{# pager}}
+                    <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
+                {{/ pager}}
+            </span>
+        </div>
+    </div>
+</div>
+{{> layout/footer_jian }}
\ No newline at end of file

@@ -8,7 +8,7 @@
             {{/if}}
             <a href="{{channelLink}}">{{channel}}</a>
             {{#if twoChannel}}
-            <a href="{{twoChannelLink}}">{{twoChannel}}</a>
+            <a href="{{twoChannelLink}}">,{{twoChannel}}</a>
             {{/if}}
             &nbsp;|&nbsp;
             <a class="detail-time" href="javascript:;" _time="{{time}}"></a>

@@ -39,7 +39,7 @@
 </div>
 {{> common/menu}}
 {{> common/menu_withleft}}
-{{> common/environment_js}}
+{{> common/environment_hk_js}}
 {{> common/script}}
 </body>