shop filter

@@ -514,7 +514,7 @@ function search(opt) {
 
 $.ajax({
     type: 'GET',
-    url: '/product/newsale/filter',
+    url: '/search/filter',
     data: {
         shop_id: shopId,
         brand: brand

@@ -332,6 +332,7 @@ class SearchController extends AbstractAction
             $condition = filter_input_array(INPUT_GET, array(
                 'query' => FILTER_DEFAULT,
                 'brand' => FILTER_DEFAULT,
+                'shop_id' => FILTER_DEFAULT,
                 'sort' => FILTER_DEFAULT,
                 'msort' => FILTER_DEFAULT,
                 'misort' => FILTER_DEFAULT,

@@ -94,7 +94,12 @@ class SearchModel
         }
 
         // 区别各种列表页面的筛选数据
-        if (isset($condition['brand'])) {
+        if (isset($condition['shop_id'])) {
+            $condition['shop'] = $condition['shop_id'];
+            unset($condition['shop_id']);
+            $listData = SearchData::searchByCondition($condition);
+            $exclude = 'null';
+        }elseif (isset($condition['brand'])) {
             $listData = BrandData::filterBrandData($condition);
             $exclude = 'brand';
         } else if (isset($condition['sort'])) {