diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue index 603c203..f1b0e4d 100644 --- a/src/views/Guide/Guide.vue +++ b/src/views/Guide/Guide.vue @@ -125,7 +125,6 @@ getBrandListByFormat().then(({ data }) => { shopList.value = data.list }) const selectedShopList = ref([]) -const idle = ref(null) const mapIdx = ref(-1) const mapTimer = ref(null) @@ -143,6 +142,7 @@ function onClickDeviceSite() { window.Map_QM.onShowDeviceSite() } function handleMapIcon(item, index) { + store.SET_SHOP(null) clearTimeout(mapIconTimer.value) window.Map_QM.changeStateShopPro(false) mapIdx.value = index @@ -199,21 +199,18 @@ function changeFloor(index) { showAll.value = false hideMapDialog() mapIdx.value = -1 - cancelIdleCallback(idle.value) window.Map_QM.showFloor(floor.floorOrder) - idle.value = requestIdleCallback(() => { - floorIdx.value = index - selectedShopList.value = shopList.value.map(brand => ({ - ...brand, - shopList: brand.shopList - .filter(item => item.floor === floor.floor) - .map(item => { - const meta = currentFloorShopMap.value[item.shopId] - return { ...item, ...(meta ? meta : {}) } - }) - })) - resolve() - }) + floorIdx.value = index + selectedShopList.value = shopList.value.map(brand => ({ + ...brand, + shopList: brand.shopList + .filter(item => item.floor === floor.floor) + .map(item => { + const meta = currentFloorShopMap.value[item.shopId] + return { ...item, ...(meta ? meta : {}) } + }) + })) + resolve() }) } const handleSelectFloor = index => { @@ -228,19 +225,16 @@ function filterAboutCurrentInfo() { const floor = shop.value ? shop.value.floor : currentFloor.value.floor const floorOrder = shop.value ? shop.value.floorOrder : currentFloor.value.floorOrder window.Map_QM.showFloor(floorOrder) - cancelIdleCallback(idle.value) - idle.value = requestIdleCallback(() => { - floorIdx.value = currentBuildingFloorsList.value.findIndex(item => item.floorCode === floorCode) - selectedShopList.value = shopList.value.map(brand => ({ - ...brand, - shopList: brand.shopList - .filter(item => item.floor === floor) - .map(item => { - const meta = currentFloorShopMap.value[item.shopId] - return { ...item, ...(meta ? meta : {}) } - }) - })) - }) + floorIdx.value = currentBuildingFloorsList.value.findIndex(item => item.floorCode === floorCode) + selectedShopList.value = shopList.value.map(brand => ({ + ...brand, + shopList: brand.shopList + .filter(item => item.floor === floor) + .map(item => { + const meta = currentFloorShopMap.value[item.shopId] + return { ...item, ...(meta ? meta : {}) } + }) + })) nextTick(() => { if (shop.value) { setShopActive(shop.value) @@ -251,7 +245,6 @@ function filterAboutCurrentInfo() { } const initiated = computed(() => selectedShopList.value && selectedShopList.value.length) onBeforeUnmount(() => { - cancelIdleCallback(idle.value) clearTimeout(mapTimer.value) clearTimeout(mapIconTimer.value) hideMapDialog()