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

pages/goodSource/index.vue

@@ -239,7 +239,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle == '账号审核中'
+				this.alertTitle = '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -274,7 +274,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle == '账号审核中') {
+				if (this.alertTitle = '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {

pages/mine/index.vue

@@ -169,7 +169,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle == '账号审核中'
+				this.alertTitle = '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -239,7 +239,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle == '账号审核中') {
+				if (this.alertTitle = '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {
@@ -258,7 +258,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {
-					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期') {
+					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期'||this.statusVal == '身份认证未通过') {
 						src = '/pages/mine/editDriverCertification'
 					}
 					console.log('this.isFirstSH', this.isFirstSH)

pages/mine/manageVehicles/addVehicle.vue

@@ -167,7 +167,7 @@
 				}
 			},
 			uploadFilePromise(url) {
-				uploadImage(url, 'appData/',
+				uploadImage('image',url, 'appData/',
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
@@ -228,7 +228,7 @@
 					count: 1,
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
-						uploadImage(res.tempFilePaths[0], 'appData/',
+						uploadImage('image',res.tempFilePaths[0], 'appData/',
 							result => {
 								// 上传成功
 								console.log('图片地址', result)

pages/order/index.vue

@@ -276,7 +276,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle == '账号审核中'
+				this.alertTitle = '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -397,7 +397,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle == '账号审核中') {
+				if (this.alertTitle = '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {