diff --git a/config/config.js b/config/config.js index 02c30d4..7cd2b6b 100755 --- a/config/config.js +++ b/config/config.js @@ -135,7 +135,7 @@ var config = { }, weapp: { - AppId: "wxb11603577a84a86d" + AppId: "wx8eb8275b78db4ede" }, ErrorCode: { NICK_NOT_AUTH: 11004, diff --git a/pages/passCar/couponDetail/couponDetail.wxml b/pages/passCar/couponDetail/couponDetail.wxml index 4eabad8..35bc47b 100644 --- a/pages/passCar/couponDetail/couponDetail.wxml +++ b/pages/passCar/couponDetail/couponDetail.wxml @@ -8,7 +8,7 @@ {{data.subTitle}} ¥{{data.salePrice/100}} - ¥{{data.price/100}} + {{data.price/100}}小时 满{{data.usePrice/100}}元可用 仅限本店使用 diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml index 17b5cb5..7af27b7 100644 --- a/pages/passCar/couponList/couponList.wxml +++ b/pages/passCar/couponList/couponList.wxml @@ -25,7 +25,7 @@ 有效期至: {{item.expiredTime}} - 立即使用 + 查看详情 查看 diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 1e76aca..10145b7 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -10,6 +10,7 @@ Page({ addCar: null, tcq: 2, flag: '', + extraData:{} }, /*车牌动态样式 */ changeStyle: function () { @@ -26,6 +27,7 @@ Page({ var that = this that.getList(); }, + onShow: function (options) { var that = this; console.log("车牌号") @@ -82,7 +84,6 @@ Page({ for (let car of that.data.carList) { if (car.stopFee.parkingFee) { that.data.payList.push(car) - console.log('bbbb' + car); } } var etcpData = { @@ -249,11 +250,14 @@ Page({ /** * 停车费用 */ - console.log(stopFee) that.setData({ [stopFee]: res.data, - [extraData]: extraDataStr - }) + [extraData]: extraDataStr, + buttonBox: res.data.parkingFee + + }), + console.log('res>>>' + JSON.stringify(that.data.buttonBox)) + }) .catch(error => { console.log(error) diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index 6bb1c2e..53eafba 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -27,7 +27,7 @@ 入场时间:{{item.stopFee.entranceTime}} - 待缴金额:¥{{item.stopFee.parkingFee}} + 停车费用:¥{{item.stopFee.parkingFee}} @@ -47,7 +47,7 @@ {{item.title}} {{item.merchantName}} - {{'¥'+item.price/100}} + {{'- '+item.price/100+'小时'}} @@ -61,8 +61,8 @@ - - + + diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss index ed13b3d..0ce8fb6 100644 --- a/pages/passCar/passCar.wxss +++ b/pages/passCar/passCar.wxss @@ -186,23 +186,23 @@ color: transparent; .textV1,.textV2{ height: 58rpx; width: 100rpx; - padding-top: 22rpx; + padding-top: 26rpx; text-align: center; line-height: 80rxp; - font-size: 28rpx; + font-size: 24rpx; color: #333; } .textV2{ - margin-top: -1rpx; + margin-top: 0rpx; padding: 0; /* background-color: rgb(0, 192, 255); */ border-radius: 10rpx; width: 300rpx; height: 80rpx; line-height: 80rpx; - font-size: 28rpx; + font-size: 20rpx; border: 4rpx #fff solid; - margin-bottom: 22rpx; + margin-bottom: 20rpx; } .textV3{ width: 225rpx; diff --git a/project.config.json b/project.config.json index d7c39ff..9eb02ef 100644 --- a/project.config.json +++ b/project.config.json @@ -12,7 +12,7 @@ }, "compileType": "miniprogram", "libVersion": "2.2.5", - "appid": "wxb11603577a84a86d", + "appid": "wx8eb8275b78db4ede", "projectname": "%E5%AF%8C%E8%8C%82%E9%93%BE%E5%AE%A2", "isGameTourist": false, "condition": {