Merge remote-tracking branch 'origin/dev2'

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

@@ -669,11 +669,11 @@ body {
 }
 
 .address_box {
-	width: 80%;
+	/*width: 80%;*/
 	margin-top: 15px;
 }
 
-.address_box>p {
+.address_box p {
 	font-size: 14px;
 	font-family: Source Han Sans SC;
 	font-weight: 400;
@@ -1376,10 +1376,10 @@ body {
 	vertical-align: middle !important;
 }
 .gzh_img{
-	position: absolute;
-    top: 64%;
+	/*position: absolute;*/
+    /*top: 64%;*/
     text-align: center;
-    right: -1px;
+    /*right: -1px;*/
 }
 .gzh_img .two_img{
 	width: 80px;

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

@@ -1202,7 +1202,7 @@ $(function() {
 							var arraddre = arr[index].address;
 							var arrtype = arr[index].type;
 							var arrspecial = arr[index].specialtype
-							var arrlebals = arr[index].lebals;
+							var arrlebals = arr[index].labels;
 							var arrtag = arr[index].tag;
 							var arrtag2 = arr[index].tag2;
 							var arrtag3 = arr[index].tag3;
@@ -1254,7 +1254,8 @@ $(function() {
 									sContnet += "<div class='three_tag' style='border: 1px solid #40A2F3;background: #EFF6FC;color: #40A2F3;'>"+arrtag3+"</div></li>"
 								}
 							}
-							sContnet += "<li class='address_box'><p><img style='' src='./img/iconAddr.png' class='flex_address'/><span class='addTress'>"+arraddre+"</span></p>"
+							sContnet += "<li class='address_box'><div style='display: flex;justify-content: space-between;'>"
+							sContnet += "<div><p><img style='' src='./img/iconAddr.png' class='flex_address'/><span class='addTress'>"+arraddre+"</span></p>"
 							if ((arrtel==null||arrtel==undefined)||arrtel==''){
 								sContnet += ''
 							} else {
@@ -1271,37 +1272,39 @@ $(function() {
 							} else {
 								sContnet += "<p style='color: #666666'><span class='flex_address'>办公时间：</span>"+arrtime+"</p>"
 							}
+							sContnet += '</div>'
 							if ((arrgzh==undefined||arrgzh==null)||arrgzh==''){
 								sContnet += ''
 							}else if(arrSptype=="交通服务"){
-								sContnet += "<li class='gzh_img'><img class='two_img' src='"+PATH+arrgzh+"'><p>微信扫描公众号办理</p></li>"
+								sContnet += "<div class='gzh_img'><img class='two_img' src='"+PATH+arrgzh+"'><p>微信扫描公众号办理</p></div>"
 							}else if(arrSptype=="文体旅游"||arrtype=="城市公园"){
-								sContnet += "<li class='gzh'><img class='two_img' src='"+PATH+arrgzh+ "'><p>微信扫描公众号预约服务</p></li>"
+								sContnet += "<div class='gzh'><img class='two_img' src='"+PATH+arrgzh+ "'><p>微信扫描公众号预约服务</p></div>"
 							}else{
-								sContnet += "<li class='gzh_img'><img class='two_img' src='"+PATH+arrgzh+ "'><p>微信扫描公众号预约挂号</p></li>"
+								sContnet += "<div class='gzh_img'><img class='two_img' src='"+PATH+arrgzh+ "'><p>微信扫描公众号预约挂号</p></div>"
+							}
+							// var arrlebals = "这个";
+							if ((arrlebals==undefined||arrlebals==null)||arrlebals==''){
+								sContnet += ''
+							} else {
+								var arrLebals=arrlebals.split(",");
+								console.log(arrLebals)
+								sContnet += "<li class='flex_orange'>"
+								for(var i=0;i<arrLebals.length;i++){
+									if((i+1) % 2 == 0) {
+										sContnet += "<div class='three_tag' style='border: 1px solid #41B643;background: #F0F6F0;color: #43BB45;'>"+arrLebals[i]+"</div>"
+									}else if((i+1) % 3 == 0){
+										sContnet += "<div class='three_tag' style='border: 1px solid #40A2F3;background: #EFF6FC;color: #40A2F3;'>"+arrLebals[i]+"</div>"
+									} else {
+										sContnet += "<div class='three_tag' style='border: 1px solid #FF843F;background: #FFF7F3;color: #FF843F;'>"+arrLebals[i]+"</div>"
+									}
+								}
+								sContnet += "</li>"
 							}
 							if (arrcontent==""||(arrcontent==undefined||arrcontent==null)){
 								sContnet += "<li style='display: flex;margin-top: 10px'>"
 							}else{
 								sContnet += "<li style='display: flex;margin-top: 10px'><a class='correct_html iconBtn' style='color: #FFFFFF;background: #2775CC;border: 1px solid #2775CC;'><img src='./img/floor.png'/><span>介绍</span></a>"
 							}
-							// sContnet += "<li style='display: flex;margin-top: 10px'><a class='correct_html iconBtn' style='color: #FFFFFF;background: #2775CC;border: 1px solid #2775CC;'><img src='./img/floor.png'/><span>介绍</span></a>"
-							// if ((arrlebals==undefined||arrlebals==null)||arrlebals==''){
-							// 	sContnet += ''
-							// } else {
-							// 	var arr=arrlebals.split(",");
-							// 	sContnet += "<li className='flex_orange'>"
-							// 	for(var i=0;i<arr.length;i++){
-							// 		if(i % 2 == 0) {
-							// 			sContnet += "<div class='three_tag' style='border: 1px solid #41B643;background: #F0F6F0;color: #43BB45;'>"+arr[i]+"</div>"
-							// 		}else if(i % 3 == 0){
-							// 			sContnet += "<div class='three_tag' style='border: 1px solid #40A2F3;background: #EFF6FC;color: #40A2F3;'>"+arr[i]+"</div>"
-							// 		} else {
-							// 			sContnet += "<div class='three_tag' style='border: 1px solid #FF843F;background: #FFF7F3;color: #FF843F;'>"+arr[i]+"</div>"
-							// 		}
-							// 	}
-							// 	sContnet += "</li>"
-							// }
 							if ((arrUrl==undefined||arrUrl==null)||arrUrl==''){
 								sContnet += ''
 							} else if(arrSptype=="民政服务") {