|
|
@@ -272,9 +272,12 @@
|
|
272
|
272
|
var ua = window.navigator.userAgent.toLowerCase();
|
|
273
|
273
|
var Wxuserinfor;//微信user
|
|
274
|
274
|
var mer_id;//商户Id
|
|
|
275
|
+ var money;//金额
|
|
|
276
|
+ var trade_type;//微信|支付宝
|
|
275
|
277
|
//动态获取金额
|
|
276
|
278
|
function myFunction() {
|
|
277
|
279
|
console.log($("#textInput").val());
|
|
|
280
|
+ money = $("#textInput").val()
|
|
278
|
281
|
}
|
|
279
|
282
|
//获取参数
|
|
280
|
283
|
var userpay = parseParms()
|
|
|
@@ -298,6 +301,7 @@
|
|
298
|
301
|
//判断是不是微信
|
|
299
|
302
|
if (ua.match(/MicroMessenger/i) == "micromessenger") {
|
|
300
|
303
|
console.log(userpay)
|
|
|
304
|
+ trade_type="WX"
|
|
301
|
305
|
if (userpay.code == "" || userpay.code == null) {
|
|
302
|
306
|
window.location.href = wechatHrefurl;
|
|
303
|
307
|
} else {
|
|
|
@@ -307,6 +311,7 @@
|
|
307
|
311
|
//判断是不是支付宝
|
|
308
|
312
|
if (ua.match(/AlipayClient/i) == "alipayclient") {
|
|
309
|
313
|
console.log(userpay)
|
|
|
314
|
+ trade_type="ALI"
|
|
310
|
315
|
if (userpay.code == null || userpay.code == "") {
|
|
311
|
316
|
local = local.replace('#/', '');
|
|
312
|
317
|
let aliHrefurl =
|
|
|
@@ -365,6 +370,21 @@
|
|
365
|
370
|
//点击支付创建订单
|
|
366
|
371
|
function btn() {
|
|
367
|
372
|
console.log(Wxuserinfor, '微信用户信息')
|
|
|
373
|
+ let data = {
|
|
|
374
|
+ mer_id: mer_id,
|
|
|
375
|
+ money: money,
|
|
|
376
|
+ trade_type: trade_type,
|
|
|
377
|
+ }
|
|
|
378
|
+ if (trade_type == 'WX') {
|
|
|
379
|
+ data.avatar = Wxuserinfor.headimgurl;
|
|
|
380
|
+ data.nickname = Wxuserinfor.nickname;
|
|
|
381
|
+ data.pay_user_id = Wxuserinfor.unionid;
|
|
|
382
|
+ } else if (trade_type == 'ALI') {
|
|
|
383
|
+
|
|
|
384
|
+ }
|
|
|
385
|
+ $.post("https://test.bjtdba.com/api/merchant/createOrder", { data }, function (data) {
|
|
|
386
|
+ console.log(data, '订单创建')
|
|
|
387
|
+ })
|
|
368
|
388
|
}
|
|
369
|
389
|
//hash参数转对象
|
|
370
|
390
|
function parseParms() {
|