diff --git a/pages/order/order.wxml b/pages/order/order.wxml index fa569c6..d5bf10a 100644 --- a/pages/order/order.wxml +++ b/pages/order/order.wxml @@ -95,13 +95,13 @@ - + \ No newline at end of file diff --git a/pages/rights/rights.js b/pages/rights/rights.js index 04bbbb2..352b2ce 100644 --- a/pages/rights/rights.js +++ b/pages/rights/rights.js @@ -32,8 +32,8 @@ Page({ disabled : false, payWayIndex : 0, payWay :[ - {value: 0, name: "微信支付"} - // {value: 1, name: "沃钱包支付"} + {value: 0, name: "微信支付"}, + {value: 1, name: "沃钱包支付"} ] }, @@ -353,7 +353,7 @@ Page({ if(this.data.payWayIndex == 1) { const newUrl = "https://lifetest.ysd-bs.com/unicom/payment?trade_no=" + res.data.trade_no let url= encodeURIComponent(newUrl) - wx.navigateTo({ + wx.redirectTo({ // 跳转到webview页面 url: `/pages/webView/webView?url=${url}` }); diff --git a/pages/rights/rights.wxml b/pages/rights/rights.wxml index c50d329..b9f8d93 100644 --- a/pages/rights/rights.wxml +++ b/pages/rights/rights.wxml @@ -143,10 +143,10 @@ - + {{payWay[payWayIndex].name}} + diff --git a/pages/welfare/welfare.js b/pages/welfare/welfare.js index 7faa0d7..d5e964b 100644 --- a/pages/welfare/welfare.js +++ b/pages/welfare/welfare.js @@ -18,6 +18,11 @@ Page({ remark : '', //使用须知 platformCp : [], //选择提交数组 platIndex : 0, //选择提交方式下标 + payWayIndex : 0, //选择支付方式下标 + payWay :[ + {value: 0, name: "微信支付"}, + {value: 1, name: "沃钱包支付"} + ] }, @@ -169,6 +174,15 @@ Page({ }) }, + /** + * 支付选择 + */ + payBind(e) { + this.setData({ + payWayIndex: e.detail.value + }) + }, + /** * 支付提交 */ @@ -178,46 +192,80 @@ Page({ is_deliver = this.data.isdeliver wx.$api.index.fridayInfo(welfareId, address_id, is_deliver).then(res=>{ - wx.$api.index.fridayPay(res.data.trade_no).then(res=>{ - let payInfo = JSON.parse(res.data) - wx.requestPayment({ - timeStamp: payInfo.timeStamp, - nonceStr : payInfo.nonceStr, - package : payInfo.package, - paySign : payInfo.paySign, - signType : payInfo.signType, - success : res=>{ - if(res.errMsg == "requestPayment:ok"){ - wx.showToast({ - title: '支付成功', - icon : 'success' - }) - setTimeout(()=>{ + if(res.data.canPay == false) { + wx.showToast({ + title : '支付成功', + icon : 'success', + duration: 2000 + }) + setTimeout(()=>{ + if(this.data.isdeliver == 1) { + wx.reLaunch({ + url: '/pages/order/order?orderType=rightsCoupons' + }) + } else { + wx.reLaunch({ + url: '/pages/order/order?orderType=rights' + }) + } + },3000) + this.setData({ + rightsTap: true + }) + }else { + // payWayIndex为0的时候为微信支付 + if(this.data.payWayIndex == 0) { + wx.$api.index.fridayPay(res.data.trade_no).then(res=>{ + let payInfo = JSON.parse(res.data) + wx.requestPayment({ + timeStamp: payInfo.timeStamp, + nonceStr : payInfo.nonceStr, + package : payInfo.package, + paySign : payInfo.paySign, + signType : payInfo.signType, + success : res=>{ + if(res.errMsg == "requestPayment:ok"){ + wx.showToast({ + title: '支付成功', + icon : 'success' + }) + setTimeout(()=>{ + if(this.data.isdeliver == 1) { + wx.reLaunch({ + url: '/pages/order/order?orderType=welfareGoods' + }) + } else { + wx.reLaunch({ + url: '/pages/order/order?orderType=welfare' + }) + } + },3000) + } + }, + fail : res=>{ if(this.data.isdeliver == 1) { wx.reLaunch({ - url: '/pages/order/order?orderType=welfareGoods' + url: '/pages/order/order?orderType=welfareGoods&stateType=unpay' }) } else { wx.reLaunch({ - url: '/pages/order/order?orderType=welfare' + url: '/pages/order/order?orderType=welfare&stateType=unpay' }) } - },3000) - } - }, - fail : res=>{ - if(this.data.isdeliver == 1) { - wx.reLaunch({ - url: '/pages/order/order?orderType=welfareGoods&stateType=unpay' - }) - } else { - wx.reLaunch({ - url: '/pages/order/order?orderType=welfare&stateType=unpay' - }) - } - } - }) - }) + } + }) + }) + } + // payWayIndex为1的时候为沃钱包支付 + if(this.data.payWayIndex == 1) { + const newUrl = "https://lifetest.ysd-bs.com/unicom/payment?trade_no=" + res.data.trade_no + let url= encodeURIComponent(newUrl) + wx.redirectTo({ + // 跳转到webview页面 + url: `/pages/webView/webView?url=${url}` + }); + } + } }) } }) \ No newline at end of file diff --git a/pages/welfare/welfare.wxml b/pages/welfare/welfare.wxml index a2eff1c..4e43ddd 100644 --- a/pages/welfare/welfare.wxml +++ b/pages/welfare/welfare.wxml @@ -90,12 +90,23 @@ - - - 支付方式 - 微信支付 - - + + + 请选择支付方式 + + + + {{payWay[payWayIndex].name}} + + + + + + + 支付方式 + {{payWay[payWayIndex].name}} + +