diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index 478a28b..aab3fcf 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -32,8 +32,42 @@ - + + + + + + + + + + + {{item.title}} + {{item.subTitle}} + + {{item.salePriceStr}} + + 满¥{{item.usePriceStr}}可用 + + + 仅限本店使用 + + + + + + + 剩余: {{item.remainInventory}} + + + 领取 + 购买 + + + + + + \ No newline at end of file diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss index 41797b3..db56dcb 100644 --- a/pages/bannerdetail/index.wxss +++ b/pages/bannerdetail/index.wxss @@ -159,13 +159,12 @@ .notes view:nth-child(2) { width: 92%; - height: 400rpx; - padding: 0 4%; + height: auto; + padding:4%; background: #fff; border-bottom: 1rpx solid #f5f5f5; display: flex; flex-direction: column; - padding-top: 2%; } .notes view:nth-child(2)>text { @@ -196,12 +195,194 @@ } .buy { + display: block; background: #00c0ff; - height: 88rpx; - width: 98%; + height: 50rpx; + width: 120rpx; margin: 0 auto; color: #fff; - font-size: 36rpx; - line-height: 88rpx; + font-size: 28rpx; + line-height: 50rpx; + text-align: center; border-radius: 6rpx; } +.coupons1-btn-gm { + background: #00c0ff !important; + border-radius: 10rpx !important; + margin: 0 !important; + padding: 0 !important; + font-family: PingFangSC-Semibold; + font-size: 28rpx; + color: #ffffff !important; + letter-spacing: 0; + height: 50rpx !important; + width: 138rpx !important; + line-height: 50rpx !important; +} +.coupons1 { + flex-direction: row; + display: flex; + padding: 30rpx; + position: relative; + height: 184rpx; + border:1px solid #eee; +} +.coupons1-border { + height: 1rpx; + /* width: 100%; */ + left: 30rpx; + right: 30rpx; + background: #f5f5f5; + position: absolute; + bottom: 0; +} +.coupons1-img { + width: 248rpx; + height: 184rpx; + overflow: hidden; + border-radius: 10rpx; +} + +.coupons1-img image { + width: 100%; + height: 100%; +} + +.coupons1-info { + padding-left: 20rpx; +} + +.coupons1-info-name { + font-size: 28rpx; + color: #000000; + letter-spacing: 0; + line-height: 38rpx; +} +.coupons1-info-price { + padding: 32rpx 0 0; +} +.i{ + font-size: 20rpx; + font-style: normal; +} +.coupons1-info-price-p { + display: inline-block; + font-size: 36rpx; + color: #f96563; + line-height: 50rpx; +} +.tit{ + margin-top: 32rpx; +} +.coupons1-info-price-o { + display: block; + text-align: center; + font-size: 26rpx; + color: #b4b4b4; + letter-spacing: 0.96rpx; + text-decoration: line-through; + line-height: 24rpx; +} + +.coupons1-info-distance { + font-size: 22rpx; + color: #c0c0c0; + letter-spacing: 0; + padding-bottom: 10rpx; + line-height: 30rpx; +} + +.coupons1-info-address { + font-size: 22rpx; + color: #585858; + letter-spacing: 0; + line-height: 30rpx; +} + +.coupons1-btn { + position: absolute; + top: 40rpx; + right: 30rpx; +} + +.coupons1-btn-gm { + background: #00c0ff !important; + border-radius: 10rpx !important; + margin: 0 !important; + padding: 0 !important; + font-family: PingFangSC-Semibold; + font-size: 28rpx; + color: #ffffff !important; + letter-spacing: 0; + height: 50rpx !important; + width: 138rpx !important; + line-height: 50rpx !important; +} +.subtitle { + font-size: 22rpx; + color: #333; + font-weight: 100; + text-align: left; +} +.coupons1-info-manjian { + color: #fa7c7a; + font-size: 20rpx; + line-height: 34rpx; + display: inline-block; +} + +/**上拉加载更多**/ +.userinfo { + display: flex; + flex-direction: column; + align-items: center; +} + +.userinfo-avatar { + width: 128rpx; + height: 128rpx; + margin: 20rpx; + border-radius: 50%; +} + +.userinfo-nickname { + color: #aaa; +} +.sy{ + display: block; + text-align: center; +} +.usermotto { + margin-top: 200px; +} + +/**/ + +scroll-view { + width: 100%; +} + +.item { + width: 90%; + height: 300rpx; + margin: 20rpx auto; + background: brown; + overflow: hidden; +} + +.item .img { + width: 430rpx; + margin-right: 20rpx; + float: left; +} + +.title { + font-size: 30rpx; + display: block; + margin: 30rpx auto; +} + +.description { + font-size: 26rpx; + line-height: 15rpx; +} diff --git a/pages/order/index/index.js b/pages/order/index/index.js index d99931e..4889e61 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -30,7 +30,21 @@ Page({ current_scroll: e.id }); }, - + gotopay:function(){ + console.log("000000"); + wx.navigateTo({ + url: '/pages/order/detail/index', + success: function(res){ + // success + }, + fail: function() { + // fail + }, + complete: function() { + // complete + } + }) + }, getList(key, pageNum) { let that = this; diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index b1ed611..23d0c16 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -11,7 +11,7 @@ {{item.title}} - 等待付款 + 等待付款 {{item.subTitle}} @@ -24,7 +24,7 @@ ¥{{item.salePrice/100}} ¥{{item.price/100}} - + 支付