地块详情 地图展示地块

pages/look-detail/look-detail.wxml

@@ -34,7 +34,7 @@
         <text class="look-top-text">土地池</text>
       </view>
     </view>
-    <map class="map">
+    <map class="map" polygons="{{polygons}}" latitude="{{latitude}}" longitude="{{longitude}}" >
       <cover-view slot="callout">
         <cover-view marker-id="1"></cover-view>
         <cover-view marker-id="2"></cover-view>

pages/look/look.js

@@ -2,6 +2,8 @@
 const $api = require('../../utils/gisApi').API;
 const WKT = require('../../utils/terraformer-wkt-parser.min');
 const gisUtil = require('../../utils/gitUtil')
+const util = require('../../utils/util')
+
 
 const global = {}; 
 //年份范围
@@ -72,10 +74,12 @@ Page({
     dialogVisible: false,
     buttons: [{text: '取消'}, {text: '详情'}], 
     titleLand:'G01-XXXXXXXXXXX02', 
+    landListedId:'CQ20210617152223',
     totalConsArea:'42356',
     startingFloorPrice:'45852',
     transferPrice:'12553',
     auctionDate:'2021-07-18',  
+
     years:arryList,
     indexStart:0,
     indexEnd:0,
@@ -117,6 +121,7 @@ Page({
     console.log(property);
     this.setData({
       titleLand:'G01-XXXXXXXXXXX03', 
+      landListedId:'CQ20210617152223',
       totalConsArea:'68749',
       startingFloorPrice:'25784',
       transferPrice:'23546',
@@ -135,11 +140,12 @@ Page({
       halfScreenDialogVisible: false
     });
   },
-  tapDialogButton(e) {
+  tapDialogButton(e) { 
-    let index = e.detail.index;
+        let index = e.detail.index;
     if(index===0){
       this.setData({
         dialogVisible: false,
+        landListedId:'',
         titleLand:'', 
         totalConsArea:'',
         startingFloorPrice:'',
@@ -150,14 +156,14 @@ Page({
     }
     else{ 
      console.log('跳转到地块详情页面')
-     //跳转到地块详情页面
+     //跳转到地块详情页面 landListedId:'CQ20210617152223',
-      this.navigateToLandDetail(1)
+      this.navigateToLandDetail(this.data.landListedId);
     }
   }, 
   //跳转到地块详情页面
-  navigateToLandDetail(id){
+  navigateToLandDetail(landListedId){
     wx.navigateTo({
-      url: '/pages/look-detail/look-detail?active=1',
+      url: '/pages/look-detail/look-detail?active=1&landListedId='+landListedId,
     })
   },
   // closeDialog: function () {
@@ -494,7 +500,7 @@ Page({
     }
     markers.push(mark)
     this.setData({
-markers: markers
+      markers: markers
     })
   },
   //定位当前
@@ -713,19 +719,7 @@ markers: markers
       that.setWKT(data, id);
     })
   },
-/* 
+
- *  10和16进制转换
- * prin 为true将10进制转为16进制
- * prin 为false将16进制转为10进制
- */  
-  ten2XO(ten){
-    let val = Number(ten);  
-    let xo= val.toString(16)
-    if(val<16){
-      xo = '0'+xo
-    } 
-    return xo;
-  },
   // 地块数据解析
   setWKT(data, id) {
     let {
@@ -750,9 +744,9 @@ markers: markers
           })
         }
       })
-      let strokeColor = ''+ item.line_color + this.ten2XO(item.line_opaqueness);
+      let strokeColor = ''+ item.line_color + util.ten2XO(item.line_opaqueness);
       let strokeWidth = item.strokeWidth ?  Number(item.strokeWidth):2;
-      let fillColor = ''+ item.fill_color + this.ten2XO(item.fill_opaqueness);
+      let fillColor = ''+ item.fill_color + util.ten2XO(item.fill_opaqueness);
       let polygon = {
         points,
         strokeColor,

utils/gisApi.js

@@ -1,4 +1,6 @@
-const baseURL = 'https://yoursairdata.com/gis/'
+// const baseURL = 'https://yoursairdata.com/gis/'
+const baseURL = 'http://47.108.164.110:8080/'
+
 const GET = 'GET';
 const POST = 'POST';
 const PUT = 'PUT';

utils/util.js

@@ -14,7 +14,16 @@ const formatNumber = n => {
   return n[1] ? n : `0${n}`
 }
 
+ const ten2XO =(ten)=>{
+  let val = Number(ten);  
+  let xo= val.toString(16)
+  if(val<16){
+    xo = '0'+xo
+  } 
+  return xo;
+}
 module.exports = {
   formatTime,
-  formatNumber
+  formatNumber,
+  ten2XO
 }