Merge branch 'release/4.7' of git.yoho.cn:fe/YOHOBUYWAP into release/4.7

@@ -70,7 +70,7 @@ class ListProcess
                 $data['gender'] = array('2,3' => 'GIRLS');
                 $data['gender'] = array('2,3' => 'GIRLS');
                 break;
                 break;
             default:
             default:
-                $data['gender'] = array('2,3' => 'GIRLS', '1,3' => 'BOYS');
+                $data['gender'] = array('1,3' => 'BOYS', '2,3' => 'GIRLS');
                 break;
                 break;
         }
         }
 
 
@@ -188,7 +188,7 @@ class ListProcess
             'dataType' => 'gender',
             'dataType' => 'gender',
             'subs' => array(
             'subs' => array(
                 array(
                 array(
-                    'dataId' => '1,2,3',
+                    'dataId' => empty($gender) ? '1,2,3' : $gender, // 产品非要这么做，我也没有办法
                     'name' => '所有性别'
                     'name' => '所有性别'
                 )
                 )
             )
             )