Procházet zdrojové kódy

ws-土地出让修改

ws před 1 rokem
rodič
revize
8ff503ca8e

+ 1 - 0
nnzwminiapp/app.json

@@ -39,6 +39,7 @@
     "pages/aticle1/aticle",
     "pages/aticle2/aticle",
     "pages/map/map",
+    "pages/map2/map",
     "pages/map-shq/map-shq",
     "pages/dataCenter/dataCenter",
     "pages/dataCenterXXTJ/dataCenterXXTJ",

+ 5 - 0
nnzwminiapp/pages/index/index.js

@@ -1472,6 +1472,11 @@ Page({
 			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/sjkf/",
 		})
   },
+  gotoTDCR() {
+    wx.navigateTo({
+			url: '/pagesPublic/pages/tdcr/index',
+		})
+  },
   gotoLLZX(){
 		wx.navigateTo({
 			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/llzx/",

+ 4 - 0
nnzwminiapp/pages/index/index.wxml

@@ -101,6 +101,10 @@
 			<!-- 内容top -->
 		</view>
 
+    <view style="width: 720rpx;margin: 0 auto;" bindtap="gotoTDCR">
+      <image src="{{imgUrl}}tdcr/index.png" style="height: 10vh;width: 100%;" />
+    </view>
+
     <view class="outside-view" style="margin-bottom: 15rpx;">
       <view class="outside-view-sjkf" bindtap="gotoSJKF" style="background-image: url({{newImgUrl}}images/sjpt-bg.png);"></view>
       <view class="outside-view-llzx" bindtap="gotoLLZX" style="background-image: url({{newImgUrl}}images/llzx-bg.png);"></view>

+ 16 - 3
nnzwminiapp/pages/map/map.js

@@ -471,12 +471,20 @@ Page({
     },
     jnxc: ['重庆市南岸区残联', '重庆市南岸区财政局', '重庆市南岸区文化和旅游发展委员会', '重庆市南岸区档案馆', '重庆市南岸区卫生健康委员会', '重庆市南岸区交通局', '重庆市南岸区规划自然资源局', '重庆市南岸区住房和城乡建设委员会', '重庆市南岸区生态环境局', '重庆市南岸区农业农村委员会', '重庆市南岸区发展和改革委员会', '重庆市南岸区消防救援支队', '重庆市南岸区城市管理局', '重庆市公安局南岸分局'],
     npzx: ['重庆市南岸区市场监管局', '重庆市公安局南岸分局'],
+    toType: ''
   },
 
   onLoad: function (options) {
     this.setData({
-      height: wx.getSystemInfoSync().windowHeight
+      height: wx.getSystemInfoSync().windowHeight,
     })
+    if (options.type && options.type == 'tdcr') {
+      this.setData({
+        toType: options.type,
+        latitude: options.lat,
+        longitude: options.lng,
+      })
+    }
     // console.log(options);
     if (options.se) {
       this.setData({
@@ -532,9 +540,14 @@ Page({
         const latitude = res.latitude
         const longitude = res.longitude
         initMapDataAll(that, latitude, longitude)
+        if (!(that.data.toType && that.data.toType == 'tdcr')) {
+          that.setData({
+            latitude: latitude,
+            longitude: longitude,
+          })
+        }
         that.setData({
-          latitude: latitude,
-          longitude: longitude,
+        
           trafficStart: "我的位置",
           circle: [{
             latitude: res.latitude,

+ 1 - 1
nnzwminiapp/pages/map/map.wxml

@@ -30,7 +30,7 @@
     </view>
 
     <view class="right-map" id="right-map">
-      <map id="map" longitude="{{longitude}}"  latitude="{{latitude}}" scale="10" bindmarkertap="markClick"   markers="{{markers}}" circles="{{circle}}" class="map"></map>
+      <map id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="12" bindmarkertap="markClick" markers="{{markers}}" circles="{{circle}}" class="map"></map>
     </view>
     <view class="icon-shq" style="background-image: url({{newImgUrl}}district/img/icon-shq.png);" bindtap="openShq"></view>
     <view wx:if="{{showTraffic}}">

+ 12 - 0
nnzwminiapp/pages/map2/item-event.wxml

@@ -0,0 +1,12 @@
+<scroll-view style="height:1280rpx" scroll-y="true">
+  <view class="matter-content">
+    <view class="matter-content-item item-text-size" wx:for="{{matterEventInfo.data}}" bindtap="clickMatterEvent" data-name="{{item.itemName}}" data-depts="{{item.depts}}">
+      <view class="matter-event-item">
+        {{item.itemName}}
+        (<text>{{item.fomartDept}}</text>)
+        (<text style="color: red;">{{item.type == 0 ? '个人' : '法人'}}</text>)
+      </view>
+    </view>
+  </view>
+  <view style="height: 100rpx;"></view>
+</scroll-view>

+ 55 - 0
nnzwminiapp/pages/map2/item-info.wxml

@@ -0,0 +1,55 @@
+
+  <view style="width: 92%;  background: #fff; margin: 20rpx auto 0 auto; border-radius: 20rpx; box-shadow: 0px 3px 6px 0px rgb(98 137 174 / 18%);">
+    <!-- 标题 -->
+    <view style="width: 90%; margin: auto; padding-top: 30rpx;">
+      <view class="item-title">{{detail_dep}}</view>
+      <view class="item-introduce2" style="margin-bottom: 10rpx;">
+        <text wx:if="{{detail_content}}" class="item-text-size">{{detail_content}}</text>
+        <image wx:if="{{detail_img}}" src="https://www.cqna.gov.cn/data{{detail_img}}"></image>
+      </view>
+      <view class="item-info">
+        <view>
+          <text class="item-text-size item-tag-text">地址:</text>
+          <text class="item-text-size item-text" style="margin-left: 5rpx;">{{detail_address}}</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公时间:</text>
+          <text class="item-text-size item-text" style="margin-left: 5rpx;">{{detail_time?detail_time:''}}</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公电话:</text>
+          <text wx:if="{{detail_tel}}" wx:for="{{detail_tel}}" wx:for-item="citem" wx:key="cidx">
+            <text class="item-text-size item-text" style="margin-left: 10rpx;" bindtap="callNumber" data-value="{{citem}}">{{citem}}</text>
+          </text>
+        </view>
+      </view>
+    </view>
+    <view class="item-btns">
+      <view class="item-bus" bindtap="changeItem" data-type="0" data-index="{{detail_index}}">公交</view>
+      <view class="item-car" bindtap="changeItem" data-type="1" data-index="{{detail_index}}">自驾</view>
+    </view>
+    <view wx:if="{{itemInfo.deptShow}}" style="width: 95%;margin: 0 auto;">
+      <view class="dept-title">入驻部门</view>
+      <view class="dept-list">
+        <view class="dept-item {{(itemInfo.deptNow == '' || itemInfo.deptNow == detail_dep) ? 'active': ''}}" bindtap="clickDept" data-dept="{{detail_dep}}">全部</view>
+        <view class="dept-item {{itemInfo.deptNow == item ? 'active': ''}}" bindtap="clickDept" data-dept="{{item}}" wx:for="{{itemInfo.deptList}}">{{item}}</view>
+      </view>
+    </view>
+    <view wx:if="{{itemInfo.matterStatus}}" style="padding-bottom: 20rpx;">
+      <view class="matter-tab">
+        <view class="matter-tab-li {{itemInfo.navType == 0 ? 'active': ''}}" bindtap="matterTab" data-type="0">个人办事</view>
+        <view class="matter-tab-li {{itemInfo.navType == 1 ? 'active': ''}}" bindtap="matterTab" data-type="1">法人办事</view>
+      </view>
+      <view class="matter-content">
+        <view class="matter-content-item item-text-size" wx:for="{{itemInfo.matterList}}" bindtap="toDetailWeb" data-url="{{item.matterUrl}}">
+          <view class="matter-content-item-round">
+            {{item.itemName}}
+          </view>
+        </view>
+      </view>
+      <view class="matter-page">
+        <view class="matter-page-prev {{itemInfo.pagePrev ? 'txt' : ''}}" bindtap="clickPageTo" data-type="0">{{'<'}}上一页</view>
+        <view class="matter-page-next {{itemInfo.pageNext ? 'txt' : ''}}" bindtap="clickPageTo" data-type="1">下一页></view>
+      </view>
+    </view>
+  </view>

+ 34 - 0
nnzwminiapp/pages/map2/item.wxml

@@ -0,0 +1,34 @@
+<scroll-view style="height:1280rpx" scroll-y="true">
+  <view wx:for="{{popData}}" wx:key="index" wx:for-item="item" style="width: 92%;  background: #fff; margin: 20rpx auto 0 auto; border-radius: 20rpx; box-shadow: 0px 3px 6px 0px rgb(98 137 174 / 18%);">
+    <!-- 标题 -->
+    <view style="width: 90%; margin: auto; padding-top: 30rpx;">
+      <view class="item-title">{{item.dep}}</view>
+      <view class="item-introduce" style="margin-bottom: 10rpx;">
+        <text wx:if="{{item.content}}" class="item-text-size">{{item.content}}</text>
+        <image wx:if="{{item.img}}" src="https://www.cqna.gov.cn/data{{item.img}}"></image>
+      </view>
+      <view class="item-info">
+        <view>
+          <text class="item-text-size item-tag-text">地址:</text>
+          <text class="item-text-size item-text" style="margin-left: 10rpx;">{{item.address}}</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公时间:</text>
+          <text class="item-text-size item-text" style="margin-left: 10rpx;">{{item.time?item.time:''}}</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公电话:</text>
+          <text wx:if="{{item.tel}}" wx:for="{{item.tel}}" wx:for-item="citem" wx:key="cidx">
+            <text class="item-text-size item-text" style="margin-left: 10rpx;" bindtap="callNumber" data-value="{{citem}}">{{citem}}</text>
+          </text>
+        </view>
+        <view class="check-info" bindtap="changeItem" data-value="none" data-index="{{index}}">点击查看详情</view>
+      </view>
+    </view>
+    <view class="item-btns">
+      <view class="item-bus" bindtap="changeItem" data-type="0" data-index="{{index}}">公交</view>
+      <view class="item-car" bindtap="changeItem" data-type="1" data-index="{{index}}">自驾</view>
+    </view>
+  </view>
+  <view style="height: 100rpx;"></view>
+</scroll-view>

+ 1599 - 0
nnzwminiapp/pages/map2/map.js

@@ -0,0 +1,1599 @@
+import {
+  imgUrl,
+  newImgUrl
+} from "../api/request"
+import {
+  getMapDataType,
+  getHandMatterPage,
+  getHandMatterBySearch,
+  getMapDataAll,
+  searchHandMatterByVal
+} from "../api/yxna-api"
+var QQMapWX = require('../../libs/qqmap-wx-jssdk.min.js');
+const popType = [
+  [
+    [{
+      "name": "受理场所",
+      "dictType": "jzs,bms",
+      "type": ""
+    }, {
+      "name": "查阅场所",
+      "dictType": "cycsbms,slcsjzs",
+      "type": ""
+    }, ],
+    [{
+      "name": "区级政务服务中心",
+      "dictType": "xzfwzxs",
+      "type": ""
+    }, {
+      "name": "镇(街道)便民服务中心",
+      "dictType": "ggfwzxs",
+      "type": ""
+    }, {
+      "name": "村(社区)便民服务站",
+      "dictType": "bmfwzxs",
+      "type": ""
+    }, {
+      "name": "生源地助学贷款办理点",
+      "dictType": "dkblds",
+      "type": ""
+    }],
+    [{
+      "name": "党群服务中心",
+      "dictType": "dqfwzxs",
+      "type": ""
+    }],
+    [{
+      "name": "职业教育学校",
+      "dictType": "zyyxs",
+      "type": ""
+    }, {
+      "name": "特殊教育学校",
+      "dictType": "xxs",
+      "type": ""
+    }, {
+      "name": "高等院校",
+      "dictType": "dxs",
+      "type": ""
+    }, {
+      "name": "小学",
+      "dictType": "xxs",
+      "type": "小学"
+    }, {
+      "name": "中学",
+      "dictType": "xxs",
+      "type": ""
+    }, {
+      "name": "幼儿园",
+      "dictType": "yeys",
+      "type": ""
+    }, {
+      "name": "教育考试中心",
+      "dictType": "",
+      "type": "jykszxs"
+    }]
+  ],
+  [
+    [{
+      "name": "村卫生室",
+      "dictType": "",
+      "type": "cwsss"
+    }, {
+      "name": "社区卫生服务站",
+      "dictType": "",
+      "type": "sqwsfwzs"
+    }, {
+      "name": "儿科诊疗服务机构",
+      "dictType": "ekzlfwjgs",
+      "type": ""
+    }, {
+      "name": "狂犬病,破伤风处置门诊",
+      "dictType": "kqbpsfczmzs",
+      "type": ""
+    }, {
+      "name": "免疫规划预防接种门诊",
+      "dictType": "myghyfjzmzs",
+      "type": ""
+    }, {
+      "name": "二级医疗机构",
+      "dictType": "ejyljgs",
+      "type": ""
+    }, {
+      "name": "三级医疗机构",
+      "dictType": "sjyljgs",
+      "type": ""
+    }, {
+      "name": "社区卫生服务机构",
+      "dictType": "sqwsfwjgs",
+      "type": ""
+    }, {
+      "name": "职业病诊断机构",
+      "dictType": "zybzdjgs",
+      "type": ""
+    }, {
+      "name": "助产医疗机构",
+      "dictType": "zcyljg",
+      "type": ""
+    }, {
+      "name": "产科门诊服务机构",
+      "dictType": "ckmzfwjgs",
+      "type": ""
+    }, {
+      "name": "医疗保障事务中心",
+      "dictType": "ybs",
+      "type": ""
+    }],
+    [{
+      "name": "派出所",
+      "dictType": "pcss",
+      "type": ""
+    }, {
+      "name": "出入境业务办理机构",
+      "dictType": "crjywbljgs",
+      "type": ""
+    }],
+    [{
+      "name": "交通支大队",
+      "dictType": "jtxljcdds",
+      "type": ""
+    }, {
+      "name": "交通违法处理机构",
+      "dictType": "jtwfcljgs",
+      "type": ""
+    }, {
+      "name": "交通事故处理机构",
+      "dictType": "jtsgcljgs",
+      "type": ""
+    }, {
+      "name": "车管所",
+      "dictType": "cgss",
+      "type": ""
+    }, {
+      "name": "机动车检测场所",
+      "dictType": "jdcjccss",
+      "type": ""
+    }, {
+      "name": "驾驶人体检医院",
+      "dictType": "jsrtjzs",
+      "type": ""
+    }, {
+      "name": "车驾管社会服务站",
+      "dictType": "cjgshfwzs",
+      "type": ""
+    }],
+    [{
+      "name": "就业和人才中心",
+      "dictType": "jyhrczxs",
+      "type": ""
+    }, {
+      "name": "社会保险事务中心",
+      "dictType": "shbxswzxs",
+      "type": ""
+    }]
+  ],
+  [
+
+    [{
+      "name": "养老机构",
+      "dictType": "ylfwjgs",
+      "type": ""
+    }],
+    [{
+      "name": "婚姻登记机构",
+      "dictType": "hydjcs",
+      "type": ""
+    }, {
+      "name": "殡仪服务机构",
+      "dictType": "byfwjgs",
+      "type": ""
+    }],
+    [],
+    []
+  ],
+  [
+    [],
+    [],
+    [],
+    [{
+      "name": "图书馆",
+      "dictType": "tsgs",
+      "type": ""
+    }, {
+      "name": "文化馆",
+      "dictType": "whgs",
+      "type": ""
+    }, {
+      "name": "文管所",
+      "dictType": "wgss",
+      "type": ""
+    }, {
+      "name": "公共体育馆",
+      "dictType": "ggtys",
+      "type": ""
+    }, {
+      "name": "旅游景点",
+      "dictType": "jqs",
+      "type": ""
+    }, {
+      "name": "公园",
+      "dictType": "gys",
+      "type": ""
+    }]
+  ],
+  [
+    [{
+      "name": "公证处",
+      "dictType": "gzcs",
+      "type": ""
+    }, {
+      "name": "司法鉴定机构",
+      "dictType": "sfjdjgs",
+      "type": ""
+    }, {
+      "name": "基层司法所",
+      "dictType": "jcfwfwss",
+      "type": ""
+    }, {
+      "name": "法律援助机构",
+      "dictType": "flyzzxs",
+      "type": ""
+    }, {
+      "name": "矫正中心",
+      "dictType": "jzzxs",
+      "type": ""
+    }],
+    [{
+      "name": "残疾人服务中心",
+      "dictType": "cjrfwzxs",
+      "type": ""
+    }, {
+      "name": "定点残疾人服务机构",
+      "dictType": "qtcjrfwzxs",
+      "type": ""
+    }],
+    [],
+    [{
+      "name": "商圈",
+      "dictType": "sqs",
+      "type": ""
+    }, {
+      "name": "购物中心",
+      "dictType": "gwzxs",
+      "type": ""
+    }, {
+      "name": "酒店",
+      "dictType": "jds",
+      "type": ""
+    }]
+  ],
+  [
+    [],
+    [],
+    [],
+    []
+  ]
+]
+
+let BMap = {};
+let x = null;
+let y = null;
+const INIT_MARKER = {
+  latitude: 0,
+  longitude: 0,
+  iconPath: imgUrl + "/location.png",
+  width: '34px',
+  height: '34px',
+  rotate: 0,
+  alpha: 1
+};
+Page({
+  data: {
+    issy:false,
+    imgUrl: imgUrl,
+    newImgUrl: newImgUrl,
+    markers: [INIT_MARKER],
+    latitude: '',
+    longitude: '',
+    custGap: 1000,
+    type: [
+      [{
+        "id": 1,
+        "name": "政务公开",
+        "image": "fgk.png",
+        "dictType": ""
+      }, {
+        "id": 2,
+        "name": "政务服务",
+        "image": "fzwfw.png",
+        "dictType": ""
+      }, {
+        "id": 3,
+        "name": "党群服务",
+        "image": "fdqfwzx.png",
+        "dictType": ""
+      }, {
+        "id": 4,
+        "name": "教育资源",
+        "image": "fjy.png",
+        "dictType": ""
+      }],
+      [{
+        "id": 1,
+        "name": "医疗卫生",
+        "image": "fyl.png",
+        "dictType": ""
+      }, {
+        "id": 2,
+        "name": "户籍管理",
+        "image": "fhjgl.png",
+        "dictType": ""
+      }, {
+        "id": 3,
+        "name": "交通服务",
+        "image": "fjtfw.png",
+        "dictType": ""
+      }, {
+        "id": 4,
+        "name": "社会保障",
+        "image": "fshbz.png",
+        "dictType": ""
+      }],
+      [{
+        "id": 1,
+        "name": "养老服务",
+        "image": "fylfw.png",
+        "dictType": ""
+      }, {
+        "id": 2,
+        "name": "民政服务",
+        "image": "fmzfw.png",
+        "dictType": ""
+      }, {
+        "id": 3,
+        "name": "办税服务",
+        "image": "fbsfwt.png",
+        "dictType": "bsfwts"
+      }, {
+        "id": 4,
+        "name": "市场监管",
+        "image": "fscjd.png",
+        "dictType": "scjdgljs"
+      }],
+      [{
+        "id": 1,
+        "name": "住房保障",
+        "image": "fgzf.png",
+        "dictType": "fwglzxs"
+      }, {
+        "id": 2,
+        "name": "不动产登记",
+        "image": "fbdcdj.png",
+        "dictType": "bdcdjzxbsdts"
+      }, {
+        "id": 3,
+        "name": "住房公积金",
+        "image": "fgjj.png",
+        "dictType": "gjjs"
+      }, {
+        "id": 4,
+        "name": "文体旅游",
+        "image": "fwtly.png",
+        "dictType": ""
+      }],
+      [{
+        "id": 1,
+        "name": "司法服务",
+        "image": "fsffw.png",
+        "dictType": ""
+      }, {
+        "id": 2,
+        "name": "助疾服务",
+        "image": "fcjr.png",
+        "dictType": ""
+      }, {
+        "id": 3,
+        "name": "产业园区",
+        "image": "fcyy.png",
+        "dictType": "cyys"
+      }, {
+        "id": 4,
+        "name": "商业服务",
+        "image": "fbmfw.png",
+        "dictType": ""
+      }],
+      [{
+        "id": 1,
+        "name": "便民公厕",
+        "image": "fgc.png",
+        "dictType": "gcs"
+      }, {
+        "id": 2,
+        "name": "停车泊车",
+        "image": "ftc.png",
+        "dictType": "tcs"
+      }, {
+        "id": 3,
+        "name": "直饮水点",
+        "image": "zysd.png",
+        "dictType": "zysd"
+      }, {
+        "id": 4,
+        "name": "劳动者港湾",
+        "image": "ldzgw.png",
+        "dictType": "ldzgw"
+      }]
+    ],
+    circle: [],
+    popData: [{
+      "popName": "",
+      "data": []
+    }],
+    showIndex: false,
+    showSearch: true,
+    showTraffic: true,
+    height: 0,
+    searchVal: '',
+    loadValue: '',
+    trafficStart: '',
+    trafficEnd: '',
+    index: 0,
+    isList: true,
+    showSet: false,
+    trafficType: 0,
+    page: 0,
+    limit: 15,
+    marksInfo: [],
+    marksView: [],
+    marksNum: 0,
+    searchInfo: {
+      navType: 0,
+      isShow: false
+    },
+    matterEventInfo: {
+      data: [],
+      isShow: false,
+      search: false
+    },
+    itemInfo: {
+      page: 1,
+      limit: 6,
+      navType: 0,
+      deptNow: '',
+      pageNext: true,
+      pagePrev: false,
+      matterStatus: true,
+      matterList: [{
+        itemName: '',
+        matterUrl: ''
+      }],
+      '重庆市南岸区政务服务中心(江南新城中心)': ['重庆市南岸区残联', '重庆市南岸区财政局', '重庆市南岸区文化和旅游发展委员会', '重庆市南岸区档案馆', '重庆市南岸区卫生健康委员会', '重庆市南岸区交通局', '重庆市南岸区规划自然资源局', '重庆市南岸区住房和城乡建设委员会', '重庆市南岸区生态环境局', '重庆市南岸区农业农村委员会', '重庆市南岸区发展和改革委员会', '重庆市南岸区消防救援支队', '重庆市南岸区城市管理局', '重庆市公安局南岸分局'],
+      '重庆市南岸区政务服务中心(南坪中心)': ['重庆市南岸区市场监管局', '重庆市公安局南岸分局'],
+    },
+    jnxc: ['重庆市南岸区残联', '重庆市南岸区财政局', '重庆市南岸区文化和旅游发展委员会', '重庆市南岸区档案馆', '重庆市南岸区卫生健康委员会', '重庆市南岸区交通局', '重庆市南岸区规划自然资源局', '重庆市南岸区住房和城乡建设委员会', '重庆市南岸区生态环境局', '重庆市南岸区农业农村委员会', '重庆市南岸区发展和改革委员会', '重庆市南岸区消防救援支队', '重庆市南岸区城市管理局', '重庆市公安局南岸分局'],
+    npzx: ['重庆市南岸区市场监管局', '重庆市公安局南岸分局'],
+    toType: ''
+  },
+
+  onLoad: function (options) {
+    this.setData({
+      height: wx.getSystemInfoSync().windowHeight,
+    })
+    if (options.type && options.type == 'tdcr') {
+      this.setData({
+        toType: options.type,
+        dataIndex: options.dataIndex
+      })
+    }
+    // console.log(options);
+    if (options.se) {
+      this.setData({
+        loadValue: options.se,
+        showTraffic: false
+      });
+    } else {
+      this.setData({
+        showTraffic: true
+      })
+    }
+
+    // searchVal
+  },
+  onReady: function () {
+    // debugger
+    const that = this
+    this.loadItem();
+    getMapDataAll().then((res) => {
+      let arr = []
+      console.log(res.data);
+      for (const key in res.data) {
+        // console.log(res.data[key]);
+        Array.prototype.push.apply(arr, res.data[key])
+      }
+
+      //   Array.prototype.push.apply(arr, res.data.xzfwzxs);
+      //   Array.prototype.push.apply(arr, res.data.ggfwzxs);
+      for (let j = 0; j < arr.length; j++) {
+        if (arr[j].tel && !(arr[j].tel instanceof Array)) {
+          arr[j].tel = arr[j].tel.split(";")
+        }
+      }
+      that.setData({
+        xzfwzxs: res.data.xzfwzxs,
+        marksInfo: arr
+      })
+      this.setMap();
+    });
+    // this.setMap();
+
+  },
+  async setMap() {
+    var that = this;
+    BMap = await new QQMapWX({
+      key: 'KN3BZ-KUDND-PGH4Y-POVRP-43KF3-RNF4K'
+    });
+
+    wx.getLocation({
+      type: 'gcj02', //返回可以用于wx.openLocation的经纬度
+      success(res) {
+        console.log(res)
+        const latitude = res.latitude
+        const longitude = res.longitude
+        initMapDataAll(that, latitude, longitude)
+        if (!(that.data.toType && that.data.toType == 'tdcr')) {
+          that.setData({
+            latitude: latitude,
+            longitude: longitude,
+          })
+        } else {
+          wx.request({
+            url: imgUrl + 'tdcr/details/data.json',
+            success: (res) => {
+              that.setData({
+                polygons: [{
+                  dashArray: [10, 10],
+                  strokeColor: '#ffe20063',
+                  fillColor: '#ffe20063',
+                  points: res.data[that.data.dataIndex].polygon
+                }],
+                longitude: res.data[that.data.dataIndex].longitude,
+                latitude: res.data[that.data.dataIndex].latitude,
+              })
+            }
+          })
+        }
+        that.setData({
+        
+          trafficStart: "我的位置",
+          circle: [{
+            latitude: res.latitude,
+            longitude: res.longitude,
+            radius: that.data.custGap + 500,
+            fillColor: '#c4d2ec6a',
+            color: '#c4d2ec'
+          }],
+          markers: [{
+            latitude: latitude,
+            longitude: longitude,
+            iconPath: imgUrl + "/location.png",
+            width: '30px',
+            height: '30px',
+            rotate: 0,
+            alpha: 1
+          }]
+        });
+      }
+    });
+  },
+  popview(e) {
+    let x = e.currentTarget.dataset.index;
+    let y = e.currentTarget.dataset.id;
+    let pop = popType[x][y - 1]
+    if (pop.length > 0) {
+      // this.setTypeDateToPop2(pop)
+      this.setData({
+        popData: pop,
+        showIndex: true
+      });
+    } else {
+      let pop = this.data.type[x][y - 1]
+      // console.log(pop);
+      this.setDateToPop(pop)
+      this.setData({
+        showTraffic: false,
+        showIndex: false
+      })
+    }
+  },
+  setTypeDateToPop2: function (pop) {
+    let arr = [];
+    pop.forEach(e => {
+      arr.push({
+        "popName": e.name
+      })
+    })
+    this.setData({
+      popData: arr
+    })
+  },
+
+  setDateToPop: function (pop) {
+    let arr = [];
+    let params = {
+      "dictType": pop.dictType,
+      "type": "",
+      "title": "",
+    };
+    wx.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    });
+    getMapDataType(params).then((res) => {
+      console.log(res.data[0].tel);
+      let data = []
+      res.data.forEach((item) => {
+        if (item.tel != null && item.tel != "" && !(item.tel instanceof Array)) {
+          item.tel = item.tel.split(";")
+        }
+        data.push(item)
+      });
+      this.setData({
+        popData: data,
+      })
+      wx.hideToast({
+        success: (res) => {},
+      });
+    });
+  },
+  closePopup() {
+    this.setData({
+      showIndex: false
+    })
+  },
+  changeInfo(e) {
+    // console.log(e.currentTarget.dataset.data);
+    let searchInfo = this.data.searchInfo
+    searchInfo.isShow = false
+    this.setData({
+      searchInfo: searchInfo
+    })
+    let dataitem = e.currentTarget.dataset.data;
+    console.log(dataitem);
+    let params = {
+      "dictType": dataitem.dictType,
+      "type": "",
+      "title": "",
+    };
+    wx.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    });
+    getMapDataType(params).then((res) => {
+      let data = []
+      switch (dataitem.name) {
+        case "小学":
+        case "特殊教育学校":
+          res.data.forEach((item) => {
+            if (item.type == dataitem.name) {
+              data.push(item)
+            }
+          });
+          break;
+        case "中学":
+          res.data.forEach((item) => {
+            if (item.type == dataitem.name || item.specialtype == dataitem.name) {
+              data.push(item)
+            }
+          });
+          break;
+        default:
+          data = res.data;
+          break;
+      }
+      let renderData = []
+      data.forEach((item) => {
+        if (item.tel != null && item.tel != "" && !(item.tel instanceof Array)) {
+          item.tel = item.tel.split(";")
+        }
+        renderData.push(item)
+      });
+      this.setData({
+        popData: renderData,
+        showTraffic: false,
+        showIndex: false
+      })
+      wx.hideToast({
+        success: (res) => {},
+      });
+    });
+
+  },
+  /**
+   * 拨打电话
+   * @param {*} e 
+   */
+  callNumber(e) {
+    let phoneNumber = e.currentTarget.dataset.value;
+    wx.makePhoneCall({
+      phoneNumber: phoneNumber,
+    });
+  },
+  /**
+   * list跳转info
+   *
+   */
+  changeItem(e) {
+    let that = this;
+    console.info(e)
+    let value = e.currentTarget.dataset.value;
+    if (value === "none") {
+      let searchInfo = that.data.searchInfo
+      searchInfo.isShow = false
+      that.setData({
+        isList: false,
+        showSearch: false,
+        showSet: false,
+        searchInfo: searchInfo
+      });
+    } else {
+      // 控制公交自驾选中状态
+      let type = e.currentTarget.dataset.type;
+      if (type == 0) {
+        if (e.detail.value == 0) {
+          changeValue = "transit";
+        } else {
+          changeValue = "driving";
+        }
+      }
+      that.setData({
+        trafficType: type,
+        showSet: false
+      });
+      that.setData({
+        isList: false,
+        showSearch: false,
+        showSet: true
+      });
+    }
+    // 详情赋值
+    let index = e.currentTarget.dataset.index;
+    let item = that.data.popData[index];
+    console.info(item);
+    let address = '';
+    if (item.address.search("重庆") == -1) {
+      address = "重庆" + item.address;
+    } else {
+      address = item.address;
+    }
+    console.log(item.time);
+    let itemInfo = that.data.itemInfo
+    if (itemInfo[item.dep]) {
+      let arr = []
+      for (let i = 0; i < itemInfo[item.dep].length; i++) {
+        arr.push(itemInfo[item.dep][i].replace('重庆市', '').replace('南岸', ''))
+      }
+      itemInfo.deptList = arr
+      itemInfo.oldDeptList = itemInfo[item.dep]
+    }
+    itemInfo.deptShow = itemInfo[item.dep] ? true : false
+    itemInfo.navType = 0
+    itemInfo.page = 1
+    itemInfo.deptNow = ''
+    let params = {
+      page: 1,
+      limit: itemInfo.limit,
+      type: itemInfo.navType,
+    }
+    if (itemInfo.deptShow) {
+      params.matterDept = itemInfo.oldDeptList.join(',')
+    } else {
+      params.matterDept = item.dep.replace('政府', '').replace('便民服务中心', '')
+    }
+    const _this = this
+    getHandMatterPage(params).then((res) => {
+      if (!(res && res.count > 0)) {
+        itemInfo.matterStatus = false
+        _this.setData({
+          itemInfo: itemInfo
+        })
+        return
+      }
+      itemInfo.matterStatus = true
+      itemInfo.pagePrev = itemInfo.page == 1
+      itemInfo.pageNext = itemInfo.page * itemInfo.limit >= res.count
+      itemInfo.matterList = res.data
+      _this.setData({
+        itemInfo: itemInfo
+      })
+    });
+
+    that.setData({
+      detail_dep: item.dep,
+      detail_content: item.content,
+      detail_img: item.img,
+      detail_address: item.address,
+      detail_time: item.time,
+      detail_tel: item.tel,
+      detail_index: index,
+      trafficEnd: address,
+      itemInfo: itemInfo
+    });
+
+    BMap.geocoder({
+      address: address,
+      success: function (data) {
+        var res = data.result
+        that.setData({
+          latitude: res.location.lat,
+          longitude: res.location.lng,
+          markers: [{
+            latitude: res.location.lat,
+            longitude: res.location.lng,
+            iconPath: imgUrl + "/location.png",
+            width: '30px',
+            height: '30px',
+            rotate: 0,
+            alpha: 1
+          }]
+        });
+      }
+    });
+  },
+
+  /**
+   * 打开全景地图
+   * @param {*} e 
+   */
+  openVR(e) {
+    wx.navigateTo({
+      url: '../map-vr/map-vr',
+    });
+  },
+
+  getSearchVal(e) {
+    this.setData({
+      searchVal: e.detail.value
+    });
+  },
+
+  loadItem() {
+    let searchVal = this.data.loadValue;
+    let datatype = this.data.type;
+    if (!searchVal) {
+      return;
+    }
+    wx.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    });
+    let x = -1
+    let y = -1
+    for (let i = 0; i < datatype.length; i++) {
+      for (let j = 0; j < datatype[i].length; j++) {
+        if (datatype[i][j].name == searchVal) {
+          x = i
+          y = j
+          break;
+        }
+      }
+      if (x != -1) {
+        break;
+      }
+    }
+    let searcharr = ""
+    if (datatype[x][y].dictType != "") {
+      searcharr = datatype[x][y].dictType
+    } else {
+      let arr = popType[x][y]
+      arr.forEach((item) => {
+        searcharr += item.dictType + ","
+      })
+      searcharr = searcharr.substring(0, searcharr.length - 1)
+    }
+
+    let params = {
+      "dictType": searcharr,
+      "type": "",
+      "title": "",
+    };
+    getMapDataType(params).then((res) => {
+      let data = []
+      res.data.forEach((item) => {
+        if (item.tel != null && item.tel != "" && !(item.tel instanceof Array)) {
+          item.tel = item.tel.split(";")
+        }
+        data.push(item)
+      });
+      this.setData({
+        // showTraffic: false,
+        popData: data,
+      })
+      wx.hideToast({
+        success: (res) => {},
+      });
+    });
+
+
+    // 搜索结果
+
+  },
+  /**
+   * 顶部搜索点击事件
+   * @param {*} e 
+   */
+  searchTap(e) {
+    let searchInfo = this.data.searchInfo
+    searchInfo.isShow = true
+    searchInfo.navType = 0
+    this.setData({
+      searchInfo: searchInfo
+    })
+    let searchVal = this.data.searchVal;
+
+    wx.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    });
+    let params = {
+      "dictType": "",
+      "type": "",
+      "title": searchVal,
+    };
+    this.setData({
+      showTraffic: false
+    })
+    getMapDataType(params).then((res) => {
+      let data = []
+      res.data.forEach((item) => {
+        if (item.tel != null && item.tel != "" && !(item.tel instanceof Array)) {
+          item.tel = item.tel.split(";")
+        }
+        data.push(item)
+      });
+      this.setData({
+        showTraffic: false,
+        popData: data,
+      })
+      wx.hideToast({
+        success: (res) => {},
+      });
+    });
+
+
+    // 搜索结果
+    wx.hideToast({
+      success: (res) => {},
+    });
+  },
+  getTrafficStart(e) {
+    this.setData({
+      trafficStart: e.detail.value
+    });
+  },
+  getTrafficEnd(e) {
+    this.setData({
+      trafficEnd: e.detail.value
+    });
+  },
+
+  /**
+   * 搜索进行交通路线规划
+   * @param {*} e 
+   */
+  searchTrafficTap(e) {
+    const that = this;
+    // console.log(that.data.trafficType);
+    let trafficType = that.data.trafficType;
+    if (trafficType == 0) {
+      changeValue = "transit";
+    } else {
+      changeValue = "driving";
+    }
+    let trafficStart = that.data.trafficStart;
+    let trafficEnd = that.data.trafficEnd;
+    if (!trafficStart || !trafficEnd) {
+      wx.showToast({
+        title: '请输入起点和终点',
+        icon: 'none'
+      });
+      return;
+    }
+    console.info(trafficStart, trafficEnd);
+
+    BMap.geocoder({
+      address: trafficEnd,
+      success: function (data) {
+        console.log(data);
+        var res = data.result
+        // console.log(res);
+        let key = 'KN3BZ-KUDND-PGH4Y-POVRP-43KF3-RNF4K'; //使用在腾讯位置服务申请的key
+        let referer = '掌上南岸'; //调用插件的app的名称
+        // 终点
+        let endPoint = JSON.stringify({
+          'name': trafficEnd,
+          'latitude': res.location.lat,
+          'longitude': res.location.lng
+		});
+		wx.openLocation({
+			name: trafficEnd,
+			latitude: res.location.lat,
+			longitude: res.location.lng
+		})
+        // wx.navigateTo({
+        //   url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint + "&mode=" + changeValue
+        // });
+      },
+
+    });
+  },
+
+  backSearch() {
+    let that = this
+    let searchInfo = that.data.searchInfo
+    searchInfo.isShow = that.data.searchVal ? true : false
+    that.setData({
+      searchInfo: searchInfo
+    })
+    let matterEventInfo = that.data.matterEventInfo
+    console.log(matterEventInfo)
+    if (!that.data.isList) {
+      if (that.data.issy) {
+        that.setData({
+          showTraffic: true,
+          showSearch: true,
+          searchVal: ''
+        });
+        this.setMap();
+        return
+      }
+      matterEventInfo.isShow = searchInfo.navType != 1
+      this.setData({
+        isList: true,
+        showSearch: true,
+        showSet: false,
+        matterEventInfo: matterEventInfo
+      });
+    } else if (!matterEventInfo.isShow && matterEventInfo.search) {
+      matterEventInfo.isShow = true
+      this.setData({
+        isList: true,
+        showSearch: true,
+        showSet: false,
+        matterEventInfo: matterEventInfo
+      });
+      // this.setMap();
+    } else {
+      matterEventInfo.isShow = false
+      matterEventInfo.search = false
+      that.setData({
+        matterEventInfo: matterEventInfo
+      })
+      if (!that.data.showTraffic) {
+        that.setData({
+          showTraffic: true,
+          showSearch: true,
+          searchVal: ''
+        });
+      }
+      this.setMap();
+    }
+    wx.getLocation({
+      type: 'gcj02', //返回可以用于wx.openLocation的经纬度
+      success(res) {
+        const latitude = res.latitude
+        const longitude = res.longitude
+        that.setData({
+          latitude: latitude,
+          longitude: longitude,
+          trafficStart: "我的位置",
+          markers: [{
+            latitude: latitude,
+            longitude: longitude,
+            iconPath: imgUrl + "/location.png",
+            width: '34px',
+            height: '34px',
+            rotate: 0,
+            alpha: 1
+          }]
+        });
+      }
+    })
+    changeValue = "transit";
+  },
+
+  matterTab(e) {
+    let itemInfo = this.data.itemInfo
+    itemInfo.navType = e.currentTarget.dataset?.type
+    let params = {
+      page: 1,
+      limit: itemInfo.limit,
+      type: itemInfo.navType,
+    }
+    if (itemInfo.deptShow) {
+      if (itemInfo.deptList && itemInfo.deptList.indexOf(itemInfo.deptNow) > -1) {
+        params.matterDept = itemInfo.deptNow.replace('政府', '').replace('便民服务中心', '')
+      } else {
+        params.matterDept = itemInfo.oldDeptList.join(',')
+      }
+    } else {
+      params.matterDept = this.data.detail_dep.replace('政府', '').replace('便民服务中心', '')
+    }
+
+    const _this = this
+    getHandMatterPage(params).then((res) => {
+      if (!(res && res.count > 0)) {
+        itemInfo.matterStatus = false
+        _this.setData({
+          itemInfo: itemInfo
+        })
+        return
+      }
+      itemInfo.matterStatus = true
+      itemInfo.page = 1
+      itemInfo.pagePrev = itemInfo.page == 1
+      itemInfo.pageNext = itemInfo.page * itemInfo.limit >= res.count
+      itemInfo.matterList = res.data
+      _this.setData({
+        itemInfo: itemInfo
+      })
+    });
+  },
+  clickDept(e) {
+    console.log(e)
+    let itemInfo = this.data.itemInfo
+    itemInfo.deptNow = e.currentTarget.dataset.dept
+    itemInfo.page = 1
+    this.setData({
+      itemInfo: itemInfo
+    })
+    let params = {
+      page: itemInfo.page,
+      limit: itemInfo.limit,
+      type: itemInfo.navType,
+    }
+    if (itemInfo.deptShow) {
+      if (itemInfo.deptList && itemInfo.deptList.indexOf(itemInfo.deptNow) > -1) {
+        params.matterDept = itemInfo.deptNow
+      } else {
+        params.matterDept = itemInfo.oldDeptList.join(',')
+      }
+    } else {
+      params.matterDept = this.data.detail_dep
+    }
+    const _this = this
+    getHandMatterPage(params).then((res) => {
+      if (!(res && res.count > 0)) {
+        itemInfo.matterStatus = false
+        _this.setData({
+          itemInfo: itemInfo
+        })
+        return
+      }
+      itemInfo.pagePrev = itemInfo.page == 1
+      itemInfo.pageNext = itemInfo.page * itemInfo.limit >= res.count
+      itemInfo.matterList = res.data
+      _this.setData({
+        itemInfo: itemInfo
+      })
+    });
+  },
+  clickPageTo(e) {
+    let itemInfo = this.data.itemInfo
+    let page = 1
+    if (e.currentTarget.dataset.type == 0) {
+      // 上一页
+      if (itemInfo.pagePrev) return
+      page = itemInfo.page - 1
+    } else {
+      if (itemInfo.pageNext) return
+      page = itemInfo.page + 1
+    }
+    let params = {
+      page: page,
+      limit: itemInfo.limit,
+      type: itemInfo.navType,
+    }
+    if (itemInfo.deptShow) {
+      if (itemInfo.deptList && itemInfo.deptList.indexOf(itemInfo.deptNow) > -1) {
+        params.matterDept = itemInfo.deptNow.replace('政府', '').replace('便民服务中心', '')
+      } else {
+        params.matterDept = itemInfo.oldDeptList.join(',')
+      }
+    } else {
+      params.matterDept = this.data.detail_dep.replace('政府', '').replace('便民服务中心', '')
+    }
+    const _this = this
+    getHandMatterPage(params).then((res) => {
+      if (!(res && res.count > 0)) {
+        itemInfo.matterStatus = false
+        _this.setData({
+          itemInfo: itemInfo
+        })
+        return
+      }
+      itemInfo.matterStatus = true
+      itemInfo.page = page
+      itemInfo.pagePrev = itemInfo.page == 1
+      itemInfo.pageNext = itemInfo.page * itemInfo.limit >= res.count
+      itemInfo.matterList = res.data
+      _this.setData({
+        itemInfo: itemInfo
+      })
+    });
+  },
+  searchTab(e) {
+    let searchInfo = this.data.searchInfo
+    searchInfo.navType = e.currentTarget.dataset.type
+    this.setData({
+      searchInfo: searchInfo
+    })
+    const _this = this
+    if (searchInfo.navType == 0) {
+      let params = {
+        "title": _this.data.searchVal,
+      };
+      getMapDataType(params).then((res) => {
+        let data = []
+        res.data.forEach((item) => {
+          if (item.tel != null && item.tel != "" && !(item.tel instanceof Array)) {
+            item.tel = item.tel.split(";")
+          }
+          data.push(item)
+        });
+        this.setData({
+          showTraffic: false,
+          popData: data,
+        })
+      });
+    } else {
+      let matterEventInfo = _this.data.matterEventInfo
+      matterEventInfo.search = true
+      _this.setData({
+        matterEventInfo: matterEventInfo
+      })
+      searchHandMatterByValFun(_this)
+      // searchHandMatter(_this)
+    }
+  },
+  clickMatterEvent(e) {
+    const _this = this
+    let matterEventInfo = _this.data.matterEventInfo
+    matterEventInfo.isShow = false
+    _this.setData({
+      matterEventInfo: matterEventInfo
+    })
+    console.log(_this.data)
+    searchHandMatter(_this, e.currentTarget.dataset.depts)
+  },
+  markClick(e) {
+    if (!e.markerId) {
+      return
+    }
+    const arr = this.data.marksInfo
+    const that = this
+    this.setData({
+      popData: arr
+    })
+    for (let i = 0; i < arr.length; i++) {
+      if (arr[i].id == e.markerId) {
+
+        let searchInfo = that.data.searchInfo
+        searchInfo.isShow = false
+        that.setData({
+          isList: false,
+          showSearch: false,
+          showSet: false,
+          showTraffic: false,
+          searchInfo: searchInfo,
+          issy:true
+        });
+        let item = arr[i];
+        console.info(item);
+        if (item.tel && !(item.tel instanceof Array)) {
+          item.tel = item.tel.split(";")
+        }
+        let address = item.address
+        console.log(item.time);
+        let itemInfo = that.data.itemInfo
+        if (itemInfo[item.dep]) {
+          let arr = []
+          for (let i = 0; i < itemInfo[item.dep].length; i++) {
+            arr.push(itemInfo[item.dep][i].replace('重庆市', '').replace('南岸', ''))
+          }
+          itemInfo.deptList = arr
+          itemInfo.oldDeptList = itemInfo[item.dep]
+        }
+        itemInfo.deptShow = itemInfo[item.dep] ? true : false
+        itemInfo.navType = 0
+        itemInfo.page = 1
+        itemInfo.deptNow = ''
+        let params = {
+          page: 1,
+          limit: itemInfo.limit,
+          type: itemInfo.navType,
+        }
+        if (itemInfo.deptShow) {
+          params.matterDept = itemInfo.oldDeptList.join(',')
+        } else {
+          params.matterDept = item.dep.replace('政府', '').replace('便民服务中心', '')
+        }
+        console.log(params)
+        const _this = this
+        getHandMatterPage(params).then((res) => {
+          if (!(res && res.count > 0)) {
+            itemInfo.matterStatus = false
+            _this.setData({
+              itemInfo: itemInfo
+            })
+            return
+          }
+          itemInfo.matterStatus = true
+          itemInfo.pagePrev = itemInfo.page == 1
+          itemInfo.pageNext = itemInfo.page * itemInfo.limit >= res.count
+          itemInfo.matterList = res.data
+          _this.setData({
+            itemInfo: itemInfo
+          })
+        });
+
+        that.setData({
+          detail_dep: item.dep,
+          detail_content: item.content,
+          detail_img: item.img,
+          detail_address: item.address,
+          detail_time: item.time,
+          detail_tel: item.tel,
+          detail_index: i,
+          trafficEnd: address,
+          itemInfo: itemInfo
+        });
+
+        break;
+      }
+    }
+  },
+  aroundEvent(e) {
+    const _this = this
+    this.setData({
+      isList: true,
+      showSearch: false,
+      showSet: false,
+      showTraffic: false,
+      popData: _this.data.marksView
+    })
+  },
+  toDetailWeb(e) {
+    console.log(e.currentTarget.dataset.url)
+    // wx.navigateTo({
+    //   url: '/pages/web/web?gzUrl=' + e.currentTarget.dataset.url,
+    // })
+  },
+  onchange(e) {
+    let that = this;
+    if (e.detail.value == 0) {
+      that.setData({
+        trafficType: 0
+      });
+      changeValue = "transit";
+    } else {
+      that.setData({
+        trafficType: 1
+      });
+      changeValue = "driving";
+    }
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+    return {
+      title: '地图服务'
+    }
+  },
+  onShareTimeline() {
+    return {
+      title: '地图服务'
+    }
+  },
+  openShq() {
+    wx.navigateTo({
+      url: '/pages/map-shq/map-shq',
+    })
+  }
+});
+let changeValue = "transit";
+
+function searchHandMatter(that, queryVal) {
+  // getHandMatterBySearch(queryVal).then((res) => {
+  //   if (res.data && res.data.length) {
+  //     searchDepVal(that, res.data.join(','), res.data)
+  //   }
+  // });
+  searchDepVal(that, queryVal, queryVal.split(","))
+}
+
+function searchDepVal(that, queryVal, deptArr) {
+  let params = {
+    title: queryVal
+  }
+  wx.showToast({
+    title: '加载中...',
+    icon: 'loading'
+  });
+  getMapDataType(params).then((res) => {
+    let data = []
+    let st = true,
+      st2 = true
+    deptArr.forEach((item) => {
+      if (that.data.jnxc.indexOf(item) > -1 && st) {
+        st = false
+        let ite = that.data.xzfwzxs[0]
+        if (ite.tel && !(ite.tel instanceof Array)) {
+          ite.tel = ite.tel.split(";")
+        }
+        data.push(ite)
+      }
+      if (that.data.npzx.indexOf(item) > -1 && st2) {
+        st2 = false
+        let ite = that.data.xzfwzxs[1]
+        if (ite.tel && !(ite.tel instanceof Array)) {
+          ite.tel = ite.tel.split(";")
+        }
+        data.push(ite)
+      }
+    })
+    res.data.forEach((item) => {
+      if (item.tel != null && item.tel != "" && !(item.tel instanceof Array)) {
+        item.tel = item.tel.split(";")
+      }
+      data.push(item)
+    });
+
+    that.setData({
+      showTraffic: false,
+      popData: data,
+    })
+    wx.hideLoading()
+  });
+  wx.hideLoading()
+}
+
+function initMapDataAll(that, lat, lng) {
+  let arr = that.data.marksInfo
+  console.log(arr)
+  let index = 0;
+  let addrArr = []
+  let marksView = []
+  let task = setInterval(function () {
+    if (index >= arr.length) {
+      addrArr.push({
+        latitude: lat,
+        longitude: lng,
+        iconPath: imgUrl + "/location.png",
+        width: '30px',
+        height: '30px',
+        rotate: 0,
+        alpha: 1,
+        label: {
+          anchorX: 10,
+          anchorY: -22,
+          bgColor: '#fff',
+          borderRadius: 5,
+          padding: 5,
+          content: "我的位置",
+          color: '#333'
+        }
+      })
+      console.log(addrArr)
+      that.setData({
+        markers: addrArr,
+        marksView: marksView,
+        marksNum: addrArr.length - 1
+      })
+      clearInterval(task)
+      return
+    }
+    const address = arr[index]
+    index++
+    const jl = getDistances(lat, lng, address.latitude, address.longitude)
+    if (jl.m <= that.data.custGap) {
+      marksView.push(address)
+      addrArr.push({
+        id: address.id,
+        latitude: address.latitude,
+        longitude: address.longitude,
+        iconPath: imgUrl + "/location.png",
+        width: '34px',
+        height: '34px',
+        rotate: 0,
+        alpha: 1,
+        label: {
+          anchorX: 10,
+          anchorY: -22,
+          bgColor: '#fff',
+          borderRadius: 5,
+          padding: 5,
+          content: address.dep,
+          color: '#333'
+        }
+      })
+    }
+    // BMap.geocoder({
+    //   address: address.address,
+    //   success: (addr) => {
+
+    // BMap.calculateDistance({
+    //   mode: 'straight',
+    //   from: {
+    //     latitude: lat,
+    //     longitude: lng
+    //   },
+    //   to: [{
+    //     latitude: addr.result.location.lat,
+    //     longitude: addr.result.location.lng
+    //   }],
+    //   success: (json) => {
+    //     console.log(getDistances(lat, lng, addr.result.location.lat, addr.result.location.lng))
+    //     console.log(json)
+    //     const jl = parseInt(json.result.elements[0].distance)
+    //     if (jl <= 1000) {
+    //       marksView.push(address)
+    //       addrArr.push({
+    //         id: address.id,
+    //         latitude: json.result.elements[0].to.lat,
+    //         longitude: json.result.elements[0].to.lng,
+    //         iconPath: imgUrl+"/location.png",
+    //         width: '34px',
+    //         height: '34px',
+    //         rotate: 0,
+    //         alpha: 1
+    //       })
+    //     }
+    //   }
+    // })
+    // }
+    // })
+  }, 10);
+}
+
+function searchHandMatterByValFun(that) {
+
+  searchHandMatterByVal(that.data.searchVal).then((res) => {
+
+    res.data.forEach((item) => {
+      const dept = item.depts.split(',')
+      let formtDept = item.fomartDept
+      const arr = dept.filter(value => that.data.jnxc.includes(value));
+      if (arr && arr.length) {
+        formtDept += ",区政务服务中心(江南新城中心)"
+      }
+      const arr2 = dept.filter(value => that.data.npzx.includes(value));
+      if (arr2 && arr2.length) {
+        formtDept += ",区政务服务中心(南坪中心)"
+      }
+      item.fomartDept = formtDept
+    })
+
+    let matterEventInfo = that.data.matterEventInfo
+    matterEventInfo.isShow = true
+    matterEventInfo.data = res.data
+    that.setData({
+      matterEventInfo: matterEventInfo
+    })
+  });
+}
+
+// 根据经纬度计算距离,参数分别为第一点的纬度,经度;第二点的纬度,经度
+function getDistances(lat1, lng1, lat2, lng2) {
+  let EARTH_RADIUS = 6378.137; // 地球半径
+  let radLat1 = lat1 * Math.PI / 180.0; //lat1 * Math.PI / 180.0=>弧度计算
+  let radLat2 = lat2 * Math.PI / 180.0;
+  let a = radLat1 - radLat2;
+  let b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+  let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+  s = s * EARTH_RADIUS;
+  s = Math.round(s * 10000) / 10000; // 输出为公里
+  return {
+    m: s * 1000,
+    km: Number(s.toFixed(2))
+  }
+}

+ 12 - 0
nnzwminiapp/pages/map2/map.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "t-tab-panel": "/miniprogram_npm/tdesign-miniprogram/tabs/tab-panel",
+    "t-tabs": "/miniprogram_npm/tdesign-miniprogram/tabs/tabs",
+    "t-input": "/miniprogram_npm/tdesign-miniprogram/input/input",
+    "t-grid": "/miniprogram_npm/tdesign-miniprogram/grid/grid",
+    "t-grid-item": "/miniprogram_npm/tdesign-miniprogram/grid/grid-item"
+  },
+  "navigationBarTitleText": "地图",
+  "navigationBarBackgroundColor": "#508FF4",
+  "navigationBarTextStyle": "white"
+}

+ 96 - 0
nnzwminiapp/pages/map2/map.wxml

@@ -0,0 +1,96 @@
+<view style="height: {{height}}px; background-color : #fff" scroll-y="true">
+  <view class="head">
+    <!-- 左边的logo和文字 -->
+    <view class="left-logo">
+      <view href="https://www.cqna.gov.cn/" target="_blank">
+        <image class="logo-img" src="{{imgUrl}}/map-logo.png"></image>
+      </view>
+    </view>
+    <!-- 右边的搜索框 -->
+    <view class="right_logo" bindtap="openVR">
+        <image src="{{imgUrl}}/second-erw-3.png" alt="" class="first_erw"></image>
+    </view>
+  </view>
+  <view class="main">
+    <view wx:if="{{showSearch}}" class="top_search">
+      <view class="input-icon">
+        <input type="text" enterkeyhint="search" confirm-type="search" bindconfirm="searchTap" name="" id="" value="{{searchVal}}"  bindinput="getSearchVal" class="inp" placeholder="请输入您要搜索的内容" />
+        <image src="{{imgUrl}}/ss2.png" class="inp-icon1" bindtap="searchTap"></image>
+      </view>
+    </view>
+    <view wx:if="{{showSet}}" class="right-search" style="position: absolute; left: 22rpx; top: 10px; width: 708rpx; height: 300rpx; display: block; box-sizing: border-box; padding-top: 10rpx;">
+        <t-tabs defaultValue="{{trafficType}}" bindchange= "onchange" theme="tag" style="height: 292rpx; ">
+          <t-tab-panel label="公交" value="0" style=" height: 180rpx; ">
+            <include src="./quert"></include>
+          </t-tab-panel>
+          <t-tab-panel label="自驾" value="1">
+            <include src="./quert"></include>
+          </t-tab-panel>
+        </t-tabs>
+    </view>
+
+    <view class="right-map" id="right-map">
+      <map id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="15" bindmarkertap="markClick" markers="{{markers}}" circles="{{circle}}" class="map" polygons="{{polygons}}" enable-satellite="true"></map>
+    </view>
+    <view class="icon-shq" style="background-image: url({{newImgUrl}}district/img/icon-shq.png);" bindtap="openShq"></view>
+    <view wx:if="{{showTraffic}}">
+      <view class="right-search" style="position: absolute; left: 22rpx; top: 700rpx; width: 708rpx; height: 370rpx; display: block; box-sizing: border-box; padding-top: 10rpx;">
+        <view style="margin-left: 15rpx;padding: 10rpx;color: #5f5d5d;" bindtap="aroundEvent">附近1公里共有<text style="color: red;">{{marksNum}}</text>个地点</view>
+        <t-tabs defaultValue="{{trafficType}}" bindchange="onchange" theme="tag" style="height: 292rpx; ">
+          <t-tab-panel label="公交" value="0" style=" height: 180rpx; ">
+            <include src="./quert"></include>
+          </t-tab-panel>
+          <t-tab-panel label="自驾" value="1">
+            <include src="./quert"></include>
+          </t-tab-panel>
+        </t-tabs>
+      </view>
+
+      <view class="left-map">
+        <view class="bttom-tab show-first">
+          <t-grid wx:for="{{type}}" wx:for-item="typeitem" wx:for-index="keys" class="block">
+            <t-grid-item bindtap="popview" wx:for="{{typeitem}}" data-index="{{keys}}" wx:key="index2" data-id="{{item.id}}" wx:for-item="item" text="{{item.name}}">
+              <!-- image=" {{imgUrl+ item.image}}" -->
+              <image src="{{imgUrl+ item.image}}" class="gridiamge"/>
+            </t-grid-item>
+          </t-grid>
+
+        </view>
+      </view>
+    </view>
+    <view wx:else >
+      <view class="wrap_result">
+          <view class="title-second" style="border-radius: 30rpx; position: absolute; left: 22rpx; top: 330px; width: 708rpx; height: 120rpx;">
+            <text style="font-size: 16px;font-weight: 400;color: #2775CC;">搜索结果</text>
+            <button type="button" class="back_btn" bindtap="backSearch">返回</button>
+          </view>
+          <view class="pad_box">
+            <view wx:if="{{searchInfo.isShow}}" class="matter-tab search-nav">
+            <view class="matter-tab-li {{searchInfo.navType == 0 ? 'active': ''}}" bindtap="searchTab" data-type="0">地点搜索</view>
+            <view class="matter-tab-li {{searchInfo.navType == 1 ? 'active': ''}}" bindtap="searchTab" data-type="1">事项搜索</view>
+          </view>
+            <include wx:if="{{isList && !matterEventInfo.isShow}}" src="./item"></include>
+            <include wx:elif="{{isList && matterEventInfo.isShow}}" src="./item-event"></include>
+            <include wx:else src="./item-info"></include>
+          </view>
+        </view>
+    </view>
+  </view>
+  
+</view>
+
+<view class="popup-box show" wx:if="{{showIndex}}" bindtap="closePopup"></view>
+<view class="info-bottom" wx:if="{{showIndex}}">
+  <view class="title">点位信息</view>
+  <view class="row-info">
+    
+    <view class="pop-value">
+      <scroll-view scroll-y="true" style="height:350rpx;margin-left: 50rpx;">
+        <view style="width:50%;float: left; height: 76rpx; margin: 5rpx 0;  " wx:for="{{popData}}" bindtap="changeInfo"  wx:for-item="item" data-data="{{item}}" wx:index="{{index}}" wx:key="index">
+          <image src="https://www.cqna.gov.cn/mnazw/applet/ding.png" class="icon-pop" style="float: left;"></image>
+          <text class="text-pop">{{item.name}}</text>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</view>

+ 1504 - 0
nnzwminiapp/pages/map2/map.wxss

@@ -0,0 +1,1504 @@
+li {
+  list-style: none;
+}
+
+a {
+  text-decoration: none;
+}
+
+.head {
+  width: 100%;
+  height: 45px;
+  background-color: #2775CC;
+  overflow: hidden;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.left-logo {
+  width: 186px;
+  margin-left: 15px;
+}
+
+.left-logo a {
+  height: 28px;
+}
+
+.logo-img {
+  width: 100%;
+  height: 28px;
+}
+
+.right_logo {
+  margin: 9px 45px 9px 0;
+  width: 61rpx;
+}
+
+.right_logo image {
+  width: 61px;
+  height: 28px;
+}
+
+/* html,body{
+	position: relative;
+	height: 100%;
+	min-height: 100%;
+} */
+/* body{
+	display: flex;
+	flex-direction: column;
+	min-height: 100vh;
+} */
+.main {
+  width: 100%;
+  /* height: calc(100vh - 44px); */
+  position: relative;
+  /* overflow: hidden; */
+  /* padding-bottom: 295px; */
+  /* flex: 1; */
+}
+
+.bttom-tab {
+  width: 100%;
+  background-color: white;
+  /* overflow-y: auto; */
+  /* overflow-x: hidden; */
+  margin-top: 135px;
+}
+
+.right-map .map {
+  width: 73%;
+  height: 800rpx;
+  overflow: hidden;
+  width: 100%;
+}
+
+.show-second {
+  display: none;
+  overflow: hidden;
+  background: #F3F3F3;
+}
+
+.show-third {
+  display: none;
+  overflow: hidden;
+  background: #F3F3F3;
+}
+
+.show-fourth {
+  display: none;
+  background: #F3F3F3;
+  overflow: hidden;
+  height: 84vw;
+  position: relative;
+}
+
+.show-fifth {
+  display: none;
+  background: #F3F3F3;
+  overflow: hidden;
+  height: 84vw;
+  position: relative;
+}
+
+.show-sixth {
+  display: none;
+  background: #F3F3F3;
+  overflow: hidden;
+  height: 84vw;
+  position: relative;
+}
+
+.left-map {
+  width: 100%;
+  /* height: 77.86666vw; */
+  border-radius: 4vw 4vw 0 0 !important;
+  background-color: white;
+  /* position: absolute;
+	left: 0;
+	bottom: 0; */
+}
+
+.right-search {
+  width: 94.66666vw;
+  position: absolute;
+  z-index: 1000;
+  left: 2.66666vw;
+  background-color: #fff;
+  border: 1px solid #DADFE3;
+  box-shadow: 0 0.8vw 4.66666vw 0 rgba(98, 137, 174, 0.18);
+  border-radius: 2.66666vw;
+  box-sizing: border-box;
+}
+
+.right-search .layui-tab-title {
+  border: none !important;
+  margin: 2.66666vw 0 4.26666vw 2.66666vw !important;
+  height: 5.86666vw !important;
+}
+
+.right-search .layui-tab-title li {
+  width: 6.66666vw !important;
+  height: 5.86666vw !important;
+  line-height: 5.86666vw !important;
+  text-align: center !important;
+  padding: 0 !important;
+  font-weight: 400 !important;
+  font-size: 14px !important;
+  font-family: Microsoft YaHei !important;
+  color: #777777 !important;
+}
+
+.right-search .layui-tab-title .layui-this {
+  background: #1B6DB9 !important;
+  border-radius: 2.93333vw !important;
+  font-size: 14px !important;
+  font-family: Microsoft YaHei !important;
+  color: #FFFFFF !important;
+}
+
+.right-search .layui-tab-title .layui-this:after {
+  border: none !important;
+}
+
+.right-search .layui-tab-content {
+  margin: 0 0 0 3.06666vw !important;
+  padding: 0 !important;
+}
+
+.input-icon {
+  display: flex;
+  align-items: center;
+}
+
+.wrap_box {
+  width: 97%;
+  height: 175rpx;
+}
+
+.serach_input {
+  margin-left: 30rpx;
+  width: 80%;
+  height: 180rpx;
+}
+
+.textbox {
+  width: 80rpx;
+  height: 90rpx;
+  line-height: 90rpx;
+  align-items: center;
+  float: left;
+}
+
+.textbox text {
+  width: 70rpx;
+  line-height: 90rpx;
+  float: left;
+  text-align: center;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 14px;
+}
+
+.block {
+  display: block;
+  margin-bottom: 32rpx;
+  width: 80%;
+  margin: auto;
+}
+
+.point {
+  width: 6rpx;
+  height: 6rpx;
+  border-radius: 6rpx;
+  background: #000;
+  float: left;
+  margin-top: 40rpx;
+}
+
+.red {
+  background: #FF6E3B;
+}
+
+.green {
+  background: #2CD5AA;
+}
+
+.cred {
+  color: #FF6E3B;
+}
+
+.cgreen {
+  color: #2CD5AA;
+}
+
+.start {
+  width: 100%;
+  height: 49%;
+}
+
+.end {
+  width: 100%;
+  height: 50%;
+}
+
+.line {
+  width: 70%;
+  height: 1rpx;
+  background: #e0e0e0;
+  margin: auto;
+}
+
+.go_input {
+  width: 70%;
+  /* height: 30rpx; */
+  height: 100%;
+  color: #5E5E5E;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 14px;
+}
+
+.inp-icon2 {
+  width: 5.06666vw;
+  height: 5.06666vw;
+  margin-top: -2vw;
+  margin: 0 0 7vw 4.39999vw;
+}
+
+.inp-icon3 {
+  width: 5.06666vw;
+  height: 5.06666vw;
+  margin-top: -2vw;
+  margin: 0 0 7vw 4.39999vw;
+}
+
+.layui-layer-btn .layui-layer-btn0 {
+  border: 1px solid #dedede !important;
+  background-color: #fff !important;
+  color: #333 !important;
+}
+
+.flex_box ul {
+  display: flex;
+  justify-content: center;
+  margin: 0 7.33333vw;
+}
+
+.flex_box ul li {
+  width: 25%;
+  display: flex;
+  justify-content: center;
+}
+
+.img_tab {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  position: relative;
+  margin-bottom: 5px;
+}
+
+.gn_img {
+  width: 10.66666vw;
+}
+
+.wrap_big {
+  overflow-y: scroll;
+  height: 340px;
+  overflow-x: hidden;
+}
+
+.inline_one {
+  width: 100% !important;
+  margin: 0 !important;
+  display: flex !important;
+  padding: 0 !important;
+}
+
+.tab_one {
+  width: 50%;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  font-size: 16px;
+  color: #333;
+  font-family: Microsoft YaHei;
+  cursor: pointer;
+  margin: 0 10px;
+}
+
+.select {
+  font-weight: bold;
+  border-bottom: 2px solid #176AB7;
+}
+
+.flex_text {
+  /* width: 181%; */
+  /* position: absolute; */
+  text-align: center;
+  font-size: 12px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #333333;
+}
+
+.flex_pop {
+  width: 93.33333vw;
+  background: #D8ECFF;
+  position: absolute;
+  z-index: 2000;
+  border-top: 3px solid #2775CC;
+  top: 109%;
+}
+
+.lineFour {
+  right: -18%;
+}
+
+.lineFour::after {
+  content: '';
+  width: 0;
+  height: 0;
+  border: 10px solid transparent;
+  border-bottom-color: #176AB7;
+  margin-top: -20px;
+  position: absolute;
+  top: 0;
+  right: 12.5%;
+}
+
+.lineThree {
+  right: -119%;
+}
+
+.lineThree::after {
+  content: '';
+  width: 0;
+  height: 0;
+  border: 10px solid transparent;
+  border-bottom-color: #176AB7;
+  margin-top: -20px;
+  position: absolute;
+  top: 0;
+  right: 35.5%;
+}
+
+.lineTwo {
+  left: -119%;
+}
+
+.lineTwo::after {
+  content: '';
+  width: 0;
+  height: 0;
+  border: 10px solid transparent;
+  border-bottom-color: #176AB7;
+  margin-top: -20px;
+  position: absolute;
+  top: 0;
+  left: 35.5%;
+}
+
+.lineOne {
+  left: -18%;
+}
+
+.lineOne::after {
+  content: '';
+  width: 0;
+  height: 0;
+  border: 10px solid transparent;
+  border-bottom-color: #176AB7;
+  margin-top: -20px;
+  position: absolute;
+  top: 0;
+  left: 12.5%;
+}
+
+.flex_wrap {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 2.60000vw 8.93333vw;
+}
+
+.flex_wrap div {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  padding: 3vw 0;
+}
+
+.mapnav {
+  display: inline-block;
+  margin-left: 1.46666vw;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.choice {
+  font-size: 16px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+  color: #2775CC;
+}
+
+.wrap_result {
+  /* width: 90%;
+	overflow-y: auto;
+	overflow-x: hidden;
+	height: 84.86666vw;
+	position: relative;
+	background: #F3F3F3;
+	margin: 0 auto;
+	padding-top: 4.5vw; */
+}
+
+.wrap_result1 {
+  width: 90%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 84.86666vw;
+  position: relative;
+  background: #F3F3F3;
+  margin: 0 auto;
+  padding-top: 4.5vw;
+}
+
+.pad_box {
+  margin-top: 80rpx;
+  width: 100%;
+}
+
+.wrap_result .title-second {
+  width: 100%;
+  margin: 0;
+  box-shadow: 0px 3px 6px 0px rgb(98 137 174 / 18%);
+  border-radius: 10px;
+  box-sizing: border-box;
+  z-index: 1000;
+}
+
+.wrap_result1 .title-second {
+  width: 90%;
+  margin: 0;
+  margin-bottom: 2.53333vw;
+  box-shadow: 0px 3px 6px 0px rgb(98 137 174 / 18%);
+  border-radius: 10px;
+  box-sizing: border-box;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999;
+}
+
+.title_flex {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #333333;
+}
+
+.flex_blue {
+  height: 20px;
+  background: rgba(23, 106, 183, .2);
+  border-radius: 10px;
+  font-size: 12px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #2775CC;
+  line-height: 20px;
+  text-align: center;
+  margin-left: 7px;
+  padding: 0px 10px;
+  margin-top: 5px;
+}
+
+.flex_orange {
+  display: flex;
+  align-items: center;
+  /* margin-top: 8px; */
+  flex-wrap: wrap;
+}
+
+.three_tag {
+  height: 26px;
+  background: rgba(244, 78, 5, .16);
+  text-align: center;
+  line-height: 26px;
+  font-size: 12px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #F54E06;
+  margin-right: 7px;
+  padding: 0 5px;
+  margin-top: 5px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.content_p {
+  display: inherit;
+  font-size: 12px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #333333;
+  line-height: 24px;
+  margin-top: 5px;
+}
+
+.img_box {
+  margin-top: 5px;
+}
+
+.img_box>img {
+  display: inline-block;
+  width: 128px;
+  height: 72px;
+  margin-right: 8px;
+}
+
+.address_box {
+  padding-bottom: 4vw;
+  border-bottom: 1px solid rgba(153, 153, 153, .3);
+  margin: 4vw 0 3.2vw 0;
+}
+
+.address_box>p {
+  font-size: 12px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+  color: #333333;
+}
+
+.flex_address {
+  font-size: 12px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+  color: #2775CC;
+}
+
+.btn_box>button {
+  width: 48%;
+  cursor: pointer;
+}
+
+.one_bus {
+  height: 10.26666vw;
+  background: #2775CC;
+  box-shadow: 0px 4px 25px 2px rgba(39, 117, 204, 0.34);
+  border-radius: 0.8vw;
+  line-height: 10.26666vw;
+  text-align: center;
+  outline: 0;
+  border: 0;
+  font-size: 14px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.two_car {
+  height: 10.26666vw;
+  background: #10B891;
+  box-shadow: 0px 4px 25px 2px rgba(16, 184, 145, 0.34);
+  line-height: 10.26666vw;
+  border-radius: 0.8vw;
+  text-align: center;
+  outline: 0;
+  border: 0;
+  font-size: 14px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.titleFirst {
+  background: #FFFFFF;
+  box-shadow: 0px 3px 6px 0px rgba(98, 137, 174, 0.18);
+  border-radius: 10px;
+  padding: 3.46666vw 4.26666vw;
+  margin-bottom: 2.53333vw;
+}
+
+.titleFirst:last-child {
+  margin-bottom: 6.53333vw;
+}
+
+.btn_box {
+  display: flex;
+  justify-content: space-between;
+}
+
+.title-second {
+
+  width: 86.66667vw;
+  margin: 48vw auto 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  /* border-bottom: 1px solid #CCCCCC; */
+  background-color: #fff;
+  padding: 3.46666vw 4vw;
+
+}
+
+.title-second>h6 {
+  font-size: 16px;
+  font-weight: 400;
+  color: #2775CC;
+}
+
+.back_wrap {
+  width: 86.66667vw;
+  margin: 11px auto 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  /* border-bottom: 1px solid #CCCCCC; */
+  background-color: #fff;
+  padding: 3.46666vw 4vw;
+  border: 1px solid #DADFE3;
+  box-shadow: 0px 3px 16px 0px rgba(98, 137, 174, 0.1800);
+  border-radius: 10px;
+}
+
+.back_wrap>h6 {
+  font-size: 16px;
+  font-weight: 400;
+  color: #2775CC;
+}
+
+.backBtn {
+  width: 64px;
+  height: 30px;
+  background-color: #FFF;
+  border: 1px solid #CCCCCC;
+  outline: none;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.back_btn {
+  width: 64px;
+  height: 30px;
+  background-color: #FFF;
+  border: 1rpx solid #CCCCCC;
+  outline: none;
+  font-size: 14px;
+  cursor: pointer;
+  line-height: 30px;
+  margin: 0;
+  padding: 0;
+}
+
+.back_Btn {
+  width: 64px;
+  height: 30px;
+  background-color: #FFF;
+  border: 1px solid #CCCCCC;
+  outline: none;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.btn_back {
+  width: 64px;
+  height: 30px;
+  background-color: #FFF;
+  border: 1px solid #CCCCCC;
+  outline: none;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.show-second .layui-tab-title {
+  display: flex;
+  justify-content: space-around !important;
+  width: 84.5% !important;
+  border: none !important;
+  margin: 2.66666vw auto 0 !important;
+  height: 5.86666vw !important;
+  background-color: #fff !important;
+  padding: 3.46666vw 4.66666vw !important;
+}
+
+.show-second .layui-tab-title li {
+  width: 25% !important;
+  line-height: 20px !important;
+  padding: 0px !important;
+}
+
+.show-second .layui-tab-title .layui-this {
+  font-size: 14px !important;
+  font-family: Source Han Sans SC !important;
+  font-weight: bold !important;
+  color: #333333 !important;
+  position: relative;
+  background-color: transparent !important;
+}
+
+.show-second .layui-tab-title .layui-this::after {
+  content: '';
+  width: 30%;
+  height: 4px;
+  background: #2775CC;
+  border-radius: 4px;
+  position: absolute;
+  top: 100%;
+  left: 37%;
+}
+
+.show-second .layui-tab-content {
+  width: 93.5% !important;
+  margin: 0 auto !important;
+  padding: 0 !important;
+}
+
+.show-third .layui-tab-title {
+  display: flex !important;
+  justify-content: space-around !important;
+  width: 84.5% !important;
+  border: none !important;
+  margin: 2.66666vw 0 0 2.66666vw !important;
+  height: 5.86666vw !important;
+  background-color: #fff !important;
+  padding: 3.46666vw 4.66666vw !important;
+}
+
+.show-third .layui-tab-title li {
+  width: 25% !important;
+  line-height: 20px !important;
+}
+
+.show-third .layui-tab-title .layui-this {
+  font-size: 14px !important;
+  font-family: Source Han Sans SC !important;
+  font-weight: bold !important;
+  color: #333333 !important;
+  position: relative;
+  background-color: transparent !important;
+}
+
+.show-third .layui-tab-title .layui-this::after {
+  content: '';
+  width: 30%;
+  height: 4px;
+  background: #2775CC;
+  border-radius: 4px;
+  position: absolute;
+  top: 100%;
+  left: 37%;
+}
+
+.show-third .layui-tab-content {
+  width: 93.5% !important;
+  margin: 0 auto !important;
+  padding-top: 0 !important;
+}
+
+.top_search {
+  position: absolute;
+  top: 2.93333vw;
+  left: 2.66666vw;
+  z-index: 1000;
+  width: 94.66666vw;
+  box-shadow: 0px 6px 32px 0px rgba(98, 137, 174, 0.18);
+  background-color: #fff;
+  border: 1px solid #DADFE3;
+  border-radius: 20px;
+  padding: 2.80000vw 5.33333vw;
+  box-sizing: border-box;
+}
+
+.top_search .input-icon {
+  justify-content: space-between;
+}
+
+.top_search .input-icon input {
+  width: 90%;
+  border: 0;
+  outline: 0;
+  font-size: 3.2vw;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+}
+
+.inp-icon1 {
+  width: 5.06666vw;
+  height: 5.06666vw;
+}
+
+/* 使用webkit内核的浏览器 */
+.top_search .input-icon input::-webkit-input-placeholder {
+  color: #5E5E5E;
+}
+
+/* Firefox版本4-18 */
+.top_search .input-icon input:-moz-placeholder {
+  color: #5E5E5E;
+}
+
+/* Firefox版本19+ */
+.top_search .input-icon input::-moz-placeholder {
+  color: #5E5E5E;
+}
+
+/* IE浏览器 */
+.top_search .input-icon input:-ms-input-placeholder {
+  color: #5E5E5E;
+}
+
+.boxpanel {
+  display: none;
+  width: 85.5%;
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 3.46666vw 4vw;
+}
+
+/* 起始点和终点的选择的样式 */
+.boxpanel h5 {
+  font-size: 16px;
+  font-weight: 400;
+  color: #2775CC;
+  cursor: default;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #CCCCCC;
+  margin: 10px 0 0 0;
+}
+
+.zjboxpanel {
+  display: none;
+  width: 85.5%;
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 3.46666vw 4vw;
+}
+
+.zjboxpanel h5 {
+  font-size: 16px;
+  font-weight: 400;
+  color: #2775CC;
+  cursor: default;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #CCCCCC;
+  margin: 10px 0 0 0;
+}
+
+.warp_choice {
+  display: flex;
+  align-items: center;
+  margin: 10px 0 5px;
+}
+
+.warp_choice span {
+  color: #FF780B;
+  font-size: 14px;
+}
+
+#startPanel p {
+  width: 100%;
+  margin: 0 auto;
+  color: #666666;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: default;
+}
+
+#startPanel p.change_text_color {
+  color: #2775CC;
+}
+
+#startPanel li {
+  cursor: pointer;
+  box-sizing: border-box;
+  padding: 5px 10px;
+}
+
+#startPanel li:hover {
+  background-color: #E9F3FF;
+  cursor: pointer;
+}
+
+#endPanel p {
+  width: 100%;
+  margin: 0 auto;
+  color: #666666;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: default;
+}
+
+#endPanel li {
+  cursor: pointer;
+  box-sizing: border-box;
+  padding: 5px 10px;
+}
+
+#endPanel li:hover {
+  background-color: #E9F3FF;
+  cursor: pointer;
+}
+
+#busstartPanel p {
+  width: 100%;
+  margin: 0 auto;
+  color: #666666;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: default;
+}
+
+#busstartPanel p.change_text_color {
+  color: #2775CC;
+}
+
+#busstartPanel li {
+  cursor: pointer;
+  box-sizing: border-box;
+  padding: 5px 10px;
+}
+
+#busstartPanel li:hover {
+  background-color: #E9F3FF;
+  cursor: pointer;
+}
+
+#busendPanel p {
+  width: 100%;
+  margin: 0 auto;
+  color: #666666;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: default;
+}
+
+#busendPanel li {
+  cursor: pointer;
+  box-sizing: border-box;
+  padding: 5px 10px;
+}
+
+#busendPanel li:hover {
+  background-color: #E9F3FF;
+  cursor: pointer;
+}
+
+.startChoice {
+  width: 64px;
+  height: 30px;
+  background: #FFFFFF;
+  border: 1px solid #ccc;
+  outline: none;
+  margin-top: 5px;
+}
+
+.endChoice {
+  width: 64px;
+  height: 20px;
+  background: #FFFFFF;
+  border: 1px solid #ccc;
+  outline: none;
+  cursor: pointer;
+  margin-top: 5px;
+}
+
+.no_results {
+  background-color: #fff;
+  height: calc(100vh - 286px);
+  box-sizing: border-box;
+  padding: 10px;
+}
+
+.layui-tab-bar {
+  display: none !important;
+}
+
+.sticky {
+  width: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  box-sizing: border-box;
+}
+
+.hide_list {
+  width: 100%;
+  cursor: pointer;
+  height: 20px;
+  line-height: 20px;
+  background-color: #f4f4f4;
+}
+
+.back_top {
+  width: 14vw;
+  height: 14vw;
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  display: none;
+  z-index: 1000;
+}
+
+.content_from_ajax {
+  width: 100% !important;
+  margin: 0 !important;
+  background-color: #fff !important;
+}
+
+.content_from_ajax .layui-tab-title li {
+  width: 50% !important;
+  padding: 0px !important;
+  font-size: 16px !important;
+  color: #999 !important;
+}
+
+.content_from_ajax .layui-tab-title .layui-this {
+  color: #000 !important;
+}
+
+.content_from_ajax .layui-tab-title .layui-this:after {
+  border-bottom: 2px solid #2775CB !important;
+}
+
+.content_from_ajax .layui-tab-content {
+  padding: 0 !important;
+}
+
+.url_from_ajax {
+  display: flex;
+  padding: 15px 12px 0;
+}
+
+.point_from_ajax {
+  width: 4px;
+  height: 4px;
+  background: #2775CC;
+  border-radius: 2px;
+  margin: 8px 8px 0 0;
+}
+
+.text_from_ajax {
+  width: 100%;
+  font-size: 15px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  border-bottom: 1px solid #F3F3F3;
+  padding: 0 0 15px 0;
+}
+
+.handle_business {
+  width: 76px;
+  height: 25px;
+  background: linear-gradient(90deg, #2775CC 0%, #6DAAEF 100%);
+  border-radius: 5px;
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 25px;
+  text-align: center;
+  line-height: 25px;
+  margin-top: 10px;
+}
+
+.handle_business img {
+  width: 11px;
+  height: 11px;
+  margin: 0 4px 0 8px;
+}
+
+.handle_business1 {
+  width: 76px;
+  height: 25px;
+  background: linear-gradient(90deg, #2775CC 0%, #6DAAEF 100%);
+  border-radius: 5px;
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 25px;
+  margin-top: 10px;
+}
+
+.handle_business2 {
+  width: 76px;
+  height: 25px;
+  background: linear-gradient(90deg, #2775CC 0%, #6DAAEF 100%);
+  border-radius: 5px;
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 25px;
+  margin-top: 10px;
+}
+
+.detailCheck {
+  width: 76px;
+  height: 25px;
+  background: linear-gradient(90deg, #2775CC 0%, #6DAAEF 100%);
+  border-radius: 5px;
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 25px;
+  margin-top: 10px;
+}
+
+.handle_business1 img {
+  width: 11px;
+  height: 11px;
+  margin: 0 4px 0 8px;
+}
+
+#demo {
+  width: 88.5%;
+  height: 35px;
+  margin: 10px auto 20px;
+}
+
+#demo .layui-laypage {
+  width: 100% !important;
+  height: 15px !important;
+}
+
+#demo .layui-laypage a {
+  height: 15px !important;
+  line-height: 10px !important;
+  border: 0 !important;
+  font-size: 14px !important;
+  font-family: Microsoft YaHei !important;
+  color: #333;
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+#demo .layui-laypage span {
+  height: 15px !important;
+  line-height: 14px !important;
+  border: 0 !important;
+  font-size: 14px !important;
+  font-family: Microsoft YaHei !important;
+  color: #333;
+  padding: 0 !important;
+  vertical-align: middle !important;
+  margin: 0 !important;
+}
+
+#demo .layui-laypage a:last-child {
+  float: right !important;
+}
+
+#demo .layui-icon {
+  line-height: 15px !important;
+  vertical-align: middle !important;
+}
+
+#demo .layui-disabled span {
+  color: #d2d2d2 !important;
+}
+
+.show-sixth .pad_box .titleFirst {
+  background: #FFFFFF;
+  padding: 3.46666vw 4.26666vw;
+  margin-bottom: 0;
+  box-shadow: 0px 0px;
+  border-radius: 0;
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+
+.popup-box {
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity .5s;
+}
+.popup-box.show {
+  opacity: 1;
+  visibility: visible;
+}
+
+.info-bottom {
+  position: fixed;
+  z-index: 2001;
+  width: 100%;
+  height: 550rpx;
+  bottom: 0;
+  background-image: url(https://www.cqna.gov.cn/mnazw/applet/mapbg.png);
+  background-size: cover;
+  /* background-repeat: no-repeat; */
+  background-color: #fff;
+  border-top-left-radius: 10rpx;
+  border-top-right-radius: 10rpx;
+}
+
+.row-info {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin: 0 88rpx;
+  font-size: 32rpx;
+  height: 55rpx;
+}
+
+.row-info view {
+  /* padding: 10rpx 0; */
+}
+
+.pop-value {
+  margin-top: 40rpx;
+  height: 400rpx;
+  width: 650rpx;
+  /* background-color: #d8ecff; */
+}
+
+.icon-pop {
+  width: 28rpx;
+  height: 38rpx;
+  display: block;
+}
+
+.text-pop {
+  display: block;
+  margin-left: 15rpx;
+  text-overflow: ellipsis;
+  /* overflow: hidden; */
+  width: 60%;
+  float: left;
+  height: 38rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  line-height: 38rpx;
+  text-align: center;
+}
+
+.item-title {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #333333;
+  margin-bottom: 10rpx;
+}
+
+.item-introduce>text {
+  display: -webkit-box;
+  word-break: break-all;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 40rpx;
+}
+
+.item-introduce>image {
+  width: 250rpx;
+  height: 150rpx;
+}
+
+.item-introduce2>text {
+  display: -webkit-box;
+  word-break: break-all;
+  -webkit-box-orient: vertical;
+  
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 40rpx;
+}
+
+.item-introduce2>image {
+  width: 250rpx;
+  height: 150rpx;
+}
+
+.item-text-size {
+  font-size: 12px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+}
+
+.item-tag-text {
+  color: #2775CC;
+}
+
+.check-info {
+  margin-top: 10rpx;
+  font-size: 12px;
+  font-family: Source Han Sans SC;
+  font-weight: 400;
+  width: 160rpx;
+  height: 60rpx;
+  background: linear-gradient(90deg, #2775CC 0%, #6DAAEF 100%);
+  line-height: 60rpx;
+  text-align: center;
+  color: #fff;
+  border-radius: 10rpx;
+}
+
+.item-btns {
+
+  border-top: 1rpx #d9dcdf solid;
+  width: 95%;
+  margin: 20rpx auto 0px auto;
+  height: 120rpx;
+}
+
+.item-btns>view {
+  width: 45%;
+  float: left;
+  margin: 20rpx 16rpx;
+  height: 80rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+}
+
+.item-bus {
+  background-color: #2775CC;
+  box-shadow: 0px 4px 25px 2px rgb(39 117 204 / 34%);
+  border-radius: 5rpx;
+}
+
+.item-car {
+  background-color: #10B891;
+  box-shadow: 0px 4px 25px 2px rgb(16 184 145 / 34%);
+  border-radius: 5rpx;
+}
+.title{
+  width: 100%;
+    height: 100rpx;
+    text-align: center;
+    line-height: 156rpx;
+    font-size: 35rpx;
+    font-weight: bold;
+}
+
+.gridiamge{
+  width: 80rpx;
+  height: 98rpx;
+  margin-bottom: -15rpx;
+}
+.dept-title {
+  margin: 30rpx 15rpx;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 500;
+}
+.dept-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, 30%);
+  grid-gap: 20rpx;
+  justify-content: center;
+  margin-bottom: 30rpx;
+}
+.dept-item {
+  width: 90%;
+  text-align: left;
+  border: 1rpx #176AB7 solid;
+  padding: 15rpx 5rpx;
+  color: #176AB7;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.dept-list .active {
+  color: #009688;
+  border: 1rpx #009688 solid;
+}
+
+.matter-tab {
+  margin: 0 auto;
+  display: flex;
+  width: 95%;
+  border-bottom: 1rpx #d9dcdf solid;
+}
+.matter-tab .matter-tab-li {
+  width: 50%;
+  height: 60rpx;
+  text-align: center;
+}
+.matter-tab>.active {
+  color: #176AB7;
+  border-bottom: 1rpx #176AB7 solid;
+}
+.matter-content {
+  width: 95%;
+  margin: 0 auto;
+}
+.matter-content-item {
+  display: flex;
+  padding: 20rpx;
+  line-height: 40rpx;
+  border-bottom: 0.5rpx #d9dcdf solid;
+}
+.matter-content-item-round:before {
+  content: "";
+  display: inline-block;
+  width: 10rpx;
+  height: 10rpx;
+  border-radius: 50%;
+  background-color: #176AB7;
+  margin-right: 5rpx;
+}
+.matter-page {
+  display: flex;
+  padding: 20rpx 30rpx;
+}
+.matter-page .matter-page-prev {
+  width: 50%;
+  text-align: left;
+}
+.matter-page .matter-page-next {
+  width: 50%;
+  text-align: right;
+}
+.matter-page .txt {
+  color: #d2d2d2;
+}
+.search-nav {
+  background-color: #fff;
+  padding-top: 20rpx;
+}
+
+.matter-event-item::before {
+  content: "";
+  display: inline-block;
+  width: 10rpx;
+  height: 10rpx;
+  border-radius: 50%;
+  background-color: #176AB7;
+  margin-right: 5rpx;
+}
+.icon-shq {
+  width: 120rpx;
+  height: 120rpx;
+  background-size: 100% 100%;
+  position: absolute;
+  top: 530rpx;
+  right: 20rpx;
+  border-radius: 20rpx;
+}

+ 22 - 0
nnzwminiapp/pages/map2/quert.wxml

@@ -0,0 +1,22 @@
+<view class="wrap_box" style="display: inline-flex;flex-direction: row;align-items: center;">
+  <view class="serach_input">
+    <view class="start ">
+      <view class="textbox">
+        <view class="point green"></view>
+        <text class="cgreen">起</text>
+      </view>
+      <input class="go_input" placeholder="请输入起点" value="{{trafficStart}}" bindinput="getTrafficStart" />
+    </view>
+    <view class="line"></view>
+    <view class="end ">
+      <view class="textbox">
+        <view class="point red"></view>
+        <text class="cred">终</text>
+      </view>
+      <input class="go_input" placeholder="请输入终点" value="{{trafficEnd}}" bindinput="getTrafficEnd" />
+    </view>
+  </view>
+  <view><image src="{{imgUrl}}/ss3.png" class="inp-icon1" bindtap="searchTrafficTap"></image></view>
+
+</view>
+

+ 24 - 0
nnzwminiapp/pagesPublic/pages/tdcr/details/detail.js

@@ -171,5 +171,29 @@ Page({
         latitude: this.data.list[this.data.dataIndex].latitude,
       },
     })
