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

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

@@ -70,9 +70,9 @@ function initHead(data){
 		'</div>' +
 		'<ul class="bottom">' +
 			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 15px;"><span>电话：</span><span class="link">'+data.contactTel+'</span></li>' +
-			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 15px;"><span>地址：</span><span class="link" title="'+data.address+'">'+data.address+'</span></li>' +
+			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 13px;"><span>地址：</span><span class="link" title="'+data.address+'">'+data.address+'</span></li>' +
 			"<li style='cursor:pointer;' onclick='clickQRCode()'><img src='images/logo-wx.png' alt=''><span>微信：点击查看二维码</span><div id='ewmImg' style='position: absolute;z-index: 99999;background: #f6f6f6;border-radius: 5px;height: 150px;width: 150px;padding: 8px;display: none;'><img style='height: 150px;width: 150px;' src='" + wechatImg + "' alt=''></div></li>" +
-			'<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')">'+website+'</span></li>' +
+			'<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')" title="'+website+'">'+website+'</span></li>' +
 		'</ul>'
 	document.getElementById('infoHead').innerHTML =html
 
@@ -210,6 +210,7 @@ function getNature(id) {
 	switch (id) {
 		case 0: return '公办';break;
 		case 1: return '民办';break;
+		case 2: return '股份制';break;
 		default:
 			return '';
 			break;

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

@@ -376,7 +376,7 @@
         }
     }
     function gotoOfficial(number) {
-        if (schoolData[number].website != null) {
+        if (schoolData[number].website != null && schoolData[number].website != '') {
             window.location.href = schoolData[number].website;
         }
     }

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

@@ -53,8 +53,6 @@
             /*box-sizing: border-box;*/
             /*position: absolute;*/
             /*top: 9px;*/
-            /*left: -10px;*/
-
             padding: 0px 35px 0px 20px;
             background-size: 100% 100%;
             height: 41px;
@@ -65,6 +63,7 @@
             box-sizing: border-box;
             position: absolute;
             top: 9px;
+            left: -10px;
         }
 
         .schoolList .message {
@@ -134,7 +133,6 @@
 
         .schoolList .message .bottom li span{
             display: inline-block;
-            width: 160px;
             word-wrap: break-word;
             overflow: hidden;
             white-space: nowrap;