Merge branch 'feature/sale' into release/4.8

@@ -26,7 +26,6 @@
             </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}}>

@@ -323,14 +323,14 @@ function search(opt) {
 
 
 
 
 // 筛选初始化
 // 筛选初始化
-function filterInit() {
+function filterInit(option) {
 
 
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
         url: '/product/sale/filter',
         url: '/product/sale/filter',
         data: $.extend(defaultOpt, {
         data: $.extend(defaultOpt, {
             saleType: '1'
             saleType: '1'
-        }),
+        }, option),
         success: function(data) {
         success: function(data) {
 
 
             if ($filterMask) {
             if ($filterMask) {
@@ -358,8 +358,6 @@ function filterInit() {
     });
     });
 }
 }
 
 
-filterInit();
-
 lazyLoad($('.lazy'));
 lazyLoad($('.lazy'));
 
 
 $listNav.bind('contextmenu', function() {
 $listNav.bind('contextmenu', function() {
@@ -539,6 +537,11 @@ $(function() {
     $selectNav.addClass('active').siblings().removeClass('active');
     $selectNav.addClass('active').siblings().removeClass('active');
     $swiperSize.hide();
     $swiperSize.hide();
     $swiperSize.filter(selector).show();
     $swiperSize.filter(selector).show();
+
+    filterInit({
+        breakSort: $selectNav.data('id'),
+        breakSize: $selectNav.data('allsub')
+    });
     search([{
     search([{
         type: 'breakSort',
         type: 'breakSort',
         id: $selectNav.data('id')
         id: $selectNav.data('id')