diff --git a/libs/wechat.js b/libs/wechat.js index 7fabb9a..d018c69 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -5,47 +5,44 @@ export const weappPay = (option) => { return new Promise((resolve, reject) => { // 吊起微信支付 // getProvider('payment').then(provider => { - let orderInfo = { - appid: option.appid, - noncestr: option.noncestr, - package: option.package, - partnerid: option.partnerid, - prepayid: option.prepayid, - sign: option.sign, - timestamp: option.timestamp + '', + let orderInfo = { + appid: option.appid, + noncestr: option.noncestr, + package: option.package, + partnerid: option.partnerid, + prepayid: option.prepayid, + sign: option.sign, + timestamp: option.timestamp + '', + } + console.log({ + provider: 'wxpay', + // signType: "MD5", + // timeStamp: orderInfo.timeStamp, + // nonceStr: orderInfo.noncestr, + // package: orderInfo.prepayid, + // signType: "MD5", + // paySign: orderInfo.sign, + orderInfo, + }, '发起支付') + // 调用登录接口 + uni.requestPayment({ + provider: 'wxpay', + ...option, + timestamp: orderInfo.timestamp, + orderInfo, + success: (success) => { + console.log(success) + uni.showToast({ + title: JSON.stringify(success), icon: 'success', duration: 5000 + }); + resolve(success) + }, + fail: (error) => { + console.log(error) + uni.showToast({ title: JSON.stringify(error), icon: 'none', duration: 5000 }); + reject(error) } - console.log({ - provider: 'wxpay', - // signType: "MD5", - // timeStamp: orderInfo.timeStamp, - // nonceStr: orderInfo.noncestr, - // package: orderInfo.prepayid, - // signType: "MD5", - // paySign: orderInfo.sign, - orderInfo, - }, '发起支付') - // 调用登录接口 - uni.requestPayment({ - provider: 'wxpay', - // timeStamp: orderInfo.timeStamp, - // nonceStr: orderInfo.noncestr, - // package: orderInfo.prepayid, - // signType: "MD5", - // paySign: orderInfo.sign, - orderInfo, - success: (success) => { - console.log(success) - uni.showToast({ - title: JSON.stringify(success), icon: 'success', duration: 5000 - }); - resolve(success) - }, - fail: (error) => { - console.log(error) - uni.showToast({ title: JSON.stringify(error), icon: 'none', duration: 5000 }); - reject(error) - } - }) + }) // }) }) } diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 1b785bd..05052d6 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -508,6 +508,18 @@ switch (data.status) { case "ORDER_EXIST": case "EXTEND_ORDER": + uni.showToast({ + title: res.msg, + icon: "none", + duration: 2000 + }); + this.$yrouter.replace({ + path: "/pages/order/OrderDetails/index", + query: { + id: data.result.orderId + } + }); + break; case "PAY_DEFICIENCY": case "PAY_ERROR": uni.showToast({ @@ -549,24 +561,24 @@ break; case "WECHAT_PAY": // 小程序支付 - weappPay(data.result.jsConfig).then(res => { + weappPay(data.result.jsConfig).finally(()=>{ this.$yrouter.replace({ path: "/pages/order/OrderDetails/index", query: { id: data.result.orderId } }); - }); + }) case "WECHAT_APP_PAY": // APP支付 - weappPay(data.result.jsConfig).then(res => { + weappPay(data.result.jsConfig).finally(()=>{ this.$yrouter.replace({ path: "/pages/order/OrderDetails/index", query: { id: data.result.orderId } }); - }); + }) // 下面为原先微信支付方式, // pay(data.result.jsConfig).finally(() => {