Ver código fonte

fix:修改小地图定位失败和列表滚动问题

aamin 1 ano atrás
pai
commit
f48c80237e

+ 31 - 24
src/data/index.js

@@ -140,85 +140,92 @@ let order = [
 
 let tag_position = {
   // 正门入口
-  fd720_hDcc3aSka: {
+  fd720_0K6LLQFHc: {
     left: "33%",
     top: "38%",
   },
-   // 一、二、三楼观景台
-   fd720_d4YFdDF1Y: {
+  // 一、二、三楼观景台
+  fd720_5yK7i2mcZ: {
     left: "49%",
     top: "54%",
   },
-  fd720_h7dHG9hdx:{
+  fd720_lycizafxl: {
     left: "49%",
     top: "54%",
   },
-  fd720_gBKWVjE9O:{
+  fd720_4Mxt7U3yT: {
     left: "49%",
     top: "54%",
   },
   // 网红桥
-  fd720_ngedG57Dv: {
+  fd720_SJ3TKmFXk: {
     left: "43%",
     top: "60%",
   },
   // 亭
-  fd720_VRAod1wnC:{
+  fd720_mtBJnwujU: {
     left: "50.5%",
     top: "63.5%",
   },
   // 小桥
-  fd720_LIBy6XrM3:{
+  fd720_L89CRHcxk: {
     left: "51.5%",
     top: "60%",
   },
-   //小径
-   fd720_TwYCDBGEs: {
+  //小径
+  fd720_sUr1rgTRt: {
     left: "54%",
     top: "65%",
   },
   // 泳池入口
-  fd720_EkMXC7g07:{
+  fd720_j8qv4fKWu: {
     left: "44.5%",
     top: "37%",
   },
   // 泳池过道
-  fd720_SLOQECgge:{
+  fd720_fjeVulQ5b: {
     left: "45%",
     top: "32%",
   },
   // 泳池中央
-  fd720_hrSZoPuJl:{
+  fd720_fgNLLhxEU: {
     left: "49%",
     top: "32%",
   },
+
   // 别墅入口
-  fd720_7LsaURUzy: {
+  '1XMt0UcrQZM': {
+    left: "46.5%",
+    top: "64.5%",
+  },
+
+  // N 别墅入口
+  fd720_GWFmikvyJ: {
     left: "46.5%",
     top: "64.5%",
   },
 
-  // 南底层客房1
-  fd720_DMtjU8yUZ: {
+  // 南底层客房
+  fd720_esY3v17aS: {
     left: "51.5%",
     top: "87%",
   },
 
   // 南底层客房2
-  fd720_n4XYjrp3n:{
+  fd720_vtqcd4kdi: {
     left: "60.5%",
     top: "87%",
   },
-  // 南高层客房1
-  fd720_vj2C84goG:{
+  // 南底层客房3
+  fd720_gIDXsLEXX: {
+    left: "60.5%",
+    top: "87%",
+  },
+  // 南高层客房
+  fd720_QMsDy40wP: {
     left: "55%",
     top: "95%",
   },
-   // 南高层客房2
-   fd720_sJoe1Ugif:{
-    left: "63%",
-    top: "95.5%",
-  },
   // 别墅小桥
   fd720_XZBFnCXAS: {
     top: "87%",

+ 8 - 7
src/store/index.js

@@ -26,13 +26,12 @@ const appStore = defineStore("app", {
         return (
           item.name === "客房区域" ||
           item.name === "壹号会馆" ||
-          item.name === "公共区"        );
+          item.name === "公共区"
+        );
       });
       res.forEach((item) => {
         if (item.name === "公共区") {
           item.name = "室外区域";
-          item.children.push('c_cOX8vF3R')
-          // item.children.concat(['c_cOX8vF3R','c_poTfM0Yd','c_HFFYrkxN','c_WqxWTSg6','c_t3sVVlxk'])
         }
       });
       res.push({
@@ -46,9 +45,6 @@ const appStore = defineStore("app", {
     newSecondaryList() {
       let newNameList;
       switch (this.currentCatalogRoot.name) {
-        case "室外区域":
-          newNameList = ["其他", "L0.0", "L5.0", "L5.5", "L11.0"];
-          break;
         case "酒店公区":
           newNameList = ["其他", "L0.0", "L5.0", "L5.5", "L11.0"];
           break;
@@ -66,7 +62,12 @@ const appStore = defineStore("app", {
     setCurrentSecondary(payload) {
       this.currentSecondary = payload;
       let arr = this.list.filter((item) => {
-        return this.currentSecondary.id == item.category;
+
+        if(this.currentCatalogRoot.name == '室外区域') {
+          return this.currentSecondary.id == item.category ||
+          item.category == "c_cOX8vF3R"
+        }
+        return  this.currentSecondary.id == item.category;
       });
 
       this.setCurrentScenesList(arr.sort((a, b) => a.weight - b.weight));

+ 1 - 1
src/views/home/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="homecon"
     :style="{ backgroundImage: `url(${require(`@/assets/images/resource/home/${isMobile ? 'mob_bg' : 'map'}.jpg`)})` }">
-    <img class="start" @click="router.push({name:'scene',params:{id:'fd720_hDcc3aSka'}})"
+    <img class="start" @click="router.push({name:'scene',params:{id:'fd720_0K6LLQFHc'}})"
       :src="require('@/assets/images/resource/home/btn_start.png')" alt="">
   </div>
 </template>

+ 1 - 0
src/views/map/bird_view.vue

@@ -2,6 +2,7 @@
   <div class="birdview">
     <img
       class="map"
+      :style="{width: route.params.name ? 'auto': '100vw'}"
       :src="!route.params.name ? DefaultBG : floorBG"
       alt=""
     />

+ 2 - 2
src/views/scene/list.vue

@@ -72,14 +72,14 @@
     <div
       class="bottom-con"
       :style="`width:${
-        Math.max(scenesListW, secondaryW) > 1150
+        Math.max(scenesListW, secondaryW) > 1880
           ? '100%'
           : Math.max(scenesListW, secondaryW) + 120 + 'px'
       }`"
     >
       <div
         class="swiper-container"
-        :style="`width:${scenesListW > 1150 ? '100%' : scenesListW + 'px'}`"
+        :style="`width:${scenesListW > 1880 ? '100%' : scenesListW + 'px'}`"
         id="swScenes"
         v-if="store.currentScenesList.length > 0"
       >

+ 1 - 1
src/views/scene/mapIcon.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="birdview" :style="{
-    transform: `translate(calc(-${props.tagdata.left} + ${isMobile ? 38 : 90}px),calc(-${props.tagdata.top} + ${isMobile ? 18 : 86}px))`
+    transform: `translate(calc(-${props.tagdata.left} + ${isMobile ? 38 : 90}px),calc(-${props.tagdata.top} + ${isMobile ? 18 : 40}px))`
   }">
     <img :src="require(`@/assets/images/resource/scene/pc_map_bg.jpg`)" alt="" />
     <div class="tag" :style="{