|
@@ -487,15 +487,12 @@ class IndexController extends AbstractAction |
|
@@ -487,15 +487,12 @@ class IndexController extends AbstractAction |
487
|
|
487
|
|
488
|
/* tar add 160826 */
|
488
|
/* tar add 160826 */
|
489
|
$data['gender'] = $this->get('gender');
|
489
|
$data['gender'] = $this->get('gender');
|
490
|
- $data['channel'] = $this->get('yh_channel') ? $this->get('yh_channel') : Helpers::getChannelByCookie();
|
|
|
491
|
-
|
|
|
492
|
//接受APP传来的封面频道参数
|
490
|
//接受APP传来的封面频道参数
|
493
|
$coverChannel = Helpers::getYhHhannel($this->get('yh_channel', ''));
|
491
|
$coverChannel = Helpers::getYhHhannel($this->get('yh_channel', ''));
|
494
|
|
492
|
|
495
|
$filter = Product\SearchModel::filter(array(
|
493
|
$filter = Product\SearchModel::filter(array(
|
496
|
'shop_id' => $shopId,
|
494
|
'shop_id' => $shopId,
|
497
|
'gender' => empty($data['gender']) ? '' : $data['gender'],
|
495
|
'gender' => empty($data['gender']) ? '' : $data['gender'],
|
498
|
- 'channel' => empty($data['channel']) ? '' : $data['channel'],
|
|
|
499
|
'brand' => empty($data['brand']) ? '' : $data['brand']
|
496
|
'brand' => empty($data['brand']) ? '' : $data['brand']
|
500
|
));
|
497
|
));
|
501
|
$data['filter'] = isset($filter['filter']) ? $filter['filter'] : array();
|
498
|
$data['filter'] = isset($filter['filter']) ? $filter['filter'] : array();
|
|
@@ -504,7 +501,6 @@ class IndexController extends AbstractAction |
|
@@ -504,7 +501,6 @@ class IndexController extends AbstractAction |
504
|
$goods = \Product\SearchModel::search(array(
|
501
|
$goods = \Product\SearchModel::search(array(
|
505
|
'shop' => $shopId,
|
502
|
'shop' => $shopId,
|
506
|
'gender' => empty($data['gender']) ? '' : $data['gender'],
|
503
|
'gender' => empty($data['gender']) ? '' : $data['gender'],
|
507
|
- 'channel' => empty($data['channel']) ? '' : $data['channel'],
|
|
|
508
|
'brand' => empty($data['brand']) ? '' : $data['brand'],
|
504
|
'brand' => empty($data['brand']) ? '' : $data['brand'],
|
509
|
'coverChannel' => $coverChannel
|
505
|
'coverChannel' => $coverChannel
|
510
|
));
|
506
|
));
|
|
@@ -517,7 +513,6 @@ class IndexController extends AbstractAction |
|
@@ -517,7 +513,6 @@ class IndexController extends AbstractAction |
517
|
'url' => Helpers::url('/product/index/category', array('shop_id' => $shopId))
|
513
|
'url' => Helpers::url('/product/index/category', array('shop_id' => $shopId))
|
518
|
),
|
514
|
),
|
519
|
'gender' => $data['gender'],
|
515
|
'gender' => $data['gender'],
|
520
|
- 'channel' => $data['channel'],
|
|
|
521
|
'coverChannel' => $coverChannel,
|
516
|
'coverChannel' => $coverChannel,
|
522
|
'appVersion' => !empty($appVersion)
|
517
|
'appVersion' => !empty($appVersion)
|
523
|
));
|
518
|
));
|