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

@@ -35,7 +35,7 @@
         <div class="about-section contact-us">
             <h2>联系我们： </h2>
             <div class="contact-us-qr">
-                <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
+                <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
             </div>
         </div>
     </div>  

@@ -35,7 +35,7 @@
         <div class="about-section contact-us">
             <h2>聯繫我們： </h2>
             <div class="contact-us-qr">
-                <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
+                <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
             </div>
         </div>
     </div>

@@ -16,31 +16,31 @@
         <div class="about-us-qr">
             <div class="product girl clearfix">
                 <div class="product-wrap">
-                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/download_boy_icon.png" alt="">
+                    <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt="">
                     <span>YOHO!BOYS</span>
                 </div>
                 <div class="product-wrap product-wrap-right">
-                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/yohoboyqr.png" alt="">
+                    <img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/yohoboyqr.png" alt="">
                     <em>iPhone / Android</em>
                 </div>          
             </div>
             <div class="product yoho clearfix">
                 <div class="product-wrap">
-                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-icon.png" alt="">
+                    <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-icon.png" alt="">
                     <span>YOHO!有货</span>
                 </div>
                 <div class="product-wrap product-wrap-right">
-                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-img.png" alt="">
+                    <img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-img.png" alt="">
                     <em>iPhone / Android</em>
                 </div>
             </div>
             <div class="product show clearfix">
                 <div class="product-wrap">
-                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-icon.png" alt="">
+                    <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-icon.png" alt="">
                     <span>Show</span>
                 </div>
                 <div class="product-wrap product-wrap-right">
-                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-img.png" alt="">
+                    <img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-img.png" alt="">
                     <em>iPhone / Android</em>
                 </div>
             </div>

@@ -16,31 +16,31 @@
         <div class="about-us-qr">
             <div class="product girl clearfix">
                 <div class="product-wrap">
-                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/download_boy_icon.png" alt="">
+                    <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt="">
                     <span>YOHO!BOYS</span>
                 </div>
                 <div class="product-wrap product-wrap-right">
-                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/yohoboyqr.png" alt="">
+                    <img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/yohoboyqr.png" alt="">
                     <em>iPhone / Android</em>
                 </div>          
             </div>
             <div class="product yoho clearfix">
                 <div class="product-wrap">
-                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-icon.png" alt="">
+                    <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-icon.png" alt="">
                     <span>YOHO!有貨</span>
                 </div>
                 <div class="product-wrap product-wrap-right">
-                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-img.png" alt="">
+                    <img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-img.png" alt="">
                     <em>iPhone / Android</em>
                 </div>
             </div>
             <div class="product show clearfix">
                 <div class="product-wrap">
-                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-icon.png" alt="">
+                    <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-icon.png" alt="">
                     <span>Show</span>
                 </div>
                 <div class="product-wrap product-wrap-right">
-                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-img.png" alt="">
+                    <img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-img.png" alt="">
                     <em>iPhone / Android</em>
                 </div>
             </div>

@@ -14,8 +14,8 @@
         <div class="about-section">
             <h2>LOGO链接：</h2>
             <ul class="links-pic-list clearfix">
-                <li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links06.png" alt=""></a></li>
-                <li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links07.png" alt=""></a></li>
+                <li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links06.png" alt=""></a></li>
+                <li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links07.png" alt=""></a></li>
             </ul>
         </div>
     </div>

@@ -14,8 +14,8 @@
         <div class="about-section">
             <h2>LOGO鏈接：</h2>
             <ul class="links-pic-list clearfix">
-                <li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links06.png" alt=""></a></li>
-                <li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links07.png" alt=""></a></li>
+                <li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links06.png" alt=""></a></li>
+                <li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links07.png" alt=""></a></li>
             </ul>
         </div>
     </div>

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index}}
\ No newline at end of file
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing }}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index}}
+{{/ contentWithAll}}
\ No newline at end of file

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index_hk}}
\ No newline at end of file
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing_hk}}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner_hk}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert_hk}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index_hk}}
+{{/ contentWithAll}}
\ No newline at end of file

-{{> channel/index_with_nothing }}
\ No newline at end of file

