diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dda8db..ec665aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
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.5](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.4...v1.0.0-B.5) (2023-07-20)
+
+
+### Bug Fixes
+
+* 🧩 相关优化 ([3124473](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/3124473236a30e48f03c1bffa1222cdd8a47d5ec))
+
## [1.0.0-B.4](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.3...v1.0.0-B.4) (2023-07-20)
diff --git a/package-lock.json b/package-lock.json
index 87927ac..a8dc2a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "vue_cli_ts",
- "version": "1.0.0-B.4",
+ "version": "1.0.0-B.5",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vue_cli_ts",
- "version": "1.0.0-B.4",
+ "version": "1.0.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 02e510f..c6c1d4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vue_cli_ts",
- "version": "1.0.0-B.4",
+ "version": "1.0.0-B.5",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/public/static/offline/JSON/getArtWorkList.json b/public/static/offline/JSON/getArtWorkList.json
index 801a554..5937ed4 100644
--- a/public/static/offline/JSON/getArtWorkList.json
+++ b/public/static/offline/JSON/getArtWorkList.json
@@ -9,7 +9,7 @@
"name": "猩猩的太空漫步",
"nameEn": "dddd",
"file_code": [
- "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/vwcYXFrhK1CbEB6uFy76R.png"
+ "/iotFile/project-ey_fpaur6s6fkgvszywana/20230711/i5NJjQ-h_RKrWqWza7g79.jpg"
],
"point": "0_3_4",
"content": "vnasfkvl",
diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js
index 142e7f3..1c46ef1 100644
--- a/public/static/qm/MainMap_QM.js
+++ b/public/static/qm/MainMap_QM.js
@@ -78,7 +78,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: 0, z: 0, scale: dir ? 0.15 : 0.055 }; //改变地图位置，大小
+ this.sceneGap = { x: 0, y: 0, z: 0, scale: dir ? 0.15 : 0.06 }; //改变地图位置，大小
this.selectBuild = 0;
this.selectFloor = 0;
@@ -4845,7 +4845,7 @@ MainMap_QM.prototype = {
}
let zo = 2, tz = 2, boxT = 0, boxZ = 0;
- let add = Map_QM.util.options.showStyle ? 80 : 40;
+ let add = Map_QM.util.options.showStyle ? 120 : 40;
Map_QM.util._indexPathFloor++;
let toFloor = parseInt(Map_QM.forShopArr[Map_QM.util._indexPathFloor].floor);
Map_QM.util.selectFloor = toFloor;
@@ -4861,6 +4861,7 @@ MainMap_QM.prototype = {
document.getElementById('moveFloor').style.bottom = zo + "px";
document.getElementById('moveFloor').style.width = add + "px";
document.getElementById('moveFloor').style.height = add + "px";
+ document.getElementById('moveFloor').style.left = "4px";
Map_QM.moveFloorbg.element.style.visibility = "visible";
Map_QM.moveFloorbg.element.style.width = (add + 8) + "px";
Map_QM.moveFloorbg.element.style.height = (floorArr.length * add) + "px";
@@ -5341,7 +5342,7 @@ FloorMap_QM.prototype = {
alphaTest: 0.1
});
let sprite = new MySprite_QM(spriteMaterial);
- sprite.scale.set(64, 64, 1);
+ sprite.scale.set(128, 128, 1);
sprite.imgUrl = url;
sprite.center = new THREE.Vector2(0.5, 0);
sprite.userData = item;
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index d3ec9e2..052d962 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -116,8 +116,6 @@ function handleDetail() {
font-family: 'font_bold';
color: #fff;
font-weight: 700;
-
- @include no-wrap;
}
.go-button {
width: 125px;
@@ -143,7 +141,7 @@ function handleDetail() {
}
#moveFloorBG {
position: absolute;
- width: 48px;
+ width: 128px;
background-color: #fff;
border-radius: 5px;
visibility: hidden;
@@ -151,9 +149,9 @@ function handleDetail() {
#moveFloor {
position: absolute;
bottom: 2px;
- left: 2px;
+ left: 4px;
z-index: -1;
- width: 48px;
+ width: 120px;
height: 48px;
background-color: #dbb186;
border-radius: 5px;
diff --git a/src/components/PlateKeyboard/PlateKeyboard.vue b/src/components/PlateKeyboard/PlateKeyboard.vue
index 7660350..0e0a507 100644
--- a/src/components/PlateKeyboard/PlateKeyboard.vue
+++ b/src/components/PlateKeyboard/PlateKeyboard.vue
@@ -109,6 +109,12 @@ onBeforeUnmount(() => {
}
&.space {
width: 88px;
+ &[data-key='F'],
+ &[data-key='M'],
+ &[data-key='T'],
+ &[data-key='Z'] {
+ margin-right: 24px;
+ }
&.del {
width: 184px;
}
diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue
index 4b092f3..1973fff 100644
--- a/src/components/PublicComponent/PublicComponent.vue
+++ b/src/components/PublicComponent/PublicComponent.vue
@@ -77,6 +77,9 @@ onBeforeUnmount(() => {
watch(route, to => {
if (to.fullPath === '/' || to.fullPath === '/nav') {
window?.Map_QM?.startRender()
+ if (to.fullPath === '/') {
+ window?.Map_QM?.showFloor(6)
+ }
} else {
window?.Map_QM?.cancelRender()
}
diff --git a/src/components/Recommend/Recommend.vue b/src/components/Recommend/Recommend.vue
index f40641a..20f6b55 100644
--- a/src/components/Recommend/Recommend.vue
+++ b/src/components/Recommend/Recommend.vue
@@ -21,7 +21,7 @@
{{ switchLanguage(shopMap[item.content.shopCode], 'shopName') }}
-
{{ shopMap[item.content.shopCode].houseNumber }}
+
{{ shopMap[item.content.shopCode].houseNumber }}
@@ -202,14 +202,16 @@ getColumnList().then(({ data }) => {
}
.number {
@include fl();
- @include no-wrap;
-
- max-width: 80px;
img {
width: 16px;
height: 16px;
margin-right: 8px;
}
+ .numbers {
+ @include no-wrap;
+
+ max-width: 80px;
+ }
}
}
}
diff --git a/src/composables/useInitMap.ts b/src/composables/useInitMap.ts
index 9e7f814..d05143a 100644
--- a/src/composables/useInitMap.ts
+++ b/src/composables/useInitMap.ts
@@ -49,12 +49,13 @@ export const useInitMap = async function () {
//点击地图店铺box
function onClickShop(event: any) {
const store = useRootStore()
-
if (event.data) {
- showMapDialog()
+ hideMapDialog()
!window.shopInfo && document.getElementById('shopInfo')
window.Map_QM.addElementLabel(window.shopInfo, event.data.xaxis, event.data.yaxis)
store.SET_SHOP(event.data.shopData)
+ store.SET_CURRENT_ART_NAME('')
+ showMapDialog()
}
// else {
// hideMapDialog()
@@ -80,6 +81,7 @@ function onClickArt(event: any) {
logoUrl: '',
yaxis: Number(poi[2])
}
+ store.SET_CURRENT_ART_NAME(event.data.artData.content.name)
store.SET_SHOP(shop)
}
}
diff --git a/src/store/root/actions.ts b/src/store/root/actions.ts
index bab77a5..c3e8dfa 100644
--- a/src/store/root/actions.ts
+++ b/src/store/root/actions.ts
@@ -26,6 +26,7 @@ export interface Actions {
SET_ART_PLACE_LIST(list: ArtPlace[]): void
SET_MAP_PARK_LIST(list: string[]): void
SET_SPECIAL_LIST(list: SpecialIndustry[]): void
+ SET_CURRENT_ART_NAME(name: string): void
}
export type GenActions = CreateActions
@@ -96,5 +97,8 @@ export const actions: GenActions = {
},
SET_SPECIAL_LIST(list) {
this.specialIndustryList = list
+ },
+ SET_CURRENT_ART_NAME(name) {
+ this.currentArtName = name
}
}
diff --git a/src/store/root/state.ts b/src/store/root/state.ts
index 3a9a81a..0ead2eb 100644
--- a/src/store/root/state.ts
+++ b/src/store/root/state.ts
@@ -22,6 +22,7 @@ export interface State {
artPlaceList: ArtPlace[] // 艺术装置集合
mapParkList: string[] // 停车位列表
specialIndustryList: SpecialIndustry[] // 特殊业态列表
+ currentArtName: string // 当前选中艺术装置
}
export const state = (): State => ({
@@ -45,5 +46,6 @@ export const state = (): State => ({
shopMap: {} as ShopMap,
artPlaceList: [],
mapParkList: [],
- specialIndustryList: []
+ specialIndustryList: [],
+ currentArtName: ''
})
diff --git a/src/views/Guide/FloorPicList.vue b/src/views/Guide/FloorPicList.vue
index 176efd9..000dc5b 100644
--- a/src/views/Guide/FloorPicList.vue
+++ b/src/views/Guide/FloorPicList.vue
@@ -46,7 +46,7 @@ getFloorPicList().then(({ data }) => {
border: 2px solid #fff;
border-radius: 0 24px 24px 0;
img {
- width: 200px;
+ width: 208px;
height: 80px;
}
}
diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue
index f8e0f26..4f30013 100644
--- a/src/views/Guide/Guide.vue
+++ b/src/views/Guide/Guide.vue
@@ -105,7 +105,7 @@ import ArtList from './ArtList.vue'
import FloorPicList from './FloorPicList.vue'
const store = useRootStore()
const { switchLanguage } = useSwitchLanguage()
-const { language, facilityList, artPlaceList } = toRefs(store)
+const { language, facilityList, artPlaceList, currentArtName } = toRefs(store)
const { floorIdx, areaName, selectedShopList, changeFloor, changeArea, changeFoodShopList } = useGuideFilterShop() //筛选店铺
const { handleMapIcon, list, mapIdx } = useGuideMapOperation(changeFloor, changeFoodShopList) //复位 位置等操作
const { handleFacility } = useFacilityNav() //公共设施导航
@@ -122,22 +122,21 @@ getAreaPicList().then(({ data }) => {
function changeFloors(floorOrder: number) {
changeFloor(floorOrder)
mapIdx.value = -1
- currentArtName.value = ''
+ currentArtName.value && store.SET_CURRENT_ART_NAME('')
}
// 切换区域
function changeAreas(name: string) {
changeArea(name)
mapIdx.value = -1
- currentArtName.value = ''
+ currentArtName.value && store.SET_CURRENT_ART_NAME('')
}
-const currentArtName = ref('')
// 展示艺术装置弹窗
function show(item: ArtPlace) {
- currentArtName.value = item.content.name
// 点位信息
const poi = item.content.point.split('_')
+ changeFloors(Number(poi[1]))
hideMapDialog()
window.Map_QM.addElementByNode(document.getElementById('artWorkInfo'), Number(poi[2]))
const art: any = document.getElementById('artWorkInfo')
@@ -154,6 +153,7 @@ function show(item: ArtPlace) {
yaxis: Number(poi[2]),
doorMaterialList: item.content.file_code
}
+ store.SET_CURRENT_ART_NAME(item.content.name)
store.SET_SHOP(shop)
}
diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue
index 7be45f4..52ca09b 100644
--- a/src/views/Nav/Nav.vue
+++ b/src/views/Nav/Nav.vue
@@ -147,7 +147,7 @@