Merge pull request 'dev' (#19) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/19
This commit is contained in:
commit
8543357487
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,6 +2,7 @@
|
||||
/.vscode
|
||||
*.log
|
||||
.env
|
||||
.user.ini
|
||||
.phpstorm.meta.php
|
||||
.constant
|
||||
install/install.lock
|
||||
|
@ -57,7 +57,8 @@ class Merchant extends BaseController
|
||||
[$page, $limit] = $this->getPage();
|
||||
$where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader', 'street_id', 'credit_buy']);
|
||||
if (empty($where['type_id'])) {
|
||||
$where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform];
|
||||
//$where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform];
|
||||
$where['type_id'] = [MerchantModel::TypeTownSupplyChain, MerchantModel::TypeStore];
|
||||
}
|
||||
return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user