Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/resources/static/district/css/sy_mobile_new.css

@@ -47,8 +47,8 @@ a {
 .bttom-tab {
     width: 100%;
     background-color: white;
-    overflow-y: auto;
-    overflow-x: hidden;
+    /* overflow-y: auto; */
+    /* overflow-x: hidden; */
 	margin-top: 14.93333vw;
 }
 .right-map {

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

@@ -434,24 +434,31 @@ $(function() {
 			localStorage.setItem("gjImg","0");
 			localStorage.setItem("zjImg","0");
 			localStorage.setItem("zjIndex","0");
+			$('.left-map').scrollTop(0);
 		} else if (tabtext == '产业园') {
 			xxGEO(cyy);
 			xrxx(cyy);
+			$('.left-map').scrollTop(0);
 		} else if (tabtext == '停车') {
 			xxGEO(tc);
 			xrxx(tc);
+			$('.left-map').scrollTop(0);
 		} else if (tabtext == '不动产登记') {
 			xxGEO(bdcdjzxbsdt);
 			xrxx(bdcdjzxbsdt);
+			$('.left-map').scrollTop(0);
 		}else if(tabtext == "公厕"){
 			xxGEO(gc);
 			xrxx(gc);
+			$('.left-map').scrollTop(0);
 		}else if(tabtext == "公租房"){
 			xxGEO(fwglzx);
 			xrxx(fwglzx);
+			$('.left-map').scrollTop(0);
 		}else if(tabtext == "公积金"){
 			xxGEO(gjj);
 			xrxx(gjj);
+			$('.left-map').scrollTop(0);
 		}
 		$(this).children('.pop').slideToggle(200);
 		$(this).siblings().find('.pop').hide();
@@ -494,6 +501,7 @@ $(function() {
 		$(".search-change li:nth-child(1)").addClass("layui-this").siblings().removeClass("layui-this");
 		$(this).parents('.flex_li').find('.flex_text').css('color','#2775CC');
 		$(this).parents('.flex_li').siblings().children('.img_tab').find('.flex_text').css('color','#333333');
+		$('.left-map').scrollTop(0);
 		var xxtx = $(this).text();
 		if (xxtx == "小学") {
 			xxGEO(xx);
@@ -1167,6 +1175,14 @@ $(function() {
 				});
 			});
 			$('.correct_html').click(function(){
+				var address_text = $(this).parent(".address_box").find("p:nth-child(1)").text();
+				var discript_text = address_text.split("：")[1];
+				var filterId = allArr.filter(function(i){
+					return i.address == discript_text
+				});
+				$.each(filterId,function(i){
+					localStorage.setItem("passid",filterId[i].id);
+				})
 				$(this).attr('href','correct.html');
 			})
 		}
@@ -1189,6 +1205,14 @@ $(function() {
 				});
 			});
 			$('.correct_html').click(function(){
+				var address_text = $(this).parent(".address_box").find("p:nth-child(1)").text();
+				var discript_text = address_text.split("：")[1];
+				var filterId = allArr.filter(function(i){
+					return i.address == discript_text
+				});
+				$.each(filterId,function(i){
+					localStorage.setItem("passid",filterId[i].id);
+				})
 				$(this).attr('href','correct.html');
 			})
 		});

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

