Merge commit '705a63c9' into develop

pages/apply/applypage1.vue

@@ -144,10 +144,8 @@
 			uploadImage(key) {
 				uni.chooseImage({
 					success: (res) => {
-						uni.showToast({
-							title: '上传中',
-							icon: 'none',
-							duration:90000
+						uni.showLoading({
+							title: '上传中'
 						})
 						const tempFilePaths = res.tempFilePaths;
 						uni.uploadFile({
@@ -157,7 +155,7 @@
 							success: (uploadFileRes) => {
 								const data = JSON.parse(uploadFileRes.data)
 								this.params[key] = data.data;
-								uni.hideToast();
+								uni.hideLoading();
 							}
 						});
 					}
@@ -193,9 +191,8 @@
 						// mozilla(firefox)
 						url = window.URL.createObjectURL(file);
 					}
-					uni.showToast({
-						title: '上传中',
-						icon: 'none'
+					uni.showLoading({
+						title: '上传中'
 					})
 					uni.uploadFile({
 						url: '/uni/api/resources',
@@ -208,7 +205,7 @@
 							const data = JSON.parse(uploadFileRes.data)
 							this.params[key] = data.data;
 							this.compressName = fileName;
-							uni.hideToast();
+							uni.hideLoading();
 						}
 					});
 				}	

pages/apply/applypage2.vue

@@ -115,7 +115,7 @@
 			uploadImage(key) {
 				uni.chooseImage({
 					success: (res) => {
-						uni.showToast({
+						uni.showLoading({
 							title: '上传中',
 							icon: 'none',
 							duration:90000
@@ -128,7 +128,7 @@
 							success: (uploadFileRes) => {
 								const data = JSON.parse(uploadFileRes.data)
 								this.params[key] = data.data;
-								uni.hideToast();
+								uni.hideLoading();
 							}
 						});
 					}
@@ -164,9 +164,8 @@
 						// mozilla(firefox)
 						url = window.URL.createObjectURL(file);
 					}
-					uni.showToast({
-						title: '上传中',
-						icon: 'none'
+					uni.showLoading({
+						title: '上传中'
 					})
 					uni.uploadFile({
 						url: '/uni/api/resources',
@@ -179,7 +178,7 @@
 							const data = JSON.parse(uploadFileRes.data)
 							this.params[key] = data.data;
 							this.compressName = fileName;
-							uni.hideToast();
+							uni.hideLoading();
 						}
 					});
 				}	

pages/apply/applypage3.vue

@@ -90,10 +90,8 @@
 			uploadImage(key) {
 				uni.chooseImage({
 					success: (res) => {
-						uni.showToast({
-							title: '上传中',
-							icon: 'none',
-							duration:90000
+						uni.showLoading({
+							title: '上传中'
 						})
 						const tempFilePaths = res.tempFilePaths
 						uni.uploadFile({
@@ -103,7 +101,7 @@
 							success: (uploadFileRes) => {
 								const data = JSON.parse(uploadFileRes.data)
 								this.params[key] = data.data;
-								uni.hideToast();
+								uni.hideLoading();
 							}
 						});
 					}

pages/certification/certification.vue

@@ -99,10 +99,8 @@
 			uploadImage(key) {
 				uni.chooseImage({
 					success: (res) => {
-						uni.showToast({
-							title: '上传中',
-							icon: 'none',
-							duration:90000
+						uni.showLoading({
+							title: '上传中'
 						})
 						const tempFilePaths = res.tempFilePaths
 						uni.uploadFile({
@@ -112,7 +110,7 @@
 							success: (uploadFileRes) => {
 								const data = JSON.parse(uploadFileRes.data)
 								this.params[key] = data.data;
-								uni.hideToast();
+								uni.hideLoading();
 							}
 						});
 					}