diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 2687f342..2a352f56 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -108,12 +108,18 @@ class MerchantIntention extends BaseController $typeId = $this->request->get('mer_type_id', 0); $typeCode = Db::name('merchant_type')->where('mer_type_id', $typeId)->value('type_code', ''); $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']){ - $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']){ - $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); }