fe / YOHOBUYWAP · Commits

Go to a project

Authored by htoooth
Commit e324a066b5d0988cd12eff215e34b6eb1f4d3c23 1 parent 85e7379c

新增销售类目

Inline Side-by-side
Showing 2 changed files with 20 additions and 5 deletions
@@ -76,4 +76,8 @@ @@ -76,4 +76,8 @@
76 76
77 {{#if outlets}} 77 {{#if outlets}}
78 <input class="query-param" type="hidden" data-attr="outlets" value="{{outlets}}"> 78 <input class="query-param" type="hidden" data-attr="outlets" value="{{outlets}}">
  79 +{{/if}}
  80 +
  81 +{{#if poolId}}
  82 + <input class="query-param" type="hidden" data-attr="poolId" value="{{poolId}}">
79 {{/if}} 83 {{/if}}
@@ -80,10 +80,7 @@ class SearchController extends AbstractAction @@ -80,10 +80,7 @@ class SearchController extends AbstractAction
80 $condition['query'] = rawurlencode($condition['query']); 80 $condition['query'] = rawurlencode($condition['query']);
81 } 81 }
82 82
83 - // 用户自定义商品类目  
84 - if(isset($condition['filter_poolId'])){  
85 - $condition['filter_poolId'] = rawurldecode($condition['poolId']);  
86 - } 83 +
87 84
88 // 标识用户是否有输入搜索内容 85 // 标识用户是否有输入搜索内容
89 $haveQuery = !empty($query); 86 $haveQuery = !empty($query);
@@ -167,6 +164,13 @@ class SearchController extends AbstractAction @@ -167,6 +164,13 @@ class SearchController extends AbstractAction
167 $data['goodListPage'] = true; 164 $data['goodListPage'] = true;
168 $data['goodList'] = $condition; 165 $data['goodList'] = $condition;
169 $data['query'] = $query; 166 $data['query'] = $query;
  167 +
  168 + // 用户自定义商品类目
  169 + if(isset($condition['poolId'])){
  170 + $data['poolId'] = rawurldecode($condition['poolId']);
  171 +
  172 + }
  173 +
170 // 搜索是一级品类 174 // 搜索是一级品类
171 if ($isQueryFirstClass) { 175 if ($isQueryFirstClass) {
172 $this->setTitle('全部' . $query); 176 $this->setTitle('全部' . $query);
@@ -258,7 +262,8 @@ class SearchController extends AbstractAction @@ -258,7 +262,8 @@ class SearchController extends AbstractAction
258 'p_d' => FILTER_DEFAULT, 262 'p_d' => FILTER_DEFAULT,
259 'outlets' => FILTER_DEFAULT, 263 'outlets' => FILTER_DEFAULT,
260 'age_level' => FILTER_DEFAULT, 264 'age_level' => FILTER_DEFAULT,
261 - 'page' => FILTER_VALIDATE_INT,), false); 265 + 'page' => FILTER_VALIDATE_INT,
  266 + 'poolId' => FILTER_DEFAULT), false);
262 267
263 if (!empty($condition['shop_id'])) { 268 if (!empty($condition['shop_id'])) {
264 $condition['shop'] = $condition['shop_id']; 269 $condition['shop'] = $condition['shop_id'];
@@ -319,6 +324,12 @@ class SearchController extends AbstractAction @@ -319,6 +324,12 @@ class SearchController extends AbstractAction
319 $condition['outlets'] = rawurldecode($condition['outlets']); 324 $condition['outlets'] = rawurldecode($condition['outlets']);
320 } 325 }
321 326
  327 + // 用户自定义商品类目
  328 + if(isset($condition['poolId'])){
  329 + $condition['filter_poolId'] = rawurldecode($condition['poolId']);
  330 + unset($condition['poolId']);
  331 + }
  332 +
322 // 转换排序方式 333 // 转换排序方式
323 $type = $this->get('type', ''); 334 $type = $this->get('type', '');
324 $order = $this->get('order', 0); 335 $order = $this->get('order', 0);