南岸地图

nnzwminiapp/pages/api/gzw-api.js

@@ -5,7 +5,7 @@ import {
 
 function emptyAreaList(page,size,data) {
 	return requestNoLoginAndTest({
-		url: `asLeaseDispositionIndex/emptyAreaList?page=`+page+`&size=`+size,
+		url: `official/emptyAreaList?page=`+page+`&size=`+size,
 		method: 'POST',
 		contentType: 'application/json;charset=UTF-8',
 		data: data
@@ -14,7 +14,7 @@ function emptyAreaList(page,size,data) {
 
 function contactList(page,size,data) {
 	return requestNoLoginAndTest({
-		url: `asLeaseDispositionIndex/contactList?page=`+page+`&size=`+size,
+		url: `official/contactList?page=`+page+`&size=`+size,
 		method: 'POST',
 		contentType: 'application/json;charset=UTF-8',
 		data: data
@@ -23,7 +23,7 @@ function contactList(page,size,data) {
 
 function voPage(data) {
 	return requestNoLoginAndTest({
-		url: `official/asLeaseDispositionInfo/voPage`,
+		url: `official/voPage`,
 		method: 'POST',
 		contentType: 'application/json;charset=UTF-8',
 		data: data
@@ -32,7 +32,7 @@ function voPage(data) {
 function getVo(data){
 	// http://219.152.50.209:81/api/app/official/asLeaseDispositionInfo/getVo
 	return requestNoLoginAndTest({
-		url: `official/asLeaseDispositionInfo/getVo`,
+		url: `official/info`,
 		method: 'POST',
 		contentType: 'application/json;charset=UTF-8',
 		data: data

nnzwminiapp/pages/api/request.js

@@ -71,7 +71,7 @@ const request2 = (options) => {
 }
 const requestNoLoginAndTest = (options) => {
 	return new Promise((resolve, reject) => {
-		options.url = "http://219.152.50.209:81/api/app/" + options.url
+		options.url = "https://www.cqna.gov.cn/data/" + options.url
 		wx.request({
 			// 配置 "wx.request" 请求参数
 			...options,

nnzwminiapp/pages/map-shq/map-shq.js

@@ -21,7 +21,7 @@ Page({
   data: {
     imgUrl: imgUrl,
     newImgUrl: newImgUrl,
-    custGap: 10000,
+    custGap: 100000,
     latitude: 0,
     longitude: 0,
     scrollId: 0,

nnzwminiapp/pages/map/map.js

@@ -68,7 +68,8 @@ Page({
         newImgUrl: newImgUrl,
         markers: [INIT_MARKER],
         latitude: '',
-        longitude: '',
+		longitude: '',
+		custGap: 100000,
         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":"" }],
@@ -76,7 +77,8 @@ Page({
             [{ "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,
@@ -179,16 +181,23 @@ Page({
                 that.setData({
                     latitude: latitude,
                     longitude: longitude,
-                    trafficStart: "我的位置",
-                    // markers: [{
-                    //     latitude: latitude,
-                    //     longitude: longitude,
-                    //     iconPath:  "/location.png",
-                    //     width: '30px',
-                    //     height: '30px',
-                    //     rotate: 0,
-                    //     alpha: 1
-                    // }]
+					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
+                    }]
                 });
             }
         });
@@ -437,7 +446,7 @@ Page({
                     markers: [{
                         latitude: res.location.lat,
                         longitude: res.location.lng,
-                        iconPath:  "/location.png",
+                        iconPath:  imgUrl+"/location.png",
                         width: '30px',
                         height: '30px',
                         rotate: 0,
@@ -1059,7 +1068,7 @@ function initMapDataAll(that, lat, lng) {
         addrArr.push({
           latitude: lat,
           longitude: lng,
-          iconPath:  "/location.png",
+          iconPath:  imgUrl+"/location.png",
           width: '30px',
           height: '30px',
           rotate: 0,
@@ -1078,7 +1087,7 @@ function initMapDataAll(that, lat, lng) {
       index++
       const jl = getDistances(lat, lng, address.latitude, address.longitude)
           console.log(jl)
-          if (jl.m <= 1000) {
+          if (jl.m <= that.data.custGap) {
             marksView.push(address)
             addrArr.push({
               id: address.id,

nnzwminiapp/pages/map/map.wxml

@@ -1,4 +1,4 @@
-<view style="height: {{height}}px; background-color : #f3f3f3" scroll-y="true">
+<view style="height: {{height}}px; background-color : #fff" scroll-y="true">
   <view class="head">
     <!-- 左边的logo和文字 -->
     <view class="left-logo">
@@ -30,11 +30,11 @@
     </view>
 
     <view class="right-map" id="right-map">
-      <map id="map" longitude="{{longitude}}"  latitude="{{latitude}}" scale="18" bindmarkertap="markClick"   markers="{{markers}}" class="map"></map>
+      <map id="map" longitude="{{longitude}}"  latitude="{{latitude}}" scale="18" bindmarkertap="markClick"   markers="{{markers}}" circles="{{circle}}" class="map"></map>
     </view>
     <view class="icon-shq" style="background-image: url({{newImgUrl}}district/img/icon-shq.jpg);" bindtap="openShq"></view>
     <view wx:if="{{showTraffic}}">
-      <view class="right-search" style="position: absolute; left: 22rpx; top: 257px; width: 708rpx; height: 370rpx; display: block; box-sizing: border-box; padding-top: 10rpx;">
+      <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; ">

nnzwminiapp/pages/map/map.wxss

@@ -64,12 +64,12 @@ a {
   background-color: white;
   /* overflow-y: auto; */
   /* overflow-x: hidden; */
-  margin-top: 80px;
+  margin-top: 135px;
 }
 
 .right-map .map {
   width: 73%;
-  height: 360px;
+  height: 800rpx;
   overflow: hidden;
   width: 100%;
 }
@@ -1498,7 +1498,7 @@ a {
   height: 80rpx;
   background-size: 100% 100%;
   position: absolute;
-  top: 400rpx;
+  top: 530rpx;
   right: 20rpx;
   border-radius: 20rpx;
 }

nnzwminiapp/pagesPublic/pages/zcinfo/zcinfo.js

@@ -32,6 +32,9 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad(options) {
+		BMap = new QQMapWX({
+			key: 'KN3BZ-KUDND-PGH4Y-POVRP-43KF3-RNF4K'
+		});
 		let param = {
 			id: options.id
 		}
@@ -42,9 +45,7 @@ Page({
 	 * 生命周期函数--监听页面初次渲染完成
 	 */
 	onReady() {
-		BMap = new QQMapWX({
-			key: 'KN3BZ-KUDND-PGH4Y-POVRP-43KF3-RNF4K'
-		});
+		
 	},
 
 	/**