|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<div class="adopt-map-page">
|
|
|
- <div class="garden-info" v-if="gardenObj">
|
|
|
+ <div class="garden-info" v-if="gardenObj && !enterSelectTree">
|
|
|
<div class="panel-title">
|
|
|
<div class="title-l">
|
|
|
<div class="title-info">
|
|
|
@@ -18,13 +18,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <div class="select-tips" v-if="enterSelectTree">请选择你想守护的树</div>
|
|
|
+ <div class="select-tips" v-if="enterSelectTree">请选择您要守护的农场区域</div>
|
|
|
|
|
|
<div ref="mapRef" class="map"></div>
|
|
|
|
|
|
- <div class="top-mask"></div>
|
|
|
+ <!-- <div class="top-mask"></div> -->
|
|
|
|
|
|
- <BaseFooter />
|
|
|
+ <!-- <BaseFooter /> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -33,13 +33,14 @@ import IndexMap from './map/index.js'
|
|
|
import RegionLayer from './map/regionLayer.js'
|
|
|
import ClusterPointsLayer from './map/clusterPointsLayer.js'
|
|
|
import { onMounted, onUnmounted, ref } from 'vue'
|
|
|
-import { useRoute } from 'vue-router'
|
|
|
+import { useRoute, useRouter } from 'vue-router'
|
|
|
import { useStore } from 'vuex'
|
|
|
import { SET_TOKEN } from '@/store/modules/app/type.js'
|
|
|
-import BaseFooter from '@/components/BaseFooter.vue'
|
|
|
+// import BaseFooter from '@/components/BaseFooter.vue'
|
|
|
|
|
|
const store = useStore()
|
|
|
const route = useRoute()
|
|
|
+const router = useRouter()
|
|
|
const mapRef = ref(null)
|
|
|
const indexMap = new IndexMap()
|
|
|
let regionLayer = null
|
|
|
@@ -241,8 +242,10 @@ onMounted(async () => {
|
|
|
|
|
|
await initAuth()
|
|
|
|
|
|
+ console.log('route', route, router)
|
|
|
+
|
|
|
// URL 带 enterSelectTree 即进入选分区模式(不再依赖 getLightTree 是否有 id)
|
|
|
- if (isEnterSelectTreeQuery(route.query.enterSelectTree)) {
|
|
|
+ if (isEnterSelectTreeQuery(route.meta.selectMode)) {
|
|
|
enterSelectTree.value = true
|
|
|
try {
|
|
|
const { data } = await VE_API.lj_home.getLightTree({ speciesId: '1' })
|
|
|
@@ -290,14 +293,14 @@ onMounted(async () => {
|
|
|
.select-tips {
|
|
|
position: absolute;
|
|
|
z-index: 3;
|
|
|
- top: 100px;
|
|
|
+ top: 10px;
|
|
|
left: 50%;
|
|
|
transform: translateX(-50%);
|
|
|
pointer-events: none;
|
|
|
- background: rgba(255, 255, 255, 0.6);
|
|
|
- color: #000;
|
|
|
+ background: rgba(0, 0, 0, 0.5);
|
|
|
+ color: #FFFFFF;
|
|
|
font-size: 12px;
|
|
|
- padding: 7px 25px;
|
|
|
+ padding: 7px 20px;
|
|
|
border-radius: 30px;
|
|
|
}
|
|
|
|