|
@@ -63,13 +63,13 @@ class HelperSearch |
|
@@ -63,13 +63,13 @@ class HelperSearch |
|
63
|
unset(self::$params['page']);
|
63
|
unset(self::$params['page']);
|
|
64
|
unset(self::$params['/sale']);
|
64
|
unset(self::$params['/sale']);
|
|
65
|
unset(self::$params['sale']);
|
65
|
unset(self::$params['sale']);
|
|
66
|
- $filter = $data['data']['filter'];
|
66
|
+ $filter = $data['product']['filter'];
|
|
67
|
//产品列表
|
67
|
//产品列表
|
|
68
|
- $result['goods'] = self::getProductList($data['data']['product_list'], $options['imgSize']);
|
68
|
+ $result['goods'] = self::getProductList($data['product']['product_list'], $options['imgSize']);
|
|
69
|
//总页数
|
69
|
//总页数
|
|
70
|
- $result['page_total'] = $data['data']['page_total'];
|
70
|
+ $result['page_total'] = $data['product']['page_total'];
|
|
71
|
//当前页
|
71
|
//当前页
|
|
72
|
- $result['page'] = $data['data']['page'];
|
72
|
+ $result['page'] = $data['product']['page'];
|
|
73
|
self::$page = $result['page'];
|
73
|
self::$page = $result['page'];
|
|
74
|
//清除选中
|
74
|
//清除选中
|
|
75
|
$result['filters']['checkedConditions']['clearUrl'] = self::current();
|
75
|
$result['filters']['checkedConditions']['clearUrl'] = self::current();
|
|
@@ -99,25 +99,25 @@ class HelperSearch |
|
@@ -99,25 +99,25 @@ class HelperSearch |
|
99
|
//可选每页显示数量
|
99
|
//可选每页显示数量
|
|
100
|
$result['opts']['pageCounts'] = self::viewNum();
|
100
|
$result['opts']['pageCounts'] = self::viewNum();
|
|
101
|
$result['opts']['curPage'] = self::$page;
|
101
|
$result['opts']['curPage'] = self::$page;
|
|
102
|
- $result['opts']['pageCount'] = $data['data']['page_total'];
|
|
|
|
103
|
- $result['opts']['nextHref'] = ($next = self::next($data['data']['page_total'],$data['data']['filter'])) ? $next['href'] : '';
|
|
|
|
104
|
- $result['hasNextPage'] = self::next($data['data']['page_total']);
|
102
|
+ $result['opts']['pageCount'] = $data['product']['page_total'];
|
|
|
|
103
|
+ $result['opts']['nextHref'] = ($next = self::next($data['product']['page_total'],$data['product']['filter'])) ? $next['href'] : '';
|
|
|
|
104
|
+ $result['hasNextPage'] = self::next($data['product']['page_total']);
|
|
105
|
//分类条件
|
105
|
//分类条件
|
|
106
|
- $result['filters']['sort'] = isset($filter['group_sort']) ? self::searchSort($filter['group_sort']) : array();
|
106
|
+ $result['filters']['sort'] = isset($data['sort']) ? self::searchSort($data['sort']['sort']) : array();
|
|
107
|
//左侧分类分类
|
107
|
//左侧分类分类
|
|
108
|
- $result['leftContent'][]['allSort'] = isset($filter['group_sort']) ? self::groupSort($filter['group_sort']) : array();
|
108
|
+ $result['leftContent'][]['allSort'] = isset($data['sort']) ? self::groupSort($data['sort']['sort']) : array();
|
|
109
|
//一周新品上架
|
109
|
//一周新品上架
|
|
110
|
- $result['leftContent'][]['newSales'] = isset($filter['recent']) ? self::recentShelve($filter['recent']) : array();
|
110
|
+ $result['leftContent'][]['newSales'] = isset($data['recent']) ? self::recentShelve($data['recent']) : array();
|
|
111
|
//全部折扣
|
111
|
//全部折扣
|
|
112
|
- $result['leftContent'][]['allDiscount'] = isset($filter['discount']) ? self::getDiscount($filter['discount']) : array();
|
112
|
+ $result['leftContent'][]['allDiscount'] = isset($data['discount']) ? self::getDiscount($data['discount']['discount']) : array();
|
|
113
|
//总记录数
|
113
|
//总记录数
|
|
114
|
- $result['totalCount'] = $data['data']['total'];
|
114
|
+ $result['totalCount'] = $data['product']['total'];
|
|
115
|
//分页
|
115
|
//分页
|
|
116
|
$result['pager'] = self::pager($result['totalCount'],$options['viewNum']);
|
116
|
$result['pager'] = self::pager($result['totalCount'],$options['viewNum']);
|
|
117
|
//选中条件
|
117
|
//选中条件
|
|
118
|
$result['filters']['checkedConditions']['conditions'] = self::getSelected();
|
118
|
$result['filters']['checkedConditions']['conditions'] = self::getSelected();
|
|
119
|
if (isset($options['controller']) && $options['controller'] == 'Search') {
|
119
|
if (isset($options['controller']) && $options['controller'] == 'Search') {
|
|
120
|
- self::setSearchNav($data['data']['total']);
|
120
|
+ self::setSearchNav($data['product']['total']);
|
|
121
|
}
|
121
|
}
|
|
122
|
$result['pathNav'] = self::$listnav;
|
122
|
$result['pathNav'] = self::$listnav;
|
|
123
|
return $result;
|
123
|
return $result;
|
|
@@ -393,7 +393,7 @@ class HelperSearch |
|
@@ -393,7 +393,7 @@ class HelperSearch |
|
393
|
'id' => $v['id'],
|
393
|
'id' => $v['id'],
|
|
394
|
'href' => $url,
|
394
|
'href' => $url,
|
|
395
|
'name' => $v['brand_name'],
|
395
|
'name' => $v['brand_name'],
|
|
396
|
- 'key' => $v['brand_name'],
|
396
|
+ 'key' => strtolower($v['brand_name']),
|
|
397
|
'active' => in_array($v['id'], $brandIds) ? true : false
|
397
|
'active' => in_array($v['id'], $brandIds) ? true : false
|
|
398
|
);
|
398
|
);
|
|
399
|
if (is_numeric($v['brand_alif'])) {
|
399
|
if (is_numeric($v['brand_alif'])) {
|
|
@@ -426,7 +426,7 @@ class HelperSearch |
|
@@ -426,7 +426,7 @@ class HelperSearch |
|
426
|
//品牌列表排序, 添加品牌索引
|
426
|
//品牌列表排序, 添加品牌索引
|
|
427
|
$index_key = array();
|
427
|
$index_key = array();
|
|
428
|
foreach ($brandList as $key => $val) {
|
428
|
foreach ($brandList as $key => $val) {
|
|
429
|
- if ($key && !in_array($key, $index_key)) {
|
429
|
+ if ($key && !in_array($key, $index_key) && !is_numeric($key)) {
|
|
430
|
$index['index'] = strtolower(($key));
|
430
|
$index['index'] = strtolower(($key));
|
|
431
|
$index['name'] = $key;
|
431
|
$index['name'] = $key;
|
|
432
|
$result['brandIndex'][] = $index;
|
432
|
$result['brandIndex'][] = $index;
|
