商品列表传入商户id

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

@@ -92,7 +92,7 @@ class Merchant extends BaseController
 
     public function productTypeList()
     {
-        $params= $this->request->params(['type','mer_cate_id','pageNum','pageSize']);
+        $params= $this->request->params(['type','mer_cate_id','pageNum','pageSize','mer_id']);
         $name=$params['type'];
 
         $domain = $this->request->domain();
@@ -117,7 +117,8 @@ class Merchant extends BaseController
             $id=491;
         }// 商贸区
         else if($name=='commercetrade'){
-            $id=$this->merId;
+            if (empty($params['mer_id'])) return app('json')->fail('店铺不存在');
+            $id=$this->merId = $params['mer_id'];
             $is_commercetrade = 1;
         }
         [$page, $limit] = $this->getPage();