男首资源位模板调整

@@ -12,51 +12,51 @@
         {{> channel/notice}}
     {{/announcement}} --}}
     {{! 中间banner}}
-    {{#singleImage}}
+    {{#if singleImage}}
         {{> channel/banner}}
-    {{/singleImage}}
+    {{/if}}
     {{! 两个小图}}
-    {{#smallPic}}
+    {{#if smallPic}}
         {{> channel/thumb-row}}
-    {{/smallPic}}
+    {{/if}}
     {{! 热门品类}}
-    {{#recommendContentFive}}
+    {{#if recommendContentFive}}
         {{> channel/hot-category}}
-    {{/recommendContentFive}}
+    {{/if}}
     {{! 热门品牌}}
-    {{#appHotBrands}}
+    {{#if appHotBrands}}
         {{> channel/hot-brands-list}}
-    {{/appHotBrands}}
+    {{/if}}
     {{! 热门品牌可滑动}}
-    {{#hotBrandsScroll}}
+    {{#if customBrands}}
         {{> channel/hot-brands-swipe}}
-    {{/hotBrandsScroll}}
+    {{/if}}
     {{! 潮人搭配}}
-    {{#trendsetterCollocation}}
+    {{#if trendsetterCollocation}}
         {{> channel/trendsetter-collocation}}
-    {{/trendsetterCollocation}}
+    {{/if}}
     {{! 潮流话题}}
-    {{#trendgoodsTopic}}
+    {{#if trendgoodsTopic}}
         {{> channel/trend-topics}}
-    {{/trendgoodsTopic}}
+    {{/if}}
     {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
-    {{#recommendContentOne}}
+    {{#if recommendContentOne}}
         {{> channel/goods-category}}
-    {{/recommendContentOne}}
+    {{/if}}
     {{! 新入住品牌/品味生活/创意生活}}
-    {{#recommendContentTwo}}
+    {{#if recommendContentTwo}}
        {{> channel/creative-life}}
-    {{/recommendContentTwo}}
+    {{/if}}
     {{! PLUS}}
     {{#if singleNameImage}}
         {{> channel/plus-star}}
     {{/if}}
     {{! 新人专享}}
-    {{#freshOnly}}
+    {{#if newUserFloor}}
         {{> channel/fresh-only}}
-    {{/freshOnly}}
+    {{/if}}
     {{! 商品列表}}
-    {{#twoColumnGoods}}
+    {{#if twoColumnGoods}}
         {{> channel/two-column-goods}}
-    {{/twoColumnGoods}}
+    {{/if}}
 {{/content}}

-{{> home/floor_header}}
+{{> channel/floor-header}}
 <ul class="fine-brands clearfix">
     {{# brands}}    
         <li class="brand">

-{{> home/floor_header_more}}
-<div class="fresh-only">
-    {{# big_image}}
-    <div class="fresh-swiper">
-        <a href="{{url}}">
-            <img class="lazy" data-original="{{img}}">
-        </a>
+{{#data}}
+    {{> channel/floor-header-more}}
+    <div class="fresh-only">
+        {{# bannerImage}}
+        <div class="fresh-swiper">
+            <a href="{{url}}">
+                <img class="lazy" data-original="{{image src 640 200}}">
+            </a>
+        </div>
+        {{/ bannerImage}}
+        <div class="fresh-list-swiper">
+            <ul class="clearfix swiper-wrapper">
+            {{# list}}
+            <li class="swiper-slide">            
+                <div class="img-box">
+                    <a href="{{url}}">
+                        <img class="swiper-lazy" data-src="{{image defaultImages 235 314}}" alt="">
+                    </a>
+                    <div class="swiper-lazy-preloader"></div>
+                </div>
+                <div class="fresh-info">
+                    <p class="fresh-name"><a href="{{url}}">{{productName}}</a></p>
+                    <p class="price">
+                        <span class="cur-price">¥{{salesPrice}}</span>
+                        {{# marketPrice}}
+                        <span class="old-price">¥{{.}}</span>
+                        {{/marketPrice}}
+                    </p>
+                    <span class="fresh-icon">新人价</span>
+                </div>
+            </li>
+            {{/ list}}
+        </ul>
+        </div>    
     </div>
-    {{/ big_image}}
-    <div class="fresh-list-swiper">
-        <ul class="clearfix swiper-wrapper">
-        {{# list}}
-        <li class="swiper-slide">            
-            <div class="img-box">
-                <a href="{{url}}">
-                    <img class="swiper-lazy" data-src="{{img}}" alt="">
-                </a>
-                <div class="swiper-lazy-preloader"></div>
-            </div>
-            <div class="fresh-info">
-                <p class="fresh-name"><a href="{{url}}">{{title}}</a></p>
-                <p class="price">
-                    <span class="cur-price">¥{{salePrice}}</span>
-                    {{# price}}
-                    <span class="old-price">¥{{.}}</span>
-                    {{/price}}
-                </p>
-                <span class="fresh-icon">新人价</span>
-            </div>
-        </li>
-        {{/ list}}
-    </ul>
-    </div>    
-</div>
\ No newline at end of file
+{{/data}}
\ No newline at end of file

@@ -33,7 +33,7 @@
                     <a href="{{url}}">
                         <div class="img-box">
                             {{#if @first}}
-                                <img class="lazy" data-original="{{image src 253 383}}" alt="">
+                                <img class="lazy" data-original="{{image src 258 383}}" alt="">
                             {{^}}
                                 <img class="lazy" data-original="{{image src 191 191}}" alt="">
                             {{/if}}

-<div class="hot-brands">
-    {{> home/floor_header}}
-    <div class="brands-swiper">
-        <ul class="brands-list swiper-wrapper clearfix">
-            {{# list}}
-            <li class="swiper-slide">
-                <a href="{{url}}">
-                    <img src="{{img}}" alt="">
-                    <span class="brands-title">{{textCn}}</span>
-                </a>
-            </li>
-            {{/ list}}
-        </ul>
+{{#data}}
+    <div class="hot-brands">
+        {{> channel/floor-header}}
+        <div class="brands-swiper">
+            <ul class="brands-list swiper-wrapper clearfix">
+                {{# list}}
+                <li class="swiper-slide">
+                    <a href="{{url}}">
+                        <img src="{{image src 140 140}}" alt="">
+                        <span class="brands-title">{{name}}</span>
+                    </a>
+                </li>
+                {{/ list}}
+            </ul>
+        </div>
     </div>
-</div>
+{{/data}}
\ No newline at end of file

@@ -19,7 +19,7 @@
 
     .classify-list > li {
         float: left;
-        width: 212px;
+        width: 213.3px;
         height: 192px;
         border-top: 1px solid #e0e0e0;
         border-right: 1px solid #e0e0e0;

@@ -85,7 +85,7 @@
     }
 
     li:first-child {
-        width: 253px;
+        width: 258px;
         height: 382px;
         border-left: none;
 

 .hot-brands {
     border-bottom: 1px solid #e0e0e0;
     background: #fff;
+    margin-top: 30px;
 
     .floor-header {
+        width: 100%;
         background: #f0f0f0;
+        padding: 0 30px;
         margin: 0;
-        padding: 29px 30px 0;
         border: 0;
 
         h2 {
@@ -82,7 +84,6 @@
     background: #fff;
     width: 100%;
     height: 160px;
-    padding-top: 20px;
     border-top: 1px solid #e0e0e0;
     overflow: hidden;
 

@@ -17,7 +17,7 @@
 
         li {
             float: left;
-            width: 158px;
+            width: 160px;
             height: 174px;
             border-top: 1px solid #e0e0e0;
             border-left: 1px solid #e0e0e0;