diff --git a/ext.json b/ext.json index d947234..11389a9 100644 --- a/ext.json +++ b/ext.json @@ -16,9 +16,13 @@ } ], "configUrl": "https://ctest.malls.iformall.com/C/api", - "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", + "car": { + "etcp": { + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } + }, "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, diff --git a/index/passCar.js b/index/passCar.js index 206eccf..ecac93c 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -50,7 +50,9 @@ Page({ quanid: '', gouHr: imgurl.gouHr.url, totalTicketNum: 0, - + remark:'', + generalPayPath:'', + generalExtraData:{}, }, getMoreList(e) { let totalNum = this.data.ticketList.length; @@ -848,6 +850,31 @@ Page({ }, timecha: res.data.duration }); + }else{ + // 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:小程序支付 + + // }, + // } + that.setData({ + parkVendor: app.globalData.parkVendor, + // extraData: extraDataStr, + stopFees: res.data, + timecha: Util.timecha(res.data.exitTime, res.data.entranceTime), + remark: res.data.remark, + generalAppId:res.data.appId, + generalPayPath: res.data.payPath, + generalExtraData: res.data.extraData, + extraDataFlag: JSON.stringify(res.data.extraData) + }); + console.log( that.data.extraDataFlag,"123456789") } that.setData({ diff --git a/index/passCar.wxml b/index/passCar.wxml index 28ecacf..aeb4cfb 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -1,4 +1,4 @@ - + @@ -46,6 +46,10 @@ 待缴费用: {{stopFees.remainingFee}}元 + + 备注: + {{remark}} + @@ -67,6 +71,20 @@ 立即支付 + + + + 立即支付 + + 立即支付 + + + + 立即支付 + + 立即支付 + + 立即支付 diff --git a/index/searchbar.wxml b/index/searchbar.wxml index 7b6c869..9061b08 100644 --- a/index/searchbar.wxml +++ b/index/searchbar.wxml @@ -6,7 +6,7 @@ - + diff --git a/index/searchbar.wxss b/index/searchbar.wxss index e77b04f..8e5aa0b 100644 --- a/index/searchbar.wxss +++ b/index/searchbar.wxss @@ -25,7 +25,10 @@ position: fixed; left: 0; background:#F4F5F9; + /* top:240rpx; */ + margin-top: 40rpx; } + .text-style { position: relative; diff --git a/pages/addPark/addPark.wxml b/pages/addPark/addPark.wxml index 816c623..0b63351 100644 --- a/pages/addPark/addPark.wxml +++ b/pages/addPark/addPark.wxml @@ -1,4 +1,5 @@ + 请输入车牌号(新能源选填) diff --git a/pages/managelicenseplate/managelicenseplate.wxml b/pages/managelicenseplate/managelicenseplate.wxml index 3f77154..9de0221 100644 --- a/pages/managelicenseplate/managelicenseplate.wxml +++ b/pages/managelicenseplate/managelicenseplate.wxml @@ -1,4 +1,5 @@ + 30天内最多绑定4次车牌解绑前请确认车已经离场