liuxue 4 years ago
parent
commit
759d00301b
1 changed files with 1 additions and 4 deletions
  1. 1 4
      index.html

+ 1 - 4
index.html

@@ -300,7 +300,6 @@
300
         }
300
         }
301
         //判断是不是微信
301
         //判断是不是微信
302
         if (ua.match(/MicroMessenger/i) == "micromessenger") {
302
         if (ua.match(/MicroMessenger/i) == "micromessenger") {
303
-            console.log(userpay)
304
             trade_type="WX"
303
             trade_type="WX"
305
             if (userpay.code == "" || userpay.code == null) {
304
             if (userpay.code == "" || userpay.code == null) {
306
                 window.location.href = wechatHrefurl;
305
                 window.location.href = wechatHrefurl;
@@ -310,7 +309,6 @@
310
         }
309
         }
311
         //判断是不是支付宝
310
         //判断是不是支付宝
312
         if (ua.match(/AlipayClient/i) == "alipayclient") {
311
         if (ua.match(/AlipayClient/i) == "alipayclient") {
313
-            console.log(userpay)
314
             trade_type="ALI"
312
             trade_type="ALI"
315
             if (userpay.code == null || userpay.code == "") {
313
             if (userpay.code == null || userpay.code == "") {
316
                 local = local.replace('#/', '');
314
                 local = local.replace('#/', '');
@@ -345,7 +343,6 @@
345
         //获取商户信息
343
         //获取商户信息
346
         function getQrcode(event) {
344
         function getQrcode(event) {
347
             $.get("https://test.bjtdba.com/api/merchant/get_mer_info", { mer_id: event.data.mer_id }, function (data) {
345
             $.get("https://test.bjtdba.com/api/merchant/get_mer_info", { mer_id: event.data.mer_id }, function (data) {
348
-                console.log(data, "商户信息")
349
                 if(data.status==200){
346
                 if(data.status==200){
350
                     $("#mername").text(data.data.mer_name)//商户头像
347
                     $("#mername").text(data.data.mer_name)//商户头像
351
                     $("#merbanner").attr("src",data.data.mer_banner)//商户头像
348
                     $("#merbanner").attr("src",data.data.mer_banner)//商户头像
@@ -382,7 +379,7 @@
382
 				} else if (trade_type == 'ALI') {
379
 				} else if (trade_type == 'ALI') {
383
 					
380
 					
384
 				}
381
 				}
385
-                $.post("https://test.bjtdba.com/api/merchant/createOrder", { data }, function (data) {
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) {
386
                 console.log(data, '订单创建')
383
                 console.log(data, '订单创建')
387
             })
384
             })
388
         }
385
         }