Merge branch 'master' into huangfamily

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

@@ -150,7 +150,7 @@ class Merchant extends BaseController
      */
     public function commerceProductList()
     {
-        $params= $this->request->params(['pageNum','pageSize']);
+        $params= $this->request->params(['pageNum','pageSize','category_id']);
         $mer_id_unset = [496,486,439,148,491];
         $domain = $this->request->domain();
         if(strpos($domain, 'test.hebeiyhc.com') !== false) {
@@ -168,7 +168,8 @@ class Merchant extends BaseController
         if($params['pageSize']!=''){
             $limit=$params['pageSize'];
         }
-        $mer_list = Db::name('merchant')->where(['category_id' => 32,'status' => 1,'is_del' => 0])->page($page)->limit($limit)->select();
+        $category_id = $params['category_id']?:32;
+        $mer_list = Db::name('merchant')->where(['category_id' => $category_id,'status' => 1,'is_del' => 0])->page($page)->limit($limit)->select();
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;