From c50567f82bb15201b8c71ac18d376d387c861bcb Mon Sep 17 00:00:00 2001 From: liyongle Date: Tue, 8 Aug 2023 16:16:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/qm/MainMap_QM.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index d83371c..f76c213 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -2075,8 +2075,7 @@ MainMap_QM.prototype = { */ changeMapState: function (state) { Map_QM.controls.reset(); - let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle - Map_QM.rotationAngle(angle) + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) if (state === "3d") { Map_QM.camera = Map_QM.cameraPerspective; Map_QM.controls.object = Map_QM.camera; @@ -2164,8 +2163,7 @@ MainMap_QM.prototype = { Map_QM.controls.maxAzimuthAngle = Infinity; Map_QM.util.pathStateObj.forShopArr = { direction: "", wayList: [] }; Map_QM.controls.reset(); - let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle - Map_QM.rotationAngle(angle) + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) if (Map_QM.guide && Map_QM.guide.visible) { Map_QM.guide.visible = false } @@ -2358,8 +2356,7 @@ MainMap_QM.prototype = { Map_QM.camera.updateProjectionMatrix(); Map_QM.shawLight.castShadow = Map_QM.util.options.shadow; Map_QM.controls.reset(); - let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle - Map_QM.rotationAngle(angle) + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) } }, @@ -2444,8 +2441,7 @@ MainMap_QM.prototype = { this.controls.maxAzimuthAngle = Infinity; this.shawLight.castShadow = this.util.options.shadow; this.controls.reset(); - let angle = this.util.options.deviceAng ? this.util.deviceObj.angle : this.util.mapAngle - this.rotationAngle(angle) + this.util.options.deviceAng && this.rotationAngle(this.util.deviceObj.angle) }, /** * @api {方法} changePathDir(pathState) 切换导航方向 @@ -3068,8 +3064,7 @@ MainMap_QM.prototype = { isJUZ = false; Map_QM.controls.setZoom(1) Map_QM.controls.reset() - let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle - Map_QM.rotationAngle(angle) + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) return; } TweenMax.killAll(true) @@ -3464,8 +3459,7 @@ MainMap_QM.prototype = { isJUZ = false; Map_QM.controls.setZoom(1) Map_QM.controls.reset() - let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle - Map_QM.rotationAngle(angle) + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) }, 5000); } if (debug) { @@ -5065,6 +5059,7 @@ MainMap_QM.prototype = { Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); Map_QM.controls.reset(); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) if (Map_QM.util.overObj && Map_QM.forShopArr[0]) { Map_QM.util.pathStateObj.isPathPlay = true; Map_QM.clearFloor(); @@ -5094,6 +5089,7 @@ MainMap_QM.prototype = { Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); Map_QM.controls.reset(); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) if (Map_QM.util.overObj) { Map_QM.clearFloor(); Map_QM.onFindPathModel(Map_QM.util.pathStateObj.ftPath); @@ -5126,6 +5122,7 @@ MainMap_QM.prototype = { Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); Map_QM.controls.reset(); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) if (Map_QM.util.overObj) { Map_QM.clearFloor(); Map_QM.onFindPathModel(Map_QM.util.pathStateObj.dtPath); @@ -5158,6 +5155,7 @@ MainMap_QM.prototype = { Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); Map_QM.controls.reset(); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle) if (Map_QM.util.overObj) { Map_QM.clearFloor(); Map_QM.onFindPathModel(Map_QM.util.pathStateObj.graphPath); From 93eee94f9d4171138bbe491c54ec1224a88f06ea Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 10 Aug 2023 17:15:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A5=BC=E5=B1=82=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Guide/Floor.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/Guide/Floor.vue b/src/views/Guide/Floor.vue index 61e8958..2425f0b 100644 --- a/src/views/Guide/Floor.vue +++ b/src/views/Guide/Floor.vue @@ -40,7 +40,7 @@ function changeFloor(floorOrder: number) { @include fl(center); position: relative; - width: 72px; + width: 80px; height: 86px; margin-bottom: 8px; color: #534f46; @@ -63,9 +63,7 @@ function changeFloor(floorOrder: number) { height: 16px; } } - .all { - height: 72px; - } + .ac { color: #fff; background: #e00068; From 912f6fcceedf1e9216cd2967d909b9e590ce3282 Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 10 Aug 2023 17:16:41 +0800 Subject: [PATCH 3/5] chore(release): 1.0.4-B.1 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e0cbb6..abfd51d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.0.4-B.1](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.4-B.0...v1.0.4-B.1) (2023-08-10) + + +### Bug Fixes + +* 🧩 地图优化 ([c50567f](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/c50567f82bb15201b8c71ac18d376d387c861bcb)) +* 🧩 修改楼层宽度 ([93eee94](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/93eee94f9d4171138bbe491c54ec1224a88f06ea)) + ### [1.0.4-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.3...v1.0.4-B.0) (2023-08-07) diff --git a/package-lock.json b/package-lock.json index 04e4a31..7facb7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.4-B.0", + "version": "1.0.4-B.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.4-B.0", + "version": "1.0.4-B.1", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index b0f15be..45b2bda 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.4-B.0", + "version": "1.0.4-B.1", "private": true, "scripts": { "serve": "vue-cli-service serve", From 266d5dbb34da0b4179a9ae0671d844c6eb35bac4 Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 10 Aug 2023 17:17:15 +0800 Subject: [PATCH 4/5] chore(release): 1.0.4 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abfd51d..e55da0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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.0.4](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.4-B.1...v1.0.4) (2023-08-10) + ### [1.0.4-B.1](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.4-B.0...v1.0.4-B.1) (2023-08-10) diff --git a/package-lock.json b/package-lock.json index 7facb7c..ebabc25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.4-B.1", + "version": "1.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.4-B.1", + "version": "1.0.4", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 45b2bda..cc04bc1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.4-B.1", + "version": "1.0.4", "private": true, "scripts": { "serve": "vue-cli-service serve", From 456d939d2fcf918e1291afe5dc3187d96443bc5e Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 10 Aug 2023 17:17:27 +0800 Subject: [PATCH 5/5] chore(release): 1.0.5-B.0 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e55da0f..22374d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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.0.5-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.4...v1.0.5-B.0) (2023-08-10) + ### [1.0.4](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.4-B.1...v1.0.4) (2023-08-10) ### [1.0.4-B.1](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.4-B.0...v1.0.4-B.1) (2023-08-10) diff --git a/package-lock.json b/package-lock.json index ebabc25..eab913a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.4", + "version": "1.0.5-B.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.4", + "version": "1.0.5-B.0", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index cc04bc1..8d3ef24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.4", + "version": "1.0.5-B.0", "private": true, "scripts": { "serve": "vue-cli-service serve",