|
|
@@ -112,7 +112,8 @@
|
|
112
|
112
|
background: #D8D8D8;
|
|
113
|
113
|
border: 0.01rem solid #979797;
|
|
114
|
114
|
}
|
|
115
|
|
- .pay_name_right img{
|
|
|
115
|
+
|
|
|
116
|
+ .pay_name_right img {
|
|
116
|
117
|
width: 100%;
|
|
117
|
118
|
height: 100%;
|
|
118
|
119
|
display: block;
|
|
|
@@ -300,7 +301,7 @@
|
|
300
|
301
|
}
|
|
301
|
302
|
//判断是不是微信
|
|
302
|
303
|
if (ua.match(/MicroMessenger/i) == "micromessenger") {
|
|
303
|
|
- trade_type="WX"
|
|
|
304
|
+ trade_type = "WX"
|
|
304
|
305
|
if (userpay.code == "" || userpay.code == null) {
|
|
305
|
306
|
window.location.href = wechatHrefurl;
|
|
306
|
307
|
} else {
|
|
|
@@ -309,7 +310,7 @@
|
|
309
|
310
|
}
|
|
310
|
311
|
//判断是不是支付宝
|
|
311
|
312
|
if (ua.match(/AlipayClient/i) == "alipayclient") {
|
|
312
|
|
- trade_type="ALI"
|
|
|
313
|
+ trade_type = "ALI"
|
|
313
|
314
|
if (userpay.code == null || userpay.code == "") {
|
|
314
|
315
|
local = local.replace('#/', '');
|
|
315
|
316
|
let aliHrefurl =
|
|
|
@@ -343,9 +344,9 @@
|
|
343
|
344
|
//获取商户信息
|
|
344
|
345
|
function getQrcode(event) {
|
|
345
|
346
|
$.get("https://test.bjtdba.com/api/merchant/get_mer_info", { mer_id: event.data.mer_id }, function (data) {
|
|
346
|
|
- if(data.status==200){
|
|
|
347
|
+ if (data.status == 200) {
|
|
347
|
348
|
$("#mername").text(data.data.mer_name)//商户头像
|
|
348
|
|
- $("#merbanner").attr("src",data.data.mer_banner)//商户头像
|
|
|
349
|
+ $("#merbanner").attr("src", data.data.mer_banner)//商户头像
|
|
349
|
350
|
}
|
|
350
|
351
|
})
|
|
351
|
352
|
}
|
|
|
@@ -354,7 +355,6 @@
|
|
354
|
355
|
$.get("https://test.bjtdba.com/api/wechat/wechatAuthorization", { code: userpay.code }, function (data) {
|
|
355
|
356
|
if (data.status == 200) {
|
|
356
|
357
|
Wxuserinfor = data.data
|
|
357
|
|
- console.log(Wxuserinfor, "接口")
|
|
358
|
358
|
}
|
|
359
|
359
|
})
|
|
360
|
360
|
}
|
|
|
@@ -368,19 +368,43 @@
|
|
368
|
368
|
function btn() {
|
|
369
|
369
|
console.log(Wxuserinfor, '微信用户信息')
|
|
370
|
370
|
let data = {
|
|
371
|
|
- mer_id: mer_id,
|
|
372
|
|
- money: money,
|
|
373
|
|
- trade_type: trade_type,
|
|
374
|
|
- }
|
|
375
|
|
- if (trade_type == 'WX') {
|
|
376
|
|
- data.avatar = Wxuserinfor.headimgurl;
|
|
377
|
|
- data.nickname = Wxuserinfor.nickname;
|
|
378
|
|
- data.pay_user_id = Wxuserinfor.unionid;
|
|
379
|
|
- } else if (trade_type == 'ALI') {
|
|
380
|
|
-
|
|
381
|
|
- }
|
|
382
|
|
- $.post("https://test.bjtdba.com/api/merchant/createOrder", { 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) {
|
|
|
371
|
+ mer_id: mer_id,
|
|
|
372
|
+ money: money,
|
|
|
373
|
+ trade_type: trade_type,
|
|
|
374
|
+ }
|
|
|
375
|
+ if (trade_type == 'WX') {
|
|
|
376
|
+ data.avatar = Wxuserinfor.headimgurl;
|
|
|
377
|
+ data.nickname = Wxuserinfor.nickname;
|
|
|
378
|
+ data.pay_user_id = Wxuserinfor.unionid;
|
|
|
379
|
+ } else if (trade_type == 'ALI') {
|
|
|
380
|
+
|
|
|
381
|
+ }
|
|
|
382
|
+ $.post("https://test.bjtdba.com/api/merchant/createOrder", { 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
|
383
|
console.log(data, '订单创建')
|
|
|
384
|
+ if (data.status == 200) {
|
|
|
385
|
+ jsapiPay(data.data)//订单数据
|
|
|
386
|
+ } else {
|
|
|
387
|
+ alert(data.message)
|
|
|
388
|
+ //400收款清空body
|
|
|
389
|
+ $("body").html("")
|
|
|
390
|
+ }
|
|
|
391
|
+ })
|
|
|
392
|
+ }
|
|
|
393
|
+ // 创建订单成功后调用接口区分微信支付还是支付宝,分别调用支付
|
|
|
394
|
+ function jsapiPay(event) {
|
|
|
395
|
+ $.post("https://test.bjtdba.com/api/merchant/jsapiPay", { out_trade_no: event.out_trade_no, type: 'HF' }, function (data) {
|
|
|
396
|
+ console.log(data, '订单创建完区分WZ')
|
|
|
397
|
+ if (data.status == 200) {
|
|
|
398
|
+ if (trade_type == 'WX') {
|
|
|
399
|
+ console.log("WX")
|
|
|
400
|
+ } else if (trade_type == 'ALI') {
|
|
|
401
|
+ console.log("ALI")
|
|
|
402
|
+ }
|
|
|
403
|
+ } else {
|
|
|
404
|
+ alert(data.message)
|
|
|
405
|
+ //400收款清空body
|
|
|
406
|
+ $("body").html("")
|
|
|
407
|
+ }
|
|
384
|
408
|
})
|
|
385
|
409
|
}
|
|
386
|
410
|
//hash参数转对象
|