mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#19) from dev into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/19
This commit is contained in:
mkm 2023-08-31 15:21:40 +08:00
commit 8543357487
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
/.vscode /.vscode
*.log *.log
.env .env
.user.ini
.phpstorm.meta.php .phpstorm.meta.php
.constant .constant
install/install.lock install/install.lock

3
app/controller/api/store/merchant/Merchant.php
View File

@ -57,7 +57,8 @@ class Merchant extends BaseController
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader', 'street_id', 'credit_buy']); $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader', 'street_id', 'credit_buy']);
if (empty($where['type_id'])) { 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)); return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
} }