From 68e619720d76d55a6ce07178a5f258dcd5972e89 Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao@1000mu.com>
Date: Thu, 1 Jun 2023 10:21:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=BC=B9=E6=A1=86=E7=9A=84=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/qm/MainMap_QM.js |  3 +++
 src/components/Map/Map.vue     | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js
index 8aeee9e..ce28597 100644
--- a/public/static/qm/MainMap_QM.js
+++ b/public/static/qm/MainMap_QM.js
@@ -3620,6 +3620,8 @@ MainMap_QM.prototype = {
 			return { direction: "", wayList: [] }
 		}
 		pathCameraState = Map_QM.util.options.pathStyle;
+		TweenMax.killAll(true);
+		Map_QM.selectShop && (Map_QM.selectShop.scale.z = 1);
 		Map_QM.reSetGuide();
 		Map_QM.onShowDeviceSite()
 		//Map_QM.clearFloor(-1, true);
@@ -6031,3 +6033,4 @@ FindPath_QM.prototype.playMoveGuide = function () {
 	}
 }
 
+
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index e90a969..0dfb354 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -6,7 +6,10 @@
     <!-- 地图弹框 -->
     <div id="shopInfo" class="boxShop boxShop2">
       <div id="shopNum">
-        <marquees :speed="25" :delay="0.8" class="name" :content="shop.shopName">{{ shop.shopName }} </marquees>
+        <marquees v-if="nameWidth > 220" :speed="25" :delay="0.8" class="name" :content="switchLanguage(shop, 'shopName')"
+          >{{ switchLanguage(shop, 'shopName') }}
+        </marquees>
+        <span v-else ref="nameRef" class="name">{{ switchLanguage(shop, 'shopName') }}</span>
       </div>
       <div class="map-flex">
         <div class="pop-bottom__detail" @click="handleDetail">{{ $t('detail') }}</div>
@@ -22,13 +25,14 @@
 
 <script setup lang="ts">
 import marquees from '@/base/Marquees/Marquees.vue'
-
 import { useRootStore } from '@/store/root'
 import { storeToRefs } from 'pinia'
+import { nextTick, ref, watch } from 'vue'
 
 const store = useRootStore()
 const { shop } = storeToRefs(store)
-
+const nameRef = ref()
+const nameWidth = ref(0)
 const emits = defineEmits(['handle-go', 'handle-Detail'])
 function handleGO() {
   emits('handle-go')
@@ -38,6 +42,11 @@ function handleGO() {
 function handleDetail() {
   emits('handle-Detail')
 }
+watch(shop, () => {
+  nextTick(() => {
+    nameWidth.value = nameRef.value.clientWidth
+  })
+})
 </script>
 
 <style lang="scss" scoped>
@@ -55,7 +64,7 @@ function handleDetail() {
 /* stylelint-disable-next-line selector-id-pattern */
 #shopInfo {
   position: absolute;
-  z-index: 500;
+  z-index: 900 !important;
   width: 254px;
   height: 128px;
   background-position: center center;