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

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

@@ -143,6 +143,9 @@
     text-overflow: ellipsis;
     -o-text-overflow:ellipsis;
 }
+.schoolList .message ul:last-child li{
+    width: 300px;
+}
 
 .schoolList .message li img {
     margin-right: 8px;

nngkxxdp/src/main/resources/static/school/js/schoolDetail.js

@@ -74,7 +74,7 @@ function initHead(data){
 	let address =  data.address ==null?"":data.address
 	let contactTel =  data.contactTel ==null?"":data.contactTel
 
-	let html = '<div class="title" id="name">' + data.name + '</div>' +
+	let html = '<div class="title" id="name">' + data.name + '\n' + '<div class="route" style="cursor:pointer " id="route" onclick="back()">返回</div></div>' +
 		'<div class="other">' +
 			'<ul>' +
 				'<li id="district">所在区：'+address+'</li>' +

nngkxxdp/src/main/resources/static/school/schoolDetail.html

@@ -68,7 +68,7 @@
         }
 
         .schoolList .message {
-            width: 560px;
+            width: 720px;
             margin-left: 20px;
         }
 
@@ -79,7 +79,7 @@
         }
 
         .schoolList .message .other {
-            width: 597px;
+            width: auto;
             /*height: 9.4375rem;*/
             background: rgb(176 176 176 / 22%);
             font-size: 16px;
@@ -110,7 +110,7 @@
         }
 
         .schoolList .message .bottom li {
-            width: 260px;
+            width: 43%;
             font-size: 16px;
             height: 30px;
             line-height: 30px;
@@ -127,7 +127,6 @@
 
         .bottom  .link {
             display: inline-block;
-            width: 160px;
             word-wrap: break-word;
             overflow: hidden;
             white-space: nowrap;
@@ -237,7 +236,6 @@
         </div>
         <div class="message" id="infoHead">
         </div>
-        <div class="route" style="cursor:pointer " id="route" onclick="back()">返回</div>
     </div>
     <ul class="titleList">
         <li id="school" class="click" onclick="checkSchool()">学校介绍</li>

nngkxxdp/src/main/resources/static/school/schoolDetailMobile.html

@@ -77,13 +77,11 @@
 
         .schoolList .message .other {
             width: 100%;
-            height: 9.4375rem;
             background: rgb(176 176 176 / 22%);
             font-size: 1rem;
             color: #666666;
             padding: 0.625rem 0;
             box-sizing: border-box;
-            display: flex;
             margin-top: 0.9375rem;
         }
 
@@ -97,7 +95,6 @@
         }
 
         .schoolList .message .other ul {
-            width: 50%;
             padding-left: 1.625rem;
             box-sizing: border-box;
         }