From 952dc9ca57f1f1ef09f0151368d70edb9b031384 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 16 Jun 2023 09:38:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=8F=E8=BF=87?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PathGroup/PathGroup.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/PathGroup/PathGroup.vue b/src/components/PathGroup/PathGroup.vue index a7593d3..ec1b6c1 100644 --- a/src/components/PathGroup/PathGroup.vue +++ b/src/components/PathGroup/PathGroup.vue @@ -16,7 +16,7 @@ {{ yourpos }} -
  • +
  • @@ -92,12 +92,17 @@ function onPathPlayOver() { playIdx.value = props.pathshop.length } +const scroll = ref() + function onPathPlaying(e: any) { // console.log(e.data) //返回小人位置 {"pathArrIn": 0, "pathIndex": 1, "shopNum":"" } const { shopNum } = e.data if (shopNum) { const idx2 = props.pathshop.findIndex((val: any) => val.shopNum === shopNum) playIdx.value = idx2 + if (scroll.value && document.getElementById(shopNum)) { + scroll.value.scrollToElement(document.getElementById(shopNum)) + } } } //重置playIdx @@ -123,6 +128,7 @@ const yourpos = computed(() => { const lastImage = computed(() => { return shop.value.logoUrl ?? require('@/assets/images/header/logo.svg') }) + defineExpose({ resetPlayIdx }) From 8147a09796d9b03675df1de10f03edd47efc004a Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 16 Jun 2023 19:10:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=A7=92=E5=BA=A6=E5=92=8Cbus=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../offline/JSON/getBusStationList.json | 2 +- public/static/qm/MainMap_QM.js | 2 +- src/components/Bus/Bus.vue | 43 ++++++++++++------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/public/static/offline/JSON/getBusStationList.json b/public/static/offline/JSON/getBusStationList.json index ea7a1ef..dee2be9 100644 --- a/public/static/offline/JSON/getBusStationList.json +++ b/public/static/offline/JSON/getBusStationList.json @@ -1 +1 @@ -{"code":200,"msg":"操作成功","data":{"busStationList":["A站","B站","C站","D站"]}} \ No newline at end of file +{"code":200,"msg":"操作成功","data":{"busStationList":["浦园A站","浦园B站","浦园C站","浦园D站"]}} \ No newline at end of file diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 602c31e..85d3e75 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -75,7 +75,7 @@ QMUtil = function () { this.pathStateObj = { isPathState: false, isPathPlay: true, basePath: "", graphPath: "", ftPath: "", dtPath: "", facAllArr: [], forShopArr: {}, elevator: null, straight: null, elevatorDown: null, seldtFacNo: "", seldownftFacNo: "", selupftFacNo: "" }; this.timeObj = { timeS: 0, collTime: -1, pathTime: -1 }; //debug 参数 相机坐标/ 镜头方向 - this.guiOptions = { cameraX: -490, cameraY: 500, cameraZ: 22, targatX: 0, targatY: 0, targatZ: 0 }; //this.button = function() {}; + this.guiOptions = { cameraX: -508, cameraY: 483, cameraZ: -4, targatX: 0, targatY: 0, targatZ: 0 }; //this.button = function() {}; this.sceneGap = { x: 0, y: 30, z: 40, scale: dir ? 0.15 : 0.085 }; //改变地图位置，大小 diff --git a/src/components/Bus/Bus.vue b/src/components/Bus/Bus.vue index a3001c3..63b3bd8 100644 --- a/src/components/Bus/Bus.vue +++ b/src/components/Bus/Bus.vue @@ -3,7 +3,7 @@

    {{ switchLanguage(busTip, 'title') }}

    - +
    {{ @@ -12,7 +12,7 @@
    - +
    {{ @@ -90,8 +90,8 @@ function setBusPositionToLeft(val: number) { } } onMounted(() => { - setBusPositionToLeft(0) - setBusPositionToRight(3) + setBusPositionToLeft(1) + setBusPositionToRight(2) }) @@ -152,12 +152,35 @@ onMounted(() => { } .bus { top: 85px; + background-image: url('@/assets/images/home/busToLeft.svg'); + &::after { + position: absolute; + top: -35px; + left: 20px; + z-index: 3; + } } } .bus { position: absolute; top: 0; left: 0; + display: block; + background-image: url('@/assets/images/home/busToRight.svg'); + width: 54px; + height: 21px; + + &::after { + position: absolute; + top: 37px; + left: 20px; + z-index: 3; + display: block; + width: 22px; + height: 22px; + background: url('@/assets/images/home/point.svg'); + content: ''; + } } .line { position: absolute; @@ -186,18 +209,6 @@ onMounted(() => { position: relative; // font-size: 24px; // color: rgb(0 0 0 / 90%); - - &::after { - position: absolute; - top: -33px; - right: 0; - left: 0; - width: 22px; - height: 22px; - margin: auto; - background: url('@/assets/images/home/point.svg'); - content: ''; - } } } } From 037bf1862b1d30314792bb3ce78e5fc4cfc2e711 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 16 Jun 2023 19:11:49 +0800 Subject: [PATCH 3/3] chore(release): 1.0.0-B.11 --- 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 f12dc29..b77f4c7 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.0-B.11](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.10...v1.0.0-B.11) (2023-06-16) + + +### Bug Fixes + +* 🧩 修改地图角度和bus位置问题 ([8147a09](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/8147a09796d9b03675df1de10f03edd47efc004a)) +* 修复经过店铺滚动问题 ([952dc9c](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/952dc9ca57f1f1ef09f0151368d70edb9b031384)) + ## [1.0.0-B.10](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.9...v1.0.0-B.10) (2023-06-15) diff --git a/package-lock.json b/package-lock.json index 5c9fda0..81d7497 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.10", + "version": "1.0.0-B.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.0-B.10", + "version": "1.0.0-B.11", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 6adbb3f..166fd42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.10", + "version": "1.0.0-B.11", "private": true, "scripts": { "serve": "vue-cli-service serve",