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

@@ -642,8 +642,12 @@ class Process
                     $result['category']['navs'] = self::mergeNavProcess($data[$key + 1], $type);
                     $result['category']['navs'] = self::mergeNavProcess($data[$key + 1], $type);
                 }
                 }
                 // floor模版
                 // floor模版
-                foreach ($data[$key + 2]['data'] as $val) {
-                    $val['src'] = Images::getImageUrl($val['src'], 185, 510, 2);
+                foreach ($data[$key + 2]['data'] as $pos => $val) {
+                    $width = 185; $height = 510;
+                    if($pos == 1) {
+                        $width = 377; $height = 504;
+                    }
+                    $val['src'] = Images::getImageUrl($val['src'], $width, $height, 2);
                     $val['url'] = Helpers::transUrl($val['url'], $type);
                     $val['url'] = Helpers::transUrl($val['url'], $type);
                     $result['category']['list'][] = array(
                     $result['category']['list'][] = array(
                         'href' => $val['url'],
                         'href' => $val['url'],

@@ -202,6 +202,10 @@ class HomeModel
             'order' => 's_t_desc',
             'order' => 's_t_desc',
             'shelve_time' => strtotime("-60 days") . ',' . time()
             'shelve_time' => strtotime("-60 days") . ',' . time()
         );
         );
+        //女首频道最新上架参数是gender=2,3
+        if($channel == self::COOKIE_NAME_GIRLS) {
+            $params['gender'] = '2,3';
+        }
         // 最新上架分类
         // 最新上架分类
         if (isset(ChannelConfig::$newArrivalSortList[$channel])) {
         if (isset(ChannelConfig::$newArrivalSortList[$channel])) {
             $sortList = ChannelConfig::$newArrivalSortList[$channel];
             $sortList = ChannelConfig::$newArrivalSortList[$channel];