diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index 2e80e34..c5fe9bf 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -43,7 +43,7 @@ Page({ that.gotoPay() }, fail: (err) => { - + } }) } @@ -52,11 +52,11 @@ Page({ checkAuthMode: AUTH_MODE, success: (res) => { console.log(res) - if (parseInt(res.isEnrolled) <= 0) { + if (res.isEnrolled) { + startSoterAuthentication(); + }else{ that.gotoPay(); - return } - startSoterAuthentication(); }, fail: (err) => { console.error(err) @@ -71,7 +71,7 @@ Page({ }else if(res.supportMode == ['fingerPrint']){ checkIsEnrolled() }else if(res.supportMode = ['fingerPrint', 'facial'] ){ - that.gotoPay(); + checkIsEnrolled() } }, fail: (err) => { @@ -93,6 +93,7 @@ Page({ }) .then(res => { if (res.code == 200) { + wx.hideLoading(); that.setData({ showModel: false }) @@ -102,6 +103,7 @@ Page({ } }) .catch(err => { + wx.hideLoading() wx.showModal({ title: "抱歉", content: err.message, @@ -133,6 +135,9 @@ Page({ }) that.getList('notenogth'); } else if (that.data.inputValue != "" && Number(that.data.remainingAmount) >= Number(that.data.inputValue)) { + wx.showLoading({ + title: '付款中', + }) that.gotoPayMoney(); } },