chenchao / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 09bd44947dbe5c61425ae4b7bdbc496782701477 2 parents 2fa1e291 f54592eb

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

Inline Side-by-side
Showing 4 changed files with 59 additions and 59 deletions
@@ -16,7 +16,7 @@ use Api\Sign; @@ -16,7 +16,7 @@ use Api\Sign;
16 */ 16 */
17 class SearchData 17 class SearchData
18 { 18 {
19 - 19 +
20 /** 20 /**
21 * 获取搜索的服务地址 21 * 获取搜索的服务地址
22 * 22 *
@@ -29,9 +29,9 @@ class SearchData @@ -29,9 +29,9 @@ class SearchData
29 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer'); 29 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
30 switch (APPLICATION_ENV) { 30 switch (APPLICATION_ENV) {
31 case 'release': 31 case 'release':
32 - case 'test':  
33 - case 'preview':  
34 return 'http://100.98.132.63/yohosearch/search.json'; 32 return 'http://100.98.132.63/yohosearch/search.json';
  33 + case 'test':
  34 + case 'preview':
35 case 'developer': 35 case 'developer':
36 default: 36 default:
37 return 'http://101.200.31.165/yohosearch/search.json'; 37 return 'http://101.200.31.165/yohosearch/search.json';
@@ -148,7 +148,7 @@ class SearchData @@ -148,7 +148,7 @@ class SearchData
148 if (!isset($condition['order'])) { 148 if (!isset($condition['order'])) {
149 $param['order'] = $orderMaps['s_t_desc']; 149 $param['order'] = $orderMaps['s_t_desc'];
150 } else { 150 } else {
151 - $param['order'] = $orderMaps[ $condition['order'] ]; 151 + $param['order'] = $orderMaps[$condition['order']];
152 } 152 }
153 if (!isset($condition['page'])) { 153 if (!isset($condition['page'])) {
154 $param['page'] = 1; 154 $param['page'] = 1;
@@ -9,6 +9,7 @@ use Plugin\Helpers; @@ -9,6 +9,7 @@ use Plugin\Helpers;
9 */ 9 */
10 class FloorProcess 10 class FloorProcess
11 { 11 {
  12 +
12 /** 13 /**
13 * 频道参数 14 * 频道参数
14 * 15 *
@@ -34,9 +35,9 @@ class FloorProcess @@ -34,9 +35,9 @@ class FloorProcess
34 35
35 $build = array(); 36 $build = array();
36 foreach ($data['list'] as $v) { 37 foreach ($data['list'] as $v) {
37 - if (empty($v)) {  
38 - continue;  
39 - } 38 + if (empty($v)) {
  39 + continue;
  40 + }
40 41
41 $fun = $v['template_name']; 42 $fun = $v['template_name'];
42 if (empty($v['data']) || !is_callable("self::$fun")) { 43 if (empty($v['data']) || !is_callable("self::$fun")) {
@@ -207,7 +208,7 @@ class FloorProcess @@ -207,7 +208,7 @@ class FloorProcess
207 foreach ($data['list'] as &$one) { 208 foreach ($data['list'] as &$one) {
208 if (isset($one['url'])) { 209 if (isset($one['url'])) {
209 $one['url'] = Helpers::getFilterUrl($one['url']); 210 $one['url'] = Helpers::getFilterUrl($one['url']);
210 - isset(self::$channel[$type]) && $one['url'] .= '?gender='.self::$channel[$type]; 211 + isset(self::$channel[$type]) && $one['url'] .= '?gender=' . self::$channel[$type];
211 } 212 }
212 $one['img'] = Helpers::getImageUrl($one['src'], 158, 174); 213 $one['img'] = Helpers::getImageUrl($one['src'], 158, 174);
213 unset($one['src']); 214 unset($one['src']);
@@ -303,11 +304,11 @@ class FloorProcess @@ -303,11 +304,11 @@ class FloorProcess
303 unset($one['src']); 304 unset($one['src']);
304 } 305 }
305 306
306 - // 区别多张图与一张图  
307 - if (count($data['big_image']) > 1) {  
308 - $result['big_image']['big_list'] = $data['big_image'];  
309 - unset($data['big_image']);  
310 - } 307 + // 区别多张图与一张图
  308 + if (count($data['big_image']) > 1) {
  309 + $result['big_image']['big_list'] = $data['big_image'];
  310 + unset($data['big_image']);
  311 + }
311 312
312 foreach ($data['list'] as $kk => &$one) { 313 foreach ($data['list'] as $kk => &$one) {
313 if ($kk == 0) { 314 if ($kk == 0) {
@@ -32,7 +32,7 @@ class DetailModel @@ -32,7 +32,7 @@ class DetailModel
32 if (is_numeric($productId) && is_numeric($goodsId)) { 32 if (is_numeric($productId) && is_numeric($goodsId)) {
33 // 调用服务 33 // 调用服务
34 $baseInfo = DetailData::baseInfo($productId, $uid); 34 $baseInfo = DetailData::baseInfo($productId, $uid);
35 - 35 +
36 // 判断商品是否在架 36 // 判断商品是否在架
37 if (empty($baseInfo['status'])) { 37 if (empty($baseInfo['status'])) {
38 return $result; 38 return $result;
@@ -41,7 +41,7 @@ class DetailModel @@ -41,7 +41,7 @@ class DetailModel
41 // 商品名称 41 // 商品名称
42 if (isset($baseInfo['productName'])) { 42 if (isset($baseInfo['productName'])) {
43 $result['goodsName'] = $baseInfo['productName']; 43 $result['goodsName'] = $baseInfo['productName'];
44 - } 44 + }
45 45
46 // 商品标签 46 // 商品标签
47 if (!empty($baseInfo['productTagBoList'])) { 47 if (!empty($baseInfo['productTagBoList'])) {
@@ -87,11 +87,11 @@ class DetailModel @@ -87,11 +87,11 @@ class DetailModel
87 } 87 }
88 } 88 }
89 89
90 - // 上市期  
91 - if (isset($baseInfo['expectArrivalTime']) && !empty($baseInfo['expectArrivalTime'])) {  
92 - $result['periodOfMarket'] = date('n', $baseInfo['expectArrivalTime']) . '月';  
93 - }  
94 - 90 + // 上市期
  91 + if (isset($baseInfo['expectArrivalTime']) && !empty($baseInfo['expectArrivalTime'])) {
  92 + $result['periodOfMarket'] = date('n', $baseInfo['expectArrivalTime']) . '月';
  93 + }
  94 +
95 // 促销信息 95 // 促销信息
96 if (isset($baseInfo['promotionBoList'])) { 96 if (isset($baseInfo['promotionBoList'])) {
97 $build = array(); 97 $build = array();
@@ -103,7 +103,7 @@ class DetailModel @@ -103,7 +103,7 @@ class DetailModel
103 } 103 }
104 104
105 $result['feedbacks'] = array(); 105 $result['feedbacks'] = array();
106 - 106 +
107 // 商品咨询 107 // 商品咨询
108 $result['feedbacks']['consultsNum'] = 0; 108 $result['feedbacks']['consultsNum'] = 0;
109 if (!empty($baseInfo['consultBoWrapper'])) { 109 if (!empty($baseInfo['consultBoWrapper'])) {
@@ -117,12 +117,12 @@ class DetailModel @@ -117,12 +117,12 @@ class DetailModel
117 $result['feedbacks']['consults'][] = $build; 117 $result['feedbacks']['consults'][] = $build;
118 } 118 }
119 $result['feedbacks']['link'] = Helpers::url('/product/detail/consults', array('product_id' => $productId, 'total' => $result['feedbacks']['consultsNum'])); 119 $result['feedbacks']['link'] = Helpers::url('/product/detail/consults', array('product_id' => $productId, 'total' => $result['feedbacks']['consultsNum']));
120 - } 120 + }
121 // 暂无咨询 121 // 暂无咨询
122 else { 122 else {
123 $result['feedbacks']['link'] = Helpers::url('/product/detail/consultform', array('product_id' => $productId)); 123 $result['feedbacks']['link'] = Helpers::url('/product/detail/consultform', array('product_id' => $productId));
124 } 124 }
125 - 125 +
126 // 商品评价 126 // 商品评价
127 $result['feedbacks']['commentsNum'] = 0; 127 $result['feedbacks']['commentsNum'] = 0;
128 if (!empty($baseInfo['commentBoWrapper'])) { 128 if (!empty($baseInfo['commentBoWrapper'])) {
@@ -159,7 +159,7 @@ class DetailModel @@ -159,7 +159,7 @@ class DetailModel
159 $colorId = intval($value['colorId']); 159 $colorId = intval($value['colorId']);
160 // 商品按颜色进行分类分组 160 // 商品按颜色进行分类分组
161 foreach ($value['goodsImagesList'] as $goods) { 161 foreach ($value['goodsImagesList'] as $goods) {
162 - $goodsList[ $goods['goodsId'] ] = $colorId; 162 + $goodsList[$goods['goodsId']] = $colorId;
163 $goodsGroup[$colorId][] = array( 163 $goodsGroup[$colorId][] = array(
164 'goodsId' => $goods['goodsId'], 164 'goodsId' => $goods['goodsId'],
165 'img' => $goods['imageUrl'], 165 'img' => $goods['imageUrl'],
@@ -172,14 +172,14 @@ class DetailModel @@ -172,14 +172,14 @@ class DetailModel
172 } 172 }
173 // 商品的尺码列表 173 // 商品的尺码列表
174 foreach ($value['goodsSizeBoList'] as $size) { 174 foreach ($value['goodsSizeBoList'] as $size) {
175 - $sizeGroup[ $colorId ] = array( 175 + $sizeGroup[$colorId] = array(
176 'sizeName' => $size['sizeName'], 176 'sizeName' => $size['sizeName'],
177 'sizeSku' => $size['goodsSizeSkuId'], 177 'sizeSku' => $size['goodsSizeSkuId'],
178 'sizeStorage' => $size['goodsSizeStorageNum'], 178 'sizeStorage' => $size['goodsSizeStorageNum'],
179 ); 179 );
180 } 180 }
181 } 181 }
182 - 182 +
183 // 商品图 183 // 商品图
184 $goodsId = intval($goodsId); 184 $goodsId = intval($goodsId);
185 if (isset($goodsList[$goodsId])) { 185 if (isset($goodsList[$goodsId])) {
@@ -207,13 +207,13 @@ class DetailModel @@ -207,13 +207,13 @@ class DetailModel
207 'numInCart' => 0, 207 'numInCart' => 0,
208 'goodsInstore' => $baseInfo['storage'], 208 'goodsInstore' => $baseInfo['storage'],
209 ); 209 );
210 - 210 +
211 // 是否收藏 211 // 是否收藏
212 $result['isCollect'] = false; 212 $result['isCollect'] = false;
213 if (isset($baseInfo['isCollect']) && $baseInfo['isCollect'] === 'Y') { 213 if (isset($baseInfo['isCollect']) && $baseInfo['isCollect'] === 'Y') {
214 $result['isCollect'] = true; 214 $result['isCollect'] = true;
215 } 215 }
216 - 216 +
217 // 底部简介的URL链接 217 // 底部简介的URL链接
218 $result['introUrl'] = Helpers::url('/product/intro_' . $baseInfo['erpProductId'] . '/' . $baseInfo['cnAlphabet'] . '.html'); 218 $result['introUrl'] = Helpers::url('/product/intro_' . $baseInfo['erpProductId'] . '/' . $baseInfo['cnAlphabet'] . '.html');
219 $result['id'] = $productId; 219 $result['id'] = $productId;
@@ -231,11 +231,11 @@ class DetailModel @@ -231,11 +231,11 @@ class DetailModel
231 public static function getSizeInfo($productSkn) 231 public static function getSizeInfo($productSkn)
232 { 232 {
233 $result = array(); 233 $result = array();
234 - 234 +
235 if (is_numeric($productSkn)) { 235 if (is_numeric($productSkn)) {
236 // 调用服务 236 // 调用服务
237 $sizeInfo = DetailData::sizeInfo($productSkn); 237 $sizeInfo = DetailData::sizeInfo($productSkn);
238 - 238 +
239 // 商品信息 239 // 商品信息
240 if (isset($sizeInfo['productDescBo']['erpProductId'])) { 240 if (isset($sizeInfo['productDescBo']['erpProductId'])) {
241 $sex = '通用'; 241 $sex = '通用';
@@ -249,7 +249,7 @@ class DetailModel @@ -249,7 +249,7 @@ class DetailModel
249 } 249 }
250 $result['goodsDescription'] = array( 250 $result['goodsDescription'] = array(
251 'title' => '商品信息', 251 'title' => '商品信息',
252 - 'enTitle' => 'DESCRIPTION', 252 + 'enTitle' => 'DESCRIPTION',
253 'detail' => array( 253 'detail' => array(
254 'list' => array( 254 'list' => array(
255 array('param' => '编号：' . $sizeInfo['productDescBo']['erpProductId']), 255 array('param' => '编号：' . $sizeInfo['productDescBo']['erpProductId']),
@@ -267,7 +267,7 @@ class DetailModel @@ -267,7 +267,7 @@ class DetailModel
267 if (isset($sizeInfo['phrase'])) { 267 if (isset($sizeInfo['phrase'])) {
268 $result['goodsDescription']['desc'] = $sizeInfo['phrase']; 268 $result['goodsDescription']['desc'] = $sizeInfo['phrase'];
269 } 269 }
270 - 270 +
271 // 尺码信息 271 // 尺码信息
272 if (!empty($sizeInfo['sizeInfoBo'])) { 272 if (!empty($sizeInfo['sizeInfoBo'])) {
273 $result['sizeInfo'] = array( 273 $result['sizeInfo'] = array(
@@ -275,25 +275,25 @@ class DetailModel @@ -275,25 +275,25 @@ class DetailModel
275 'enTitle' => 'SIZE INFO', 275 'enTitle' => 'SIZE INFO',
276 'detail' => array('list' => array()), 276 'detail' => array('list' => array()),
277 ); 277 );
278 - $sizeNameList = array(0 => array('param' => '吊牌尺码')) ; // 尺码名称 278 + $sizeNameList = array(0 => array('param' => '吊牌尺码')); // 尺码名称
279 $sizeBoGroup = array(); // 尺码按ID分组 279 $sizeBoGroup = array(); // 尺码按ID分组
280 foreach ($sizeInfo['sizeInfoBo']['sizeAttributeBos'] as $attr) { 280 foreach ($sizeInfo['sizeInfoBo']['sizeAttributeBos'] as $attr) {
281 - $sizeBoGroup[ $attr['id'] ][0] = array('param' => $attr['attributeName']); 281 + $sizeBoGroup[$attr['id']][0] = array('param' => $attr['attributeName']);
282 } 282 }
283 foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) { 283 foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) {
284 $sizeNameList[] = array('param' => $value['sizeName']); 284 $sizeNameList[] = array('param' => $value['sizeName']);
285 foreach ($value['sortAttributes'] as $attr) { 285 foreach ($value['sortAttributes'] as $attr) {
286 - $sizeBoGroup[ $attr['id'] ][] = array('param' => $attr['sizeValue']); 286 + $sizeBoGroup[$attr['id']][] = array('param' => $attr['sizeValue']);
287 } 287 }
288 } 288 }
289 - 289 +
290 // 根据模板页面的显示，按表格一列一列来显示 290 // 根据模板页面的显示，按表格一列一列来显示
291 $result['sizeInfo']['detail']['list'][0]['params'] = $sizeNameList; 291 $result['sizeInfo']['detail']['list'][0]['params'] = $sizeNameList;
292 foreach ($sizeBoGroup as $value) { 292 foreach ($sizeBoGroup as $value) {
293 $result['sizeInfo']['detail']['list'][]['params'] = $value; 293 $result['sizeInfo']['detail']['list'][]['params'] = $value;
294 } 294 }
295 } 295 }
296 - 296 +
297 // 测量方式 297 // 测量方式
298 if (!empty($sizeInfo['sizeImage'])) { 298 if (!empty($sizeInfo['sizeImage'])) {
299 $result['measurementMethod'] = array( 299 $result['measurementMethod'] = array(
@@ -302,7 +302,7 @@ class DetailModel @@ -302,7 +302,7 @@ class DetailModel
302 'img' => $sizeInfo['sizeImage'], 302 'img' => $sizeInfo['sizeImage'],
303 ); 303 );
304 } 304 }
305 - 305 +
306 // 模特试穿, 竖着输出排列显示 306 // 模特试穿, 竖着输出排列显示
307 if (!empty($sizeInfo['modelBos'])) { 307 if (!empty($sizeInfo['modelBos'])) {
308 $result['reference'] = array( 308 $result['reference'] = array(
@@ -310,11 +310,11 @@ class DetailModel @@ -310,11 +310,11 @@ class DetailModel
310 'enTitle' => 'REFERENCE', 310 'enTitle' => 'REFERENCE',
311 'detail' => array('list' => array()), 311 'detail' => array('list' => array()),
312 ); 312 );
313 - 313 +
314 // 控制是否显示备注 314 // 控制是否显示备注
315 $showRemark = false; 315 $showRemark = false;
316 $remarkList = array(0 => array('param' => '备注')); 316 $remarkList = array(0 => array('param' => '备注'));
317 - 317 +
318 $result['reference']['detail']['list'][0]['params'] = array(0 => array('param' => '')); // 头像列表 318 $result['reference']['detail']['list'][0]['params'] = array(0 => array('param' => '')); // 头像列表
319 $result['reference']['detail']['list'][1]['params'] = array(0 => array('param' => '模特')); // 模特名字列表 319 $result['reference']['detail']['list'][1]['params'] = array(0 => array('param' => '模特')); // 模特名字列表
320 $result['reference']['detail']['list'][2]['params'] = array(0 => array('param' => '身高')); // 身高列表 320 $result['reference']['detail']['list'][2]['params'] = array(0 => array('param' => '身高')); // 身高列表
@@ -322,7 +322,7 @@ class DetailModel @@ -322,7 +322,7 @@ class DetailModel
322 $result['reference']['detail']['list'][4]['params'] = array(0 => array('param' => '三围')); // 三围列表 322 $result['reference']['detail']['list'][4]['params'] = array(0 => array('param' => '三围')); // 三围列表
323 $result['reference']['detail']['list'][5]['params'] = array(0 => array('param' => '吊牌尺码')); // 吊牌尺码 323 $result['reference']['detail']['list'][5]['params'] = array(0 => array('param' => '吊牌尺码')); // 吊牌尺码
324 $result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述 324 $result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述
325 - 325 +
326 foreach ($sizeInfo['modelBos'] as $value) { 326 foreach ($sizeInfo['modelBos'] as $value) {
327 $result['reference']['detail']['list'][0]['params'][] = array('param' => $value['avatar']); 327 $result['reference']['detail']['list'][0]['params'][] = array('param' => $value['avatar']);
328 $result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']); 328 $result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']);
@@ -338,13 +338,13 @@ class DetailModel @@ -338,13 +338,13 @@ class DetailModel
338 $remarkList[] = array('param' => ''); 338 $remarkList[] = array('param' => '');
339 } 339 }
340 } 340 }
341 - 341 +
342 // 显示模特备注 342 // 显示模特备注
343 if ($showRemark) { 343 if ($showRemark) {
344 $result['reference']['detail']['list'][7]['params'] = $remarkList; 344 $result['reference']['detail']['list'][7]['params'] = $remarkList;
345 } 345 }
346 } 346 }
347 - 347 +
348 // 商品材质 348 // 商品材质
349 if (!empty($sizeInfo['productMaterialList'])) { 349 if (!empty($sizeInfo['productMaterialList'])) {
350 $result['materials'] = array( 350 $result['materials'] = array(
@@ -359,7 +359,7 @@ class DetailModel @@ -359,7 +359,7 @@ class DetailModel
359 ); 359 );
360 } 360 }
361 } 361 }
362 - 362 +
363 // 洗涤提示 363 // 洗涤提示
364 if (!empty($sizeInfo['washTipsBoList'])) { 364 if (!empty($sizeInfo['washTipsBoList'])) {
365 $result['washTips']['list'] = array(); 365 $result['washTips']['list'] = array();
@@ -384,7 +384,6 @@ class DetailModel @@ -384,7 +384,6 @@ class DetailModel
384 ); 384 );
385 } 385 }
386 } 386 }
387 -  
388 } 387 }
389 388
390 return $result; 389 return $result;
@@ -396,7 +395,7 @@ class DetailModel @@ -396,7 +395,7 @@ class DetailModel
396 public static function getComments($productId, $pageNum = 1, $pageSize = 100) 395 public static function getComments($productId, $pageNum = 1, $pageSize = 100)
397 { 396 {
398 $result = array(); 397 $result = array();
399 - 398 +
400 if (is_numeric($productId) && is_numeric($pageNum) && is_numeric($pageSize)) { 399 if (is_numeric($productId) && is_numeric($pageNum) && is_numeric($pageSize)) {
401 $commentList = DetailData::commentList($productId, $pageNum, $pageSize); 400 $commentList = DetailData::commentList($productId, $pageNum, $pageSize);
402 if (!empty($commentList)) { 401 if (!empty($commentList)) {
@@ -410,10 +409,10 @@ class DetailModel @@ -410,10 +409,10 @@ class DetailModel
410 } 409 }
411 } 410 }
412 } 411 }
413 - 412 +
414 return $result; 413 return $result;
415 } 414 }
416 - 415 +
417 /** 416 /**
418 * 获取咨询列表 417 * 获取咨询列表
419 * 418 *
@@ -425,7 +424,7 @@ class DetailModel @@ -425,7 +424,7 @@ class DetailModel
425 public static function getConsults($productId, $pageNum = 1, $pageSize = 100) 424 public static function getConsults($productId, $pageNum = 1, $pageSize = 100)
426 { 425 {
427 $result = array(); 426 $result = array();
428 - 427 +
429 if (is_numeric($productId) && is_numeric($pageNum) && is_numeric($pageSize)) { 428 if (is_numeric($productId) && is_numeric($pageNum) && is_numeric($pageSize)) {
430 $consultList = DetailData::consultList($productId, $pageNum, $pageSize); 429 $consultList = DetailData::consultList($productId, $pageNum, $pageSize);
431 if (!empty($consultList)) { 430 if (!empty($consultList)) {
@@ -439,10 +438,10 @@ class DetailModel @@ -439,10 +438,10 @@ class DetailModel
439 } 438 }
440 $consultList = array(); 439 $consultList = array();
441 } 440 }
442 - 441 +
443 return $result; 442 return $result;
444 } 443 }
445 - 444 +
446 /** 445 /**
447 * 获取为你优选的商品 446 * 获取为你优选的商品
448 * 447 *
@@ -452,7 +451,7 @@ class DetailModel @@ -452,7 +451,7 @@ class DetailModel
452 public static function getPreference($productSkn) 451 public static function getPreference($productSkn)
453 { 452 {
454 $result = array(); 453 $result = array();
455 - 454 +
456 if (is_numeric($productSkn)) { 455 if (is_numeric($productSkn)) {
457 $preference = DetailData::preference($productSkn); 456 $preference = DetailData::preference($productSkn);
458 if (!empty($preference['data'])) { 457 if (!empty($preference['data'])) {
@@ -461,8 +460,8 @@ class DetailModel @@ -461,8 +460,8 @@ class DetailModel
461 } 460 }
462 } 461 }
463 } 462 }
464 - 463 +
465 return $result; 464 return $result;
466 } 465 }
467 - 466 +
468 } 467 }
@@ -184,12 +184,12 @@ class NewsaleModel @@ -184,12 +184,12 @@ class NewsaleModel
184 $newsale = NewsaleData::getNewsaleFocus($codeKey); 184 $newsale = NewsaleData::getNewsaleFocus($codeKey);
185 185
186 // 调用接口获取数据并封装 186 // 调用接口获取数据并封装
187 - if (isset($newsale['code']) && isset($newsale['data'][0]['data'])) {  
188 - if(count($newsale['data'][0]['data']) === 1) {  
189 - $result = Helpers::formatBanner($newsale['data'][0]['data'][0], 640, 240); 187 + if (isset($newsale['code']) && isset($newsale['data']['list'])) {
  188 + if(count($newsale['data']['list']) === 1) {
  189 + $result = Helpers::formatBanner($newsale['data']['list'][0]['data'][0], 640, 240);
190 } else { 190 } else {
191 - foreach ($newsale['data'][0]['data'] as $one) {  
192 - $result['list'][] = Helpers::formatBanner($one, 640, 240); 191 + foreach ($newsale['data']['list'] as $one) {
  192 + $result['list'][] = Helpers::formatBanner($one['data'], 640, 240);
193 } 193 }
194 } 194 }
195 } 195 }