'添加奥莱筛选参数'

@@ -32,7 +32,7 @@ var $input = $('#search-input input'),
     $icon = $('.search-icon'),
     $clear = $('#search-input .clear-input');
 
-var shopId,sort,brand;
+var shopId,sort,brand,outlets;
 
 //默认筛选条件
 var defaultOpt = require('./query-param');
@@ -105,6 +105,7 @@ function getQueryString(name) {
 
 shopId = getQueryString('shop_id');
 sort = getQueryString('sort');
+outlets = getQueryString('outlets');
 
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
@@ -178,6 +179,11 @@ function search(opt) {
                     discount: opt.id
                 };
                 break;
+            case 'outlets':
+                ext = {
+                    outlets: opt.id
+                };
+                break;
         }
 
         $.extend(defaultOpt, ext); //扩展筛选项
@@ -221,6 +227,10 @@ function search(opt) {
         params.brand = brand;
     }
 
+    if (outlets) {
+        params.outlets = outlets;
+    }
+
     $.extend(setting, defaultOpt, params);
 
     searching = true;

@@ -68,4 +68,8 @@
 
 {{#if limit}}
     <input class="query-param" type="hidden" data-attr="limit" value="{{limit}}">
+{{/if}}
+
+{{#if outlets}}
+    <input class="query-param" type="hidden" data-attr="outlets" value="{{outlets}}">
 {{/if}}
\ No newline at end of file

@@ -30,7 +30,6 @@ class SearchController extends AbstractAction
     /**
      * 搜索列表页
      *
-     * tar mark
      */
     public function listAction()
     {
@@ -202,12 +201,7 @@ class SearchController extends AbstractAction
             $this->setTitle($condition['title']);
             $this->setNavHeader($condition['title'], true, SITE_MAIN);
         }
-        //奥莱商品过滤新品标签
-        if (isset($condition['outlets']) && $condition['outlets'] === '1') {
-            foreach ($data['goodList']['new'] as $outletskey => $outletsval) {
-                unset($data['goodList']['new'][$outletskey]['tags']);
-            }
-        }
+
         $this->_view->display('list', $data);
     }
 
@@ -294,6 +288,11 @@ class SearchController extends AbstractAction
                 $condition['query'] = rawurldecode($condition['query']);
             }
 
+            // 转义奥莱
+            if (isset($condition['outlets'])) {
+                $condition['outlets'] = rawurldecode($condition['outlets']);
+            }
+
             // 转换排序方式
             $type = $this->get('type', '');
             $order = $this->get('order', 0);
@@ -328,12 +327,14 @@ class SearchController extends AbstractAction
 
             $data = Product\SearchModel::getSearchData($condition, $showTag, $tagNew, $tagSale);
         } while (false);
+
         //奥莱商品过滤新品标签
         if (isset($condition['outlets']) && $condition['outlets'] === '1') {
-            foreach ($data['goodList']['new'] as $outletskey => $outletsval) {
-                unset($data['goodList']['new'][$outletskey]['tags']);
+            foreach ($data['new'] as $outletskey => $outletsval) {
+                unset($data['new'][$outletskey]['tags']);
             }
         }
+
         if (empty($data['new'])) {
             echo ' ';
         } else {