|
|
@@ -272,6 +272,7 @@
|
|
272
|
272
|
<script type="text/javascript">
|
|
273
|
273
|
var ua = window.navigator.userAgent.toLowerCase();
|
|
274
|
274
|
var Wxuserinfor;//微信user
|
|
|
275
|
+ var ZfBuserinfor;//支付宝user
|
|
275
|
276
|
var mer_id;//商户Id
|
|
276
|
277
|
var money;//金额
|
|
277
|
278
|
var trade_type;//微信|支付宝
|
|
|
@@ -359,14 +360,16 @@
|
|
359
|
360
|
}
|
|
360
|
361
|
//支付宝获取用户信息
|
|
361
|
362
|
function aliUser() {
|
|
362
|
|
- $.get("https://test.bjtdba.com/api/ali/aliSign", { code: userpay.code }, function (data) {
|
|
363
|
|
- console.log(data, '支付宝用户信息')
|
|
|
363
|
+ $.get("https://test.bjtdba.com/api/ali/aliSign", { code: userpay.auth_code }, function (data) {
|
|
|
364
|
+ if (data.status == 200) {
|
|
|
365
|
+ ZfBuserinfor = data.data
|
|
|
366
|
+ }
|
|
364
|
367
|
})
|
|
365
|
368
|
}
|
|
366
|
369
|
//点击支付创建订单
|
|
367
|
370
|
function btn() {
|
|
368
|
371
|
//开始loading
|
|
369
|
|
-
|
|
|
372
|
+
|
|
370
|
373
|
let data = {
|
|
371
|
374
|
mer_id: mer_id,
|
|
372
|
375
|
money: money,
|
|
|
@@ -377,7 +380,11 @@
|
|
377
|
380
|
data.nickname = Wxuserinfor.nickname;
|
|
378
|
381
|
data.pay_user_id = Wxuserinfor.unionid;
|
|
379
|
382
|
} else if (trade_type == 'ALI') {
|
|
380
|
|
-
|
|
|
383
|
+ data.pay_user_id = ZfBuserinfor.user_id;
|
|
|
384
|
+ }
|
|
|
385
|
+ //支付宝user_id
|
|
|
386
|
+ if (userpay.user_id) {
|
|
|
387
|
+ data.user_id = userpay.user_id;
|
|
381
|
388
|
}
|
|
382
|
389
|
$.post("https://test.bjtdba.com/api/merchant/createOrder", { money: money, mer_id: data.mer_id, trade_type: data.trade_type, avatar: data.avatar, nickname: data.nickname, pay_user_id: data.pay_user_id }, function (data) {
|
|
383
|
390
|
console.log(data, '订单创建')
|
|
|
@@ -398,11 +405,11 @@
|
|
398
|
405
|
console.log("WX")
|
|
399
|
406
|
paymentByWxpay(data.data)
|
|
400
|
407
|
} else if (trade_type == 'ALI') {
|
|
401
|
|
- console.log("ALI")
|
|
|
408
|
+ paymentByAlipay(data.data)
|
|
402
|
409
|
}
|
|
403
|
410
|
} else {
|
|
404
|
411
|
alert(data.message)
|
|
405
|
|
- //结束loading
|
|
|
412
|
+ //结束loading
|
|
406
|
413
|
}
|
|
407
|
414
|
})
|
|
408
|
415
|
}
|
|
|
@@ -462,7 +469,7 @@
|
|
462
|
469
|
// alert('取消支付');
|
|
463
|
470
|
// },
|
|
464
|
471
|
fail: function (res) {
|
|
465
|
|
- //结束loading
|
|
|
472
|
+ //结束loading
|
|
466
|
473
|
alert('支付失败');
|
|
467
|
474
|
}
|
|
468
|
475
|
});
|
|
|
@@ -472,6 +479,21 @@
|
|
472
|
479
|
});
|
|
473
|
480
|
|
|
474
|
481
|
}
|
|
|
482
|
+ //支付宝支付
|
|
|
483
|
+ function paymentByAlipay(data) {
|
|
|
484
|
+ var pay_info = JSON.parse(data.expend.pay_info)
|
|
|
485
|
+ AlipayJSBridge.call("tradePay", {
|
|
|
486
|
+ tradeNO: pay_info.tradeNO, // 必传,此使用方式下该字段必传
|
|
|
487
|
+ }, function (result) {
|
|
|
488
|
+ if (result.resultCode == '9000') {
|
|
|
489
|
+ this.$Common.toast('支付成功');
|
|
|
490
|
+ alert("支付成功")
|
|
|
491
|
+ money = '';
|
|
|
492
|
+ } else {
|
|
|
493
|
+ alert("支付失败")
|
|
|
494
|
+ }
|
|
|
495
|
+ });
|
|
|
496
|
+ }
|
|
475
|
497
|
//hash参数转对象
|
|
476
|
498
|
function parseParms() {
|
|
477
|
499
|
var str = window.location.href.split("?")[1];
|