diff --git a/src/App.vue b/src/App.vue index 038b89d..9c0f952 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,6 +8,14 @@ diff --git a/src/views/Guide/list.js b/src/components/MapControl/list.js similarity index 100% rename from src/views/Guide/list.js rename to src/components/MapControl/list.js diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index ca3cc3c..f8115ab 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/src/components/PublicComponent/PublicComponent.vue @@ -1,7 +1,7 @@ @@ -19,7 +19,7 @@ import { defineAsyncComponent, watch, onMounted, ref, onBeforeUnmount } from 'vue' import { storeToRefs } from 'pinia' import { useStore } from '@/store/root' -import { useRouter, useRoute } from 'vue-router' +import { useRouter } from 'vue-router' import { useHandleScreen } from '@/composables/useHandleScreen' import { useLogout } from '@/composables/useLogout' import { useInitMap } from '@/composables/useInitMap' @@ -32,9 +32,8 @@ const SearchBar = defineAsyncComponent(() => import('./SearchBar.vue')) const Tabs = defineAsyncComponent(() => import('./Tabs.vue')) const router = useRouter() -const route = useRoute() const store = useStore() -const { shop, showSearch, language } = storeToRefs(store) +const { shop, showSearch, language, path } = storeToRefs(store) const { resetClickNumber, setLogoutRef, addTotalClick } = useLogout() @@ -77,8 +76,8 @@ onBeforeUnmount(() => { window.removeEventListener('touchend', checkHandleScreen) }) -watch(route, to => { - if (to.fullPath === '/guide' || to.fullPath === '/nav' || to.fullPath === '/billboard') { +watch(path, nxtPath => { + if (nxtPath === '/guide' || nxtPath === '/nav' || nxtPath === '/billboard') { window?.Map_QM?.startRender() } else { window?.Map_QM?.cancelRender() diff --git a/src/components/PublicComponent/SearchBar.vue b/src/components/PublicComponent/SearchBar.vue index 61e9180..8dd741d 100644 --- a/src/components/PublicComponent/SearchBar.vue +++ b/src/components/PublicComponent/SearchBar.vue @@ -1,6 +1,6 @@