.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
 /dist
-
+*.zip
 
 # local env files
 .env.local

public/static/qm/MainMap_QM.js

@@ -71,7 +71,7 @@ QMUtil = function () {
 	//debug 参数 相机坐标/ 镜头方向
 	this.guiOptions = { cameraX: 0, cameraY: 220, cameraZ: 220, targatX: 0, targatY: 0, targatZ: 0 }; //this.button = function() {};
 
-	this.sceneGap = { x: 0, y: 20, z: 0, scale: dir ? 0.15 : 0.09 };   //改变地图位置，大小
+	this.sceneGap = { x: 0, y: 20, z: 0, scale: dir ? 0.15 : 0.075 };   //改变地图位置，大小
 
 	this.selectBuild = 0;
 	this.selectFloor = 0;

src/assets/images/guide/search.svg

@@ -3,7 +3,7 @@
 <rect width="257" height="72" rx="36" fill="url(#paint0_linear_683_15477)"/>
 <path d="M44.6667 22.6665C51.2907 22.6665 56.6667 28.0425 56.6667 34.6665C56.6667 41.2905 51.2907 46.6665 44.6667 46.6665C38.0427 46.6665 32.6667 41.2905 32.6667 34.6665C32.6667 28.0425 38.0427 22.6665 44.6667 22.6665ZM44.6667 43.9998C49.8227 43.9998 54.0001 39.8225 54.0001 34.6665C54.0001 29.5092 49.8227 25.3332 44.6667 25.3332C39.5094 25.3332 35.3334 29.5092 35.3334 34.6665C35.3334 39.8225 39.5094 43.9998 44.6667 43.9998ZM55.9801 44.0945L59.7521 47.8652L57.8654 49.7518L54.0947 45.9798L55.9801 44.0945Z" fill="#A6976F"/>
 <rect x="78" y="24" width="2" height="24" fill="#C7C2B7"/>
-<path d="M110.832 35.456C108.859 35.04 107.269 34.528 106.064 33.92C104.805 34.464 103.141 34.9867 101.072 35.488L100.528 33.68C102.075 33.4133 103.333 33.1253 104.304 32.816C103.557 32.24 102.896 31.536 102.32 30.704H101.6V29.152H105.2V28.256H101.616V21.936C101.979 21.8613 102.411 21.744 102.912 21.584C103.413 21.4133 103.909 21.2373 104.4 21.056L105.04 22.56C104.368 22.8373 103.787 23.0453 103.296 23.184V24.192H104.672V25.6H103.296V26.704H105.2V20.64H106.944V26.704H108.912V25.6H107.424V24.176H108.912V23.184H107.408V21.648H110.592V28.256H106.944V29.152H110.24V30.688C109.483 31.6267 108.709 32.3627 107.92 32.896C108.72 33.1413 109.867 33.376 111.36 33.6L110.832 35.456ZM101.168 28.304C100.955 28.4107 100.539 28.6027 99.92 28.88V33.504C99.92 34.0053 99.8613 34.3787 99.744 34.624C99.6373 34.8693 99.4347 35.04 99.136 35.136C98.848 35.232 98.4053 35.28 97.808 35.28C97.4987 35.28 97.2 35.264 96.912 35.232L96.544 33.392C96.8853 33.4453 97.1947 33.472 97.472 33.472C97.7493 33.472 97.9307 33.4293 98.016 33.344C98.112 33.2587 98.16 33.088 98.16 32.832V29.664L96.704 30.272L96.48 28.32C97.024 28.1067 97.584 27.8773 98.16 27.632V25.12H96.768V23.264H98.16V20.672H99.92V23.264H101.2V25.12H99.92V26.848C100.069 26.784 100.416 26.624 100.96 26.368L101.168 28.304ZM104.384 30.704C104.885 31.28 105.44 31.7493 106.048 32.112C106.741 31.7493 107.408 31.28 108.048 30.704H104.384ZM121.152 31.248V33.216C121.152 33.9627 121.008 34.4907 120.72 34.8C120.432 35.12 119.957 35.2853 119.296 35.296C118.699 35.296 118.187 35.2693 117.76 35.216L117.408 33.472C117.888 33.5467 118.315 33.5893 118.688 33.6C118.901 33.6 119.051 33.5253 119.136 33.376C119.221 33.2267 119.264 33.008 119.264 32.72V31.36L116.912 31.472L117.744 32.736C117.093 33.1733 116.373 33.6107 115.584 34.048C114.805 34.4853 114.043 34.8693 113.296 35.2L112.608 33.52C114.325 32.816 115.648 32.1387 116.576 31.488L115.168 31.568C114.859 31.5787 114.421 31.6053 113.856 31.648L113.568 30.016C114.229 30.016 114.832 29.9627 115.376 29.856C116.123 29.6533 117.152 29.2427 118.464 28.624L115.824 28.816L114.816 28.896L114.592 27.616C114.859 27.5733 115.093 27.5307 115.296 27.488C115.509 27.4453 115.669 27.3973 115.776 27.344C116.352 27.0453 117.157 26.5173 118.192 25.76H115.072V27.264H113.104V24.144H119.04V23.264H113.616V21.648H119.04V20.576H120.928V21.648H126.384V23.264H120.928V24.144H126.896V27.296H124.928V25.76H120.736C119.787 26.464 118.981 27.0133 118.32 27.408C119.376 27.3547 120.304 27.2907 121.104 27.216C121.851 26.768 122.432 26.3947 122.848 26.096L124.112 27.168C123.216 27.7333 122.283 28.2613 121.312 28.752C120.352 29.2427 119.504 29.632 118.768 29.92L123.184 29.664L122.4 28.976L123.696 28.064L124.064 28.384C125.461 29.6213 126.373 30.4693 126.8 30.928L125.712 32.048L125.44 31.776C125.227 31.552 124.987 31.312 124.72 31.056L121.152 31.248ZM122.8 31.376C123.344 31.6213 124.091 31.984 125.04 32.464C126 32.9333 126.752 33.312 127.296 33.6L126.48 35.152C125.957 34.864 125.216 34.48 124.256 34C123.307 33.5093 122.549 33.136 121.984 32.88L122.8 31.376Z" fill="#736661"/>
+<path d="M98.592 21.04H109.328V26.72H98.592V21.04ZM100.56 24.912H107.392V22.848H100.56V24.912ZM99.008 35.152H97.184V27.968H103.248V35.152H101.456V34.416H99.008V35.152ZM104.512 35.152V27.968H110.752V35.152H108.96V34.416H106.352V35.152H104.512ZM101.456 32.624V29.76H99.008V32.624H101.456ZM106.352 29.76V32.624H108.96V29.76H106.352ZM127.296 31.12V32.832H124.352V35.328H122.496V32.832H118.32V31.12H119.616L119.04 30.304C119.733 29.9093 120.272 29.5413 120.656 29.2H118.8V21.888H121.28C121.536 21.248 121.701 20.7787 121.776 20.48L123.712 20.704C123.68 20.8427 123.541 21.2373 123.296 21.888H126.8V29.2H122.624C122.197 29.8827 121.568 30.5227 120.736 31.12H122.496V29.76H124.352V31.12H127.296ZM115.088 28.032V28.24H117.824V35.216H116.224V30.08H115.056C115.013 31.1893 114.912 32.144 114.752 32.944C114.603 33.7333 114.373 34.544 114.064 35.376L112.352 34.592C112.651 33.76 112.869 33.072 113.008 32.528C113.147 31.9733 113.243 31.3173 113.296 30.56C113.36 29.8027 113.392 28.7573 113.392 27.424V21.264H115.088V25.088H116.096V20.96H117.68V25.088H118.352V26.96H115.088V28.032ZM121.936 24.784V23.424H120.512V24.784H121.936ZM123.536 24.784H125.088V23.424H123.536V24.784ZM120.512 26.224V27.584H121.68C121.797 27.1787 121.872 26.7253 121.904 26.224H120.512ZM125.088 27.584V26.224H123.504C123.451 26.7467 123.381 27.2 123.296 27.584H125.088ZM142.832 35.456C140.859 35.04 139.269 34.528 138.064 33.92C136.805 34.464 135.141 34.9867 133.072 35.488L132.528 33.68C134.075 33.4133 135.333 33.1253 136.304 32.816C135.557 32.24 134.896 31.536 134.32 30.704H133.6V29.152H137.2V28.256H133.616V21.936C133.979 21.8613 134.411 21.744 134.912 21.584C135.413 21.4133 135.909 21.2373 136.4 21.056L137.04 22.56C136.368 22.8373 135.787 23.0453 135.296 23.184V24.192H136.672V25.6H135.296V26.704H137.2V20.64H138.944V26.704H140.912V25.6H139.424V24.176H140.912V23.184H139.408V21.648H142.592V28.256H138.944V29.152H142.24V30.688C141.483 31.6267 140.709 32.3627 139.92 32.896C140.72 33.1413 141.867 33.376 143.36 33.6L142.832 35.456ZM133.168 28.304C132.955 28.4107 132.539 28.6027 131.92 28.88V33.504C131.92 34.0053 131.861 34.3787 131.744 34.624C131.637 34.8693 131.435 35.04 131.136 35.136C130.848 35.232 130.405 35.28 129.808 35.28C129.499 35.28 129.2 35.264 128.912 35.232L128.544 33.392C128.885 33.4453 129.195 33.472 129.472 33.472C129.749 33.472 129.931 33.4293 130.016 33.344C130.112 33.2587 130.16 33.088 130.16 32.832V29.664L128.704 30.272L128.48 28.32C129.024 28.1067 129.584 27.8773 130.16 27.632V25.12H128.768V23.264H130.16V20.672H131.92V23.264H133.2V25.12H131.92V26.848C132.069 26.784 132.416 26.624 132.96 26.368L133.168 28.304ZM136.384 30.704C136.885 31.28 137.44 31.7493 138.048 32.112C138.741 31.7493 139.408 31.28 140.048 30.704H136.384ZM153.152 31.248V33.216C153.152 33.9627 153.008 34.4907 152.72 34.8C152.432 35.12 151.957 35.2853 151.296 35.296C150.699 35.296 150.187 35.2693 149.76 35.216L149.408 33.472C149.888 33.5467 150.315 33.5893 150.688 33.6C150.901 33.6 151.051 33.5253 151.136 33.376C151.221 33.2267 151.264 33.008 151.264 32.72V31.36L148.912 31.472L149.744 32.736C149.093 33.1733 148.373 33.6107 147.584 34.048C146.805 34.4853 146.043 34.8693 145.296 35.2L144.608 33.52C146.325 32.816 147.648 32.1387 148.576 31.488L147.168 31.568C146.859 31.5787 146.421 31.6053 145.856 31.648L145.568 30.016C146.229 30.016 146.832 29.9627 147.376 29.856C148.123 29.6533 149.152 29.2427 150.464 28.624L147.824 28.816L146.816 28.896L146.592 27.616C146.859 27.5733 147.093 27.5307 147.296 27.488C147.509 27.4453 147.669 27.3973 147.776 27.344C148.352 27.0453 149.157 26.5173 150.192 25.76H147.072V27.264H145.104V24.144H151.04V23.264H145.616V21.648H151.04V20.576H152.928V21.648H158.384V23.264H152.928V24.144H158.896V27.296H156.928V25.76H152.736C151.787 26.464 150.981 27.0133 150.32 27.408C151.376 27.3547 152.304 27.2907 153.104 27.216C153.851 26.768 154.432 26.3947 154.848 26.096L156.112 27.168C155.216 27.7333 154.283 28.2613 153.312 28.752C152.352 29.2427 151.504 29.632 150.768 29.92L155.184 29.664L154.4 28.976L155.696 28.064L156.064 28.384C157.461 29.6213 158.373 30.4693 158.8 30.928L157.712 32.048L157.44 31.776C157.227 31.552 156.987 31.312 156.72 31.056L153.152 31.248ZM154.8 31.376C155.344 31.6213 156.091 31.984 157.04 32.464C158 32.9333 158.752 33.312 159.296 33.6L158.48 35.152C157.957 34.864 157.216 34.48 156.256 34C155.307 33.5093 154.549 33.136 153.984 32.88L154.8 31.376Z" fill="#736661"/>
 <path d="M103.036 47.456C103.036 48.056 102.88 48.56 102.568 48.968C102.264 49.368 101.864 49.664 101.368 49.856C100.88 50.048 100.356 50.144 99.7956 50.144C98.9796 50.144 98.2436 49.956 97.5876 49.58C96.9316 49.196 96.4956 48.656 96.2796 47.96L97.6956 47.156C97.8876 47.604 98.1676 47.952 98.5356 48.2C98.9036 48.448 99.3436 48.572 99.8556 48.572C100.272 48.572 100.6 48.488 100.84 48.32C101.088 48.152 101.212 47.908 101.212 47.588C101.212 47.332 101.128 47.12 100.96 46.952C100.8 46.784 100.596 46.652 100.348 46.556C100.108 46.46 99.7756 46.348 99.3516 46.22C98.7836 46.052 98.3196 45.888 97.9596 45.728C97.5996 45.56 97.2916 45.312 97.0356 44.984C96.7796 44.656 96.6516 44.224 96.6516 43.688C96.6516 43.12 96.7996 42.64 97.0956 42.248C97.3996 41.848 97.7956 41.552 98.2836 41.36C98.7796 41.16 99.3116 41.06 99.8796 41.06C100.656 41.06 101.32 41.236 101.872 41.588C102.424 41.94 102.78 42.416 102.94 43.016L101.524 43.82C101.38 43.444 101.164 43.152 100.876 42.944C100.588 42.728 100.228 42.62 99.7956 42.62C99.4036 42.62 99.0836 42.712 98.8356 42.896C98.5956 43.072 98.4756 43.308 98.4756 43.604C98.4756 43.828 98.5516 44.016 98.7036 44.168C98.8556 44.312 99.0476 44.432 99.2796 44.528C99.5196 44.616 99.8396 44.72 100.24 44.84C100.816 45.008 101.292 45.18 101.668 45.356C102.044 45.524 102.364 45.78 102.628 46.124C102.9 46.46 103.036 46.904 103.036 47.456ZM109.513 46.292H105.949V48.476H110.065V50H104.209V41.216H109.933V42.728H105.949V44.792H109.513V46.292ZM115.626 41.216L119.178 50H117.33L116.562 47.996H113.142L112.398 50H110.658L114.102 41.216H115.626ZM115.998 46.508L114.822 43.424L113.682 46.508H115.998ZM127.478 50L125.402 49.988L123.266 46.832H123.194H121.922V50H120.182V41.216H123.218C123.906 41.216 124.51 41.332 125.03 41.564C125.55 41.796 125.95 42.128 126.23 42.56C126.51 42.984 126.65 43.472 126.65 44.024C126.65 44.584 126.506 45.076 126.218 45.5C125.93 45.924 125.526 46.248 125.006 46.472L127.478 50ZM121.922 42.692V45.356H123.014C123.526 45.356 123.95 45.248 124.286 45.032C124.63 44.808 124.802 44.472 124.802 44.024C124.802 43.568 124.634 43.232 124.298 43.016C123.962 42.8 123.534 42.692 123.014 42.692H121.922ZM132.024 48.548C132.448 48.548 132.812 48.436 133.116 48.212C133.428 47.988 133.676 47.676 133.86 47.276L135.312 48.116C135.096 48.708 134.7 49.196 134.124 49.58C133.548 49.956 132.86 50.144 132.06 50.144C131.284 50.144 130.576 49.956 129.936 49.58C129.296 49.204 128.788 48.672 128.412 47.984C128.036 47.288 127.848 46.492 127.848 45.596C127.848 44.7 128.032 43.908 128.4 43.22C128.776 42.532 129.284 42 129.924 41.624C130.572 41.248 131.284 41.06 132.06 41.06C132.86 41.06 133.548 41.252 134.124 41.636C134.7 42.012 135.096 42.496 135.312 43.088L133.86 43.928C133.676 43.528 133.428 43.216 133.116 42.992C132.812 42.768 132.448 42.656 132.024 42.656C131.576 42.656 131.176 42.776 130.824 43.016C130.472 43.256 130.192 43.6 129.984 44.048C129.784 44.488 129.684 45.004 129.684 45.596C129.684 46.188 129.784 46.708 129.984 47.156C130.192 47.604 130.472 47.948 130.824 48.188C131.176 48.428 131.576 48.548 132.024 48.548ZM138.176 44.672H142.136V41.216H143.888V50H142.136V46.22H138.176V50H136.436V41.216H138.176V44.672Z" fill="#C7C2B7"/>
 <rect x="0.5" y="0.5" width="256" height="71" rx="35.5" stroke="white"/>
 </g>

src/components/Header/Header.vue

@@ -3,6 +3,7 @@
     <img src="../../assets/images/header/header_bg_blur.png" class="header-blur common-size" alt="" />
     <img src="../../assets/images/header/header_bg.png" class="header-bg common-size" alt="" />
     <img src="@/assets/images/header/logo.svg" class="logo" alt="" />
+    <div></div>
     <div class="header-right">
       <div class="flex">
         <p class="current">{{ currentTime }}</p>

src/components/Map/Map.vue

@@ -43,12 +43,10 @@ function handleDetail() {
   emits('handle-Detail')
 }
 watch(shop, () => {
-  const timeId = setTimeout(() => {
-    clearTimeout(timeId)
-    nextTick(() => {
-      nameWidth.value = nameRef.value.clientWidth
-    })
-  }, 400)
+  nameWidth.value = 0
+  nextTick(() => {
+    nameWidth.value = nameRef.value.clientWidth
+  })
 })
 </script>
 
@@ -89,7 +87,7 @@ watch(shop, () => {
       display: inline-block;
     }
 
-    @include no-wrap;
+    // @include no-wrap;
   }
   .go-button {
     width: 125px;

src/components/PublicComponent/PublicComponent.vue

@@ -59,9 +59,10 @@ onMounted(() => {
   window.addEventListener('touchend', checkHandleScreen)
 
   window.leaveScreenSave = () => {
-    checkHandleScreen(new TouchEvent('touchstart'))
+    checkHandleScreen(new TouchEvent('touchend'))
     console.log('Android调用成功 :>>>>>>>>> ')
   }
+  checkHandleScreen(new TouchEvent('touchend'))
 })
 onBeforeUnmount(() => {
   window.removeEventListener('touchend', checkHandleScreen)

src/views/Guide/Guide.vue

@@ -117,7 +117,7 @@ function onClickMapIcon(event: any) {
   if (event.data) {
     const floorName = store.currentBuildingFloorsList.find(_floor => _floor.floorOrder === event.data.floorOrder)?.floor
     const shop = new Brand({
-      shopName: event.data.title + '电梯',
+      shopName: event.data.facCode === 'dt' ? event.data.title + '电梯' : event.data.title,
       floorOrder: event.data.floorOrder,
       floor: floorName ?? '',
       logoUrl: event.data.src,

src/views/Index/Middle.vue

@@ -6,7 +6,10 @@
       </div>
       <div class="brand" @click="go('brand', '品牌搜索')">
         <div class="txt_w">{{ switchLanguage(list[0], 'title') }}</div>
-        <div class="sear">{{ $t('searB') }}</div>
+        <div class="sear">
+          <img src="@/assets/images/index/icon_brand.png" alt="" />
+          {{ $t('searB') }}
+        </div>
       </div>
       <div class="activity" @click="go('activity', '优惠与活动')">
         <div class="txt_w">{{ switchLanguage(list[1], 'title') }}</div>
@@ -122,12 +125,17 @@ function go(path: string, moduleName: string) {
       position: absolute;
       top: 84px;
       left: 24px;
+      display: flex;
+      align-items: center;
       font-size: 16px;
       font-family: 'font_regular';
       color: rgb(255 255 255 / 80%);
       font-style: normal;
       font-weight: 400;
       line-height: 24px;
+      img {
+        margin-right: 9.6px;
+      }
     }
   }
   .activity {