chore(release): 1.1.0-B.3

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.3](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.2...v1.1.0-B.3) (2023-06-01)
+
+
+### Bug Fixes
+
+* 🧩 修改地图弹框的层级以及滚动问题 ([68e6197](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/68e619720d76d55a6ce07178a5f258dcd5972e89))
+
 ## [1.1.0-B.2](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.1...v1.1.0-B.2) (2023-05-31)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.1.0-B.2",
+  "version": "1.1.0-B.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.1.0-B.2",
+      "version": "1.1.0-B.3",
       "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.2",
+  "version": "1.1.0-B.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

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 () {
 	}
 }
 
+

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;