+  },
+  mapEvent(e) {
+    const arr = this.data.list[this.data.dataIndex].polygon.map(item => {
+      return [
+        item.longitude,
+        item.latitude
+      ]
+    })
+    if (this.pointInPolygon([e.detail.longitude, e.detail.latitude], arr)) {
+      wx.navigateTo({
+        url: '/pages/map2/map?dataIndex=' + this.data.dataIndex + '&type=tdcr',
+      })
+    }
+  },
+  pointInPolygon(point, polygon) {
+    let x = point[0], y = point[1];
+    let inside = false;
+    for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+      let xi = polygon[i][0], yi = polygon[i][1];
+      let xj = polygon[j][0], yj = polygon[j][1];
+      let intersect = ((yi > y) !== (yj > y)) && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
+      if (intersect) inside = !inside;
+    }
+    return inside;
   }
 })

+ 1 - 1
nnzwminiapp/pagesPublic/pages/tdcr/details/detail.wxml

@@ -2,7 +2,7 @@
 <view class="main" style="background-image: url({{imgPath}}/index/bg.png);">
   <view class="header" style="height: {{headerStyle.height}}px;line-height: {{headerStyle.height}}px;margin-top: {{headerStyle.top}}px;"><image class="go-back" bindtap="goBack" src="{{imgPath}}/details/back.png" />{{list[dataIndex].name}}</view>
   <view class="map-content" style="background-image: url({{imgPath}}/details/map-border.png);">
