From b27350e4b656503dbe4b97e1d70746831e95b0ea Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 10 Jan 2019 15:31:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1=E6=89=AB=E5=95=86?= =?UTF-8?q?=E6=88=B7=E4=BA=8C=E7=BB=B4=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cardorder/index/index.js | 52 ++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 7ee7c27..ea47922 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -54,34 +54,36 @@ Page({ let that = this; wx.scanCode({ success: (res) => { - console.log(res.result) - Http.get({ - url: config.api.findByCode, - data: { - merchantCode: res.result, - } - }) - .then(res => { - console.log(res); - if (res.code == 200) { - let merChantDetail = JSON.stringify(res.data); - if (merChantDetail && e.currentTarget.dataset.cardid && e.currentTarget.dataset.remainingamount) { - wx.navigateTo({ - url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, - }) - } else { - wx.showToast({ - title: "未识别到商户二维码", - icon: "none", - mask: false - }) - } + console.log(JSON.parse(res.result).merchant_id_scan) + let merchant_id_scan = JSON.parse(res.result).merchant_id_scan; + if(merchant_id_scan){ + Http.get({ + url: config.api.findByCode, + data: { + merchantCode: merchant_id_scan, } }) - .catch(err => { - console.log(err) + .then(res => { + console.log(res); + if (res.code == 200) { + let merChantDetail = JSON.stringify(res.data); + if (merChantDetail && e.currentTarget.dataset.cardid && e.currentTarget.dataset.remainingamount) { + wx.navigateTo({ + url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, + }) + } + } + }) + .catch(err => { + console.log(err) + }) + }else{ + wx.showToast({ + title: "未识别到商户二维码", + icon: "none", + mask: false }) - + } }, fail: (res) => { console.log(res);