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