From 5d088dede6c693c174ccdc36a7c46a10fdf77fdc Mon Sep 17 00:00:00 2001
From: Wayne <943146732@qq.com>
Date: Thu, 29 Feb 2024 16:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E9=A2=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/model/store/Shop.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/store/model/store/Shop.php b/app/store/model/store/Shop.php
index 6ab723b3..23e161ce 100644
--- a/app/store/model/store/Shop.php
+++ b/app/store/model/store/Shop.php
@@ -88,7 +88,6 @@ class Shop extends ShopModel
         if (!$this->validateForm($data)) {
             return false;
         }
-        $data['remark'] = json_encode($data['remark'], JSON_UNESCAPED_UNICODE);
         return $this->save($this->createData($data));
     }
 
@@ -102,7 +101,6 @@ class Shop extends ShopModel
         if (!$this->validateForm($data)) {
             return false;
         }
-        $data['remark'] = json_encode($data['remark'], JSON_UNESCAPED_UNICODE);
         return $this->save($this->createData($data)) !== false;
     }
     
@@ -148,6 +146,10 @@ class Shop extends ShopModel
         [$data['province_id'], $data['city_id'], $data['region_id']] = $data['cascader'];
         // 当前商城ID
         $data['store_id'] = self::$storeId;
+
+        $data['remark'] = json_encode($data['remark'], JSON_UNESCAPED_UNICODE);
+        $data['history'] = json_encode($data['history'], JSON_UNESCAPED_UNICODE);
+
         return $data;
     }