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

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

@@ -90,9 +90,15 @@ function initHead(data){
 		'<ul class="bottom">' +
 			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 15px;"><span>电话：</span><span class="link" title="'+contactTel+'">'+contactTel+'</span></li>' +
 			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 13px;"><span>地址：</span><span class="link" title="'+address+'">'+address+'</span></li>' +
-			"<li style='cursor:pointer;position: relative;' 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;top: 30px;'><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+'\')" title="'+website+'">'+website+'</span></li>' +
-		'</ul>'
+			"<li style='cursor:pointer;position: relative;' 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;top: 30px;'><img style='height: 150px;width: 150px;' src='" + wechatImg + "' alt=''></div></li>"
+
+		if (!(website==null||website=="")){
+			html+='<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')" title="'+website+'">'+website+'</span></li>'
+
+		} else {
+			html+= '<li></li>'
+		}
+		html+='</ul>'
 	document.getElementById('infoHead').innerHTML =html
 
 }

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

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
-    <title>学校</title>
+    <title>学校-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/school.css">
     <link rel="stylesheet" href="css/conmon.css">
     <style>

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

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>学校详情</title>
+    <title>学校详情-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" type="text/css" href="./layui/layui.css" media="all">
     <style>