diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index 2ddd3a0..23b74a1 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -66,9 +66,9 @@ font-family: PingFang-SC-Bold; font-weight: bold; color: #FD782D; - /* line-height: 44rpx; */ + line-height: 44rpx; margin-left: 16rpx; - /* padding-top: 16rpx; */ + padding-top: 16rpx; } .rmb{ font-size: 24rpx!important; @@ -132,7 +132,7 @@ .coupons-btn-gms { background: #b9b9b9 !important; - border-radius: 10px 0px 5px 0px !important; + border-radius: 10px!important; opacity: 0.6; margin: 0 !important; padding: 0 !important; diff --git a/components/hot/index.js b/components/hot/index.js index 73dd2af..97ce405 100644 --- a/components/hot/index.js +++ b/components/hot/index.js @@ -23,7 +23,9 @@ Component({ wangmeimeibargin: imgurl.wangmeimeibargin.url, list: [], pintuanList:[], - total: '' + total: '', + flag:false, + page:1, }, /** * 组件的方法列表 @@ -35,8 +37,8 @@ Component({ Http.get({ url: config.api.couponChannelList, data: { - pageNum: 1, - pageSize: 5, + pageNum: this.data.page++, + pageSize: 1, targetAd: 6 } }).then(res => { @@ -60,14 +62,15 @@ Component({ Http.get({ url: config.api.couponChannelList, data: { - pageNum: 1, - pageSize: 4, + pageNum: this.data.page++, + pageSize: 1, targetAd: 7 - } + }, }).then(res => { this.setData({ pintuanList: res.data.list, - total: res.data.total + total: res.data.total, + flag: true }); console.log(this.data.pintuanList) }) @@ -79,6 +82,11 @@ Component({ mask: false }); }) + }, + // //换一换 + getChange(){ + + }, //跳转砍价详情 gotokjdetail: function (e) { diff --git a/components/hot/index.wxml b/components/hot/index.wxml index 7b62a07..a330e8c 100644 --- a/components/hot/index.wxml +++ b/components/hot/index.wxml @@ -5,7 +5,7 @@ 爆款专区 - + 换一换 diff --git a/pages/addPark/addPark.json b/pages/addPark/addPark.json index 9e30d0a..0db3cdf 100644 --- a/pages/addPark/addPark.json +++ b/pages/addPark/addPark.json @@ -1,3 +1,4 @@ { - "navigationBarTitleText": "添加车辆" + "navigationBarTitleText": "添加车辆", + "navigationBarBackgroundColor": "#F4F5F9" } \ No newline at end of file diff --git a/pages/addPark/addPark.wxss b/pages/addPark/addPark.wxss index 2b2339c..c484ac8 100644 --- a/pages/addPark/addPark.wxss +++ b/pages/addPark/addPark.wxss @@ -1,5 +1,7 @@ /* pages/park/addPark/addPark.wxss */ - +page{ + background: #F4F5F9; +} .addpark-title { margin-top: 48rpx; text-align: center; @@ -18,9 +20,8 @@ .addpark-num-head { display: flex; width: 164rpx; - background: #58abfa; border-radius: 10rpx; - color: #fff; + color: #3C3C3C; text-align: center; align-items: center; } @@ -29,13 +30,17 @@ width: 88rpx; height: 82rpx; line-height: 82rpx; + margin: 0 auto; + border: 2rpx solid #E1E1E1; + border-radius: 10rpx; + background: #FFFFFF; } .addpark-num-center { display: flex; margin-left: 20rpx; width: 392rpx; - border: 2rpx solid #58abfa; + /* border: 2rpx solid #E1E1E1; */ border-radius: 10rpx; text-align: center; align-items: center; @@ -46,7 +51,7 @@ } .addpark-num-center-border { - border-left: 2rpx solid #58abfa; + border-left: 2rpx solid #E1E1E1; } .addpark-num-new { @@ -55,10 +60,12 @@ text-align: center; align-items: center; margin-left: 20rpx; - border: 2rpx solid #12c67a; + border: 2rpx dashed #2C8DFF; border-radius: 10rpx; } - +.addpark-num-new view { + border:none!important; +} .newsource { font-size: 16rpx; position: absolute; @@ -66,9 +73,9 @@ left: 670rpx; height: 30rpx; width: 60rpx; - background: #11c67b; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); color: #fff; - border: 1px solid #11c67b; + /* border: 1px solid #11c67b; */ border-radius: 14rpx; text-align: center; line-height: 30rpx; @@ -78,7 +85,7 @@ width: 672rpx; margin: 34rpx auto; height: 440rpx; - border: 2rpx solid #58abfa; + border: 2rpx solid #FD832D; border-radius: 16rpx; padding: 30rpx 15rpx; } @@ -91,7 +98,7 @@ .addpark-choose-font { width: 80rpx; height: 77rpx; - background: #f8f8f8; + background: #FEFFFE; text-align: center; line-height: 77rpx; border: 1 px solid #f8f8f8; @@ -114,24 +121,24 @@ width: 672rpx; margin: 34rpx auto; height: 510rpx; - border: 2rpx solid #58abfa; + border: 2rpx solid #FD832D; border-radius: 16rpx; padding: 30rpx 15rpx; } .choose { - color: #58abfa; + color: #FD832D; } .choose-title { - border: 6rpx solid #ffd255; + border: 2rpx solid #FD832D; } .addpark-button-submit { width: 670rpx; height: 94rpx; margin: 0 auto; - background: #60b4fc; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); color: #fff; border-radius: 60rpx; line-height: 94rpx; diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index bc23fcd..15e1b94 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -82,7 +82,7 @@ page{ font-size: 18rpx; position: absolute; right: 0; - top: 18rpx; + top: 22rpx; } .money{ display: inline-block!important; diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 9e9df95..9425923 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -5,6 +5,7 @@ let app = getApp(); const imgurl = require("../../../utils/imgurl"); Page({ data: { + noCoupon: imgurl.noCoupon.url, couponUrl: imgurl.coupon.url, linessUrl: imgurl.liness.url, wmhome: imgurl.wmhome.url, diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 596ab74..5f44de9 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -6,7 +6,7 @@ - + 请您敬请期待 我们正在筹备一大波优惠活动 diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 0492190..53cb0c5 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -45,11 +45,12 @@ {{data.title}}电子卡 {{data.subTitle}} - 售价: + + {{data.salePriceStr}} {{data.creditPrice}}积分 - - {{data.priceStr}}元 + + {{data.priceStr}}小时 过期不退款 @@ -130,7 +131,7 @@ {{data.salePriceStr}}元马上购买 - + @@ -146,7 +147,7 @@
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 661ceff..fbe7ada 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -112,7 +112,7 @@ button::after { display: block; font-weight: bold; font-size: 32rpx; - color: #000; + color: #3C3C3C; letter-spacing: 1.09rpx; line-height: 45rpx; width: 542rpx; @@ -139,8 +139,8 @@ button::after { font-size: 24rpx; color: #919191; letter-spacing: 0; - height: 70rpx; - line-height: 70rpx; + height: 50rpx; + line-height: 50rpx; /* border-bottom: 1px solid #eee; */ border-bottom: 1px solid #f9f9f9; } @@ -177,7 +177,11 @@ button::after { color: #999; letter-spacing: 0; } - +.salePriceStr .rmb{ + color: #FD782D; + font-size: 24rpx; + float: left; +} .salePriceStr .pri01 { font-size: 40rpx; color: #FD782D; @@ -334,7 +338,7 @@ button::after { } .buy-view { - background: #fff; + /* background: #fff; */ height: 92rpx; bottom: 0; left: 0; @@ -345,7 +349,7 @@ button::after { .buy { position: relative; - background: #af6e34; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); height: 94rpx; width: 560rpx; margin: 0 auto 30rpx; @@ -354,7 +358,9 @@ button::after { line-height: 94rpx; border-radius: 61rpx; } - +.buyHr{ + background: #CECECE!important; +} .goback { position: relative; float: left; @@ -373,8 +379,8 @@ button::after { left: 0; right: 0; top: 0; - bottom: 50rpx; - margin: auto; + bottom:0; + margin:10rpx auto; } .tel { @@ -570,15 +576,20 @@ button::after { left: 0; right: 0; bottom: 0; - padding-bottom: 37rpx; - padding-top: 37rpx; + padding-bottom: 22rpx; + padding-top: 22rpx; z-index: 12; /* background: #fff; */ } .btnTxt{ - /* margin-top: 30rpx; */ + width: 50rpx; + height: 30rpx; + line-height: 50rpx; color: #FD782D; font-size: 20rpx; + position: absolute; + right:42rpx ; + bottom: 15rpx; } .btns .fr,.btns .fl { @@ -591,8 +602,8 @@ button::after { .btns .fl { margin-left: 20rpx; color: #fff; - background: rgba(255, 169, 2, 1); - box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + /* box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); */ } .btns .fl text { @@ -610,8 +621,8 @@ button::after { color: #fff; margin-right: 20rpx; line-height: 95rpx; - background: rgba(236, 59, 45, 1); - box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); + background: linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%); + /* box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); */ } .support-tansfer { diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 32f5a90..cb4abf8 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -8,6 +8,8 @@ const QR = require("../../../utils/memberqrcode.js"); Page({ data: { code: "", + topLine: imgurl.topLine.url, + btomLine: imgurl.btomLine.url, lineUrl: imgurl.line.url, wm01Url: imgurl.wm01.url, wm02Url: imgurl.wm02.url, diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index 897a331..1cf77af 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -1,113 +1,116 @@ - - - - - - - {{data.title}} - {{data.subTitle}} - - ¥{{data.couponPrice/100}} - ¥{{data.salePrice/100}} - ¥{{data.salePrice/100}} - ¥{{data.price/100}} - - 过期不退款 - + + + + + + - - - - 有效期至: - {{expiredTime}} - - - 有效期: - {{validStartDate}} - - {{validEndDate}} - - 满{{data.usePrice/100}}元可用 - 仅限本店使用 - - - - - - - - - - + + {{data.title}} + {{data.subTitle}} + + ¥{{data.couponPrice/100}} + ¥{{data.salePrice/100}} + ¥{{data.salePrice/100}} + ¥{{data.price/100}} + + 过期不退款 + + - - - 优惠券码:{{code}} - - - - - 适用门店 + + 有效期至: + {{expiredTime}} - -