完善支付选项

pages/peanut/home.vue

@@ -415,10 +415,8 @@
 					orderId:result.payment.username,
 					receiptData:result.transactionReceipt,
 					productId:result.payment.productid,
-					customerOid:this.userInfo.id
-					
-				}
-				console.log(data,'data')
+					customerOid:this.userInfo.id					
+				}				
 				$http.request({
 					url: "Ipa/failure",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		

pages/peanut/reCharge.vue

@@ -58,7 +58,7 @@
 		</view>
 		<view class="char_btn">
 
-			<view @click="kaiChar">立即充值</view>
+			<view @click="goToPay">立即充值</view>
 
 			<!-- <view @click="iosPay" >立即充值</view>	 -->
 
@@ -101,6 +101,7 @@
 					title: '',
 					content: ''
 				},
+				chargeOrderSn:'', // 通过query传过来的orderSN（二次支付情况）
 				xieyiShow: false,
 				stepsCj: {},
 				cjList: [],
@@ -144,7 +145,8 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			
+			this.chargeOrderSn = e.orderSn
+			// console.log(e.orderSn,'orderSn')
 		},
 		//页面显示
 		onShow() {
@@ -232,14 +234,13 @@
 					})
 				})
 			},
-			topay(id) {
+			topay(id) {				
 				const that = this
-				uni.hideLoading()
-				// uni.showLoading({
-				// 	title: '充值中请勿离开',
-				// 	mask: true
-				// })					
-				 
+				uni.hideLoading()				
+				// if(this.chargeOrderSn != '' || this.chargeOrderSn != undefined){  // 判断是不是二次支付的订单
+				// 	that.orderSn = this.chargeOrderSn
+				// 	console.log(that.orderSn,'二次支付的订单号')
+				// }
 				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
 				this.setUserInfo({restoreFlag:true});
 				console.log(this.userInfo,'更新后的用户信息')				
@@ -303,8 +304,6 @@
 						success: function (res) {
 							if (res.confirm) {
 								console.log('用户点击确定');
-							} else if (res.cancel) {
-								console.log('用户点击取消');
 							}
 						}
 					});					
@@ -371,7 +370,13 @@
 				this.iphonepay()
 			},
 			// 充值
-			kaiChar() {
+			goToPay(){
+				
+					this.kaiChar()					
+				
+			},
+			// 正常充值
+			kaiChar() {  // 常规充值
 				if (this.radioValue == '1') {
 					uni.showLoading({
 						title: '支付中，请勿离开',
@@ -387,6 +392,7 @@
 						realMoney: that.stepsCj.money * 1, //实收金额
 						orderStatus: 0, //订单状态
 						orderType: "point", //订单类型
+						productId: that.stepsCj.priceTypeId      // 充值的类型id
 					}
 					$http.request({
 						url: "book/buyorder/rechargeSave",
@@ -425,7 +431,8 @@
 								that.orderSn = res.orderSn
 								let data1={
 									orderSn:that.orderSn,
-									// orderId:that.orderSn,									
+									buyOrderId: that.stepsCj.priceTypeId,
+									totalAmount: that.stepsCj.money
 								}
 								console.log(data1,'data1')
 								// console.log(this.userInfo.channelList,'channelList')
@@ -473,8 +480,7 @@
 				}
 
 
-			},
-
+			},            
 			// 跳转
 			onPageJump(url) {
 				uni.navigateTo({