Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/payment/paySuccess/paySuccess.vue

@@ -34,9 +34,9 @@
 						sum += 700
 					}
 					if (this.status == "2" || this.status == "4" || this.status == "5") {
-						uni.redirectTo({
-						 url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
-						})
+						// uni.redirectTo({
+						//  url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
+						// })
 						return
 					}
 					if (this.status == "3") {
@@ -55,9 +55,13 @@
 			}
 			intFun()
 		},
-		beforeDestroy() {
+		onHide() {
+			if (this.timer) {
+				clearInterval(this.timer)
+			}
+		},
+		onUnload() {
 			if (this.timer) {
-				//清除定时器
 				clearInterval(this.timer)
 			}
 		},