From d7c0aa4d3de45bc3081ede58ec959908a909191c Mon Sep 17 00:00:00 2001
From: liyongle <liyongle@123>
Date: Fri, 4 Aug 2023 15:18:24 +0800
Subject: [PATCH 1/2] chore(release): 1.0.2

---
 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 def4e94..47b6b24 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.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.2-B.2...v1.0.2) (2023-08-04)
+
 ### [1.0.2-B.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.2-B.1...v1.0.2-B.2) (2023-08-04)
 
 
diff --git a/package-lock.json b/package-lock.json
index a7b3c66..aba5cac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.2-B.2",
+  "version": "1.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.0.2-B.2",
+      "version": "1.0.2",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",
diff --git a/package.json b/package.json
index e6b3f6d..9b1f648 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.2-B.2",
+  "version": "1.0.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

From d3c4ce530c246d4afdfeb41ad3222ff6a5d76e9c Mon Sep 17 00:00:00 2001
From: liyongle <liyongle@123>
Date: Sat, 5 Aug 2023 10:11:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=BA=E6=99=AF=E8=A7=82=E5=B1=82=E6=97=B6?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BD=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PublicComponent/PublicComponent.vue        | 18 +++++++++++++-----
 src/composables/useGuideFilterShop.ts          | 17 +++++++----------
 src/composables/useInitMap.ts                  | 14 ++++++++++++++
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue
index e8c0064..191346e 100644
--- a/src/components/PublicComponent/PublicComponent.vue
+++ b/src/components/PublicComponent/PublicComponent.vue
@@ -78,11 +78,19 @@ watch(route, to => {
     if (to.fullPath === '/') {
       window?.Map_QM?.showFloor(device.value.floorOrder)
       const art: any = document.getElementById('mapContainer')
-      art.style.width = '2864px'
-      art.style.height = '1896px'
-      art.style.right = '0'
-      art.style.top = '0'
-      window.Map_QM.changeWindowResize(2864, 1896)
+      if (device.value.floorOrder !== 6) {
+        art.style.width = '2864px'
+        art.style.height = '1896px'
+        art.style.right = '0'
+        art.style.top = '0'
+        window.Map_QM.changeWindowResize(2864, 1896)
+      } else {
+        art.style.width = '2244px'
+        art.style.height = '1352px'
+        art.style.right = '690px'
+        art.style.top = '304px'
+        window.Map_QM.changeWindowResize(2244, 1352)
+      }
       if (store.currentArtName) {
         store.SET_CURRENT_ART_NAME('')
       }
diff --git a/src/composables/useGuideFilterShop.ts b/src/composables/useGuideFilterShop.ts
index 6af9d75..c688f8e 100644
--- a/src/composables/useGuideFilterShop.ts
+++ b/src/composables/useGuideFilterShop.ts
@@ -27,22 +27,19 @@ export const useGuideFilterShop = () => {
     floorIdx.value = floorOrder
     selectedShopList.value = shopList.value.filter(item => item.floorOrder === floorOrder)
     hideMapDialog()
+    const art: any = document.getElementById('mapContainer')
     if (floorOrder === 6) {
-      const art: any = document.getElementById('mapContainer')
       art.style.width = '2244px'
       art.style.height = '1352px'
       art.style.right = '690px'
       art.style.top = '304px'
       window.Map_QM.changeWindowResize(2244, 1352)
-    } else {
-      const art: any = document.getElementById('mapContainer')
-      if (art.style.width !== '2864px') {
-        art.style.width = '2864px'
-        art.style.height = '1896px'
-        art.style.right = '0'
-        art.style.top = '0'
-        window.Map_QM.changeWindowResize(2864, 1896)
-      }
+    } else if (art.style.width !== '2864px') {
+      art.style.width = '2864px'
+      art.style.height = '1896px'
+      art.style.right = '0'
+      art.style.top = '0'
+      window.Map_QM.changeWindowResize(2864, 1896)
     }
     window.Map_QM.showFloor(floorOrder)
   }
diff --git a/src/composables/useInitMap.ts b/src/composables/useInitMap.ts
index 088d799..b7b42da 100644
--- a/src/composables/useInitMap.ts
+++ b/src/composables/useInitMap.ts
@@ -28,6 +28,20 @@ export const useInitMap = async function () {
           })
         })
         store.SET_MAP_PARK_LIST(arr)
+        const art: any = document.getElementById('mapContainer')
+        if (device.value.floorOrder === 6) {
+          art.style.width = '2244px'
+          art.style.height = '1352px'
+          art.style.right = '690px'
+          art.style.top = '304px'
+          window.Map_QM.changeWindowResize(2244, 1352)
+        } else if (art.style.width !== '2864px') {
+          art.style.width = '2864px'
+          art.style.height = '1896px'
+          art.style.right = '0'
+          art.style.top = '0'
+          window.Map_QM.changeWindowResize(2864, 1896)
+        }
       },
       {
         build: device.value?.buildingOrder ?? 0,