diff --git a/assets/img/park.png b/assets/img/park.png new file mode 100644 index 0000000..78528a3 Binary files /dev/null and b/assets/img/park.png differ diff --git a/assets/img/quan.png b/assets/img/quan.png index 8be3e1f..554943d 100644 Binary files a/assets/img/quan.png and b/assets/img/quan.png differ diff --git a/assets/img/rule.png b/assets/img/rule.png new file mode 100644 index 0000000..a5aa5ff Binary files /dev/null and b/assets/img/rule.png differ diff --git a/assets/img/wenti.png b/assets/img/wenti.png index 98cba54..c9218bf 100644 Binary files a/assets/img/wenti.png and b/assets/img/wenti.png differ diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index bb9f70e..010c2cd 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -4,7 +4,7 @@ - + {{data.title}} {{data.subTitle}} diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss index 558e487..85c8a6a 100644 --- a/pages/bannerdetail/index.wxss +++ b/pages/bannerdetail/index.wxss @@ -1,7 +1,7 @@ @import "../../app.wxss"; page { - background: #fe5252; + background: #eee; } .coupons { @@ -31,9 +31,9 @@ page { z-index: 1000000000; background: #fff; border-radius: 12rpx; - width: 702rpx; + width: 705rpx; height: 212rpx; - margin: -46rpx auto 0; + margin: 24rpx auto 0; } .act text { diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index a7cba2b..11a67bf 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -16,14 +16,24 @@ Page({ onUnload: function() { let that = this; clearInterval(that.data.setInter); + wx.setScreenBrightness({ + value: that.data.sight, + }) }, onLoad: function(options) { - console.log(options); let that = this; - that.setData({ - code: options.quancode, - couponorderstatus: options.couponorderstatus - }); + console.log(options.sight); + setTimeout(function() { + wx.setScreenBrightness({ + value: 0.7, + }) + }, 200), + that.setData({ + sight: options.sight, + code: options.quancode, + couponorderstatus: options.couponorderstatus + }); + //获得优惠券的详情 that.data.setInter = setInterval(function() { diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index db5a9f4..9dde69c 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -33,13 +33,21 @@ Page({ this.getList(0, 1); }, onShow: function () { + let that = this; wx.setStorage({ key: 'couponNum', data: "couponNum1", }) wx.hideTabBarRedDot({ index:2 - }) + }), + wx.getScreenBrightness({ + success:function(res){ + that.setData({ + sight:res.value + }) + } + }); }, //点击跳转到券详情页面 gotouse: function (e) { @@ -51,7 +59,7 @@ Page({ } wx.navigateTo({ url: `/pages/couponorder/detail/index?quancode=${ - e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` + e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}&sight=${this.data.sight}` }); }, getList(key, pageNum) { diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 327fe5b..5bcd798 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -33,7 +33,7 @@ Page({ e.currentTarget.dataset.subtitle }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ e.currentTarget.dataset.couponorderstatus - }` + }&sight=${that.data.sight}` }); console.log(e.currentTarget.dataset.couponorderstatus); } else { @@ -44,7 +44,7 @@ Page({ e.currentTarget.dataset.subtitle }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ that.data.mystatus - }` + }&sight=${that.data.sight}` }); } }, @@ -209,7 +209,16 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onShow: function () {}, + onShow: function () { + let that = this; + wx.getScreenBrightness({ + success: function (res) { + that.setData({ + sight: res.value + }) + } + }); + }, /** * 生命周期函数--监听页面隐藏 diff --git a/pages/orderquanma/index.js b/pages/orderquanma/index.js index ec73b9e..a279e5d 100644 --- a/pages/orderquanma/index.js +++ b/pages/orderquanma/index.js @@ -9,11 +9,15 @@ Page({ }, onLoad: function(options) { let that = this; + setTimeout(function () { + wx.setScreenBrightness({ + value: 0.7, + }) + }, 200), util.barcode("barcode", options.quancode, 500, 100); util.qrcode("qrcode", options.quancode, 350, 350); - - console.log("zhuangtai"); that.setData({ + sight: options.sight, code: options.quancode, title: options.title, subtitle: options.subtitle, @@ -80,5 +84,8 @@ Page({ onUnload: function() { let that = this; clearInterval(that.data.setInter); + wx.setScreenBrightness({ + value: that.data.sight, + }) } }); diff --git a/pages/passCar/couponDetail/couponDetail.js b/pages/passCar/couponDetail/couponDetail.js index 584990e..01dff39 100644 --- a/pages/passCar/couponDetail/couponDetail.js +++ b/pages/passCar/couponDetail/couponDetail.js @@ -24,34 +24,6 @@ Page({ code: options.quancode }); - //获得优惠券的详情 - that.data.setInter = setInterval(function () { - if ( - options.quancode != null && - options.quancode != "" && - options.quancode != undefined && - options.couponorderstatus == 0 - ) { - Http.get({ - url: config.api.couponOrderDetail, - data: { - couponOrderId: options.quancode - } - }).then(res => { - console.log(res); - that.setData({ - data: res.data - }); - that.setData({ - expiredTime: util.fmtDate(that.data.data.expiredTime), - updateDate: util.fmtDate(that.data.data.updateDate), - createDate: util.fmtDate(that.data.data.createDate) - }); - }); - } - }, 2000); - - // if (options.couponorderstatus != "0") { Http.get({ url: config.api.couponOrderDetail, data: { @@ -64,13 +36,12 @@ Page({ }); that.setData({ expiredTime: util.fmtDate(that.data.data.expiredTime), - updateDate: util.fmtDate(that.data.data.updateDate), - createDate: util.fmtDate(that.data.data.createDate) + updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dddd hh:mm:ss"), + createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dddd hh:mm:ss") }); util.barcode("barcode", options.quancode, 510, 100); util.qrcode("qrcode", options.quancode, 350, 350); }); - // } }, phone: function () { let that = this; diff --git a/pages/passCar/couponDetail/couponDetail.wxml b/pages/passCar/couponDetail/couponDetail.wxml index 35bc47b..665d66e 100644 --- a/pages/passCar/couponDetail/couponDetail.wxml +++ b/pages/passCar/couponDetail/couponDetail.wxml @@ -1,10 +1,11 @@ - + - - {{data.title}} + + + 优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券 {{data.subTitle}} ¥{{data.salePrice/100}} @@ -14,35 +15,15 @@ - - 有效期至: - {{expiredTime}} - - - - 适用门店 - - - + - 下单时间{{createDate}} 核销时间{{updateDate}} 过期时间{{updateDate}} 退款时间{{updateDate}} - + 有效期至:{{expiredTime}} 订单编号{{data.orderId}} - - 实付金额{{data.couponPrice/100}}元 + 实付金额{{data.couponPrice/100}}元 diff --git a/pages/passCar/couponDetail/couponDetail.wxss b/pages/passCar/couponDetail/couponDetail.wxss index 6da2aa7..0262613 100644 --- a/pages/passCar/couponDetail/couponDetail.wxss +++ b/pages/passCar/couponDetail/couponDetail.wxss @@ -2,22 +2,24 @@ padding-bottom: 10rpx; } -.panel,.zhuangtai image{ +.panel, .zhuangtai image { position: relative; width: 510rpx; height: 581rpx; - display: block; + display: block; border-radius: 10rpx; background-color: #fff; margin: 22rpx auto 0; padding: 30rpx 0 0; z-index: 10000000000; } -.pane2{ + +.pane2 { background: #fff; - opacity: .6; + opacity: 0.6; } -.pane2 image{ + +.pane2 image { width: 500rpx; display: block; margin: 40rpx auto 0; @@ -71,6 +73,7 @@ width: 350rpx; height: 350rpx; } + .coupon_detail { padding: 0 20rpx; margin-top: 30rpx; @@ -84,13 +87,14 @@ float: right; } -.coupon_detail .wmfl{ +.coupon_detail .wmfl { display: block; - width: 255rpx; - height: 184rpx; + width: 200rpx; + height: 165rpx; border-radius: 16rpx; overflow: hidden; } + .coupon_detail image { display: block; width: 100%; @@ -101,22 +105,45 @@ width: 400rpx; } +.right { + margin-left: 20rpx; + width: 420rpx; + overflow: hidden; +} + .coupon_detail .title { - font-size: 36rpx; + font-size: 32rpx; + width: 420rpx; + height: 40rpx; + white-space: nowrap; + text-overflow:ellipsis; + overflow: hidden; } +.money{ + width: 420rpx; + height: 50rpx; + white-space: nowrap; + text-overflow:ellipsis; + overflow: hidden; +} .time { font-size: 26rpx; color: #999; + width: 420rpx; + height: 32rpx; + white-space: nowrap; + text-overflow:ellipsis; + overflow: hidden; } .time text { font-size: 26rpx; - color: red; + color: #ff4949; } .money text { - color: red; + color: #ff4949; font-size: 36rpx; } @@ -142,11 +169,11 @@ .timevalidity text:nth-of-type(1) { color: #333; - font-size: 30rpx; + font-size: 28rpx; } .timevalidity text:nth-of-type(2) { - font-size: 30rpx; + font-size: 28rpx; color: red; } @@ -192,7 +219,7 @@ } .posi_logo view:nth-child(2) text:nth-child(1) { - font-size: 30rpx; + font-size: 28rpx; } .posi_logo view:nth-child(2) text:nth-child(2) { @@ -202,7 +229,7 @@ } .tit { - font-size: 30rpx; + font-size: 28rpx; color: #000; font-weight: bold; padding: 24rpx 0 33rpx; @@ -218,11 +245,11 @@ margin: auto; width: 50rpx; height: 50rpx; - z-index:1000000; + z-index: 1000000; } .notes { - border-top: 20rpx solid #f5f5f5; + border-top: 12rpx solid #f5f5f5; } .notes view:nth-child(1) { @@ -235,7 +262,7 @@ } .notes view:nth-child(1) text { - font-size: 30rpx; + font-size: 28rpx; font-weight: bold; } @@ -255,8 +282,8 @@ } .note view { - height: 94rpx; - line-height: 94rpx; + height: 88rpx; + line-height: 88rpx; border-bottom: 2rpx solid #f9f9f9; } @@ -268,7 +295,7 @@ width: 30%; text-indent: 30rpx; text-align: left; - font-size: 30rpx; + font-size: 28rpx; color: #000; } @@ -277,7 +304,7 @@ padding-right: 3%; text-align: right; color: #bdbdbd; - font-size: 30rpx; + font-size: 28rpx; } .manjian { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index fd6c643..ecf95ca 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -43,7 +43,11 @@ Page({ url: '/pages/managelicenseplate/managelicenseplate', }) }, - + showquan:function(){ + wx.navigateTo({ + url: '/pages/passCar/couponList/couponList', + }) + }, onShow: function (options) { var that = this; that.getList(); diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index bc90ad7..ddf4c5d 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -1,18 +1,13 @@ - - - {{park.addr}} - - - - 总车位:{{park.number}}个 - - + + {{park.addr}} + ({{park.number}}车位) + + @@ -65,10 +60,10 @@ - - + + + 立即支付 - @@ -81,15 +76,13 @@ 车辆入场后,才能绑车牌 - - - - 我的停车券 - - - + + + 我的停车券 + + - + @@ -99,6 +92,14 @@ + + + 缴费规则 + + + + + 常见问题 diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss index 394451a..2eb5ecf 100644 --- a/pages/passCar/passCar.wxss +++ b/pages/passCar/passCar.wxss @@ -6,8 +6,23 @@ page { .container{ padding-bottom: 60rpx; } +.header{ + width: 690rpx; + height: 80rpx; + font-size: 32rpx; + margin: 0 auto; + border-radius:16rpx; + line-height: 80rpx; + letter-spacing: 3rpx; +} +.header image{ + width: 40rpx; + vertical-align: middle; + margin-top:-5rpx; + margin-right:6rpx; +} .top{ - padding-bottom: 34rpx; + border-bottom:2rpx solid #f8f8f8; } .headBox { width: 690rpx; @@ -90,7 +105,7 @@ page { .borderBox { width: 750rpx; - margin-top: 26rpx; + margin-top:30rpx; } .borderUp { @@ -154,17 +169,16 @@ page { .bottonBox { width: 750rpx; - margin-top: 32rpx; + margin-top: 34rpx; margin-bottom: 80rpx; border-top: 16rpx #f8f8f8 solid; - padding-top: 13rpx; } .textStyle { background-color: white; height: 88rpx; line-height: 88rpx; - padding-left: 92rpx; + padding-left: 82rpx; border-bottom: 1px #f8f8f8 solid; position: relative; font-size: 30rpx; @@ -205,7 +219,7 @@ page { height: 88rpx; line-height: 88rpx; margin: 0 auto; - background: #56bdf8; + background: #00c0ff; border-radius: 60rpx; position: relative; margin-top: 30rpx; @@ -216,7 +230,7 @@ page { height: 180rpx; line-height: 180rpx; float: left; - background: #56bdf8; + background: #00c0ff; border-radius: 12rpx; border: 3px solid #fff; text-align: center; @@ -394,9 +408,9 @@ page { } .buy { - background: #56bdf8; + background: #00c0ff; height: 88rpx; - width: 98%; + width: 73%; margin: 0 auto; color: #fff; font-size: 36rpx; @@ -404,13 +418,17 @@ page { border-radius: 60rpx; position: relative; z-index: 100; + text-align: center; } .buyBox { height: 88rpx; + line-height: 88rpx; width: 98%; position: absolute; left: 0; + right: 0; + bottom: 0; top: 0; z-index: 100000000; border-radius: 60rpx; @@ -422,7 +440,6 @@ page { .borderBox { width: 750rpx; - border-top: 16rpx #f8f8f8 solid; } .carmanage { @@ -485,7 +502,7 @@ page { } .orderBox { - padding: 0 20rpx; + padding: 0 45rpx; position: relative; } @@ -586,13 +603,13 @@ button::after { } .orderBox .fl { - line-height: 67rpx; + line-height: 70rpx; font-size: 28rpx; color: #333; } .orderBox .fr { - line-height: 67rpx; + line-height: 70rpx; font-size: 28rpx; color: #ff4949; } diff --git a/pages/user/index.wxml b/pages/user/index.wxml index f9ad8b5..3aa4ff2 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -67,7 +67,7 @@ - 版本号:2.1.0 + 版本号:2.1.2