Merge remote-tracking branch 'origin/master'

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

@@ -1365,6 +1365,18 @@ body {
     vertical-align: middle;
     text-align: center;
 }
+.gzh{
+	position: absolute;
+    top: 45%;
+    text-align: center;
+    right: -1px;
+}
+.gzh .two_img{
+	width: 80px;
+    height: 80px;
+    vertical-align: middle;
+    text-align: center;
+}
 .text-tab-title-two{
 	position: relative;
 	height: 55px;

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

@@ -276,8 +276,8 @@ $(function(){
         marker.addEventListener("dragend", function (e) {
             lngAndlat= new BMap.Point(e.point.lng, e.point.lat);
             myGeo.getLocation(lngAndlat, function(rs){
-                var addComp = rs.addressComponents;
-                $('#newAddres').val(addComp.city + addComp.district + addComp.street + addComp.streetNumber)
+                var addComp = rs.surroundingPois[0].title;
+                $('#newAddres').val(addComp)
             })
         });
 		map.addOverlay(marker);

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

@@ -1522,7 +1522,7 @@ $(function() {
 								sContnet += "<p>微信扫描公众号办理</p>"
 								sContnet += "</li>"
 							}else if(arrSptype=="文体旅游"||arrtype=="城市公园"){
-								sContnet += "<li class='gzh_img'>"
+								sContnet += "<li class='gzh'>"
 								sContnet += "<img class='two_img' src='" +PATH+arrgzh + "'>"
 								sContnet += "<p>微信扫描公众号预约服务</p>"
 								sContnet += "</li>"

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() + 157;
+    var hlHeight = window.outerHeight - $('.head').outerHeight() - $('.bttom-tab').outerHeight() + 85;
     $('.right-map').css('height',hlHeight);
     var msHeight = $('.right-map').outerHeight() - $('.right-search').outerHeight()/1.3;
     $('.right-search').css('top',msHeight);
@@ -812,7 +812,7 @@ $(function () {
 		map.clearOverlays();
         var sContnet = '';
 		var addFirst;
-        // getAllArr = arr;
+        getAllArr = arr;
         if (!arr){
             return
         }else{
@@ -2993,9 +2993,9 @@ $(function () {
             map.addOverlay(mk);
             map.panTo(r.point);
             myGeo.getLocation(r.point, function(rs){
-                var addComp = rs.addressComponents;
-                $('#gj-one').val(addComp.district + addComp.street + addComp.streetNumber);
-                $('#zj-one').val(addComp.city+addComp.district+addComp.street + addComp.streetNumber);
+                var addComp = rs.surroundingPois[0].title;
+                $('#gj-one').val(addComp);
+                $('#zj-one').val(addComp);
             })
         } else {
             // alert('未能获得您的定位，请手动输入起点');

nngkxxdp/src/main/resources/static/page/index.html

@@ -1892,7 +1892,7 @@
                     }, 300);
                     break;
                 case "main-gkxx":
-                    $('#main-gkxx').attr('src', 'http://localhost:7777/natj/enter_showLetterbox.html');
+                    $('#main-gkxx').attr('src', 'http://nazwfw.cqna.gov.cn/natj/enter_showLetterbox.html');
                     clearInterval(timer);
                     clearInterval(time);
                     clearTimeout(t);