-{{> channel/index_with_nothing_hk}}
\ No newline at end of file

-{{> channel/index_without_advert}}
\ No newline at end of file

-{{> channel/index_without_advert_hk}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner_hk}}
\ No newline at end of file

@@ -7,6 +7,24 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index}}
+
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing }}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index}}
+{{/ contentWithAll}}
+
+
+
 
 

@@ -7,6 +7,23 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index_hk}}
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing_hk}}
+{{/ contentWithNothing}}
 
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner_hk}}
+{{/ contentWithAdvert}}
+
+
+
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert_hk}}
+{{/ contentWithCenterBanner}}
+
+
+{{# contentWithAll}}
+	{{> channel/index_hk}}
+{{/ contentWithAll}}
 

-{{> channel/index_with_nothing }}
\ No newline at end of file

-{{> channel/index_with_nothing_hk}}
\ No newline at end of file

-{{> channel/index_without_advert}}
\ No newline at end of file

-{{> channel/index_without_advert_hk}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner_hk}}
\ No newline at end of file

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index}}
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing }}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index}}
+{{/ contentWithAll}}

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index_hk}}
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing_hk}}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner_hk}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert_hk}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index_hk}}
+{{/ contentWithAll}}

-{{> channel/index_with_nothing }}
\ No newline at end of file

-{{> channel/index_with_nothing_hk}}
\ No newline at end of file

-{{> channel/index_without_advert}}
\ No newline at end of file

-{{> channel/index_without_advert_hk}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner_hk}}
\ No newline at end of file

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index}}
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing }}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index}}
+{{/ contentWithAll}}
\ No newline at end of file

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index_hk}}
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing_hk}}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner_hk}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert_hk}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index_hk}}
+{{/ contentWithAll}}

-{{> channel/index_with_nothing }}
\ No newline at end of file

-{{> channel/index_with_nothing_hk}}
\ No newline at end of file

-{{> channel/index_without_advert}}
\ No newline at end of file

-{{> channel/index_without_advert_hk}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner_hk}}
\ No newline at end of file

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index}}
\ No newline at end of file
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing }}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index}}
+{{/ contentWithAll}}
\ No newline at end of file

@@ -7,4 +7,18 @@
     centerBanner//通栏的结构体
     pager       //分页结构体
 -->
-{{> channel/index_hk}}
+{{# contentWithNothing}}
+	{{> channel/index_with_nothing_hk}}
+{{/ contentWithNothing}}
+
+{{# contentWithAdvert}}
+	{{> channel/index_without_centerbanner_hk}}
+{{/ contentWithAdvert}}
+
+{{# contentWithCenterBanner}}
+	{{> channel/index_without_advert_hk}}
+{{/ contentWithCenterBanner}}
+
+{{# contentWithAll}}
+	{{> channel/index_hk}}
+{{/ contentWithAll}}

-{{> channel/index_with_nothing }}
\ No newline at end of file

-{{> channel/index_with_nothing_hk}}
\ No newline at end of file

-{{> channel/index_without_advert}}
\ No newline at end of file

-{{> channel/index_without_advert_hk}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner}}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> channel/index_without_centerbanner_hk}}
\ No newline at end of file

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 <!--内容列表-->
-<div class="content">
+<div class="content clearfix">
     {{# topItems}}
         {{> default/default_item}}
     {{/ topItems}}

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 
-<div class="content">
+<div class="content clearfix">
     
     {{# topItems}}
         {{> default/default_item}}

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 
-<div class="content">
+<div class="content clearfix">
     
     {{# topItems}}
         {{> default/default_item}}

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 
-<div class="content">
+<div class="content clearfix">
     {{# topItems}}
         {{> default/default_item}}
     {{/ topItems}}

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 
-<div class="content">
+<div class="content clearfix">
     
     {{# topItems}}
         {{> default/default_item}}

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 
-<div class="content">
+<div class="content clearfix">
     
     {{# topItems}}
         {{> default/default_item}}

@@ -15,7 +15,7 @@
     {{/ tvs}}
 </div>
 
-<div class="content">
+<div class="content clearfix">
     
     {{# topItems}}
         {{> default/default_item}}