Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

pages/mine/driverCertificationNext.vue

@@ -441,12 +441,12 @@
 													'/driverInfo/api/qualificationLicenseShibie', {
 														image: result
 													}).then(res => {
-													if (res.data.qualificationCertificate) {
+													if (res.data&&res.data.qualificationCertificate) {
 														_this.dataDetails.qualificationCertificateValidityDate = res.data.qualificationCertificate
 														// _this.dataDetails.driverLicenseValidityDate =
 														// 	res.data.driverEndDate
 													}
-													if(res.data.qualificationCertificateNum){
+													if(res.data&&res.data.qualificationCertificateNum){
 														_this.dataDetails.qualificationCertificateNumber = res.data.qualificationCertificateNum
 													}
 													_this.$forceUpdate()

pages/mine/editDriverCertificationNext.vue

@@ -447,12 +447,10 @@
 													'/driverInfo/api/qualificationLicenseShibie', {
 														image: result
 													}).then(res => {
-													if (res.data.qualificationCertificate) {
+													if (res.data&&res.data.qualificationCertificate) {
 														_this.dataDetails.qualificationCertificateValidityDate = res.data.qualificationCertificate
-														// _this.dataDetails.driverLicenseValidityDate =
-														// 	res.data.driverEndDate
 													}
-													if(res.data.qualificationCertificateNum){
+													if(res.data&&res.data.qualificationCertificateNum){
 														_this.dataDetails.qualificationCertificateNumber = res.data.qualificationCertificateNum
 													}
 													_this.$forceUpdate()

pages/news/index.vue

@@ -107,6 +107,7 @@
 		},
 		methods: {
 			newsNumber() {
+				let that = this
 				that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 					reCommonId: this.userInfo.id,
 				}).then(res3 => {
@@ -179,10 +180,12 @@
 						this.newsNumber() //查询消息气泡
 					})
 					.catch(res => {
+						
 						uni.$u.toast(res.message);
 					});
 			},
 			look() {
+				let that = this
 				that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 					reCommonId: this.userInfo.id,
 				}).then(res3 => {