diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 09194c6..8e75ff3 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -2,6 +2,7 @@ var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"), s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp(); var oo=t.globalData.setting; var regeneratorRuntime = require('../../../utils/runtime.js'); +var util_pay = require("../../../utils/pay.js"); Page({ data: { @@ -981,9 +982,24 @@ Page({ //要进行判断,如果是用微信支付,就要跳转到支付界面 if (order_amount > 0) { th.setData({ isclose: 0 }); - void e.jumpToCart4({ - order_sn: data.data, - }, 1); + //void e.jumpToCart4({ + // order_sn: data.data, + //}, 1); + util_pay.pay(data.data, function() { + app.my_warnning("支付成功",1,th); + setTimeout(function () { + wx.navigateTo({ + url: "/pages/user/order_list/order_list" + }) + },1000) + + }, function () { + //支付失败 + setTimeout(function () { + wx.navigateBack({ delta: 1 }) + },1000) + },oo.stoid); + } else { var dd = { parent_sn: data.data, diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 2e733c3..e91f5ae 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -2,6 +2,7 @@ var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"), s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp(); var oo=t.globalData.setting; var regeneratorRuntime = require('../../../utils/runtime.js'); +var util_pay = require("../../../utils/pay.js"); Page({ data: { @@ -457,11 +458,26 @@ Page({ }) //要进行判断,如果是用微信支付,就要跳转到支付界面 if (order_amount > 0) { - th.setData({ isclose: 0 }); - void e.jumpToCart4({ - order_sn: data.data, - type:1, - }, 1); + th.setData({ isclose: 0 }); + //void e.jumpToCart4({ + // order_sn: data.data, + // type:1, + // }, 1); + util_pay.pay(data.data, function() { + app.my_warnning("支付成功",1,th); + setTimeout(function () { + wx.navigateTo({ + url: "/pages/user/order_list/order_list" + }) + },1000) + }, function () { + //支付失败 + setTimeout(function () { + wx.navigateBack({ delta: 1 }) + },1000) + + },oo.stoid,1); + } else { var dd = { parent_sn: data.data,