chore(release): 1.0.0-B.4

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.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)
+
+
+### Bug Fixes
+
+* 🧩 相关优化 ([70e1361](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/70e1361dfb59a70d7d6627aeda4178fb018d05be))
+
 ## [1.0.0-B.3](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.2...v1.0.0-B.3) (2023-07-20)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.3",
+  "version": "1.0.0-B.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.0.0-B.3",
+      "version": "1.0.0-B.4",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.3",
+  "version": "1.0.0-B.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

public/static/qm/MainMap_QM.js

@@ -5544,12 +5544,7 @@ FloorMap_QM.prototype = {
 									mapData.shopArea[i].type = "promotion";
 									this.addTagLabel(mapData.shopArea[i], { "node": mapData.shopArea[i].shopNav, "floor": this.floorOrder, "build": this.buildOrder });
 								}
-								if (shopData[h].formatColor) {
-									entColor = parseInt(shopData[h].formatColor.replace("#", "0x"), 16);
-								}
-								if (shopData[h].borderColor) {
-									borderColor = parseInt(shopData[h].borderColor.replace("#", "0x"), 16);
-								}
+
 								break;
 							}
 						}

src/components/PlateInput/PlateInput.vue

@@ -81,7 +81,7 @@ $btn-width: 197px;
   position: relative;
   display: flex;
   justify-content: space-between;
-  width: 856px;
+  width: 872px;
   margin-bottom: 40px;
   &::before {
     position: absolute;

src/components/PlateKeyboard/PlateKeyboard.vue

@@ -10,6 +10,7 @@
         keyboardIdx === index ? 'active' : '',
         searchMethods === '车位' ? 'space' : ''
       ]"
+      :data-key="item"
       @click="handleKeyboard(item, index)"
     >
       <svg
@@ -90,6 +91,22 @@ onBeforeUnmount(() => {
       width: 24px;
       height: 24px;
     }
+
+    &[data-key='黑'],
+    &[data-key='甘'],
+    &[data-key='藏'],
+    &[data-key='警'],
+    &[data-key='F'],
+    &[data-key='M'],
+    &[data-key='T'],
+    &[data-key='Z'] {
+      margin-right: 16px;
+    }
+    &[data-key='3'],
+    &[data-key='6'],
+    &[data-key='9'] {
+      margin-right: 0;
+    }
     &.space {
       width: 88px;
       &.del {
@@ -104,6 +121,7 @@ onBeforeUnmount(() => {
       justify-content: center;
       align-items: center;
       width: 88px;
+      margin-right: 0;
       background: #fff;
       line-height: initial;
     }

src/views/Art/ArtItem.vue

@@ -7,7 +7,7 @@
           <div class="title">{{ artInfo.content.name }}</div>
           <div class="titleEn">{{ artInfo.content.nameEn }}</div>
         </div>
-        <img src="@/assets/images/art/go.svg" alt="" />
+        <img src="@/assets/images/art/go.svg" alt="" @click="go(artInfo)" />
       </div>
       <ScrollView :list="switchLanguage(artInfo.content, 'content')" class="intro-scroll" scrollbar>
         <div class="intro">{{ switchLanguage(artInfo.content, 'content') }}</div>
@@ -17,13 +17,35 @@
 </template>
 
 <script setup lang="ts">
-import ScrollView from '@/base/ScrollView/ScrollView.vue'
+import { useRouter } from 'vue-router'
 import { useSwitchLanguage } from '@/composables/useSwitchLanguage'
+import { useRootStore } from '@/store/root'
+import ScrollView from '@/base/ScrollView/ScrollView.vue'
 const { switchLanguage } = useSwitchLanguage()
+const store = useRootStore()
+const router = useRouter()
 type Prop = {
   artInfo: ArtPlace
 }
 defineProps<Prop>()
+
+// 跳转导航
+function go(item: ArtPlace) {
+  // 点位信息
+  const poi = item.content.point.split('_')
+  const floors = store.currentBuildingFloorsList.filter(item => item.floorOrder === Number(poi[1]))
+  const shop = {
+    shopCode: '',
+    shopName: item.content.name,
+    shopNameEn: item.content.nameEn,
+    floorOrder: floors[0].floorOrder,
+    floor: floors[0].floor,
+    logoUrl: item.content.icon[0],
+    yaxis: Number(poi[2])
+  }
+  store.SET_SHOP(shop)
+  router.push('/nav')
+}
 </script>
 
 <style lang="scss" scoped>

src/views/Guide/Guide.vue

@@ -150,8 +150,9 @@ function show(item: ArtPlace) {
     shopNameEn: item.content.nameEn,
     floorOrder: floors[0].floorOrder,
     floor: floors[0].floor,
-    logoUrl: '',
-    yaxis: Number(poi[2])
+    logoUrl: item.content.icon[0],
+    yaxis: Number(poi[2]),
+    doorMaterialList: item.content.file_code
   }
   store.SET_SHOP(shop)
 }