From c7b3cffd192aa6e7982d43d7425e156033a25d3f Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 22 Sep 2023 09:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/store/merchant/MerchantIntention.php         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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);
     }