-    <map class="map" enable-satellite="true" longitude="{{centerPoint.longitude}}" latitude="{{centerPoint.latitude}}" polygons="{{polygons}}" markers="{{markers}}" scale="{{scale}}"></map>
+    <map class="map" enable-satellite="true" longitude="{{centerPoint.longitude}}" latitude="{{centerPoint.latitude}}" polygons="{{polygons}}" markers="{{markers}}" scale="{{scale}}" bindtap="mapEvent"></map>
   </view>
   <view class="tab">
     <view class="tab-item" wx:for="{{tabs}}" style="{{tabActive == index ? 'background-image: url(' + imgPath + '/details/tab-bg.png);' : ''}}" data-index="{{index}}" bindtap="tabEvent">{{item.label}}</view>

+ 22 - 8
nnzwminiapp/pagesPublic/pages/tdcr/index.js

@@ -15,30 +15,38 @@ Page({
       top: 4
     }],
     cursors: [{
+      id: 0,
       txt: '中西医结合医院',
       top: -12,
       left: 28,
       dropTop: 3.5,
-      dropLeft: 12
+      dropLeft: 12,
+      zIndex: 10
     }, {
+      id: 2,
       txt: '廖家山地块',
       top: -16,
       left: 20,
       dropTop: 5,
       dropLeft: 5
     }, {
+      id: 1,
       txt: '南坪东路588号',
       top: -30,
       left: 61,
       dropTop: 4,
-      dropLeft: 5
+      dropLeft: 5,
+      zIndex: 11
     }, {
+      id: 3,
       txt: '四公里片区',
       top: -30,
       left: 61,
       dropTop: 4,
-      dropLeft: 5
+      dropLeft: 5,
+      zIndex: 9
     }, {
+      id: 4,
       txt: '双峰山1号地块',
       top: -39,
       left: 35,
@@ -47,27 +55,27 @@ Page({
     }],
     list: [{
       icon: 'icon-quyu.png',
-      txt: '区域中心  得天独厚',
+      txt: '两江四岸、区域核心',
       top: 0,
       left: 12
     }, {
       icon: 'icon-house.png',
-      txt: '南岸新区  宜居宜业',
+      txt: '山城花冠、主城肺叶',
       top: 1,
       left: 5
     }, {
       icon: 'icon-ai.png',
-      txt: '资源富集  优势明显',
+      txt: '南部增长极,金融“第三极”',
       top: 1,
       left: 0
     }, {
       icon: 'icon-car.png',
-      txt: '立体交通  四通八达',
+      txt: '毗邻机场、坐拥东站',
       top: 1,
       left: 12
     }, {
       icon: 'icon-bod.png',
-      txt: '产业坚实  人才汇聚',
+      txt: '产业坚实人才汇聚',
       top: 1,
       left: 20
     }],
@@ -181,6 +189,7 @@ Page({
         // 如果到最左侧
         touchData.flag = 2;
         console.log('向右滑动');
+        wx.navigateBack()
       }
     }
     //将当前坐标进行保存以进行下一次计算
@@ -258,4 +267,9 @@ Page({
       }, 1500);
     }
   },
