Merge branch 'feature/sale' into release/1.0

@@ -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}}>

@@ -3,14 +3,14 @@
     <div class="left-container">
     <div class="left-container">
         {{# left}}
         {{# left}}
             <a href="{{url}}">
             <a href="{{url}}">
-                <div class="thumb-row-box left-thumb-row-box" style="background-image:url({{image src 275 160}})"></div>
+                <div class="thumb-row-box left-thumb-row-box" style="background-image:url({{image src 276 296}})"></div>
             </a>
             </a>
         {{/ left}}
         {{/ left}}
     </div>
     </div>
     <div class="right-container">
     <div class="right-container">
         {{# right}}
         {{# right}}
             <a href="{{url}}">
             <a href="{{url}}">
-                <div class="thumb-row-box right-thumb-row-box {{#if @first}}first{{/if}}" style="background-image:url({{image src 275 160}})"></div>
+                <div class="thumb-row-box right-thumb-row-box {{#if @first}}first{{/if}}" style="background-image:url({{image src 276 134}})"></div>
             </a>
             </a>
         {{/ right}}
         {{/ right}}
     </div>
     </div>

@@ -292,6 +292,13 @@ function search(opt) {
                 }
                 }
             }
             }
 
 
+            $('.good-detail-text .name').each(function() {
+                var $this = $(this),
+                    $title = $this.find('a');
+
+                $title[0].mlellipsis(2);
+            });
+
             nav.reload = false;
             nav.reload = false;
             nav.page = page;
             nav.page = page;
 
 
@@ -299,13 +306,6 @@ function search(opt) {
             loading.hideLoadingMask();
             loading.hideLoadingMask();
 
 
             window.rePosFooter();
             window.rePosFooter();
-
-            $('.good-detail-text .name').each(function() {
-                var $this = $(this),
-                    $title = $this.find('a');
-
-                $title[0].mlellipsis(2);
-            });
         },
         },
         error: function() {
         error: function() {
             tip.show('网络断开连接了~');
             tip.show('网络断开连接了~');
@@ -318,14 +318,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) {
@@ -353,8 +353,6 @@ function filterInit() {
     });
     });
 }
 }
 
 
-filterInit();
-
 lazyLoad($('.lazy'));
 lazyLoad($('.lazy'));
 
 
 $listNav.bind('contextmenu', function() {
 $listNav.bind('contextmenu', function() {
@@ -534,6 +532,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')

@@ -8,8 +8,8 @@
 
 
     .thumb-row-box {
     .thumb-row-box {
         display: inline-block;
         display: inline-block;
-        width: 275px;
-        height: 132px;
+        width: 276px;
+        height: 134px;
         border-radius: 0;
         border-radius: 0;
         background-size: 100% 100%;
         background-size: 100% 100%;
         background-repeat: no-repeat;
         background-repeat: no-repeat;
@@ -22,7 +22,7 @@
     }
     }
 
 
     .left-thumb-row-box {
     .left-thumb-row-box {
-        height: 308px;
+        height: 296px;
     }
     }
 
 
     .left-container {
     .left-container {
@@ -31,13 +31,13 @@
 
 
     .right-container {
     .right-container {
         float: right;
         float: right;
-        width: 275px;
-        height: 280px;
+        width: 276px;
+        height: 296px;
         border-radius: 4px;
         border-radius: 4px;
         margin: 0;
         margin: 0;
 
 
         .right-thumb-row-box {
         .right-thumb-row-box {
-            margin: 44px 0 0;
+            margin: 28px 0 0;
         }
         }
     }
     }
 }
 }