|
@@ -48,11 +48,11 @@ class ListController extends WebAction |
|
@@ -48,11 +48,11 @@ class ListController extends WebAction |
|
48
|
$condition['gender'] = $gender;
|
48
|
$condition['gender'] = $gender;
|
|
49
|
//每页显示商品数
|
49
|
//每页显示商品数
|
|
50
|
if(!isset($condition['viewNum']) || empty($condition['viewNum'])){
|
50
|
if(!isset($condition['viewNum']) || empty($condition['viewNum'])){
|
|
51
|
- $condition['viewNum'] =60;
|
51
|
+ $condition['viewNum'] =59;
|
|
52
|
}
|
52
|
}
|
|
53
|
$view_num_arr = array(60, 100, 200);
|
53
|
$view_num_arr = array(60, 100, 200);
|
|
54
|
if (!in_array($condition['viewNum'], $view_num_arr)) {
|
54
|
if (!in_array($condition['viewNum'], $view_num_arr)) {
|
|
55
|
- $condition['viewNum'] = 60;
|
55
|
+ $condition['viewNum'] = 59;
|
|
56
|
}
|
56
|
}
|
|
57
|
//每行显示的商品数量
|
57
|
//每行显示的商品数量
|
|
58
|
if(!isset($condition['rowNum']) || empty($condition['rowNum'])){
|
58
|
if(!isset($condition['rowNum']) || empty($condition['rowNum'])){
|
|
@@ -70,14 +70,25 @@ class ListController extends WebAction |
|
@@ -70,14 +70,25 @@ class ListController extends WebAction |
|
70
|
//$query = $this->get('query');
|
70
|
//$query = $this->get('query');
|
|
71
|
//返回搜索条件
|
71
|
//返回搜索条件
|
|
72
|
$condition['needFilter'] = 1;
|
72
|
$condition['needFilter'] = 1;
|
|
|
|
73
|
+ //过滤赠品
|
|
|
|
74
|
+ $condition['attribute_not'] = 2;
|
|
|
|
75
|
+ /*sale*/
|
|
|
|
76
|
+ //默认排序
|
|
|
|
77
|
+ if (!isset($condition['order']) || empty($condition['order'])) {
|
|
|
|
78
|
+ $condition['order'] = 's_n_desc';
|
|
|
|
79
|
+ }
|
|
|
|
80
|
+ if (!isset($condition['p_d']) || empty($condition['p_d'])) {
|
|
|
|
81
|
+ $condition['p_d'] = '0,0.9';
|
|
|
|
82
|
+ }
|
|
73
|
$options = array(
|
83
|
$options = array(
|
|
74
|
'imgSize' => $imgSize,
|
84
|
'imgSize' => $imgSize,
|
|
75
|
'minImgSize' => $minImgSize,
|
85
|
'minImgSize' => $minImgSize,
|
|
76
|
'gender' => $gender,
|
86
|
'gender' => $gender,
|
|
77
|
'needPd' => 'Y',
|
87
|
'needPd' => 'Y',
|
|
78
|
'rowNum' =>$condition['rowNum'],
|
88
|
'rowNum' =>$condition['rowNum'],
|
|
79
|
- 'viewNum' =>$condition['viewNum'],
|
89
|
+ 'viewNum' =>$condition['viewNum']-1,
|
|
80
|
);
|
90
|
);
|
|
|
|
91
|
+
|
|
81
|
$params = $condition + $_GET;
|
92
|
$params = $condition + $_GET;
|
|
82
|
$params = array_filter($params);
|
93
|
$params = array_filter($params);
|
|
83
|
$data = SearchModel::getSearchData($params,$options);
|
94
|
$data = SearchModel::getSearchData($params,$options);
|
