diff --git a/app.json b/app.json index c93061a..1e18c89 100644 --- a/app.json +++ b/app.json @@ -46,6 +46,8 @@ "pages/orderquanma/index", "pages/passCar/couponList/couponList", "pages/passCar/couponDetail/couponDetail", + "pages/passCar/showList/showList", + "pages/passCar/showDetail/showDetail", "pages/managelicenseplate/managelicenseplate", "pages/payrule/payrule", "pages/grade/grade", diff --git a/config/config.js b/config/config.js index 297d2ca..b90f37c 100755 --- a/config/config.js +++ b/config/config.js @@ -180,6 +180,10 @@ var config = { * 联合登录 */ carInit: "/car/init", + /** + * 停车支付订单列表 + */ + carPayOrderList: "/car/payOrderList", /** * 绑车牌 */ diff --git a/index/passCar.js b/index/passCar.js index 3b186f0..ef2a825 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -54,6 +54,7 @@ Page({ generalPayPath: '', generalExtraData: {}, goHomeUrl: "", + supportPay: "" }, getMoreList(e) { let totalNum = this.data.ticketList.length; @@ -192,6 +193,33 @@ Page({ } }, + callPay(data) { + wx.requestPayment({ + timeStamp: data.timeStamp, + nonceStr: data.nonceStr, + package: data.package, + signType: data.signType ? data.signType : "MD5", + paySign: res.data.paySign, + success: res => { + wx.showLoading({ + title: '订单正在处理中...', + }) + this.showList() + }, + fail: res => { + wx.hideLoading(); + wx.showToast({ + title: '支付失败', + icon: 'error' + }) + /** + * 支付失败,需要更新订单的状态 + */ + }, + complete: res => { } + }); + }, + //停车费用为0 paySuccess: function () { wx.showModal({ @@ -201,6 +229,27 @@ Page({ }) }, + // supportPay等于1时 + goToPay() { + Http.post({ + url: '/car/createPayOrder', + data: { + carNumber: this.data.listCardNum, + carFee: String(this.data.stopFees.remainingFee * 100) + } + }).then(res => { + console.log(res, 'res'); + const data = res.data + this.callPay(data) + }).catch(err => { + wx.showToast({ + title: err.message, + icon: 'none', + mask: true + }) + }) + }, + gotomange: function () { wx.navigateTo({ url: '/pages/managelicenseplate/managelicenseplate', @@ -236,6 +285,13 @@ Page({ url: '/pages/passCar/couponList/couponList', }) }, + + showList: function () { + wx.navigateTo({ + url: '/pages/passCar/showList/showList', + }) + }, + gotodetail: function (e) { wx.showModal({ title: '缴费规则', @@ -631,6 +687,15 @@ Page({ if (res.data.token) { app.globalData.etcpToken = res.data.token; } + if (res.data.supportPay && res.data.supportPay == 1) { + that.setData({ + supportPay: 1 + }) + } else { + that.setData({ + supportPay: 0 + }) + } /** * 获得停车费用 */ @@ -912,7 +977,8 @@ Page({ }, timecha: res.data.duration }); - } else { + } else { // *#06# + // var extraDataStr = { // params: { // token: app.globalData.etcpToken, @@ -934,8 +1000,7 @@ Page({ generalAppId: res.data.appId, generalPayPath: res.data.payPath, generalExtraData: res.data.extraData, - extraDataFlag: JSON.stringify(res.data.extraData), - + extraDataFlag: JSON.stringify(res.data.extraData) }); console.log(that.data.extraDataFlag, "123456789") } diff --git a/index/passCar.wxml b/index/passCar.wxml index 50daf4a..a901b26 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -60,28 +60,28 @@ 系统提示: --> - + 立即支付 立即支付 - + 立即支付 立即支付 - + 立即支付 立即支付 - + 立即支付 @@ -89,7 +89,7 @@ - + 立即支付 @@ -97,7 +97,9 @@ - 立即支付 + 立即支付 + + @@ -109,6 +111,14 @@ 车辆入场后,才能绑车牌 + + + 我的支付订单 + + + + + 我的停车券 diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index fadc9ee..567328c 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -164,7 +164,8 @@ 首页 + {{priceAndStockObj.salePrice/100}}元马上购买 +