Merge branch 'develop' into wjw_fenqi

main.js

@@ -77,9 +77,14 @@ function backup() {
 }
 
 // 跳转外部链接,使用webview
-function jump(url) {
-	// #ifdef H5
-	window.location.href = url;
+function jump(url, type) {
+	// #ifdef H5
+	if(type === 1){
+		// 重定向到指定地址，防止回退
+		window.location.replace(url);
+	}else{
+		window.location.href = url;
+	}
 	// #endif
 
 	// #ifndef H5

pages/payresult/payresult.vue

@@ -21,7 +21,9 @@
 			let timer = setInterval(() => {
 				if(this.time <= 0){
 					const {origin} = window.location;
-					this.$jump(`${origin}/index.php?app=member`);
+					// 清除合同信息缓存
+					uni.removeStorageSync('installment');
+					this.$jump(`${origin}/index.php?app=member`, 1);
 					clearInterval(timer);
 					return;
 				}
@@ -30,7 +32,9 @@
 		},
 		methods:{
 			jumpPhp(){
-				this.$jump(`${origin}/index.php?app=member`);
+				// 清除合同信息缓存
+				uni.removeStorageSync('installment');
+				this.$jump(`${origin}/index.php?app=member`, 1);
 			}
 		}
 	}

pages/signcontract/signcontract.vue

@@ -113,7 +113,7 @@
 				const {contract_no, equipment_id, property_id} = install;
 				const url = this.is_eidt ? '/uni/api/signcontract/EditContract' : '/uni/api/signcontract/AddContract';
 				uni.showLoading({
-					title: '提交中。。。'
+					title: '提交中...'
 				})
 				uni.request({
 					url: url,

pages/wxpay/wxpay.vue

@@ -115,6 +115,9 @@
 						}
 					}
 				);
+			},
+			goBack(){
+				this.$backup();
 			}
 		}
 	}

pages/yuepay/yuepay.vue

@@ -77,6 +77,9 @@
 						}
 					}
 				})
+			},
+			goBack(){
+				this.$backup();
 			}
 		}
 	}