Merge branch 'dev' of http://101.201.78.203/cfld-front/shuchengminipro into dev

src/pages/detail/components/CommonDetail.vue

@@ -33,7 +33,6 @@
         class="flex align-center justify-center common-detail__contact-btn"
         @tap="handleContact"
       >
-        <!-- todo 图标 -->
         <image
           class="common-detail__icon"
           src="@/static/img/icon-phone.png"
@@ -89,10 +88,6 @@ export default defineComponent({
       };
       return config[this.detailType];
     },
-    phone() {
-      // todo 联系人电话
-      return "";
-    },
     imageList() {
       if (this.detail) {
         const { imgUrlList = [], vrUrlList = [] } = this.detail;
@@ -133,11 +128,12 @@ export default defineComponent({
       }
     },
     handleContact() {
-      if (this.phone) {
+      const { contactPerson, phone } = this.detail || {};
+      if (contactPerson && phone) {
         this.callTitle = this.typeName + "对接人";
         this.phoneInfo = {
-          name: this.detail.contactPerson,
-          phone: this.phone,
+          name: contactPerson,
+          phone,
         };
       } else {
         this.callTitle = "联系我们";

src/pages/entryPark/index.vue

@@ -49,7 +49,7 @@
           </div>
         </div>
       </div>
-      <div v-show="activeBar !== 1">
+      <div>
         <dropdown-vue
           ref="dropDown"
           :menuList="$u.deepClone(menuList[activeBar])"
@@ -95,8 +95,8 @@
       >
       </u-empty>
     </view>
-    <div v-show="mode === 'map'" class="content z-100" style="padding-top: 246rpx;">
-      <map id="mapId" @markertap="handleMarkerClick" @callouttap="handleMarkerClick" :scale='11' style="width: 100%;height: calc(100vh - 246rpx)" latitude="31.464086" longitude="116.944909" class="map" :markers="markers">
+    <div v-else class="content z-100" :class="{'no-filter': activeBar === 1}" style="padding-top: 246rpx;">
+      <map id="mapId" :polygons="polygons" @markertap="handleMarkerClick" @callouttap="handleMarkerClick" :scale='11' style="width: 100%;height: calc(100vh - 246rpx)" latitude="31.464086" longitude="116.944909" class="map" :markers="markers">
       </map>
       <div v-if="activeInfo.id" :key="activeInfo.id" @click="toDetail(activeInfo)" style="position: fixed;padding: 0 30rpx;bottom: 30rpx;width: 100vw;z-index: 999;box-sizing: border-box;">
         <park-card-vue :key="activeInfo.id" :key-words="keyWords" :detail="activeInfo" v-if="activeBar == 0"></park-card-vue>
@@ -114,6 +114,7 @@ import carrierCardVue from "../../components/media/carrier-card.vue";
 import parkCardVue from "../../components/media/park-card.vue";
 import landCardVue from "../../components/media/land-card.vue";
 import dropdownVue from "../../components/dropdown/dropdown.vue";
+import areaData from './areaData.js';
 export default {
   components: {
     carrierCardVue,
@@ -130,6 +131,14 @@ export default {
       pageNum: 1,
       haveMore: true,
       isLoading: true,
+      polygons: [
+        {
+          points: areaData,
+          strokeWidth: 2,
+          strokeColor: '#4274EF',
+          fillColor: '#4274EF10',
+        }
+      ],
       //筛选菜单列表
       menuList: [
         [
@@ -148,18 +157,18 @@ export default {
           },
         ],
         [
-          // {
-          //   id: 1,
-          //   name: "土地类型",
-          //   isMultiple: false, //是否多选
-          //   showType: 3, //下拉框类型(1、2、3、4)
-          // },
-          // {
-          //   id: 2,
-          //   name: "面积",
-          //   isMultiple: false, //是否多选
-          //   showType: 3, //下拉框类型(1、2、3、4)
-          // },
+          {
+            id: 1,
+            name: "土地类型",
+            isMultiple: false, //是否多选
+            showType: 3, //下拉框类型(1、2、3、4)
+          },
+          {
+            id: 2,
+            name: "面积",
+            isMultiple: false, //是否多选
+            showType: 3, //下拉框类型(1、2、3、4)
+          },
         ],
         [
           {
@@ -243,6 +252,8 @@ export default {
         carrier_type: 'carrierType',
         carrier_construction: 'carrierConstruction',
         carrier_area: 'carrierArea',
+        land_type: 'landType',
+        land_area: 'area',
       }
       const result = Object.entries(params).map(([key, value]) => {
         const target = config[key];
@@ -454,7 +465,7 @@ export default {
 .content {
   padding-top: 250rpx + 20rpx;
   &.no-filter {
-    padding-top: 250rpx + 20rpx - 80rpx;
+    // padding-top: 250rpx + 20rpx - 80rpx;
   }
 }
 .media-card {