@@ -13,7 +13,7 @@ layui.use('element', function () {
 
 $(function () {
     // 获取高度
-    var hlHeight = window.outerHeight - $('.head').outerHeight() - $('.bttom-tab').outerHeight() + 6;
+    var hlHeight = window.outerHeight - $('.head').outerHeight() - $('.bttom-tab').outerHeight() + 78;
     $('.right-map').css('height',hlHeight);
     var msHeight = $('.right-map').outerHeight() - $('.right-search').outerHeight()/1.3;
     $('.right-search').css('top',msHeight);
@@ -39,7 +39,7 @@ $(function () {
 	var ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],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=[];
+    var yb=[],dkbld=[],cjgshfwz=[],jykszx=[],xzfwzx=[],jzzx=[],jyhrczx=[],shbxswzx=[],sq=[],gjj=[];
     // 数组接收的是渲染页面的值
     var getAllArr = [];
     // 参数用来判断进入的页面
@@ -376,6 +376,11 @@ $(function () {
 				getAllJson.push(res.data.sqs[i]);
 				contrastArrey.push(res.data.sqs[i]);
 			});
+			$.each(res.data.gjjs,function(i){
+				gjj.push(res.data.gjjs[i])
+				getAllJson.push(res.data.gjjs[i]);
+				contrastArrey.push(res.data.gjjs[i]);
+			});
         },
         error: function (err) { },
     });
@@ -513,9 +518,6 @@ $(function () {
 		}else if(xxtx == "养老机构"){
             applyClickList();
 			xrList(ylfwjg);
-		}else if(xxtx == "公厕"){
-            applyClickList();
-			xrList(gc);
 		}else if(xxtx == "图书馆"){
             applyClickList();
 			xrList(tsg);
@@ -537,9 +539,6 @@ $(function () {
 		}else if(xxtx == "定点残疾人服务机构"){
             applyClickList();
 			xrList(ddcjrfwjg);
-		}else if(xxtx == "公租房项目"){
-            applyClickList();
-			xrList(fwglzx);
 		}else if(xxtx == "公证处"){
             applyClickList();
 			xrList(gzc);
@@ -643,6 +642,18 @@ $(function () {
             applyClickList();
             $('.show-fifth .title-second>h6').text(cyytext);
             xrList(bdcdjzxbsdt);
+		}else if(cyytext == "公厕"){
+            applyClickList();
+            $('.show-fifth .title-second>h6').text(cyytext);
+			xrList(gc);
+		}else if(cyytext == "公租房"){
+            $('.show-fifth .title-second>h6').text(cyytext);
+            applyClickList();
+			xrList(fwglzx);
+		}else if(cyytext == "公积金"){
+            $('.show-fifth .title-second>h6').text(cyytext);
+            applyClickList();
+			xrList(gjj);
 		}
     })
 

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

@@ -210,78 +210,6 @@
 								<img src="img/fjtfw.png" class="gn_img">
 								<p class="flex_text">交通服务</p>
                                 <div class="flex_pop pop lineThree" style="display: none;">
-                                    <!-- <div class="wrap_big">
-                                        <div class="flex_wrap">
-                                            <div class="inline_one">
-                                                <div class="tab_one">按办理业务查询</div>
-                                                <div class="tab_one select">按办事网点查询</div>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">交通支大队</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">交通违法处理机构（执法站）</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">交通事故处理机构</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">车管所</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">车管站</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">机动车检测场</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">机动车考试场</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">非机动车登记站</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">机动车解体厂</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">进京证办证处</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">交通法制咨询机构</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">驾驶人体检医院</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">政务服务中心交管服务点</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">4s店代办临牌服务点</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">4s店检验发牌服务站</a>
-                                            </div>
-                                            <div>
-                                                <img src="img/flex.png">
-                                                <a class="mapnav">汽车交易市场服务点</a>
-                                            </div>
-                                        </div>
-                                    </div> -->
                                     <div class="flex_wrap">
                                         <div>
                                             <img src="img/flex.png">
@@ -343,26 +271,6 @@
                                     <div class="flex_wrap">
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">公证处</a>
-                                        </div>
-                                        <div>
-                                            <img src="img/flex.png">
-                                            <a class="mapnav">司法鉴定机构</a>
-                                        </div>
-                                        <div>
-                                            <img src="img/flex.png">
-                                            <a class="mapnav">基层司法所</a>
-                                        </div>
-                                        <div>
-                                            <img src="img/flex.png">
-                                            <a class="mapnav">法律援助机构</a>
-                                        </div>
-                                        <div>
-                                            <img src="img/flex.png">
-                                            <a class="mapnav">矫正中心</a>
-                                        </div>
-                                        <div>
-                                            <img src="img/flex.png">
                                             <a class="mapnav">就业和人才中心</a>
                                         </div>
                                         <div>
@@ -519,51 +427,90 @@
                                     <div class="flex_wrap">
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">公厕</a>
-                                        </div>
-                                        <div>
-                                            <img src="img/flex.png">
-                                            <a class="mapnav">残疾人服务中心</a>
+                                            <a class="mapnav">公租房项目</a>
                                         </div>
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">定点残疾人服务机构</a>
+                                            <a class="mapnav">商圈</a>
                                         </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/fbdcdj.png" class="gn_img">
+                                <p class="flex_text">不动产登记</p>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/fcjr.png" class="gn_img">
+                                <p class="flex_text">残疾人服务</p>
+                                <div class="flex_pop pop lineFour" style="display: none;">
+                                    <div class="flex_wrap">
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">公租房项目</a>
+                                            <a class="mapnav">残疾人服务中心</a>
                                         </div>
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">商圈</a>
+                                            <a class="mapnav">定点残疾人服务机构</a>
                                         </div>
-                                        <!-- <div>
-                                            <img src="img/flex.png">
-                                            <a class="mapnav">公园</a>
-                                        </div> -->
                                     </div>
                                 </div>
                             </div>
                         </li>
+                    </ul>
+                    <ul>
                         <li>
                             <div class="img_tab">
-                                <img src="img/fbdcdj.png" class="gn_img">
-                                <p class="flex_text">不动产登记</p>
-                                <!-- <div class="flex_pop pop lineThree" style="display: none;">
+                                <img src="img/fgc.png" class="gn_img">
+                                <p class="flex_text">公厕</p>
+                            </div>
+						</li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/fgzf.png" class="gn_img">
+                                <p class="flex_text">公租房</p>
+                            </div>
+						</li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/fsffw.png" class="gn_img">
+                                <p class="flex_text">司法服务</p>
+                                <div class="flex_pop pop lineThree" style="display: none;">
                                     <div class="flex_wrap">
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">养老机构</a>
+                                            <a class="mapnav">公证处</a>
                                         </div>
                                         <div>
                                             <img src="img/flex.png">
-                                            <a class="mapnav">社区养老服务驿站</a>
+                                            <a class="mapnav">司法鉴定机构</a>
+                                        </div>
+                                        <div>
+                                            <img src="img/flex.png">
+                                            <a class="mapnav">基层司法所</a>
+                                        </div>
+                                        <div>
+                                            <img src="img/flex.png">
+                                            <a class="mapnav">法律援助机构</a>
+                                        </div>
+                                        <div>
+                                            <img src="img/flex.png">
+                                            <a class="mapnav">矫正中心</a>
                                         </div>
                                     </div>
-                                </div> -->
+                                </div>
                             </div>
                         </li>
-                        <li class="flex_li"></li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/fgjj.png" class="gn_img">
+                                <p class="flex_text">公积金</p>
+                            </div>
+						</li>
                     </ul>
                 </div>
             </div>