From abdb1659639cd174688a2f2a3333a0689c854f5f Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao@1000mu.com>
Date: Fri, 2 Jun 2023 11:20:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/qm/MainMap_QM.js |  4 ++++
 src/components/Map/Map.vue     |  4 +++-
 src/composables/useLogout.ts   | 24 +++++++++++++-----------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js
index 12a08d7..c25a3eb 100644
--- a/public/static/qm/MainMap_QM.js
+++ b/public/static/qm/MainMap_QM.js
@@ -4446,6 +4446,7 @@ MainMap_QM.prototype = {
 			clearTimeout(Map_QM.util.timeObj.pathTime);
 			if (Map_QM.util.overObj && Map_QM.forShopArr[0]) {
 				Map_QM.util.pathStateObj.isPathPlay = true;
+				Map_QM.controls.reset()
 				Map_QM.clearFloor();
 				Map_QM.onFindPathToObj();
 			}
@@ -4473,6 +4474,7 @@ MainMap_QM.prototype = {
 		Map_QM.util.timeObj.pathTime = setTimeout(() => {
 			clearTimeout(Map_QM.util.timeObj.pathTime);
 			if (Map_QM.util.overObj) {
+				Map_QM.controls.reset()
 				Map_QM.clearFloor();
 				Map_QM.onFindPathModel(Map_QM.util.pathStateObj.ftPath);
 				if (callBack) {
@@ -4504,6 +4506,7 @@ MainMap_QM.prototype = {
 		Map_QM.util.timeObj.pathTime = setTimeout(() => {
 			clearTimeout(Map_QM.util.timeObj.pathTime);
 			if (Map_QM.util.overObj) {
+				Map_QM.controls.reset()
 				Map_QM.clearFloor();
 				Map_QM.onFindPathModel(Map_QM.util.pathStateObj.dtPath);
 				if (callBack) {
@@ -4535,6 +4538,7 @@ MainMap_QM.prototype = {
 		Map_QM.util.timeObj.pathTime = setTimeout(() => {
 			clearTimeout(Map_QM.util.timeObj.pathTime);
 			if (Map_QM.util.overObj) {
+				Map_QM.controls.reset()
 				Map_QM.clearFloor();
 				Map_QM.onFindPathModel(Map_QM.util.pathStateObj.graphPath);
 				if (callBack) {
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 35f2d39..d8cef9d 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -6,7 +6,7 @@
     <!-- 地图弹框 -->
     <div id="shopInfo" class="boxShop boxShop2">
       <div id="shopNum">
-        <marquees v-if="nameWidth > 220" :speed="25" :delay="0.8" class="name" :content="switchLanguage(shop, 'shopName')"
+        <marquees v-if="nameWidth > 190" :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>
@@ -76,11 +76,13 @@ watch(shop, () => {
 
   /* stylelint-disable-next-line selector-id-pattern */
   #shopNum {
+    overflow: hidden;
     width: 220px;
     height: 60px;
     padding: 25px 18px 0 36px;
     font-size: 22px;
     font-family: 'font_bold';
+    white-space: nowrap;
     color: #fff;
     font-weight: 700;
     .name {
diff --git a/src/composables/useLogout.ts b/src/composables/useLogout.ts
index 55f4ce8..262e01f 100644
--- a/src/composables/useLogout.ts
+++ b/src/composables/useLogout.ts
@@ -19,18 +19,20 @@ export const useLogout = () => {
   //点击商场logo 达到最大次数显示退出框
   function addTotalClick(e: TouchEvent) {
     try {
-      const { clientX, clientY } = e.changedTouches[0]
-      const _clientX = parseInt(String(clientX), 10)
-      const _clientY = parseInt(String(clientY), 10)
-      if (_clientX >= 0 && _clientX <= SAFE_COORDINATES && _clientY >= 0 && _clientY <= SAFE_COORDINATES) {
-        clickedNumberTotal.value++
-      }
-      nextTick(() => {
-        if (clickedNumberTotal.value >= MAX_NUMBER) {
-          logout.value = true
-          resetClickNumber()
+      if (e.changedTouches.length && e.changedTouches[0].clientX) {
+        const { clientX, clientY } = e.changedTouches[0]
+        const _clientX = parseInt(String(clientX), 10)
+        const _clientY = parseInt(String(clientY), 10)
+        if (_clientX >= 0 && _clientX <= SAFE_COORDINATES && _clientY >= 0 && _clientY <= SAFE_COORDINATES) {
+          clickedNumberTotal.value++
         }
-      })
+        nextTick(() => {
+          if (clickedNumberTotal.value >= MAX_NUMBER) {
+            logout.value = true
+            resetClickNumber()
+          }
+        })
+      }
     } catch (error) {
       console.log(error)
     }