新增筛选

app/controller/api/store/merchant/Merchant.php

@@ -120,7 +120,7 @@ class Merchant extends BaseController
         if($params['pageSize']!=''){
             $limit=$params['pageSize'];
         }
-        $where = $this->request->params(['keyword','order','mer_cate_id','price_on', 'price_off','brand_id']);
+        $where = $this->request->params(['keyword','order','mer_cate_id', 'cate_id','price_on', 'price_off','brand_id']);
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;
@@ -128,7 +128,6 @@ class Merchant extends BaseController
         log::info("====={$params['mer_cate_id']}===");
         if($params['mer_cate_id']){
             $where['cate_id'] = $params['mer_cate_id'];
-            unset($where['mer_cate_id']);
         }
 
         return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439));