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

@@ -129,8 +129,8 @@ class SearchData
             's_t_asc' => 'shelve_time:asc',
             's_p_asc' => 'sales_price:asc',
             '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_asc' => 'product_skn:asc',
             'activities_desc' => 'activities.order_by:desc',

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