Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

--Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
++Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05

@@ -129,8 +129,8 @@ class SearchData
             's_t_asc' => 'shelve_time:asc',
             's_t_asc' => 'shelve_time:asc',
             's_p_asc' => 'sales_price:asc',
             's_p_asc' => 'sales_price:asc',
             's_p_desc' => 'sales_price:desc',
             's_p_desc' => 'sales_price:desc',
-            's_d_desc' => 'discount:desc',
-            's_d_asc' => 'discount:asc',
+            'p_d_desc' => 'discount:desc',
+            'p_d_asc' => 'discount:asc',
             'skn_desc' => 'product_skn:desc',
             'skn_desc' => 'product_skn:desc',
             'skn_asc' => 'product_skn:asc',
             'skn_asc' => 'product_skn:asc',
             'activities_desc' => 'activities.order_by:desc',
             'activities_desc' => 'activities.order_by:desc',

@@ -61,7 +61,7 @@ class ListProcess
         $filters = array('classify' => array());
         $filters = array('classify' => array());
 
 
         // 返回数据中有没有gender时要添加gender
         // 返回数据中有没有gender时要添加gender
-        // $data['gender'] = array('2,3'=>'GIRLS','1,3'=>'BOYS');
+        $data['gender'] = array('2,3'=>'GIRLS','1,3'=>'BOYS');
 
 
         $num = 1;
         $num = 1;
         foreach ($data as $key => $val) {
         foreach ($data as $key => $val) {

@@ -12,7 +12,6 @@ var $ = require('jquery'),
 
 
 var navHammer,
 var navHammer,
     winH = $(window).height(),
     winH = $(window).height(),
-    loadMoreH = $('#load-more').height(),
     $goodList = $('#goods-list'),
     $goodList = $('#goods-list'),
     searching = false,
     searching = false,
     page = 0,
     page = 0,
@@ -140,7 +139,7 @@ $('.maybe-like p').on('touchstart', function (e) {
 
 
 //srcoll to load more
 //srcoll to load more
 $(window).scroll(function () {
 $(window).scroll(function () {
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
+    if ($(window).scrollTop() + winH >= $(document).height()) {
         search();
         search();
     }
     }
 });
 });

@@ -74,7 +74,7 @@ if ($('.swiper-container .swiper-slide').length > 1) {
         autoplay: 3000,
         autoplay: 3000,
         autoplayDisableOnInteraction: false,
         autoplayDisableOnInteraction: false,
         paginationClickable: true,
         paginationClickable: true,
-        pagination: '.swiper-pagination'
+        pagination: '.banner-top .pagination-inner'
     });
     });
 }
 }
 
 

@@ -86,7 +86,7 @@ if ($('.swiper-container .swiper-slide').length > 1) {
         autoplay: 3000,
         autoplay: 3000,
         autoplayDisableOnInteraction: false,
         autoplayDisableOnInteraction: false,
         paginationClickable: true,
         paginationClickable: true,
-        pagination: '.swiper-pagination'
+        pagination: '.banner-top .pagination-inner'
     });
     });
 }
 }
 
 

@@ -17,15 +17,14 @@
         overflow: hidden;
         overflow: hidden;
 
 
         .brand-logo {
         .brand-logo {
-            display: table-cell;
             width: 100%;
             width: 100%;
             height: 128rem / $pxConvertRem;
             height: 128rem / $pxConvertRem;
             line-height: 128rem / $pxConvertRem;
             line-height: 128rem / $pxConvertRem;
             text-align: center;
             text-align: center;
             font-size: 0;
             font-size: 0;
-            vertical-align: middle;
 
 
             img {
             img {
+                vertical-align: middle;
                 max-width: 100%;
                 max-width: 100%;
                 max-height: 100%;
                 max-height: 100%;
             }
             }