From abdb1659639cd174688a2f2a3333a0689c854f5f Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 2 Jun 2023 11:20:19 +0800 Subject: [PATCH 1/3] =?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 @@
- {{ switchLanguage(shop, 'shopName') }} {{ switchLanguage(shop, 'shopName') }} @@ -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) } From a0bb7dd91ec9038b4cd3e875e9b750bb0fc08bc3 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Thu, 8 Jun 2023 14:18:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A7=88?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=AE=BE=E6=96=BD=E7=82=B9=E5=87=BB=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=89=BA=E6=9C=AF=E6=A5=BC?= =?UTF-8?q?=E6=89=BF=E5=90=8D=E7=A7=B0=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Art/ArtMapItem.vue | 4 ++-- src/views/Guide/Guide.vue | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/Art/ArtMapItem.vue b/src/views/Art/ArtMapItem.vue index 718988f..aa268ff 100644 --- a/src/views/Art/ArtMapItem.vue +++ b/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'; diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue index a08063f..5ffe795 100644 --- a/src/views/Guide/Guide.vue +++ b/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) } //点击控制地图 From f848ff8f7228a8f788243fef541c13e03dc4e091 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Thu, 8 Jun 2023 14:23:37 +0800 Subject: [PATCH 3/3] chore(release): 1.1.0-B.5 --- CHANGELOG.md | 9 +++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 360ad33..edf5828 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/package-lock.json b/package-lock.json index 41dde4d..52cff13 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index 8a914e5..20902d9 100644 --- a/package.json +++ b/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",