From d8f7065dd3cca1f24a5b9c3472d8d7a8154f01c2 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 30 Dec 2019 11:09:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E5=A2=9E=E5=8A=A0]:[?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E6=96=B0=E5=A2=9E=E5=81=9C=E8=BD=A6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index/passCar.js | 60 +++++++++++++++++++++++++++++++++------------- index/passCar.wxml | 12 ++++++---- 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/index/passCar.js b/index/passCar.js index 2ca8dea..6d9b165 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -206,13 +206,24 @@ Page({ bindfail: function (res) { console.log(res) }, - gotoetcp: function () { - wx.navigateToMiniProgram({ - appId: that.data.etcpAppId, - extraData: this.data.extraData, - envVersion: 'release', - path: "pages/pay/order-pay-open/main", - }) + gotoetcp: function (e) { + // etcp parkVendor1 + // 新加 parkVendor5 + if (e.target.dataset.flag == 'parkVendor1'){ + wx.navigateToMiniProgram({ + appId: this.data.etcpAppId, + extraData: this.data.extraData, + envVersion: 'release', + path: "pages/pay/order-pay-open/main", + }) + } else if (e.target.dataset.flag == 'parkVendor5'){ + wx.navigateToMiniProgram({ + appId: 'wxbd08b4baa10fcc1d', + extraData: this.data.extraData, + envVersion: 'release', + path: "pages/park/park", + }) + } }, showquan: function () { wx.navigateTo({ @@ -740,22 +751,37 @@ Page({ }) .then(res => { console.log(res) - var extraDataStr = { - params: { - token: app.globalData.etcpToken, - syncId: res.data.orderId, - payType: 6, // 小程序支付 - CarNumber: carNumber, - returnUrl: that.data.etcpCallbackUrl, - source: "FUMAO-001", - actionId: "1" //操作ID,1:小程序支付 + if(app.globalData.parkVendor != 5){ + var extraDataStr = { + params: { + token: app.globalData.etcpToken, + syncId: res.data.orderId, + payType: 6, // 小程序支付 + CarNumber: carNumber, + returnUrl: that.data.etcpCallbackUrl, + source: "FUMAO-001", + actionId: "1" //操作ID,1:小程序支付 + } } - }; + } else if (app.globalData.parkVendor == 5) { + var extraDataStr = { + params: { + union_id: '200389', + order_id: res.data.orderId, + park_id: "30536", + plate_number: carNumber, + money: res.data.remainingFee, + park_name: "", + } + } + } + that.setData({ extraData: extraDataStr, stopFees: res.data, timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) }); + that.setData({ scroll: true }) diff --git a/index/passCar.wxml b/index/passCar.wxml index 111b25b..d964325 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -46,18 +46,22 @@ {{stopFees.remainingFee}}元 - + 立即支付 - 立即支付 + 立即支付 + + + + 立即支付 + + 立即支付 - 立即支付 -