Commit 1391c17b46401ad9acb046ed9363611a7cf5a101

Authored by 后端开发-许程
2 parents da3cde23 2f090dbe

Merge branch 'work-1.1_20191010' of http://git.vipzhuang.cn/wxd/MShopWeApp into work-1.1_20191010

pages/cart/cart2/cart2.js
... ... @@ -997,10 +997,9 @@ Page({
997 997 // order_sn: data.data,
998 998 //}, 1);
999 999 util_pay.pay(data.data, function() {
1000   - app.my_warnning("支付成功",1,th);
1001 1000 setTimeout(function () {
1002 1001 wx.navigateTo({
1003   - url: "/pages/user/order_list/order_list"
  1002 + url: "/pages/payment/pay_success/pay_success?type="+2+"&order_sn="+data.data,
1004 1003 })
1005 1004 },1000)
1006 1005  
... ...
pages/cart/cart2_pt/cart2_pt.js
... ... @@ -464,10 +464,9 @@ Page({
464 464 // type:1,
465 465 // }, 1);
466 466 util_pay.pay(data.data, function() {
467   - app.my_warnning("支付成功",1,th);
468 467 setTimeout(function () {
469 468 wx.navigateTo({
470   - url: "/pages/user/order_list/order_list"
  469 + url: "/pages/payment/pay_success/pay_success?type="+1+"&order_sn="+data.data,
471 470 })
472 471 },1000)
473 472 }, function () {
... ...