bugfix

pages/apply/applypage1.vue

@@ -128,17 +128,24 @@
 								this.params[item] = d[item]
 							});
 							this.qualification_id = d.qualification_id;
+							this.data = {
+								contract_no: d.contract_no,
+								equipment_id: d.equipment_id,
+								property_id: d.property_id
+							}
 						}
 					}
 					
 				});
+			} else {
+				uni.getStorage({
+					key: 'installment',
+					success: (res) => {
+						this.data = res.data;
+					}
+				});
 			}
-			uni.getStorage({
-				key: 'installment',
-				success: (res) => {
-					this.data = res.data;
-				}
-			});
+			
 		},
 		mounted() {
 			// #ifdef H5
@@ -270,7 +277,8 @@
 				const url = this.qualification_id ? '/uni/api/userqualification/EditUserQualification/first' : '/uni/api/userqualification/AddUserQualification';
 				uni.showToast({
 					title: '提交中',
-					icon: 'none'
+					icon: 'none',
+					duration: 90000
 				})
 				uni.request({
 					url: url,

pages/apply/applypage2.vue

@@ -87,7 +87,8 @@
 				compressName: '',
 				data: null,
 				submitFlag: true,
-				contract_no: ''
+				contract_no: '',
+				qualification_id: ''
 			}
 		},
 		onLoad(option) {
@@ -101,15 +102,22 @@
 						Object.keys(this.params).forEach((item, index) => {
 							this.params[item] = d[item]
 						});
+						this.data = {
+							contract_no: d.contract_no,
+							equipment_id: d.equipment_id,
+							property_id: d.property_id
+						}
+						this.qualification_id = d.qualification_id;
+					}
+				});
+			} else {
+				uni.getStorage({
+					key: 'installment',
+					success: (res) => {
+						this.data = res.data;
 					}
 				});
 			}
-			uni.getStorage({
-				key: 'installment',
-				success: (res) => {
-					this.data = res.data;
-				}
-			});
 		},
 		mounted() {
 			// #ifdef H5
@@ -230,20 +238,22 @@
 				this.submitFlag = false;
 				uni.showToast({
 					title: '提交中',
-					icon: 'none'
+					icon: 'none',
+					duration: 90000
 				})
 				uni.request({
 					url: '/uni/api/userqualification/EditUserQualification/second',
 					method: 'PUT',
 					data: {
 						...this.params,
-						...this.data
+						...this.data,
+						qualification_id: this.qualification_id
 					},
 					success: (res) => {
 						this.submitFlag = true;
 						if(res.data.code === 0) {
 							uni.navigateTo({
-								url: '/pages/apply/applypage3'
+								url: `/pages/apply/applypage3?contract_no=${this.contract_no}`
 							});
 						} else {
 							uni.hideToast();

pages/apply/applypage3.vue

@@ -75,16 +75,46 @@
 					vehicle_license: '', //机动车
 				},
 				submitFlag: true,
-				data: null
+				data: null,
+				qualification_id: ''
 			}
 		},
-		onLoad() {
-			uni.getStorage({
-				key: 'installment',
-				success: (res) => {
-					this.data = res.data;
-				}
-			});
+		onLoad(option) {
+			if(option.contract_no) {
+				this.contract_no = option.contract_no;
+				uni.request({
+					url: `/uni/api/userqualification/GetUserQualification/${option.contract_no}`,
+					method: 'GET',
+					success: (res) => {
+						const d = res.data.data;
+						Object.keys(this.params).forEach((item, index) => {
+							this.params[item] = d[item]
+						});
+						this.data = {
+							contract_no: d.contract_no,
+							equipment_id: d.equipment_id,
+							property_id: d.property_id
+						},
+						this.qualification_id = d.qualification_id
+						uni.setStorage({
+							key: 'installment',
+							data: {
+								contract_no: d.contract_no,
+								equipment_id: d.equipment_id,
+								property_id: d.property_id
+							}
+							
+						});
+					}
+				});
+			} else {
+				uni.getStorage({
+					key: 'installment',
+					success: (res) => {
+						this.data = res.data;
+					}
+				});
+			}
 		},
 		methods: {
 			uploadImage(key) {
@@ -120,14 +150,16 @@
 				this.submitFlag = false;
 				uni.showToast({
 					title: '提交中',
-					icon: 'none'
+					icon: 'none',
+					duration: 90000
 				})
 				uni.request({
-					url: '/uni/api/userqualification/EditUserQualification/second',
+					url: '/uni/api/userqualification/EditUserQualification/third',
 					method: 'PUT',
 					data: {
 						...this.params,
-						...this.data
+						...this.data,
+						qualification_id: this.qualification_id
 					},
 					success: (res) => {
 						this.submitFlag = true;