Merge branch 'dev' into yj-dev

subPages/recharge-centre/recharge-centre.vue

@@ -312,20 +312,38 @@
 					});
 					return false;
 				}
-				uni.showToast({
+				uni.showModal({
-					title: '提交订单...',
+					title: '请确认充值号码',
-					icon: 'none',
+					content: '充值号码 : ' + that.inputPhone + ',充值成功后无法退款',
-					duration: 2000,
+					success: function(res) {
-					success() {
+						if (res.confirm) {
-						uni.navigateTo({
+							uni.navigateTo({
-							url: '../unionComfirmation/unionComfirmation?orderPrice=' + that.price +
+								url: '../unionComfirmation/unionComfirmation?orderPrice=' + that
-								'&payPrice=' + that.inputAmount + '&rechargeContent=' + that.inputPhone +
+									.price +
-								'&rechargeModel=' + that.amoutType +
+									'&payPrice=' + that.inputAmount + '&rechargeContent=' + that
-								'&objectId=' + that.inputAmountId + '&rechargeType=' + that.swiperCurrent
+									.inputPhone +
-						})
+									'&rechargeModel=' + that.amoutType +
+									'&objectId=' + that.inputAmountId + '&rechargeType=' + that
+									.swiperCurrent
+							})
+						}
 					}
 				})
 
+				// uni.showToast({
+				// 	title: '提交订单...',
+				// 	icon: 'none',
+				// 	duration: 2000,
+				// 	success() {
+				// 		uni.navigateTo({
+				// 			url: '../unionComfirmation/unionComfirmation?orderPrice=' + that.price +
+				// 				'&payPrice=' + that.inputAmount + '&rechargeContent=' + that.inputPhone +
+				// 				'&rechargeModel=' + that.amoutType +
+				// 				'&objectId=' + that.inputAmountId + '&rechargeType=' + that.swiperCurrent
+				// 		})
+				// 	}
+				// })
+
 			}
 		}
 	}
@@ -338,7 +356,7 @@
 
 	.popImg {
 		width: 100%;
-		height: 100%;
+		height: 100%;
 		min-height: 430px;
 	}
 
@@ -479,4 +497,4 @@
 			color: #c1b569;
 		}
 	}
-</style>
+</style>