diff --git a/app/common/model/system/merchant/Merchant.php b/app/common/model/system/merchant/Merchant.php index 2bb72fe3..6efd4009 100644 --- a/app/common/model/system/merchant/Merchant.php +++ b/app/common/model/system/merchant/Merchant.php @@ -37,6 +37,18 @@ class Merchant extends BaseModel const TypeTownServer = 16; //镇服务团队 const TypeTownSupplyChain = 17; //镇级供应链 + //定义店铺类型code + const TypeCode = [ + 'TypeStore', //镇街店铺 + 'TypeCloudWarehouse', //镇级云仓 + 'TypeSupplyChain', //市级供应链 + 'TypePlatform', //市级云仓 + 'TypeTeamServer', //小组服务团 + 'TypeVillageServer', //村服务团队 + 'TypeTownServer', //镇服务团队 + 'TypeTownSupplyChain', //镇级供应链 + ]; + const TypeMap = [ self::TypeStore => '镇街店铺', self::TypeCloudWarehouse => '里海云仓', diff --git a/app/controller/admin/system/merchant/MerchantType.php b/app/controller/admin/system/merchant/MerchantType.php index 5d559878..047ad39b 100644 --- a/app/controller/admin/system/merchant/MerchantType.php +++ b/app/controller/admin/system/merchant/MerchantType.php @@ -91,7 +91,7 @@ class MerchantType extends BaseController protected function getValidParams() { - $data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'auth', 'description']); + $data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'type_code']); $validate = app()->make(MerchantTypeValidate::class); $validate->check($data); if ($data['is_margin'] == 1) {