diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 5659dfb..ea2dc9b 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -91,64 +91,6 @@ Page({ console.log("payOrderUpdate catch", err); }); }, - payment: res => { - var that = this; - var payOrderId = "" + res.data.out_trade_no; - wx.requestPayment({ - timeStamp: res.timeStamp, - nonceStr: res.nonceStr, - package: res.package, - signType: "MD5", - paySign: res.paySign, - success: res => { - that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 - console.log(res); - console.log("支付成功"); - wx.showToast({ - title: "购买成功", - duration: 2500 - }); - wx.navigateBack({ - delta: 2 - }); - }, - fail: res => { - that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败 - console.log(res); - console.log("支付失败"); - return; - }, - complete: res => { - console.log(res); - console.log("支付完成"); - var url = this.data.url; - console.log("get url", url); - if (res.errMsg == "requestPayment:ok") { - wx.showModal({ - title: "提示", - content: "支付成功" - }); - if (url) { - setTimeout(function() { - wx.redirectTo({ - url: "/pages" + url - }); - }, 2000); - } else { - setTimeout(() => { - wx.navigateBack(); - }, 2000); - } - } else { - wx.showModal({ - title: "错误提示", - content: res.errMsg - }); - } - return; - } - }); - }, orderFunc() { var that = this; wx.showLoading({ @@ -201,10 +143,70 @@ Page({ } }).then(res => { console.log(res); - var payOrderId = "" + res.data.out_trade_no; + /* + /// Begin payment ---- + var payOrderId = "" + res.data.payOrderId; wx.hideLoading(); - //payment(res); + wx.requestPayment({ + timeStamp: res.data.timeStamp, + nonceStr: res.data.nonceStr, + package: res.data.package, + signType: "MD5", + paySign: res.data.paySign, + success: res => { + that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 + console.log(res); + console.log("支付成功"); + wx.showToast({ + title: "购买成功", + duration: 2500 + }); + wx.navigateBack({ + delta: 2 + }); + }, + fail: res => { + that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败 + console.log(res); + console.log("支付失败"); + return; + }, + complete: res => { + console.log(res); + console.log("支付完成"); + var url = res.data.url; + console.log("get url", url); + if (res.errMsg == "requestPayment:ok") { + wx.showModal({ + title: "提示", + content: "支付成功" + }); + if (url) { + setTimeout(function () { + wx.redirectTo({ + url: "/pages" + url + }); + }, 2000); + } else { + setTimeout(() => { + wx.navigateBack(); + }, 2000); + } + } else { + wx.showModal({ + title: "错误提示", + content: res.errMsg + }); + } + return; + } + }); + /// End payment -------- + */ + ///// virtual pay + var payOrderId = "" + res.data.out_trade_no; that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 + ///// end virtual pay }); } else { // 免费券