From ba19df2666e8e8e4d60d5f9ea23824071db3135c Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Wed, 5 Jul 2023 17:38:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E5=BA=97=E9=93=BA=E4=B8=8D=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=AF=BC=E8=88=AA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/useInitConfigAndMallInfo.js | 9 +++++++--
 src/composables/useInitMap.js               | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/composables/useInitConfigAndMallInfo.js b/src/composables/useInitConfigAndMallInfo.js
index 593e9cf..3debd64 100644
--- a/src/composables/useInitConfigAndMallInfo.js
+++ b/src/composables/useInitConfigAndMallInfo.js
@@ -8,7 +8,7 @@ export const useInitConfigAndMallInfo = async () => {
   } = await getConfig()
   const store = useStore()
   if (config.debug) new VConsole()
-  {
+  try {
     const { data: theme } = await getTheme()
 
     const r = document.querySelector(':root')
@@ -19,10 +19,15 @@ export const useInitConfigAndMallInfo = async () => {
       .map(([k, v]) => [k, './static/offline' + v])
       .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {})
     store.SET_THEME(theme)
+  } catch (error) {
+    console.log(error)
   }
-  {
+
+  try {
     const { data: menuList } = await getMenuList()
     store.SET_MENU_LIST(menuList)
+  } catch (error) {
+    console.log(error)
   }
 
   try {
diff --git a/src/composables/useInitMap.js b/src/composables/useInitMap.js
index 68b2878..8a19f14 100644
--- a/src/composables/useInitMap.js
+++ b/src/composables/useInitMap.js
@@ -56,7 +56,7 @@ function onClickShop(event) {
     bounceShopAndChangeColor(null)
     hideMapDialog()
   } else {
-    store.SET_SHOP(event.data.shopData)
+    store.SET_SHOP({ ...event.data.shopData })
     bounceShopAndChangeColor(event.data.shopData)
   }
 }