ws

nnzwminiapp/pages/map2/map.js

@@ -548,13 +548,17 @@ Page({
           wx.request({
             url: imgUrl + 'tdcr/details/data.json',
             success: (res) => {
-              that.setData({
-                polygons: [{
+              let polygons = []
+              res.data[that.data.dataIndex].polygon.forEach(item => {
+                polygons.push({
                   dashArray: [10, 10],
                   strokeColor: '#ffe20063',
                   fillColor: '#ffe20063',
-                  points: res.data[that.data.dataIndex].polygon
-                }],
+                  points: item
+                })
+              })
+              that.setData({
+                polygons,
                 longitude: res.data[that.data.dataIndex].longitude,
                 latitude: res.data[that.data.dataIndex].latitude,
               })

nnzwminiapp/pages/map2/map.wxml

@@ -3,7 +3,7 @@
     <!-- 左边的logo和文字 -->
     <view class="left-logo">
       <view href="https://www.cqna.gov.cn/" target="_blank">
-        <image class="logo-img" src="{{imgUrl}}/map-logo.png"></image>
+        <image class="logo-img" src="{{imgUrl}}/tdcr/title-icon.png"></image>
       </view>
     </view>
     <!-- 右边的搜索框 -->

nnzwminiapp/pagesPublic/pages/tdcr/details/detail.js

@@ -37,6 +37,7 @@ Page({
     wx.request({
       url: imgUrl + 'tdcr/details/data.json',
       success: (res) => {
+        console.log(res);
         _this.setData({
           headerStyle: wx.getMenuButtonBoundingClientRect(),
           dataIndex: options.index,
@@ -157,15 +158,19 @@ Page({
         height: 25,
       })
     })
-    this.setData({
-      markers,
-      scale: this.data.list[this.data.dataIndex].scale || '16',
-      polygons: [{
+    let polygons = []
+    this.data.list[this.data.dataIndex].polygon.forEach(item => {
+      polygons.push({
         dashArray: [10, 10],
         strokeColor: '#ffe20063',
         fillColor: '#ffe20063',
-        points: this.data.list[this.data.dataIndex].polygon
-      }],
+        points: item
+      })
+    })
+    this.setData({
+      markers,
+      scale: this.data.list[this.data.dataIndex].scale || '16',
+      polygons,
       centerPoint: {
         longitude: this.data.list[this.data.dataIndex].longitude,
         latitude: this.data.list[this.data.dataIndex].latitude,

nnzwminiapp/pagesPublic/pages/tdcr/index.js

@@ -16,42 +16,50 @@ Page({
     }],
     cursors: [{
       id: 0,
-      txt: '中西医结合医院',
+      txt: '廖家山一期',
       top: -12,
-      left: 28,
-      dropTop: 3.5,
-      dropLeft: 12,
+      left: 36,
+      dropTop: 4,
+      dropLeft: 4,
       zIndex: 10
     }, {
       id: 2,
-      txt: '廖家山地块',
-      top: -16,
-      left: 20,
+      txt: '双峰山1号',
+      top: -20,
+      left: 18,
       dropTop: 5,
-      dropLeft: 5
+      dropLeft: 5,
+      zIndex: 9
     }, {
       id: 1,
-      txt: '南坪东路588号',
+      txt: '四公里大片区',
       top: -30,
-      left: 61,
-      dropTop: 4,
+      left: 50,
+      dropTop: 5,
       dropLeft: 5,
       zIndex: 11
     }, {
       id: 3,
-      txt: '四公里片区',
-      top: -30,
+      txt: '广阳湾产城融合三期',
+      top: -35,
       left: 61,
-      dropTop: 4,
-      dropLeft: 5,
+      dropTop: 5,
+      dropLeft: 9,
       zIndex: 9
     }, {
       id: 4,
-      txt: '双峰山1号地块',
-      top: -39,
-      left: 35,
-      dropTop: 4,
-      dropLeft: 5
+      txt: '广阳湾产城融合二期',
+      top: -38,
+      left: 33,
+      dropTop: 5,
+      dropLeft: 9
+    }, {
+      id: 5,
+      txt: '广阳湾产城融合一期',
+      top: -50,
+      left: 14,
+      dropTop: 5,
+      dropLeft: 9
     }],
     list: [{
       icon: 'icon-quyu.png',
@@ -145,7 +153,7 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '2024年土地出让',
+      title: '2024年土地供应',
       imageUrl: imgUrl + '/tdcr/share.jpg'
     }
   },

nnzwminiapp/pagesPublic/pages/tdcr/tdcr-list/index.js

@@ -22,7 +22,7 @@ Page({
     top: 21,
     zIndex: 1,
     nameStyle: {
-      txt: '中西医结合医院',
+      txt: '廖家山一期',
       img: 'tdcrlist7.png'
     },
     lineStyle: {
@@ -39,7 +39,7 @@ Page({
     top: 34.5,
     zIndex: 3,
     nameStyle: {
-      txt: '南坪东路588号',
+      txt: '四公里大片区',
       img: 'tdcrlist8.png',
       color: '#0F2887',
       x: 2
@@ -58,7 +58,7 @@ Page({
     top: 28.5,
     zIndex: 2,
     nameStyle: {
-      txt: '廖家山地块',
+      txt: '双峰山1号',
       img: 'tdcrlist7.png'
     },
     lineStyle: {
@@ -74,7 +74,7 @@ Page({
     left: 41,
     top: 48,
     nameStyle: {
-      txt: '四公里片区',
+      txt: '广阳湾三期',
       img: 'tdcrlist7.png',
       top: 25.5
     },
@@ -91,7 +91,24 @@ Page({
     left: 27,
     top: 46.5,
     nameStyle: {
-      txt: '双峰山1号地块',
+      txt: '广阳湾二期',
+      img: 'tdcrlist7.png',
+      top: 33
+    },
+    lineStyle: {
+      height: 12,
+      left: 3,
+      top: 16
+    },
+    postionStyle: {
+      top: -0.5,
+      left: 0.5
+    }
+  }, {
+    left: 50,
+    top: 30.5,
+    nameStyle: {
+      txt: '广阳湾一期',
       img: 'tdcrlist7.png',
       top: 33
     },
@@ -163,7 +180,7 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '2024年土地出让',
+      title: '2024年土地供应',
       imageUrl: imgUrl + '/tdcr/share.jpg'
     }
   },

nnzwminiapp/pagesPublic/pages/tdcr/tdcr-list/index.wxml

@@ -4,7 +4,7 @@
   capture-bind:touchstart="handleTouchstart"
   capture-catch:touchend="handleTouchend"
   class="main" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist3.png');">
-  <view class="header" style="height: {{headerStyle.height}}px;line-height: {{headerStyle.height}}px;top: {{headerStyle.top}}px;">2024年土地出让</view>
+  <view class="header" style="height: {{headerStyle.height}}px;line-height: {{headerStyle.height}}px;top: {{headerStyle.top}}px;">2024年土地供应</view>
 	<view class="map-block" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist1.png');">
     <view class="map-block-item" wx:for="{{list}}" style="top: {{item.top}}vh;left: {{item.left}}vw;{{item.zIndex ? 'z-index: ' + item.zIndex : ''}}">
       <view bindtap="gotoDetail" data-index="{{index}}" data-scale="{{item.scale}}" class="item-name" style="background-image:url('{{imgUrl}}tdcrlist/{{item.nameStyle.img}}');{{item.nameStyle.color ? 'color: ' + item.nameStyle.color + ';' : ''}}{{item.nameStyle.top ? 'top: ' + item.nameStyle.top + 'vh;' : ''}}{{item.nameStyle.left ? 'left: ' + item.nameStyle.left + 'vw;' : ''}}{{item.nameStyle.x ? 'background-position-x: ' + item.nameStyle.x + 'vw;' : ''}}">{{item.nameStyle.txt}}</view>