diff --git a/assets/img/game.png b/assets/img/game.png new file mode 100644 index 0000000..7341f09 Binary files /dev/null and b/assets/img/game.png differ diff --git a/assets/img/lines.png b/assets/img/lines.png new file mode 100644 index 0000000..19d913e Binary files /dev/null and b/assets/img/lines.png differ diff --git a/assets/img/liness.png b/assets/img/liness.png new file mode 100644 index 0000000..814ffa4 Binary files /dev/null and b/assets/img/liness.png differ diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index d5cfd26..a58cc3c 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -1,4 +1,3 @@ - @@ -9,10 +8,9 @@ {{data.title}} {{data.subTitle}} - - {{data.salePriceStr}} + {{data.salePriceStr}} - 满¥{{data.usePriceStr}}可用 + 满{{data.usePriceStr}}元可用 仅限本店使用 @@ -26,8 +24,7 @@ 马上购 已售罄 - 剩余{{data.remainInventory}} - + 剩余{{data.remainInventory}} \ No newline at end of file diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index 5bbf1b4..5025349 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -17,6 +17,7 @@ bottom: 0; } + .coupons-img { width: 180rpx; height: 180rpx; diff --git a/pages/couponorder/index/index.json b/pages/couponorder/index/index.json index 85a5c31..3d9ed19 100644 --- a/pages/couponorder/index/index.json +++ b/pages/couponorder/index/index.json @@ -3,5 +3,7 @@ "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" }, - "navigationBarTitleText": "我的优惠劵" + "navigationBarTitleText": "我的优惠劵", + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black" } \ No newline at end of file diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index 85a615f..f8fcda5 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -3,7 +3,7 @@ - + 请您敬请期待 @@ -14,20 +14,26 @@ - - - - - {{item.title}} + + + - - 有效期至: - {{item.expiredTime}} + + + {{item.title}} + + + {{item.subTitle}} + + 去使用 + 查看 - 立即使用 - 查看 + + + + 有效期至: + {{item.expiredTime}} diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss index c8e71f8..e3c1f33 100644 --- a/pages/couponorder/index/index.wxss +++ b/pages/couponorder/index/index.wxss @@ -1,6 +1,7 @@ .market { width: 100%; height: 100%; + background: #f5f5f5; } .tabs { @@ -23,33 +24,58 @@ position: relative; } -.detail_msg { - width: 92%; - height: 186rpx !important; +.mms { + width: 690rpx; + height: 170rpx !important; background: #fff; + padding: 30rpx 0 0; + margin: 0 auto 30rpx; + border-radius: 16rpx; + border-top: 8rpx solid #02b7ff; + box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); +} + +.detail_msg { display: flex; - padding: 30rpx 4%; - border-bottom: 1rpx solid #ededed; + padding-bottom: 30rpx; +} + +.expiretime { + display: block; + width: 100%; + text-align: left; + text-indent: 1em; + height: 40rpx; + line-height: 40rpx; + font-size: 22rpx; + color: #333; + letter-spacing: 0; +} + +.liness { + display: block; + width: 100%; } .logo { - width: 180rpx; - height: 180rpx; + width: 60rpx; + height: 60rpx; border: 1px solid #f8f8f8; - border-radius: 15rpx; + border-radius: 50rpx; display: block; + margin-left: 20rpx; } .logo image { - width: 180rpx; - height: 180rpx; - border-radius: 15rpx; + width: 60rpx; + height: 60rpx; + border-radius: 50%; } .info view:nth-child(1) { display: flex; justify-content: space-between; - padding: 0 4%; + padding: 0 2%; } .info { @@ -57,16 +83,18 @@ } .info view:nth-child(1) text { - font-size: 30rpx; - margin-top: 10rpx; + font-size: 32rpx; + line-height: 32rpx; color: #333; + letter-spacing: 0; } .info view:nth-child(2) { - color: #ff3434; - font-size: 24rpx; padding-left: 4%; - margin-top: 1%; + font-size: 22rpx; + color: #333; + letter-spacing: 0; + margin-top: 6rpx; } .info view:nth-child(3) { @@ -75,26 +103,22 @@ .btns { position: absolute; - right: 30rpx; - bottom: 39rpx; - width: 180rpx; - height: 60rpx; - line-height: 60rpx; + right: 57rpx; + top: 38rpx; + width: 120rpx; + height: 48rpx; + line-height: 48rpx; text-align: center; - background: #00c0ff; - color: #fff; - border-radius: 15rpx; + border: 2rpx solid #02c0ff; + border-radius: 60rpx; + color: #02c0ff; font-size: 28rpx; } .txt1 { font-size: 22rpx; - color: #999; -} - -.txt2 { - font-size: 22rpx; - color: #f96563; + color: #333; + letter-spacing: 0; } .nocoupon image { @@ -127,7 +151,7 @@ color: #fff; font-style: 30rpx; width: 100%; - border-radius:60rpx; + border-radius: 60rpx; } .loading { @@ -144,9 +168,11 @@ vertical-align: middle; margin-right: 10rpx; } -.active{ - opacity: .6; + +.active { + opacity: 0.6; } + .nav { position: absolute; bottom: 3.3%; diff --git a/pages/index/index.js b/pages/index/index.js index 6584e88..34332e4 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -14,6 +14,11 @@ Page({ swiperCurrent: e.detail.current }); }, + gotogame:function(){ + wx.navigateTo({ + url: '/pages/game/game', + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ac268eb..9de6e1a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,5 +1,10 @@ + + + 新用户专享神秘礼物 + 独家福利,抢完即止 + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index e68f49a..5d7eca4 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -6,17 +6,58 @@ width: 100%; font-family: PingFangSC-Semibold; font-size: 30rpx; - color: #ffffff; + color: #fff; letter-spacing: 0.75rpx; z-index: 9; line-height: 88rpx; overflow: hidden; } + page { width: 100%; height: auto; overflow-x: hidden; } -.txt{ - margin-left: 20rpx; + +.txt { + margin-left: 20rpx; +} + +.game { + position: relative; + width: 750rpx; + height: 200rpx; + z-index: 10000000; +} + +.game text { + display: block; + position: relative; + z-index: 100; +} + +.game text:nth-of-type(1) { + display: inline-block; + padding-top: 65rpx; + padding-left: 70rpx; + font-size: 32rpx; + color: #333; + line-height: 36rpx; +} + +.game text:nth-of-type(2) { + font-size: 24rpx; + color: #999; + line-height: 24rpx; + padding-left: 70rpx; +} + +.game image { + position: absolute; + width: 100%; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 10; } diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index 9c4bcf1..5f92168 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -13,23 +13,24 @@ {{item.subTitle}} - ¥{{item.salePriceStr}} - ¥{{item.priceStr}} + 售价:{{item.salePriceStr}} + {{item.priceStr}}元 + - 剩余时间: + 距结束: {{item.endtime}} - 剩余件数: - {{item.remainInventory}}件 + 剩余: + {{item.remainInventory}}张 - 购买 - 领取 + 购买 + 领取 diff --git a/pages/rushToBuy/index.wxss b/pages/rushToBuy/index.wxss index b6461c6..28b9d4d 100644 --- a/pages/rushToBuy/index.wxss +++ b/pages/rushToBuy/index.wxss @@ -1,9 +1,11 @@ -.flashSale { +.flashSale,page{ width: 100%; - height: 100%; - background: #fff; + background: #f5f5f5; + padding-bottom: 30rpx; +} +.flashSale > view:nth-of-type(1){ + margin-top: 0!important; } - .loading { text-align: center; height: 80rpx; @@ -11,7 +13,6 @@ font-size: 26rpx; color: #999; } - .loading image { width: 40rpx; height: 40rpx; @@ -21,25 +22,28 @@ .flashSaleItemWrap { width: 100%; - height: 410rpx; - border-bottom: 10rpx solid #f8f8f8; + margin-top: 30rpx; } .flashSaleItem { - width: 90%; - height: 410rpx; + width: 690rpx; + margin: 0 auto; display: flex; flex-direction: column; background: #fff; - margin: 0 auto; + border-radius: 16rpx; + padding-bottom: 30rpx; +} + +.lines { + display: block; + width: 100%; } .flashSaleItemTop { display: flex; - padding-top: 28rpx; flex-direction: row; - padding-bottom: 25rpx; - border-bottom: 1rpx solid #ededed; + padding: 28rpx 30rpx 10rpx; } .flashSaleItemTopL { @@ -47,15 +51,14 @@ } .food { - width: 248rpx; + width: 180rpx; border-radius: 10rpx; - height: 184rpx; + height: 180rpx; } .flashSaleItemTopR { flex: 2; flex-direction: column; - margin-left: 20rpx; } .flashSaleItemTopRTop { @@ -75,7 +78,8 @@ .small { font-size: 24rpx; - color: #00c0ff; + color: #333; + letter-spacing: 0; margin-top: 15rpx; } @@ -96,8 +100,8 @@ } .flashSaleItemBottom { - margin-top: 20rpx; position: relative; + padding: 0 30rpx; } .remainingTime { @@ -107,7 +111,7 @@ .realRemainingTime { margin-left: 10rpx; - color: #f96563; + color: #FF4949; font-size: 28rpx; } @@ -119,6 +123,7 @@ .view1 { width: 550rpx; display: block; + line-height: 33rpx; } .remainingNumber { @@ -134,15 +139,33 @@ .buy { position: absolute; - top: 34rpx; + top: 27rpx; bottom: 0; - right: 0rpx; - width: 138rpx; - height: 50rpx; - line-height: 50rpx; + right: 30rpx; + width: 140rpx; + height: 60rpx; + line-height: 60rpx; text-align: center; - background: #00c0ff; + background: #ff4949; + border-radius: 60rpx; color: #fff; - border-radius: 10rpx; font-size: 28rpx; } + +.sale { + font-size: 24rpx; + color: #999; + letter-spacing: 0; + display: inline-block; + margin-right: 6rpx; +} + +.yuan { + font-size: 24rpx; + color: #ff4949; + letter-spacing: 0; +} + +.active { + opacity: 0.6; +} diff --git a/pages/user/index.wxml b/pages/user/index.wxml index d5123fb..46c9eab 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -67,7 +67,7 @@ - 版本号:1.0.1 + 版本号:2.0.0 \ No newline at end of file