Merge remote-tracking branch 'origin/master'

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/index/index.js

@@ -120,11 +120,12 @@ Page({
 			let temp = [];
 			let data = res.data.data;
 			for (let i = 0; i < data.length; i++) {
+				let text = data[i]._source.content.replace(/<[^>]+>/g, "");
 				temp.push({
 					sourceAsMap: {
 						highlight: data[i]._source.title,
 						title: res.data.highlightArr[i].title,
-						contentText: data[i]._source.content,
+						contentText: text,
 						content: data[i]._source.content,
 						departmentname: data[i]._source.departmentname
 					}

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

@@ -38,26 +38,32 @@ function initHead(data){
 	let schoolType = getSchoolType(data.schoolType);
 	let canteenType = data.canteenType==1?"有":"无"
 	let recruitType = data.recruitType==1?"统一招生":"自主招生"
+	let postal = data.postal==null?"":data.postal
+	let competentDepartment = data.competentDepartment==null?"":data.competentDepartment
+	let superviseTel = data.superviseTel==null?"":data.superviseTel
+	let wechatImg = data.wechatImg==null?"":data.wechatImg
+	let website = data.website==null?"":data.website
+
 	let html = '<div class="title" id="name">' + data.name + '</div>' +
 		'<div class="other">' +
 			'<ul>' +
 				'<li id="district">所在区:'+data.address+'</li>' +
-				'<li id="postcode">邮编:'+data.postal+'</li>' +
+				'<li id="postcode">邮编:'+postal+'</li>' +
 				'<li id="natureOfTheSchool">学校性质:'+natureType+'</li>' +
 				'<li id="schoolClasses">学校类别:'+schoolType+'</li>' +
 			'</ul>' +
 			'<ul>' +
 				'<li>餐食情况:'+canteenType+'</li>' +
 				'<li>招生方式:'+recruitType+'</li>' +
-				'<li>上级主管部门:'+data.competentDepartment+'</li>' +
-				'<li>监督电话:'+data.superviseTel+'</li>' +
+				'<li>上级主管部门:'+competentDepartment+'</li>' +
+				'<li>监督电话:'+superviseTel+'</li>' +
 			'</ul>' +
 		'</div>' +
 		'<ul class="bottom">' +
 			'<li><img src="images/logo-dh.png" alt=""><span>电话：</span><span>'+data.contactTel+'</span></li>' +
 			'<li><img src="images/logo-dt.png" alt=""><span>地址：</span><span>'+data.address+'</span></li>' +
-			'<li><img src="images/logo-wx.png" alt=""><span>微信：</span><span>'+data.wechatImg+'</span></li>' +
-			'<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+data.website+'\')">'+data.website+'</span></li>' +
+			'<li><img src="images/logo-wx.png" alt=""><span>微信：</span><span>'+wechatImg+'</span></li>' +
+			'<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')">'+website+'</span></li>' +
 		'</ul>'
 	document.getElementById('infoHead').innerHTML =html
 
@@ -79,8 +85,8 @@ function initbody(data){
 
 function conts(data){
 	let html = ""
-	html+=data.bookCharge;
-	html+=data.studyCharge;
+	html+=data.bookCharge==null?"":data.bookCharge;
+	html+=data.studyCharge==null?"":data.studyCharge;
 	document.getElementById('conts').innerHTML = html;
 }
 
@@ -195,6 +201,9 @@ function getSchoolType(id) {
 		case 8:
 			return '职业院校';
 			break;
+		default:
+			return '';
+			break;
 	}
 }
 function getNature(id) {