From 78af9620da74472fdd0dbc9abecb15586ab061c8 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Mon, 22 May 2023 15:53:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B1=95=E7=A4=BA=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=E6=98=BE=E7=A4=BA=E5=BA=97=E9=93=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/ShopItem/ShopItem.vue | 18 +++++++++++++++++-
 src/composables/useInitMap.js  |  5 +----
 src/views/Guide/Guide.vue      |  1 +
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue
index b0dc9f9..637572d 100644
--- a/src/base/ShopItem/ShopItem.vue
+++ b/src/base/ShopItem/ShopItem.vue
@@ -15,7 +15,10 @@
           :size="120"
           :text="`${config.mobileNav}?code=${currentFloor.projectCode}&s=${currentFloor.floorOrder}_${currentFloor.location}_屏幕的位置&e=${shop.houseNumber}`"
         ></QRCodeFromText>
-        <div class="qrcode-meta">扫码导航</div>
+        <p class="name">
+          <span class="shop-name">{{ switchLanguage(shop, 'shopName') }}</span>
+          <span class="qrcode-tag">扫码导航</span>
+        </p>
       </div>
     </Transition>
     <Teleport to="body">
@@ -111,6 +114,19 @@ const deactivate = () => store.SET_SHOP(null)
     line-height: 14px;
     color: var(--brand-metaColor, rgba(0, 0, 0, 0.4));
   }
+  .qrcode-tag {
+    display: flex;
+    align-items: center;
+    font-weight: 700;
+    font-size: 14px;
+    line-height: 16px;
+    width: 76px;
+    height: 28px;
+    background: #ffffff;
+    border-radius: 23px;
+    color: rgba(0, 0, 0, 0.8);
+    justify-content: center;
+  }
   .dir {
     width: 20px;
     height: 20px;
diff --git a/src/composables/useInitMap.js b/src/composables/useInitMap.js
index aed95e8..94f1a05 100644
--- a/src/composables/useInitMap.js
+++ b/src/composables/useInitMap.js
@@ -33,9 +33,6 @@ const bounceShopAndChangeColor = data => {
   if (lastShop) window.Map_QM.changeMapIPState(lastShop.houseNumber, lastShop.formatColor)
   lastShop = data
   if (!data) return
-  const xaxis = JSON.parse(data.xaxis).map(Number)
-  showMapDialog()
-  window.Map_QM.addElementLabel(document.getElementById('shopInfo'), xaxis[0], xaxis[2])
   window.Map_QM.changeMapIPState(data.houseNumber, '#516DD8')
 }
 
@@ -45,12 +42,12 @@ export const setShopActive = shop => {
 }
 
 export const setShopInactive = () => {
-  hideMapDialog()
   bounceShopAndChangeColor(null)
 }
 
 //点击地图店铺box
 function onClickShop(event) {
+  console.log(event)
   const store = useStore()
   store.SET_FACILITY(null)
   if (!event.data) {
diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue
index 0f0e677..9c30b1d 100644
--- a/src/views/Guide/Guide.vue
+++ b/src/views/Guide/Guide.vue
@@ -171,6 +171,7 @@ watch(shop, nxt => {
   if (!nxt) {
     setShopInactive()
   } else if (nxt && initiated.value) {
+    setShopActive(nxt)
     window.Map_QM.pathNode({ floor: nxt.floorOrder, node: nxt.yaxis })
   }
 })