From 392b2645976e380964cc3a567d62cf33e36d8816 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 29 Sep 2018 20:01:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E9=80=89=E6=8B=A9=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8][=E4=BF=AE=E6=94=B9]:=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0=E5=88=B8=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=81=9C=E8=BD=A6=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 1 + assets/img/gou.png | Bin 0 -> 16709 bytes pages/passCar/choicecoupon/choicecoupon.js | 74 +++++ pages/passCar/choicecoupon/choicecoupon.json | 3 + pages/passCar/choicecoupon/choicecoupon.wxml | 39 +++ pages/passCar/choicecoupon/choicecoupon.wxss | 211 +++++++++++++++ pages/passCar/couponDetail/couponDetail.wxss | 5 +- pages/passCar/couponList/couponList.wxml | 6 +- pages/passCar/passCar.js | 267 ++++++++++--------- pages/passCar/passCar.wxml | 41 ++- pages/passCar/passCar.wxss | 37 ++- pages/ques/ques.wxss | 2 +- pages/user/index.wxml | 2 +- 13 files changed, 526 insertions(+), 162 deletions(-) create mode 100644 assets/img/gou.png create mode 100644 pages/passCar/choicecoupon/choicecoupon.js create mode 100644 pages/passCar/choicecoupon/choicecoupon.json create mode 100644 pages/passCar/choicecoupon/choicecoupon.wxml create mode 100644 pages/passCar/choicecoupon/choicecoupon.wxss diff --git a/app.json b/app.json index 6f84ecc..c654f2c 100644 --- a/app.json +++ b/app.json @@ -25,6 +25,7 @@ "pages/addPark/addPark", "pages/orderquanma/index", "pages/passCar/couponList/couponList", + "pages/passCar/choicecoupon/choicecoupon", "pages/passCar/couponDetail/couponDetail", "pages/managelicenseplate/managelicenseplate" ], diff --git a/assets/img/gou.png b/assets/img/gou.png new file mode 100644 index 0000000000000000000000000000000000000000..2b84bc89527c9c832b385bdf6a0aec0b2a5d007f GIT binary patch literal 16709 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 literal 0 HcmV?d00001 diff --git a/pages/passCar/choicecoupon/choicecoupon.js b/pages/passCar/choicecoupon/choicecoupon.js new file mode 100644 index 0000000..966a00f --- /dev/null +++ b/pages/passCar/choicecoupon/choicecoupon.js @@ -0,0 +1,74 @@ +const format = require("../../../utils/util.js"); +const config = require("../../../config/config.js"); +const app = getApp(); +const Http = require("../../../utils/HttpBasics"); +Page({ + data: { + list: [], + current: "0", + current_scroll: "0", + page: 1, + allow_load: true + }, + onLoad(options) { + this.getList(0, 0); + if (options.quanid){ + this.setData({ + quanid: options.quanid + }) + } + }, + + /** + * 选择使用的优惠券 + */ + choicecoupon: function(e) { + wx.navigateBack(); + console.log(e); + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2] //上一个页面 + var that = this; + var quantitle = e.currentTarget.dataset.title; + var quanid = e.currentTarget.dataset.id; + prevPage.setData({ + quantitle: quantitle, + quanid: quanid, + }); + wx.setStorage({ + key: 'chosed', + data: 'chosed', + }) + }, + getList(key, pageNum) { + var that = this; + console.log(key); + console.log(pageNum); + if (that.data.allow_load) { + Http.get({ + url: config.api.couponOrderList + "?type=5", + data: { + pageNum: pageNum, + pageSize: 20, + couponOrderStatus: key + } + }).then(res => { + console.log(res); + res.data.list.map(file => { + file.expiredTime = format.formatTime( + file.expiredTime, + "yyyy-MM-dddd hh:mm:ss" + ); + }); + if (pageNum > res.data.pages) { + that.setData({ + allow_load: false + }); + } + that.data.list = that.data.list.concat(res.data.list); + that.setData({ + list: that.data.list + }); + }); + } + }, +}); \ No newline at end of file diff --git a/pages/passCar/choicecoupon/choicecoupon.json b/pages/passCar/choicecoupon/choicecoupon.json new file mode 100644 index 0000000..2d7e370 --- /dev/null +++ b/pages/passCar/choicecoupon/choicecoupon.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "停车券" +} \ No newline at end of file diff --git a/pages/passCar/choicecoupon/choicecoupon.wxml b/pages/passCar/choicecoupon/choicecoupon.wxml new file mode 100644 index 0000000..b50189d --- /dev/null +++ b/pages/passCar/choicecoupon/choicecoupon.wxml @@ -0,0 +1,39 @@ + + + + + 请您敬请期待 + 我们正在筹备一大波优惠活动 + + + + + + + + + + + + {{item.title}} + + + {{item.subTitle}} + + {{item.salePrice/100}} + + + + + + + 有效期至: + {{item.expiredTime}} + + + + + {{content}} + + + \ No newline at end of file diff --git a/pages/passCar/choicecoupon/choicecoupon.wxss b/pages/passCar/choicecoupon/choicecoupon.wxss new file mode 100644 index 0000000..8b98674 --- /dev/null +++ b/pages/passCar/choicecoupon/choicecoupon.wxss @@ -0,0 +1,211 @@ +.market { + width: 100%; + height: 100%; + /* background: #f5f5f5; */ +} + +.tabs { + width: 100% !important; + height: 88rpx; + text-align: center; + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 100000; +} + +.i-tab { + width: 25% !important; + display: inline-block; +} + +.section { + position: relative; +} + +.mms { + position: relative; + width: 690rpx; + background: #fff; + padding: 20rpx 0 0; + margin: 0 auto 46rpx; + border-top: 8rpx solid #02b7ff; + box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); +} + +.detail_msg { + display: flex; +} + +.expiretime { + display: block; + width: 100%; + text-align: left; + text-indent: 1em; + height: 50rpx; + line-height: 50rpx; + font-size: 22rpx; + color: #999; + letter-spacing: 0; +} + +.liness { + display: block; + width: 100%; + margin-top: 20rpx; +} + +.logo { + width: 60rpx; + height: 60rpx; + border: 1px solid #f8f8f8; + border-radius: 50rpx; + display: block; + margin-left: 20rpx; +} + +.logo image { + width: 60rpx; + height: 60rpx; + border-radius: 50%; +} + +.info view:nth-child(1) { + display: flex; + justify-content: space-between; + padding: 0 2%; +} + +.info { + width: 100%; +} + +.info view:nth-child(1) text { + font-size: 32rpx; + line-height: 32rpx; + height: 32rpx; + color: #333; + letter-spacing: 0; + width: 400rpx; + display: inline-block; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + +.info view:nth-child(2) { + padding-left: 2%; + font-size: 22rpx; + color: #333; + letter-spacing: 0; + margin-top: 6rpx; + display: inline-block; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + width: 400rpx; +} + +.info view:nth-child(3) { + margin-left: 20rpx; +} + +.btns { + position: absolute; + right: 57rpx; + top: 0; + bottom: 0; + margin: auto; + width: 180rpx; + height: 48rpx; + line-height: 48rpx; + text-align: right; + color: #f96563; + font-size: 40rpx; +} + +.yuan { + color: #333; + font-size: 26rpx; +} + +.txt1 { + font-size: 22rpx; + color: #333; + letter-spacing: 0; +} + +.nocoupon image { + width: 300rpx; + display: block; + margin: 3% auto 0; +} + +.txt001 { + display: block; + line-height: 48rpx; + font-size: 34rpx; + color: #333; + letter-spacing: 0; + text-align: center; +} + +.txt002 { + display: block; + margin-top: 1%; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + line-height: 40rpx; + text-align: center; +} + +.nocoupon button { + background: #00c0ff; + color: #fff; + font-style: 30rpx; + width: 100%; + border-radius: 60rpx; +} + +.loading { + text-align: center; + height: 80rpx; + line-height: 80rpx; + font-size: 26rpx; + color: #999; +} + +.loading image { + width: 60rpx; + height: 60rpx; + vertical-align: middle; + margin-right: 10rpx; +} + +.active { + opacity: 0.6; +} + +.nav { + position: absolute; + bottom: 3.3%; + left: 0; + right: 0; + margin: auto; + width: 670rpx; + border-radius: 60rpx; + background: #02c0ff; + font-size: 32px; + color: #fff; + text-align: center; + line-height: 32px; +} + +.gou { + position: absolute; + top: -15rpx; + right: -10rpx; + width: 60rpx; +} diff --git a/pages/passCar/couponDetail/couponDetail.wxss b/pages/passCar/couponDetail/couponDetail.wxss index 7cee945..6da2aa7 100644 --- a/pages/passCar/couponDetail/couponDetail.wxss +++ b/pages/passCar/couponDetail/couponDetail.wxss @@ -73,6 +73,7 @@ } .coupon_detail { padding: 0 20rpx; + margin-top: 30rpx; } .fl { @@ -154,8 +155,8 @@ display: flex; flex-direction: column; background: #fff; - border-bottom: 20rpx solid #f5f5f5; - border-top: 20rpx solid #f5f5f5; + border-bottom: 6rpx solid #f5f5f5; + border-top: 6rpx solid #f5f5f5; position: relative; } diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml index 873e410..6eca002 100644 --- a/pages/passCar/couponList/couponList.wxml +++ b/pages/passCar/couponList/couponList.wxml @@ -16,9 +16,9 @@ - + + 总车位:{{park.number}}个 停车费: @@ -19,8 +19,7 @@ - + @@ -47,18 +46,27 @@ 停车时长: {{timecha}} - + + + 优惠券: - 2小时优免券 + + {{quantitle}} + {{couponList.length}}张可用 + + + + + 待缴费用: - {{stopFees.remainingFee}} + {{stopFees.remainingFee}} - - + + + @@ -98,16 +106,5 @@ - - \ No newline at end of file diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss index e334774..394451a 100644 --- a/pages/passCar/passCar.wxss +++ b/pages/passCar/passCar.wxss @@ -3,7 +3,11 @@ page { background-color: #fff; } +.container{ + padding-bottom: 60rpx; +} .top{ + padding-bottom: 34rpx; } .headBox { width: 690rpx; @@ -60,7 +64,7 @@ page { width: 690rpx; font-size: 28rpx; color: #999; - margin: 10rpx auto 60rpx; + margin: 10rpx auto 0; } .time { @@ -150,7 +154,10 @@ page { .bottonBox { width: 750rpx; - margin-top: 30rpx; + margin-top: 32rpx; + margin-bottom: 80rpx; + border-top: 16rpx #f8f8f8 solid; + padding-top: 13rpx; } .textStyle { @@ -218,7 +225,7 @@ page { .passNumberBox { width: 690rpx; - margin: 50rpx auto 0; + margin: 32rpx auto 0; position: relative; background-color: white; } @@ -383,7 +390,7 @@ page { background: #fff; position: relative; height: 88rpx; - margin-top: 50rpx; + margin-top: 30rpx; } .buy { @@ -415,15 +422,15 @@ page { .borderBox { width: 750rpx; - border-top: 4rpx #f8f8f8 solid; + border-top: 16rpx #f8f8f8 solid; } .carmanage { position: relative; width: 690rpx; - margin: 0 auto; - height: 80rpx; - line-height: 82rpx; + margin: 15rpx auto 0; + height: 60rpx; + line-height: 60rpx; /* border-bottom: 1rpx solid #eee; */ } @@ -464,7 +471,7 @@ page { .mycar { display: inline-block; font-size: 33rpx; - color: #333; + color: #666; line-height: 35rpx; letter-spacing: 1.16rpx; } @@ -579,13 +586,13 @@ button::after { } .orderBox .fl { - line-height: 60rpx; + line-height: 67rpx; font-size: 28rpx; color: #333; } .orderBox .fr { - line-height: 60rpx; + line-height: 67rpx; font-size: 28rpx; color: #ff4949; } @@ -602,3 +609,11 @@ button::after { border-radius: 6rpx; margin-right: 6rpx; } +.jiant{ + display: inline-block; + width: 44rpx; + height: 44rpx; + vertical-align: middle; + margin-top: -6rpx; + margin-right: -10rpx; +} \ No newline at end of file diff --git a/pages/ques/ques.wxss b/pages/ques/ques.wxss index ad4e9f4..3c83dca 100644 --- a/pages/ques/ques.wxss +++ b/pages/ques/ques.wxss @@ -1,5 +1,5 @@ .content { - padding: 0 30rpx; + padding: 0 30rpx 30rpx 30rpx; margin: 30rpx auto; } diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 6543b23..9302def 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -67,7 +67,7 @@ - 版本号:2.0.8 + 版本号:2.0.9