From ebf608c991f974ceb4d257f80e8abd6cff761933 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 2 Jun 2023 09:49:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- public/static/qm/MainMap_QM.js | 2 +- src/assets/images/guide/search.svg | 2 +- src/components/Map/Map.vue | 12 +++++------- src/components/PublicComponent/PublicComponent.vue | 3 ++- src/views/Guide/Guide.vue | 2 +- src/views/Index/Middle.vue | 10 +++++++++- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d99ff4a..4ceda2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .DS_Store node_modules /dist - +*.zip # local env files .env.local diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index ce28597..12a08d7 100644 --- a/public/static/qm/MainMap_QM.js +++ b/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; diff --git a/src/assets/images/guide/search.svg b/src/assets/images/guide/search.svg index d43b403..dcb91fb 100644 --- a/src/assets/images/guide/search.svg +++ b/src/assets/images/guide/search.svg @@ -3,7 +3,7 @@ - + diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index e3f3eca..35f2d39 100644 --- a/src/components/Map/Map.vue +++ b/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 + }) }) @@ -89,7 +87,7 @@ watch(shop, () => { display: inline-block; } - @include no-wrap; + // @include no-wrap; } .go-button { width: 125px; diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index e0b643d..302dae1 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/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) diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue index 445b467..a08063f 100644 --- a/src/views/Guide/Guide.vue +++ b/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, diff --git a/src/views/Index/Middle.vue b/src/views/Index/Middle.vue index d69822a..861b067 100644 --- a/src/views/Index/Middle.vue +++ b/src/views/Index/Middle.vue @@ -6,7 +6,10 @@
{{ switchLanguage(list[0], 'title') }}
-
{{ $t('searB') }}
+
+ + {{ $t('searB') }} +
{{ switchLanguage(list[1], 'title') }}
@@ -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 { -- 2.30.2 From 99a36041d3d619ff07f2b5276ee10e3c63267111 Mon Sep 17 00:00:00 2001 From: liyongle Date: Fri, 2 Jun 2023 09:52:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=F0=9F=93=9A=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header/Header.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 5dbc836..62989f1 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -3,6 +3,7 @@ +

{{ currentTime }}

-- 2.30.2