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

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

@@ -688,25 +688,6 @@ a {
 .search-result li div span{
 	font-size: 25px;
 } */
-
-.search-result div div ol li div {
-	font: 25px arial, sans-serif !important;
-}
-
-.search-result div div ol li div div:first-child a {
-	font: 25px arial, sans-serif !important;
-}
-
-.search-result div div ol li div div:nth-child(2) b {
-	font-size: 35px !important;
-	margin-top: 2px !important;
-}
-
-.search-result div div ol li div div:nth-child(3) b {
-	font-size: 35px !important;
-	margin-top: 2px !important;
-}
-
 .textSecond {
 	width: 100%;
 	margin: 22px auto 30px;
@@ -723,19 +704,19 @@ a {
 }
 
 .title-second>h6 {
-	font-size: 40px;
+	font-size: 34px;
 	font-weight: 400;
 	color: #2775CC;
 }
 
 .btn-back {
-	width: 64px;
-	height: 30px;
-	background-color: #FFF;
-	border: 1px solid #CCCCCC;
-	outline: none;
-	font-size: 14px;
-	cursor: pointer;
+	width: 96px;
+    height: 56px;
+    background-color: #FFF;
+    border: 1px solid #CCCCCC;
+    outline: none;
+    font-size: 33px;
+    cursor: pointer;
 }
 
 .backBtn {
@@ -750,12 +731,13 @@ a {
 
 .content-second {
 	width: 86%;
-	height: 37px;
-	margin: 10px auto;
-	background-color: #EEEEEE;
-	display: flex;
-	align-items: center;
-	justify-content: flex-start;
+    height: 55px;
+    margin: 10px auto;
+    background-color: #EEEEEE;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    font-size: 27px;
 }
 
 #start {
@@ -799,22 +781,53 @@ a {
 	/* width: calc(100% / 4) !important; */
 	border: 1px solid #eee !important;
 	color: #666666 !important;
+	font-size: 25px;
+}
+.layui-tab-content>div>h1{
+	font-size: 23px !important;
 }
-
 .content-title>.layui-this:after {
 	border: none;
 }
-
+.trans-title>p{
+	font-size: 20px !important;
+}
+.trans_plan_desc{
+    font-size: 23px;
+}
+.navtrans-navlist-icon ~ div{
+	line-height: 24px !important;
+    font-size: 21px;
+}
 /* .content-title>.layui-tab-title>.layui-this {
 	background-color: #E9F3FF !important;
 	color: #2775CC !important;
 } */
-
+.layui-tab-title >li{
+	font-size: 25px;
+}
+.navtrans-view{
+	height: 87px !important;
+}
+.navtrans-view>span{
+	font-size:32px;
+	height: 42px;
+	line-height: 42px;
+}
+.navtrans-view>div{
+	font-size: 25px;
+	padding: 53px 0 0 0!important;
+}
+.navtrans-view>a{
+	font-size: 20px;
+}
 .content-title>.layui-this {
 	background-color: #E9F3FF !important;
 	color: #2775CC !important;
 }
-
+.navtrans-bus-desc{
+	line-height: 36px !important;
+}
 .line {
 	width: 100%;
 	margin: 0 0 20px 0;
@@ -908,13 +921,13 @@ a {
 }
 
 .back-btn {
-	width: 64px;
-	height: 30px;
-	background-color: #FFF;
-	border: 1px solid #CCCCCC;
-	outline: none;
-	font-size: 14px;
-	cursor: pointer;
+	width: 77px;
+    height: 48px;
+    background-color: #FFF;
+    border: 1px solid #CCCCCC;
+    outline: none;
+    font-size: 29px;
+    cursor: pointer;
 }
 
 .right-map {

nngkxxdp/src/main/resources/static/wzkp/css/wzkp.css

@@ -476,7 +476,7 @@ body {
     border-radius: 15px 0 0 0 !important;
 }
 
-.table_wrap thead tr th:nth-last-child(2) {
+.table_wrap thead tr th:nth-last-child(1) {
     border-collapse: separate;
     border-spacing: 0;
     border-radius: 0 15px 0 0;
@@ -749,7 +749,7 @@ body {
     border-radius: 15px 0 0 0 !important;
 }
 
-.content_hide thead tr th:nth-last-child(2) {
+.content_hide thead tr th:nth-last-child(1) {
     border-collapse: separate !important;
     border-spacing: 0 !important;
     border-radius: 0 15px 0 0  !important;