Merge branch 'master' into 03/18VipActive

src/views/visitManager/addVisit.vue

@@ -111,8 +111,8 @@ export default {
 				studentId: null,
 				type: null,
 				purpose: null,
-				overview: null,
-				feedback: null,
+				overview: '',
+				feedback: '',
 				visitTime: null,
 				visiterType: 'TEACHER'
 			},
@@ -278,7 +278,7 @@ export default {
 			queryStudentsWithTeacher(params).then(res => {
 				let result = res.data
 				this.loading = false
-				if (result.code == 200) {
+				if (result.code == 200 && result.data) {
 					params.page = result.data.pageNo
 					this.dataList = this.dataList.concat(result.data.rows)
 					if (params.page >= result.data.totalPage) {