elis 2 سال پیش
والد
کامیت
f41e7ee30c
2فایلهای تغییر یافته به همراه87 افزوده شده و 85 حذف شده
  1. 85 83
      nnzwminiapp/pages/map/map.js
  2. 2 2
      nnzwminiapp/pages/map/map.wxml

+ 85 - 83
nnzwminiapp/pages/map/map.js

@@ -599,444 +599,446 @@ Page({
         let y = e.currentTarget.dataset.id;
         let pop = popType[x][y - 1]
         if (pop.length > 0) {
-            setTypeDateToPop(pop)
-
+            this.setTypeDateToPop(pop)
             this.setData({
-                popData: pop,
+                // popData: pop,
                 showIndex: true
             });
         } else {
-            let pop = type[x][y - 1]
-            setDateToPop(pop)
+            let pop = this.data.type[x][y - 1]
+            this.setDateToPop(pop)
             this.setData({
                 showTraffic: false,
                 showIndex: false
             })
         }
     },
-    setTypeDateToPop: function (pop) {
+    setTypeDateToPop:function(pop) {
         let arr = [];
         pop.forEach(e => {
             switch (e) {
                 case "受理场所":
-                    arr = {
-                        "popName": e,
-                        "data": qjjz
-                    }
+                    arr.push({
+                      "popName": e,
+                      "data": this.data.qjjz
+                  });
                     break
                 case "查阅场所":
-                    arr = {
-                        "popName": e,
-                        "data": cycsbms
-                    }
+                    arr.push({
+                      "popName": e,
+                      "data": this.data.cycsbms
+                  });
                     break
                 case "区级政务服务中心":
                     arr = {
                         "popName": e,
-                        "data": xzfwzx
+                        "data": this.data.xzfwzx
                     }
                     break
                 case "镇(街道)便民服务中心":
                     arr = {
                         "popName": e,
-                        "data": ggfwzx
+                        "data": this.data.ggfwzx
                     }
                     break
                 case "村(社区)便民服务站":
                     arr = {
                         "popName": e,
-                        "data": bmfwzx
+                        "data": this.data.bmfwzx
                     }
                     break
                 case "生源地助学贷款办理点":
                     arr = {
                         "popName": e,
-                        "data": dkbld
+                        "data": this.data.dkbld
                     }
                     break
                 case "党群服务中心":
                     arr = {
                         "popName": e,
-                        "data": dqfwzx
+                        "data": this.data.dqfwzx
                     }
                     break
                 case "职业教育学校":
                     arr = {
                         "popName": e,
-                        "data": zyyx
+                        "data": this.data.zyyx
                     }
                     break
                 case "特殊教育学校":
                     arr = {
                         "popName": e,
-                        "data": tsjy
+                        "data":this.data.tsjy
                     }
                     break
                 case "高等院校":
                     arr = {
                         "popName": e,
-                        "data": dx
+                        "data": this.data.dx
                     }
                     break
                 case "小学":
                     arr = {
                         "popName": e,
-                        "data": xx
+                        "data": this.data.xx
                     }
                     break
                 case "中学":
                     arr = {
                         "popName": e,
-                        "data": zx
+                        "data": this.data.zx
                     }
                     break
                 case "幼儿园":
                     arr = {
                         "popName": e,
-                        "data": yey
+                        "data": this.data.yey
                     }
                     break
                 case "教育考试中心":
                     arr = {
                         "popName": e,
-                        "data": jykszx
+                        "data": this.data.jykszx
                     }
                     break
                 case "村卫生室":
                     arr = {
                         "popName": e,
-                        "data": cwss
+                        "data": this.data.cwss
                     }
                     break
                 case "社区卫生服务站":
                     arr = {
                         "popName": e,
-                        "data": sqwsfwz
+                        "data": this.data.sqwsfwz
                     }
                     break
                 case "儿科诊疗服务机构":
                     arr = {
                         "popName": e,
-                        "data": ekzlfwjg
+                        "data": this.data.ekzlfwjg
                     }
                     break
                 case "狂犬病、破伤风处置门诊":
                     arr = {
                         "popName": e,
-                        "data": kqbpsfczmz
+                        "data": this.data.kqbpsfczmz
                     }
                     break
                 case "免疫规划预防接种门诊":
                     arr = {
                         "popName": e,
-                        "data": myghyfjzmz
+                        "data": this.data.myghyfjzmz
                     }
                     break
                 case "二级医疗机构":
                     arr = {
                         "popName": e,
-                        "data": ejyljg
+                        "data": this.data.ejyljg
                     }
                     break
                 case "三级医疗机构":
                     arr = {
                         "popName": e,
-                        "data": sjyljg
+                        "data": this.data.sjyljg
                     }
                     break
                 case "社区卫生服务机构":
                     arr = {
                         "popName": e,
-                        "data": sqwsfwjg
+                        "data": this.data.sqwsfwjg
                     }
                     break
                 case "职业病诊断机构":
                     arr = {
                         "popName": e,
-                        "data": zybzdjg
+                        "data": this.data.zybzdjg
                     }
                     break
                 case "助产医疗机构":
                     arr = {
                         "popName": e,
-                        "data": zcyljg
+                        "data": this.data.zcyljg
                     }
                     break
                 case "产科门诊服务机构":
                     arr = {
                         "popName": e,
-                        "data": ckmzfwjg
+                        "data": this.data.ckmzfwjg
                     }
                     break
                 case "医疗保障事务中心":
                     arr = {
                         "popName": e,
-                        "data": yb
+                        "data": this.data.yb
                     }
                     break
                 case "核酸采样点":
                     arr = {
                         "popName": e,
-                        "data": hscyd
+                        "data": this.data.hscyd
                     }
                     break
                 case "派出所":
                     arr = {
                         "popName": e,
-                        "data": pcs
+                        "data": this.data.pcs
                     }
                     break
                 case "出入境业务办理机构":
                     arr = {
                         "popName": e,
-                        "data": crjywbljg
+                        "data": this.data.crjywbljg
                     }
                     break
                 case "交通支大队":
                     arr = {
                         "popName": e,
-                        "data": jtxljcdd
+                        "data": this.data.jtxljcdd
                     }
                     break
                 case "交通违法处理机构":
                     arr = {
                         "popName": e,
-                        "data": jtwfcljg
+                        "data": this.data.jtwfcljg
                     }
                     break
                 case "交通事故处理机构":
                     arr = {
                         "popName": e,
-                        "data": jtsgcljg
+                        "data": this.data.jtsgcljg
                     }
                     break
                 case "车管所":
                     arr = {
                         "popName": e,
-                        "data": cgs
+                        "data": this.data.cgs
                     }
                     break
                 case "机动车检测场所":
                     arr = {
                         "popName": e,
-                        "data": jdcjccs
+                        "data": this.data.jdcjccs
                     }
                     break
                 case "驾驶人体检医院":
                     arr = {
                         "popName": e,
-                        "data": jsrtjz
+                        "data": this.data.jsrtjz
                     }
                     break
                 case "就业和人才中心":
                     arr = {
                         "popName": e,
-                        "data": jyhrczx
+                        "data": this.data.jyhrczx
                     }
                     break
                 case "社会保险事务中心":
                     arr = {
                         "popName": e,
-                        "data": shbxswzx
+                        "data": this.data.shbxswzx
                     }
                     break
                 case "养老机构":
                     arr = {
                         "popName": e,
-                        "data": ylfwjg
+                        "data": this.data.ylfwjg
                     }
                     break
                 case "婚姻登记机构":
                     arr = {
                         "popName": e,
-                        "data": hydjjg
+                        "data": this.data.hydjjg
                     }
                     break
                 case "殡仪服务机构":
                     arr = {
                         "popName": e,
-                        "data": byfwjg
+                        "data": this.data.byfwjg
                     }
                     break
                 case "图书馆":
                     arr = {
                         "popName": e,
-                        "data": tsg
+                        "data": this.data.tsg
                     }
                     break
                 case "文化馆":
                     arr = {
                         "popName": e,
-                        "data": whg
+                        "data": this.data.whg
                     }
                     break
                 case "文管所":
                     arr = {
                         "popName": e,
-                        "data": wgs
+                        "data": this.data.wgs
                     }
                     break
                 case "公共体育馆":
                     arr = {
                         "popName": e,
-                        "data": ggty
+                        "data": this.data.ggty
                     }
                     break
                 case "旅游景点":
                     arr = {
                         "popName": e,
-                        "data": jq
+                        "data": this.data.jq
                     }
                     break
                 case "公园":
                     arr = {
                         "popName": e,
-                        "data": gy
+                        "data": this.data.gy
                     }
                     break
                 case "公证处":
                     arr = {
                         "popName": e,
-                        "data": gzc
+                        "data": this.data.gzc
                     }
                     break
                 case "司法鉴定机构":
                     arr = {
                         "popName": e,
-                        "data": sfjdjg
+                        "data": this.data.sfjdjg
                     }
                     break
                 case "基层司法所":
                     arr = {
                         "popName": e,
-                        "data": jcfwfws
+                        "data": this.data.jcfwfws
                     }
                     break
                 case "法律援助机构":
                     arr = {
                         "popName": e,
-                        "data": flyzzx
+                        "data": this.data.flyzzx
                     }
                     break
                 case "矫正中心":
                     arr = {
                         "popName": e,
-                        "data": jzzx
+                        "data": this.data.jzzx
                     }
                     break
                 case "残疾人服务中心":
                     arr = {
                         "popName": e,
-                        "data": cjrfwzx
+                        "data": this.data.cjrfwzx
                     }
                     break
                 case "定点残疾人服务机构":
                     arr = {
                         "popName": e,
-                        "data": ddcjrfwjg
+                        "data": this.data.ddcjrfwjg
                     }
                     break
                 case "商圈":
                     arr = {
                         "popName": e,
-                        "data": sq
+                        "data": this.data.sq
                     }
                     break
                 case "购物中心":
                     arr = {
                         "popName": e,
-                        "data": gwzx
+                        "data": this.data.gwzx
                     }
                     break
                 case "酒店":
                     arr = {
                         "popName": e,
-                        "data": jd
+                        "data": this.data.jd
                     }
                     break
             }
         });
+        this.setData({
+          popData:arr
+        })
     },
-    setTypeDateToPop: function (pop) {
+    setDateToPop: function (pop) {
         let arr = [];
         pop.forEach(e => {
             switch (e) {
                 case "受理场所":
                     arr = {
                         "popName": e,
-                        "data": qjjz
+                        "data": this.data.qjjz
                     }
                     break
                 case "查阅场所":
                     arr = {
                         "popName": e,
-                        "data": cycsbms
+                        "data": this.data.cycsbms
                     }
                     break
                 case "区级政务服务中心":
                     arr = {
                         "popName": e,
-                        "data": xzfwzx
+                        "data": this.data.xzfwzx
                     }
                     break
                 case "镇(街道)便民服务中心":
                     arr = {
                         "popName": e,
-                        "data": ggfwzx
+                        "data": this.data.ggfwzx
                     }
                     break
                 case "村(社区)便民服务站":
                     arr = {
                         "popName": e,
-                        "data": bmfwzx
+                        "data": this.data.bmfwzx
                     }
                     break
                 case "生源地助学贷款办理点":
                     arr = {
                         "popName": e,
-                        "data": dkbld
+                        "data": this.data.dkbld
                     }
                     break
                 case "党群服务中心":
                     arr = {
                         "popName": e,
-                        "data": dqfwzx
+                        "data": this.data.dqfwzx
                     }
                     break
                 case "职业教育学校":
                     arr = {
                         "popName": e,
-                        "data": zyyx
+                        "data": this.data.zyyx
                     }
                     break
                 case "特殊教育学校":
                     arr = {
                         "popName": e,
-                        "data": tsjy
+                        "data": this.data.tsjy
                     }
                     break
                 case "高等院校":
                     arr = {
                         "popName": e,
-                        "data": dx
+                        "data": this.data.dx
                     }
                     break
                 case "小学":
                     arr = {
                         "popName": e,
-                        "data": xx
+                        "data": this.data.xx
                     }
                     break
                 case "中学":
                     arr = {
                         "popName": e,
-                        "data": zx
+                        "data": this.data.zx
                     }
                     break
                 case "幼儿园":
                     arr = {
                         "popName": e,
-                        "data": yey
+                        "data": this.data.yey
                     }
                     break
             }
@@ -1048,7 +1050,7 @@ Page({
         })
     },
     changeInfo(e) {
-        console.log(e.currentTarget.dataset.name);
+        console.log(e.currentTarget.dataset.data);
         this.setData({
             showTraffic: false,
             showIndex: false

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

@@ -75,9 +75,9 @@
   <view class="row-info">
     <view class="pop-value">
       <scroll-view scroll-y="true" style="height:350rpx">
-        <view style="width:50%;float: left;" wx:for="{{popData}}" bindtap="changeInfo" wx:for-item="item" data-name="{{item}}" wx:index="{{index}}" wx:key="index">
+        <view style="width:50%;float: left;" wx:for="{{popData}}" bindtap="changeInfo"  wx:for-item="item" data-data="{{item.data}}" wx:index="{{index}}" wx:key="index">
           <image src="{{imgUrl}}/flex.png" class="icon-pop" style="float: left;"></image>
-          <text class="text-pop">{{item}}</text>
+          <text class="text-pop">{{item.popName}}</text>
         </view>
       </scroll-view>
     </view>