Merge branch 'feature/sale' into release/4.8

@@ -26,6 +26,7 @@
             </li>
             </li>
         </ul>
         </ul>
         <div class="sub-size">
         <div class="sub-size">
+            {{log this}}
             {{# sub}}
             {{# sub}}
             <div class="size-area">
             <div class="size-area">
                 <div class="swiper-size" id="size-swiper-{{key}}" {{#if @first}}style="display:block"{{/if}}>
                 <div class="swiper-size" id="size-swiper-{{key}}" {{#if @first}}style="display:block"{{/if}}>

@@ -3,7 +3,9 @@
     {{#content}}
     {{#content}}
         {{! 头部banner}}
         {{! 头部banner}}
         {{#if focus}}
         {{#if focus}}
+            <div class="focus-wrap">
             {{> resources/banner-top}}
             {{> resources/banner-top}}
+            </div>
         {{/if}}
         {{/if}}
 
 
         {{! 两个小图}}
         {{! 两个小图}}
@@ -22,18 +24,18 @@
         {{/if}}
         {{/if}}
 
 
         {{!-- 会员专享 --}}
         {{!-- 会员专享 --}}
-        <div class="vip-floor-wrap">
         {{#if vipFloor}}
         {{#if vipFloor}}
+            <div class="vip-floor-wrap">
             {{> resources/vip-floor}}
             {{> resources/vip-floor}}
-        {{/if}}
             </div>
             </div>
+        {{/if}}
 
 
         {{!-- 断码区 --}}
         {{!-- 断码区 --}}
-        <div class="off-code-area-wrap">
         {{#if offCodeArea}}
         {{#if offCodeArea}}
+            <div class="off-code-area-wrap">
             {{> resources/off-code-area}}
             {{> resources/off-code-area}}
-            {{/if}}
             </div>
             </div>
+        {{/if}}
 
 
         {{!-- OUTLETS --}}
         {{!-- OUTLETS --}}
         {{#if titleImage}}
         {{#if titleImage}}

@@ -113,6 +113,10 @@ $.each($listNav.find('li'), function(key, item) {
     $(item).addClass(goodsType[key]);
     $(item).addClass(goodsType[key]);
 });
 });
 
 
+$.each($swiperSize, function(key, item) {
+    $(item).addClass(goodsType[key]);
+});
+
 // 判断导航类型
 // 判断导航类型
 function judgeType(dom) {
 function judgeType(dom) {
     var navType;
     var navType;
@@ -531,8 +535,10 @@ $(function() {
     } else {
     } else {
         selector = '.coat';
         selector = '.coat';
     }
     }
-    $selectNav = $('#list-nav').find(selector);
+    $selectNav = $listNav.find(selector);
     $selectNav.addClass('active').siblings().removeClass('active');
     $selectNav.addClass('active').siblings().removeClass('active');
+    $swiperSize.hide();
+    $swiperSize.filter(selector).show();
     search([{
     search([{
         type: 'breakSort',
         type: 'breakSort',
         id: $selectNav.data('id')
         id: $selectNav.data('id')

@@ -72,10 +72,12 @@
         max-height: 320px;
         max-height: 320px;
     }
     }
 
 
+    .focus-wrap,
     .vip-floor-wrap,
     .vip-floor-wrap,
     .off-code-area-wrap {
     .off-code-area-wrap {
         .banner-top {
         .banner-top {
             height: 200px;
             height: 200px;
+            overflow: hidden;
         }
         }
     }
     }