完善支付选项

config/utils.js

@@ -158,32 +158,8 @@ export const setPay = function(payInfo, callback) {
 		if (payData.orderInfo != '' && payData.orderInfo != undefined) {
 			console.log("支付参数", payData);
 			// let EnvUtils = plus.android.importClass('com.alipay.sdk.app.EnvUtils');
-			// EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);
-			let payData1 = {
-				provider: 'alipay',
-				orderInfo: data.orderInfo,
-				success(res) {
-					console.log('success:' + res);					
-				},
-										//调用失败的回调
-				fail(err) {
-					console.log('fail:' + err);
-					console.log(JSON.stringify(err))
-					uni.showModal({
-						title: '提示',
-						showCancel:false,
-						content: '商家支付参数错误，请重新发起付款',
-						success: function (res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				}
-			}
-			uni.requestPayment(payData1);
+			// EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);			
+			uni.requestPayment(payData);
 		}
 
 	}, err => {
@@ -262,15 +238,14 @@ export const getLatLon = function(tip) {
 // 单独重新微信支付
 export const setWXPay = function(payInfo, callback) {
 	$http.request({
-		url: "/pay/placeAnOrder/app",
+		url: "/pay/placeAnOrder/shoppingpay",
 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 		data:payInfo,
 		header: { //默认 无 说明：请求头1
 			'Content-Type': 'application/json'
 		},
 	}).then(res => {
-		console.log(res,'res')
-		
+		console.log(res,'res')		
 		if(res.code === 0){
 			let payData = {
 				provider : 'wxpay',
@@ -289,19 +264,21 @@ export const setWXPay = function(payInfo, callback) {
 							success: true,
 							data: res
 						});
-						// console.log('success:' + JSON.stringify(res));
+						 console.log('success:' + JSON.stringify(res));
 					},
 				    fail(err) {						
 						callback && callback({
 							success: false,
 							data: err
 						});
-					//	console.log('fail:' + JSON.stringify(err));
+						console.log('fail:' + JSON.stringify(err));
 						
 					}											
 			}
 			// console.log(payData)
+			if(payData.orderInfo.prepayid != '' && payData.orderInfo.prepayid != undefined){
 			uni.requestPayment(payData);
+			}
 		}
 	})
 }