Merge pull request 'dev' (#18) from dev into test

Reviewed-on: https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/pulls/18

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.1.0-B.5](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.4...v1.1.0-B.5) (2023-06-08)
+
+
+### Bug Fixes
+
+* 修改导览公共设施点击逻辑，修改艺术楼承名称遮挡问题 ([a0bb7dd](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a0bb7dd91ec9038b4cd3e875e9b750bb0fc08bc3))
+* 修改滚动范围 ([abdb165](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/abdb1659639cd174688a2f2a3333a0689c854f5f))
+* 修改问题 ([ebf608c](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/ebf608c991f974ceb4d257f80e8abd6cff761933))
+
 ## [1.1.0-B.4](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.3...v1.1.0-B.4) (2023-06-01)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.1.0-B.4",
+  "version": "1.1.0-B.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.1.0-B.4",
+      "version": "1.1.0-B.5",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.1.0-B.4",
+  "version": "1.1.0-B.5",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

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) {

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 {

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)
     }

src/views/Art/ArtMapItem.vue

@@ -62,7 +62,7 @@ function clickGo() {
 
     .art-title {
       max-width: 170px;
-      height: 16px;
+      height: 19px;
       font-size: 14px;
       font-family: 'font_bold';
       color: #736661;
@@ -73,7 +73,7 @@ function clickGo() {
     }
     .art-author {
       max-width: 170px;
-      height: 14px;
+      height: 17px;
       margin-top: 2px;
       font-size: 10px;
       font-family: 'font_bold';

src/views/Guide/Guide.vue

@@ -140,11 +140,10 @@ function clickFloor(floorItem: Floor) {
 //点击公共设施
 function clickFac(item: Facility) {
   store.shop.houseNumber && store.shop.formatColor && window.Map_QM.changeMapIPState(store.shop.houseNumber, store.shop.formatColor)
-  if (item.abbreviation === 'dt') {
-    window.Map_QM.bounceIcon('dt')
-    return
+  if (item.abbreviation) {
+    window.Map_QM.bounceIcon(item.abbreviation)
   }
-  handleFacility(item)
+  // handleFacility(item)
 }
 
 //点击控制地图