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

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

@@ -58,13 +58,13 @@ function initHead(data){
 			'<ul>' +
 				'<li id="district">所在区:'+data.address+'</li>' +
 				'<li id="natureOfTheSchool">学校性质:'+natureType+'</li>' +
-				'<li>餐食情况:'+canteenType+'</li>' +
+				'<li title="'+canteenType+'">餐食情况:'+canteenType+'</li>' +
 				'<li>上级主管部门:'+competentDepartment+'</li>' +
 			'</ul>' +
 			'<ul>' +
 				'<li id="postcode">邮编:'+postal+'</li>' +
 				'<li id="schoolClasses">学校类别:'+schoolType+'</li>' +
-				'<li>招生方式:'+recruitType+'</li>' +
+				'<li title="'+recruitType+'">招生方式:'+recruitType+'</li>' +
 				'<li>监督电话:'+superviseTel+'</li>' +
 			'</ul>' +
 		'</div>' +

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

@@ -84,17 +84,24 @@
             background: rgb(176 176 176 / 22%);
             font-size: 16px;
             color: #666666;
-            padding: 10px 26px;
+            padding: 10px 0;
             box-sizing: border-box;
             display: flex;
             margin-top: 15px;
         }
 
         .schoolList .message .other li {
-            line-height: 30px
+            line-height: 30px;
+            word-wrap: break-word;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            cursor: pointer;
         }
-        .schoolList .message .other ul:last-child{
-            margin-left: 76px;
+        .schoolList .message .other ul{
+            width:50%;
+            padding-left: 26px;
+            box-sizing: border-box;
         }
         .schoolList .message .bottom {
             margin-top: 15px;