更新获取申请协议
This commit is contained in:
parent
2adb8f4b2f
commit
c7b3cffd19
@ -108,12 +108,18 @@ class MerchantIntention extends BaseController
|
|||||||
$typeId = $this->request->get('mer_type_id', 0);
|
$typeId = $this->request->get('mer_type_id', 0);
|
||||||
$typeCode = Db::name('merchant_type')->where('mer_type_id', $typeId)->value('type_code', '');
|
$typeCode = Db::name('merchant_type')->where('mer_type_id', $typeId)->value('type_code', '');
|
||||||
$repository = app()->make(CacheRepository::class);
|
$repository = app()->make(CacheRepository::class);
|
||||||
$agreeData[] = $repository->getResult('consign_product_agree');
|
$agree = $repository->getResult('consign_product_agree');
|
||||||
|
$agree['content'] = $agree['consign_product_agree'];
|
||||||
|
$agreeData[] = $agree;
|
||||||
if ($typeCode == Merchant::TypeCode['TypeStore']){
|
if ($typeCode == Merchant::TypeCode['TypeStore']){
|
||||||
$agreeData[] = $repository->getResult('mer_services_agree');
|
$agree = $repository->getResult('mer_services_agree');
|
||||||
|
$agree['content'] = $agree['mer_services_agree'];
|
||||||
|
$agreeData[] = $agree;
|
||||||
}
|
}
|
||||||
if ($typeCode == Merchant::TypeCode['TypeSupplyChain'] || $typeCode == Merchant::TypeCode['TypeTownSupplyChain']){
|
if ($typeCode == Merchant::TypeCode['TypeSupplyChain'] || $typeCode == Merchant::TypeCode['TypeTownSupplyChain']){
|
||||||
$agreeData[] = $repository->getResult('mer_supply_agree');
|
$agree = $repository->getResult('mer_supply_agree');
|
||||||
|
$agree['content'] = $agree['mer_services_agree'];
|
||||||
|
$agreeData[] = $agree;
|
||||||
}
|
}
|
||||||
return app('json')->success($agreeData);
|
return app('json')->success($agreeData);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user