Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/district/js/correct.js

@@ -88,6 +88,9 @@ $(function () {
             for (let i = 0; i < res.data.tcs.length; i++) {
                 allArr.push(res.data.tcs[i]);
             }
+            for (let i = 0; i < res.data.zysd.length; i++) {
+                allArr.push(res.data.zysd[i]);
+            }
             $.each(res.data.gcs, function (i) {
                 allArr.push(res.data.gcs[i]);
             });

nngkxxdp/src/main/resources/static/district/js/sy_mobile.js

@@ -33,7 +33,7 @@ $(function () {
     var myGeo = new BMap.Geocoder();
 
     var xxs=[],xx=[],zx=[],tsjy=[],dx=[],zyyx=[],yey=[],bmfwzx=[],ggfwzx=[],dqfwzx=[],cyy=[],byfwjg=[],cwss=[],sqwsfwz=[],ejyljg=[];
-	var ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],gc=[],hydjjg=[],zcyljg=[],ckmzfwjg=[],pcs=[];
+	var ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],zysd=[],gc=[],hydjjg=[],zcyljg=[],ckmzfwjg=[],pcs=[];
 	var crjywbljg=[],jtxljcdd=[],jtwfcljg=[],jtsgcljg=[],cgs=[],jdcjccs=[],jsrtjz=[],ylfwjg=[],tsg=[],whg=[],wgs=[],ggty=[],jq=[];
 	var bdcdjzxbsdt=[],cjrfwzx=[],ddcjrfwjg=[],fwglzx=[],gzc=[],sfjdjg=[],jcfwfws=[],flyzzx=[],bsfwt=[],scjdglj=[];
     var yb=[],dkbld=[],cjgshfwz=[],jykszx=[],xzfwzx=[],jzzx=[],jyhrczx=[],shbxswzx=[],sq=[],gjj=[],hscyd=[],gwzx=[],jd=[];
@@ -193,6 +193,11 @@ $(function () {
                 getAllJson.push(res.data.tcs[i]);
                 contrastArrey.push(res.data.tcs[i]);
 			});
+            $.each(res.data.zysd,function(i){
+                zysd.push(res.data.zysd[i]);
+                getAllJson.push(res.data.zysd[i]);
+                contrastArrey.push(res.data.zysd[i]);
+            });
             $.each(res.data.gcs,function(i){
 				gc.push(res.data.gcs[i])
 				getAllJson.push(res.data.gcs[i]);
@@ -815,6 +820,11 @@ $(function () {
                 xrList(tc);
                 getPointPostAjax(tc);
                 break;
+            case '直饮水点':
+                applyClickList();
+                xrList(zysd);
+                getPointPostAjax(zysd);
+                break;
             case '不动产登记':
                 applyClickList();
                 xrList(bdcdjzxbsdt);

nngkxxdp/src/main/resources/static/district/sy_mobile.html

@@ -514,6 +514,12 @@
 								<p class="flex_text">停车泊车</p>
 							</div>
 						</li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/zysd.png" class="gn_img">
+                                <p class="flex_text">直饮水点</p>
+                            </div>
+                        </li>
                         <li></li>
                     </ul>
                 </div>

nnzwminiapp/pages/map/map.js

@@ -36,6 +36,7 @@ const popType = [
     [
         ["商圈", "购物中心", "酒店"],
         [],
+        [],
         []
     ]
 ]
@@ -79,7 +80,7 @@ Page({
         showSet: false,
         trafficType: 0,
         xxs: [], xx: [], zx: [], tsjy: [], dx: [], zyyx: [], yey: [], bmfwzx: [], ggfwzx: [], dqfwzx: [], cyy: [], byfwjg: [], cwss: [], sqwsfwz: [], ejyljg: [],
-        ekzlfwjg: [], kqbpsfczmz: [], myghyfjzmz: [], sjyljg: [], sqwsfwjg: [], zybzdjg: [], gy: [], tc: [], gc: [], hydjjg: [], zcyljg: [], ckmzfwjg: [], pcs: [],
+        ekzlfwjg: [], kqbpsfczmz: [], myghyfjzmz: [], sjyljg: [], sqwsfwjg: [], zybzdjg: [], gy: [], tc: [], zysd: [], gc: [], hydjjg: [], zcyljg: [], ckmzfwjg: [], pcs: [],
         crjywbljg: [], jtxljcdd: [], jtwfcljg: [], jtsgcljg: [], cgs: [], jdcjccs: [], jsrtjz: [], ylfwjg: [], tsg: [], whg: [], wgs: [], ggty: [], jq: [],
         bdcdjzxbsdt: [], cjrfwzx: [], ddcjrfwjg: [], fwglzx: [], gzc: [], sfjdjg: [], jcfwfws: [], flyzzx: [], bsfwt: [], scjdglj: [],
         yb: [], dkbld: [], cjgshfwz: [], jykszx: [], xzfwzx: [], jzzx: [], jyhrczx: [], shbxswzx: [], sq: [], gjj: [], hscyd: [], gwzx: [], jd: [],
@@ -97,7 +98,7 @@ Page({
           success: (res) => {
               res = res.data;
               let xxs = [], xx = [], zx = [], tsjy = [], dx = [], zyyx = [], yey = [], bmfwzx = [], ggfwzx = [], dqfwzx = [], cyy = [], byfwjg = [], cwss = [], sqwsfwz = [], ejyljg = [];
-              let ekzlfwjg = [], kqbpsfczmz = [], myghyfjzmz = [], sjyljg = [], sqwsfwjg = [], zybzdjg = [], gy = [], tc = [], gc = [], hydjjg = [], zcyljg = [], ckmzfwjg = [], pcs = [];
+              let ekzlfwjg = [], kqbpsfczmz = [], myghyfjzmz = [], sjyljg = [], sqwsfwjg = [], zybzdjg = [], gy = [], tc = [], zysd = [], gc = [], hydjjg = [], zcyljg = [], ckmzfwjg = [], pcs = [];
               let crjywbljg = [], jtxljcdd = [], jtwfcljg = [], jtsgcljg = [], cgs = [], jdcjccs = [], jsrtjz = [], ylfwjg = [], tsg = [], whg = [], wgs = [], ggty = [], jq = [];
               let bdcdjzxbsdt = [], cjrfwzx = [], ddcjrfwjg = [], fwglzx = [], gzc = [], sfjdjg = [], jcfwfws = [], flyzzx = [], bsfwt = [], scjdglj = [];
               let yb = [], dkbld = [], cjgshfwz = [], jykszx = [], xzfwzx = [], jzzx = [], jyhrczx = [], shbxswzx = [], sq = [], gjj = [], hscyd = [], gwzx = [], jd = [];
@@ -359,6 +360,16 @@ Page({
               that.setData({
                   tc: tc
               });
+              for (let i in res.data.zysd) {
+                  if (res.data.zysd[i].tel) {
+                      res.data.zysd[i].tel = res.data.zysd[i].tel.split(';');
+                  }
+                  zysd.push(res.data.zysd[i]);
+                  getAllJson.push(res.data.zysd[i]);
+              }
+              that.setData({
+                zysd: zysd
+              });
               for (let i in res.data.gcs) {
                   if (res.data.gcs[i].tel) {
                       res.data.gcs[i].tel = res.data.gcs[i].tel.split(';');
@@ -1209,6 +1220,9 @@ Page({
             case "停车泊车":
             arr = this.data.tc;
             break
+            case "直饮水点":
+            arr = this.data.zysd;
+            break
         }
         this.setData({
           popData:arr