更iæ新

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

@@ -168,8 +168,11 @@ class Merchant extends BaseController
         if($params['pageSize']!=''){
             $limit=$params['pageSize'];
         }
-        $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();
+        $category_id = $params['category_id']?:0;
+        $where['is_del'] = 0;
+        $where['status'] = 1;
+        $category_id && $where['category_id'] = $category_id;
+        $mer_list = Db::name('merchant')->where($where)->page($page)->limit(100)->select();
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;