|
@@ -212,26 +212,27 @@ define(function (require) {
|
|
|
window.location.href = 'http://callclient?method=pay¶m=' + encodeURIComponent(param_str) + '&callback=' + _callback;
|
|
|
},
|
|
|
wx: function () {
|
|
|
- console.log(config.test);
|
|
|
if (config.test) {
|
|
|
pingpp.createPayment(params.charge, function (result, err) {
|
|
|
- if (result) {
|
|
|
- console.log(err);
|
|
|
+ if (result == "success") {
|
|
|
+ // 只有微信公众账号 wx_pub 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。
|
|
|
var res = {
|
|
|
success: true
|
|
|
};
|
|
|
callback(res);
|
|
|
- }
|
|
|
- if (err) {
|
|
|
+ } else if (result == "fail") {
|
|
|
+ // charge 不正确或者微信公众账号支付失败时会在此处返回
|
|
|
+ console.log(err);
|
|
|
+ } else if (result == "cancel") {
|
|
|
+ // 微信公众账号支付取消支付
|
|
|
console.log(err);
|
|
|
}
|
|
|
});
|
|
|
- }else {
|
|
|
- var option = params['charge'].credential.wx_pub;
|
|
|
- var prepay = option["package"].replace('prepay_id=', '');
|
|
|
- var bookingTime = params.orderInfo.booking_time_str;
|
|
|
- location.href = '/webapp/o2o/module/pay/index.html?appId=' + option.appId + '&nonceStr=' + option.nonceStr + '&package=' + prepay + '&signType=' + option.signType + '&timeStamp=' + option.timeStamp + '&paySign=' + option.paySign + '&amount=' + params['charge'].amount + '&created=' + params['charge'].created + '&body=' + params['charge'].body + '&bookingTime=' + bookingTime;
|
|
|
}
|
|
|
+ var option = params['charge'].credential.wx_pub;
|
|
|
+ var prepay = option["package"].replace('prepay_id=', '');
|
|
|
+ var bookingTime = params.orderInfo.booking_time_str;
|
|
|
+ location.href = '/webapp/o2o/module/pay/index.html?appId=' + option.appId + '&nonceStr=' + option.nonceStr + '&package=' + prepay + '&signType=' + option.signType + '&timeStamp=' + option.timeStamp + '&paySign=' + option.paySign + '&amount=' + params['charge'].amount + '&created=' + params['charge'].created + '&body=' + params['charge'].body + '&bookingTime=' + bookingTime;
|
|
|
}
|
|
|
});
|
|
|
var callback = typeof (arguments[1]) == 'function' ? arguments[1] : null;
|