diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index ebad8e1..aa06f7d 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2397,22 +2397,40 @@ Page({ //---用微信支付--- if (dd.tail_pay_type == 0) { - var n = t.data.data; - th.weixinPay(n, - function () { - //---用余额支付--- - getApp().my_warnning("支付成功", 1, th); - var send_time = th.data.pre_arr.delivery_date; - if (th.data.pre_arr.delivery_type == 2) { - send_time = th.data.pre_arr.delivery_daynum * 3600; - } - th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time }); - this.data.paying=0; - - }, function () { - this.data.paying=0; - getApp().my_warnning("支付失败", 0, th); - }) + util_pay.pay_data(t,function (){ + //---用余额支付--- + getApp().my_warnning("支付成功", 1, th); + var send_time = th.data.pre_arr.delivery_date; + if (th.data.pre_arr.delivery_type == 2) { + send_time = th.data.pre_arr.delivery_daynum * 3600; + } + th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time }); + th.data.paying=0; + + },function (e){ + th.data.paying=0; + wx.showToast({ + title:e, + icon: 'none', + duration: 2500 + }) + }) + // var n = t.data.data; + // th.weixinPay(n, + // function () { + // //---用余额支付--- + // getApp().my_warnning("支付成功", 1, th); + // var send_time = th.data.pre_arr.delivery_date; + // if (th.data.pre_arr.delivery_type == 2) { + // send_time = th.data.pre_arr.delivery_daynum * 3600; + // } + // th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time }); + // th.data.paying=0; + // + // }, function () { + // this.data.paying=0; + // getApp().my_warnning("支付失败", 0, th); + // }) } else { if (t.data.code == 0) { var send_time = th.data.pre_arr.delivery_date; @@ -2426,7 +2444,7 @@ Page({ } else { getApp().my_warnning(t.data.msg, 1, th); } - this.data.paying=0; + th.data.paying=0; } } }); diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 6afa7b0..58a010d 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1291,7 +1291,7 @@ Page({ wx.showToast({ title: "视频号仅支持物流", icon: 'none', - duration: 2000 + duration: 2500 }) setTimeout(function () { diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 1fb6e05..2355c42 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -3,6 +3,7 @@ var t = getApp(), oo = t.globalData.setting, os=oo; var ut=require("../../../utils/util.js"); +var util_pay=require("../../../utils/pay.js"); var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ @@ -86,6 +87,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + util_pay.set_fir(); getApp().check_can_share(); var th = this; if (th.data.isclose == 0) { @@ -606,15 +608,24 @@ Page({ //---用微信支付--- if (dd.tail_pay_type == 0) { - var n = t.data.data; - th.weixinPay(n, - function () { - var allmoney = th.data.allpice; - th.jumpPaymentPage(th.data.order.order_sn, allmoney); - }, function () { - th.data.paying=0; - getApp().my_warnning("支付失败", 0, th); - }) + + util_pay.pay_data(t,function (){ + var allmoney = th.data.allpice; + th.jumpPaymentPage(th.data.order.order_sn, allmoney); + },function (){ + th.data.paying=0; + getApp().my_warnning("支付失败", 0, th); + }) + + //var n = t.data.data; + // th.weixinPay(n, + // function () { + // var allmoney = th.data.allpice; + // th.jumpPaymentPage(th.data.order.order_sn, allmoney); + // }, function () { + // th.data.paying=0; + // getApp().my_warnning("支付失败", 0, th); + // }) } else { if (t.data.code == 0) { //---用余额支付---