From 01b737fd8a2832222c06827c460f67e979962815 Mon Sep 17 00:00:00 2001
From: jiannibang <jiannibang@gmail.com>
Date: Tue, 20 Dec 2022 16:48:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=97=E9=93=BA=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Map/Map.vue        |  63 ++++++------------------------
 src/components/Map/bg.png         | Bin 0 -> 1723 bytes
 src/composables/useFacilityNav.js |   6 +--
 src/composables/useInitMap.js     |   8 ++--
 4 files changed, 18 insertions(+), 59 deletions(-)
 create mode 100644 src/components/Map/bg.png

diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index e26cb5b..bb7df79 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -4,12 +4,8 @@
     <div id="mapContainer" :class="$route.path === '/billboard' ? 'billboard' : $route.path === '/guide' ? 'guide' : ''" />
 
     <!-- 地图弹框 -->
-    <div id="shopInfo" class="boxShop boxShop2" :style="{ backgroundImage: `url(${require('@/assets/images/map/map-dialog.png')})` }">
-      <div id="shopNum">{{ switchLanguage(shop, 'shopName') }}</div>
-      <div style="display: flex; align-items: center">
-        <div class="pop-bottom" @click="handleDetail">{{ $t('detail') }}</div>
-        <div class="go-button" @click="handleGO">{{ $t('nav') }}</div>
-      </div>
+    <div id="shopInfo" class="boxShop">
+      <div>{{ switchLanguage(shop, 'shopName') }}</div>
     </div>
     <div id="moveFloorBG">
       <span id="moveFloor"></span>
@@ -24,17 +20,6 @@ import { useStore } from '@/store/root'
 
 const store = useStore()
 const { shop } = storeToRefs(store)
-
-const emits = defineEmits(['handle-GO', 'handle-Detail'])
-
-function handleGO() {
-  emits('handle-GO')
-}
-
-// 点击地图弹框详情
-function handleDetail() {
-  emits('handle-Detail')
-}
 </script>
 
 <style lang="scss" scoped>
@@ -60,42 +45,18 @@ function handleDetail() {
   position: absolute;
   z-index: 9000 !important;
   visibility: hidden;
-  width: 235px;
-  height: 158px;
-  background-size: contain;
-  background-repeat: no-repeat;
-  background-position: center center;
-  #shopNum {
-    height: 75px;
-    line-height: 80px;
-    padding: 10px 36px 0 36px;
+  height: 36px;
+  background: center / 100% 100% no-repeat url(./bg.png);
+  div {
+    font-weight: 700;
+    font-size: 12px;
+    line-height: 30px;
+    text-align: center;
+    border-radius: 100px;
     color: #ffffff;
-    font-family: 'font_medium';
-    font-size: 20px;
+    padding: 0 12px;
     @include no-wrap;
-  }
-  .go-button {
-    width: 50%;
-    text-align: center;
-    line-height: 50px;
-    font-weight: bold;
-    font-size: 18px;
-    color: #6a5e59;
-    height: 50px;
-    font-family: 'font_medium';
-    text-align: center;
-  }
-
-  .pop-bottom {
-    font-weight: bold;
-    font-size: 17px;
-    width: 50%;
-    height: 50px;
-    line-height: 50px;
-    color: #6a5e59;
-    overflow: hidden;
-    font-family: 'font_medium';
-    text-align: center;
+    z-index: 1;
   }
 }
 #moveFloorBG {
diff --git a/src/components/Map/bg.png b/src/components/Map/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..f742df765b7bfc248b0b74c520bc090c8201221d
GIT binary patch
literal 1723
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
Rpy&Vq002ovPDHLkV1oI%9&i8v

literal 0
HcmV?d00001

diff --git a/src/composables/useFacilityNav.js b/src/composables/useFacilityNav.js
index 1731f9d..6707e01 100644
--- a/src/composables/useFacilityNav.js
+++ b/src/composables/useFacilityNav.js
@@ -16,11 +16,9 @@ export const useFacilityNav = () => {
     store.showVoice && store.SET_SHOW_VOICE(false)
     store.showDetail && store.SET_SHOW_DETAIL(false)
 
-    const facility = window.Map_QM.pathIcon({ type: item.type })
-    const floorName = store.currentBuildingFloorsList.find(floor => floor.floorOrder === facility.floor)?.floor
+    window.Map_QM.bounceIcon({ type: item.type })
 
-    handleFacility(item.title, facility.floor, floorName, item.imgUrl, facility.node, true)
-    router.push('/nav')
+    router.push('/guide')
   }
 
   return { _handleFacility }
diff --git a/src/composables/useInitMap.js b/src/composables/useInitMap.js
index 1650bea..90f7d4b 100644
--- a/src/composables/useInitMap.js
+++ b/src/composables/useInitMap.js
@@ -26,17 +26,17 @@ export const useInitMap = function () {
       Message({ text: '地图数据获取失败', type: 'success' })
     })
 }
-
+let lastShop
 //点击地图店铺box
 function onClickShop(event) {
   const store = useStore()
-  // store.shop.houseNum && store.shop.formatColor && window.Map_QM.changeMapIPState(store.shop.houseNum, store.shop.formatColor)
-
+  if (lastShop) window.Map_QM.changeMapIPState(lastShop.shopNum, lastShop.entColor)
+  lastShop = event.data
   if (event.data) {
     showMapDialog()
     window.Map_QM.addElementLabel(document.getElementById('shopInfo'), event.data.xaxis, event.data.yaxis)
     store.SET_SHOP(event.data.shopData)
-    window.Map_QM.changeMapIPState(event.data.shopNum, '#AD8164')
+    window.Map_QM.changeMapIPState(event.data.shopNum, '#516DD8')
   } else {
     hideMapDialog()
   }