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

@@ -29,9 +29,9 @@ class SearchData
         defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
         defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
         switch (APPLICATION_ENV) {
         switch (APPLICATION_ENV) {
             case 'release':
             case 'release':
+                return 'http://100.98.132.63/yohosearch/search.json';
             case 'test':
             case 'test':
             case 'preview':
             case 'preview':
-                return 'http://100.98.132.63/yohosearch/search.json';
             case 'developer':
             case 'developer':
             default:
             default:
                 return 'http://101.200.31.165/yohosearch/search.json';
                 return 'http://101.200.31.165/yohosearch/search.json';
@@ -148,7 +148,7 @@ class SearchData
         if (!isset($condition['order'])) {
         if (!isset($condition['order'])) {
             $param['order'] = $orderMaps['s_t_desc'];
             $param['order'] = $orderMaps['s_t_desc'];
         } else {
         } else {
-            $param['order'] = $orderMaps[ $condition['order'] ];
+            $param['order'] = $orderMaps[$condition['order']];
         }
         }
         if (!isset($condition['page'])) {
         if (!isset($condition['page'])) {
             $param['page'] = 1;
             $param['page'] = 1;

@@ -9,6 +9,7 @@ use Plugin\Helpers;
  */
  */
 class FloorProcess
 class FloorProcess
 {
 {
+
     /**
     /**
      * 频道参数
      * 频道参数
      * 
      * 
@@ -207,7 +208,7 @@ class FloorProcess
         foreach ($data['list'] as &$one) {
         foreach ($data['list'] as &$one) {
             if (isset($one['url'])) {
             if (isset($one['url'])) {
                 $one['url'] = Helpers::getFilterUrl($one['url']);
                 $one['url'] = Helpers::getFilterUrl($one['url']);
-                isset(self::$channel[$type]) && $one['url'] .= '?gender='.self::$channel[$type];
+                isset(self::$channel[$type]) && $one['url'] .= '?gender=' . self::$channel[$type];
             }
             }
             $one['img'] = Helpers::getImageUrl($one['src'], 158, 174);
             $one['img'] = Helpers::getImageUrl($one['src'], 158, 174);
             unset($one['src']);
             unset($one['src']);

@@ -159,7 +159,7 @@ class DetailModel
                     $colorId = intval($value['colorId']);
                     $colorId = intval($value['colorId']);
                     // 商品按颜色进行分类分组
                     // 商品按颜色进行分类分组
                     foreach ($value['goodsImagesList'] as $goods) {
                     foreach ($value['goodsImagesList'] as $goods) {
-                        $goodsList[ $goods['goodsId'] ] = $colorId;
+                        $goodsList[$goods['goodsId']] = $colorId;
                         $goodsGroup[$colorId][] = array(
                         $goodsGroup[$colorId][] = array(
                             'goodsId' => $goods['goodsId'],
                             'goodsId' => $goods['goodsId'],
                             'img' => $goods['imageUrl'],
                             'img' => $goods['imageUrl'],
@@ -172,7 +172,7 @@ class DetailModel
                     }
                     }
                     // 商品的尺码列表
                     // 商品的尺码列表
                     foreach ($value['goodsSizeBoList'] as $size) {
                     foreach ($value['goodsSizeBoList'] as $size) {
-                        $sizeGroup[ $colorId ] = array(
+                        $sizeGroup[$colorId] = array(
                             'sizeName' => $size['sizeName'],
                             'sizeName' => $size['sizeName'],
                             'sizeSku' => $size['goodsSizeSkuId'],
                             'sizeSku' => $size['goodsSizeSkuId'],
                             'sizeStorage' => $size['goodsSizeStorageNum'],
                             'sizeStorage' => $size['goodsSizeStorageNum'],
@@ -275,15 +275,15 @@ class DetailModel
                     'enTitle' => 'SIZE INFO',
                     'enTitle' => 'SIZE INFO',
                     'detail' => array('list' => array()),
                     'detail' => array('list' => array()),
                 );
                 );
-                $sizeNameList = array(0 => array('param' => '吊牌尺码')) ; // 尺码名称
+                $sizeNameList = array(0 => array('param' => '吊牌尺码')); // 尺码名称
                 $sizeBoGroup = array(); // 尺码按ID分组
                 $sizeBoGroup = array(); // 尺码按ID分组
                 foreach ($sizeInfo['sizeInfoBo']['sizeAttributeBos'] as $attr) {
                 foreach ($sizeInfo['sizeInfoBo']['sizeAttributeBos'] as $attr) {
-                    $sizeBoGroup[ $attr['id'] ][0] = array('param' => $attr['attributeName']);
+                    $sizeBoGroup[$attr['id']][0] = array('param' => $attr['attributeName']);
                 }
                 }
                 foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) {
                 foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) {
                     $sizeNameList[] = array('param' => $value['sizeName']);
                     $sizeNameList[] = array('param' => $value['sizeName']);
                     foreach ($value['sortAttributes'] as $attr) {
                     foreach ($value['sortAttributes'] as $attr) {
-                        $sizeBoGroup[ $attr['id'] ][] = array('param' => $attr['sizeValue']);
+                        $sizeBoGroup[$attr['id']][] = array('param' => $attr['sizeValue']);
                     }
                     }
                 }
                 }
 
 
@@ -384,7 +384,6 @@ class DetailModel
                     );
                     );
                 }
                 }
             }
             }
-            
         }
         }
 
 
         return $result;
         return $result;

@@ -184,12 +184,12 @@ class NewsaleModel
         $newsale = NewsaleData::getNewsaleFocus($codeKey);
         $newsale = NewsaleData::getNewsaleFocus($codeKey);
 
 
         // 调用接口获取数据并封装
         // 调用接口获取数据并封装
-        if (isset($newsale['code']) && isset($newsale['data'][0]['data'])) {
-            if(count($newsale['data'][0]['data']) === 1) {
-                $result = Helpers::formatBanner($newsale['data'][0]['data'][0], 640, 240);
+        if (isset($newsale['code']) && isset($newsale['data']['list'])) {
+            if(count($newsale['data']['list']) === 1) {
+                $result = Helpers::formatBanner($newsale['data']['list'][0]['data'][0], 640, 240);
             } else {
             } else {
-                foreach ($newsale['data'][0]['data'] as $one) {
-                    $result['list'][] = Helpers::formatBanner($one, 640, 240);
+                foreach ($newsale['data']['list'] as $one) {
+                    $result['list'][] = Helpers::formatBanner($one['data'], 640, 240);
                 }
                 }
             }
             }
         }
         }