|
|
@@ -291,7 +291,8 @@
|
|
291
|
291
|
} else {
|
|
292
|
292
|
local = window.location.href;
|
|
293
|
293
|
}
|
|
294
|
|
- let wechatHrefurl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + 'wx66f5f8def2b755da' +
|
|
|
294
|
+ // wx66f5f8def2b755da
|
|
|
295
|
+ let wechatHrefurl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + 'wx6ac5b448b75117d9' +
|
|
295
|
296
|
"&redirect_uri=" + encodeURIComponent(local) +
|
|
296
|
297
|
"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
|
|
297
|
298
|
|
|
|
@@ -323,7 +324,7 @@
|
|
323
|
324
|
}
|
|
324
|
325
|
//获取二维码
|
|
325
|
326
|
function get_mer_info() {
|
|
326
|
|
- $.post("https://test.bjtdba.com/api/merchantcheckcodeid/" + userpay.id, function (data) {
|
|
|
327
|
+ $.post("https://app.bjtdba.com/api/merchantcheckcodeid/" + userpay.id, function (data) {
|
|
327
|
328
|
if (data.status == 200) {
|
|
328
|
329
|
if (data.data.code == 1) {
|
|
329
|
330
|
mer_id = data.data.mer_id; //获取店铺id
|
|
|
@@ -343,7 +344,7 @@
|
|
343
|
344
|
}
|
|
344
|
345
|
//获取商户信息
|
|
345
|
346
|
function getQrcode(event) {
|
|
346
|
|
- $.get("https://test.bjtdba.com/api/merchant/get_mer_info", { mer_id: event.data.mer_id }, function (data) {
|
|
|
347
|
+ $.get("https://app.bjtdba.com/api/merchant/get_mer_info", { mer_id: event.data.mer_id }, function (data) {
|
|
347
|
348
|
if (data.status == 200) {
|
|
348
|
349
|
$("#mername").text(data.data.mer_name)//商户名称
|
|
349
|
350
|
$("#merbanner").attr("src", data.data.mer_banner)//商户头像
|
|
|
@@ -352,7 +353,7 @@
|
|
352
|
353
|
}
|
|
353
|
354
|
//wx获取用户信息
|
|
354
|
355
|
function user() {
|
|
355
|
|
- $.get("https://test.bjtdba.com/api/wechat/wechatAuthorization", { code: userpay.code }, function (data) {
|
|
|
356
|
+ $.get("https://app.bjtdba.com/api/wechat/wechatAuthorization", { code: userpay.code }, function (data) {
|
|
356
|
357
|
if (data.status == 200) {
|
|
357
|
358
|
Wxuserinfor = data.data
|
|
358
|
359
|
}
|
|
|
@@ -360,7 +361,7 @@
|
|
360
|
361
|
}
|
|
361
|
362
|
//支付宝获取用户信息
|
|
362
|
363
|
function aliUser() {
|
|
363
|
|
- $.get("https://test.bjtdba.com/api/ali/aliSign", { code: userpay.auth_code }, function (data) {
|
|
|
364
|
+ $.get("https://app.bjtdba.com/api/ali/aliSign", { code: userpay.auth_code }, function (data) {
|
|
364
|
365
|
if (data.status == 200) {
|
|
365
|
366
|
ZfBuserinfor = data.data
|
|
366
|
367
|
}
|
|
|
@@ -386,7 +387,7 @@
|
|
386
|
387
|
if (userpay.user_id) {
|
|
387
|
388
|
data.user_id = userpay.user_id;
|
|
388
|
389
|
}
|
|
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) {
|
|
|
390
|
+ $.post("https://app.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) {
|
|
390
|
391
|
console.log(data, '订单创建')
|
|
391
|
392
|
if (data.status == 200) {
|
|
392
|
393
|
out_trade_no = data.data.out_trade_no
|
|
|
@@ -399,7 +400,7 @@
|
|
399
|
400
|
}
|
|
400
|
401
|
// 创建订单成功后调用接口区分微信支付还是支付宝,分别调用支付
|
|
401
|
402
|
function jsapiPay(event) {
|
|
402
|
|
- $.post("https://test.bjtdba.com/api/merchant/jsapiPay", { out_trade_no: event.out_trade_no, type: 'HF' }, function (data) {
|
|
|
403
|
+ $.post("https://app.bjtdba.com/api/merchant/jsapiPay", { out_trade_no: event.out_trade_no, type: 'HF' }, function (data) {
|
|
403
|
404
|
console.log(data, '订单创建完区分WZ')
|
|
404
|
405
|
if (data.status == 200) {
|
|
405
|
406
|
if (trade_type == 'WX') {
|