+  toDetail(e) {
+    wx.navigateTo({
+      url: './details/detail?index=' + e.target.dataset.index,
+    })
+  }
 })

+ 3 - 3
nnzwminiapp/pagesPublic/pages/tdcr/index.wxml

@@ -10,11 +10,11 @@
     style="margin-left: {{item.left}}vw;margin-top: {{item.top}}vh;"/>
   </view>
   <view class="main-content">
-    <view class="item" wx:for="{{cursors}}" style="left: {{item.left}}vw;top: {{item.top}}vh;">
+    <view class="item" wx:for="{{cursors}}" style="left: {{item.left}}vw;top: {{item.top}}vh;{{item.zIndex ? 'z-index: ' + item.zIndex + ';' : ''}}">
       <view class="item-title">
         <text>{{item.txt}}</text>
       </view>
-      <image class="item-img" src="{{imgPath}}/index/cursor3.gif" 
+      <image class="item-img" src="{{imgPath}}/index/cursor3.gif" bindtap="toDetail" data-index="{{item.id}}"
       style="left: {{item.dropLeft}}vw;top: {{item.dropTop}}vh;"/>
     </view>
   </view>
@@ -24,5 +24,5 @@
       <view class="list-item-txt"><text>{{item.txt}}</text></view>
     </view>
   </view>
-  <view class="bottom-btn" style="background-image: url({{imgPath}}/index/btn.png);">共创文明新南岸</view>
+  <!-- <view class="bottom-btn" style="background-image: url({{imgPath}}/index/btn.png);">共创文明新南岸</view> -->
 </view>