diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 87a61b0..9c33704 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -43,10 +43,11 @@ Page({ // 扫一扫去支付 gotoPay: function(e) { let that = this; + console.log(e.currentTarget.dataset.remainingamount) wx.scanCode({ success: (res) => { wx.navigateTo({ - url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&cardRemainRealAmount=${e.currentTarget.dataset.cardRemainRealAmount}`, + url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, }) }, fail: (res) => { diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index d4aacbd..be47ea6 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -19,6 +19,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function(options) { + console.log(options.remainingAmount) let that = this; that.setData({ merChant: JSON.parse(options.merChant), @@ -48,7 +49,9 @@ Page({ .then(res => { console.log(res); if(res.code==200){ - that.startAuth(); + wx.navigateTo({ + url: '/pages/paySuccess/paySuccess', + }) } }) .catch(err => { @@ -65,11 +68,6 @@ Page({ showCancel: false }) } else if (that.data.inputValue != "" && Number(that.data.remainingAmount) < Number(that.data.inputValue)) { - // wx.showModal({ - // title: '抱歉', - // content: '余额不足', - // showCancel: false - // }) that.setData({ showModel: true }) @@ -85,9 +83,7 @@ Page({ challenge: 'test', authContent: '请验证已有的指纹以继续', success: (res) => { - wx.navigateTo({ - url: '/pages/paySuccess/paySuccess', - }) + that.gotoPayMoney(); }, fail: (err) => { diff --git a/pages/scanPay/scanPay.wxml b/pages/scanPay/scanPay.wxml index 5e7a82f..a147040 100644 --- a/pages/scanPay/scanPay.wxml +++ b/pages/scanPay/scanPay.wxml @@ -1,5 +1,4 @@ - 付款给{{merChant.merchant_name}} @@ -8,7 +7,7 @@ ¥ - + diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 6fadc22..e6eee87 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -76,7 +76,7 @@ - 版本号:3.2.1 + 版本号:3.2.2