diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index 1f662b4..8e61946 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -24,25 +24,18 @@ Page({ onShow: function () { let that = this; that.getBannerlist(); + console.log("onShow") + console.log() var todayDate=new Date().getTime(); that.setData({ todayDate:todayDate }) - let myDiscount = wx.getStorageSync('myDiscount'); - console.log(myDiscount) - if (myDiscount == 'myDiscount') { - wx.setStorageSync('myDiscount', "dismyDiscount") - that.getList(1, "mybargain"); - that.setData({ - flag: "mybargain" - }) - } else { - wx.setStorageSync('myDiscount', "dismyDiscount") - that.getList(1, "bargaingoods"); - that.setData({ - flag: "bargaingoods" - }) - } + that.getList(1, "bargaingoods"); + that.setData({ + flag: "bargaingoods", + bargaingoods:true, + mybargain:false + }) }, /** * banner diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index d40c750..7f487f3 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -26,27 +26,29 @@ - + {{item.title}} {{item.subTitle}} - 距砍价到{{item.salePrice/100}}元还差:{{item.pressCurrentValue/100}}元 + 距砍价到{{item.salePrice/100}}元还差:{{item.pressCurrentValue/100}}元 已砍价到底价:{{item.salePrice/100}}元 - 邀请好友砍价 - 重新砍价 - - 立即支付 - + + 邀请好友砍价 - - 重新砍价 - + + + 立即支付 + + + + 重新砍价 + + + - - + diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index af6b54d..df6345d 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -17,16 +17,17 @@ page{ padding: 0 32rpx; } .listitem .fl { - width: 200rpx; + width: 180rpx; height: 180rpx!important; border-radius: 10rpx; overflow: hidden; + margin-top:10rpx; } .listitem .icon{ width: 140rpx; height: 116rpx; position: absolute; - top: 12rpx; + top: 0; right: 0; } .listitem .ri { @@ -64,7 +65,6 @@ page{ } .ri .txt04 { width: 100%; - color:#FF3232; font-size:24rpx; color:rgba(255,50,50,1); line-height:44rpx; @@ -77,7 +77,7 @@ page{ } .listitem{ position: relative; - padding: 31rpx 0; + padding: 21rpx 0; border-bottom: 1rpx solid #F9F9F9; } .botton{ @@ -97,7 +97,7 @@ page{ position: absolute; right: 0; text-align: center; - bottom: 31rpx; + bottom: 6rpx; width:186rpx; height:48rpx; line-height:48rpx; @@ -123,7 +123,7 @@ page{ position: absolute; right: 0; text-align: center; - bottom: 31rpx; + bottom: 8rpx; line-height:48rpx; border-radius:24rpx; font-size:26rpx; @@ -404,4 +404,9 @@ page{ width: 300rpx; height: 300rpx; margin: 0 auto 16rpx; + } + .again{ + position: relative; + width: 686rpx; + height: 200rpx; } \ No newline at end of file diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 4e04553..20d3ad8 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -36,7 +36,6 @@ Page({ }) } that.pressOrderDetail(options.orderId); - // that.getPressOrderStatus(options.orderId) } }, /** @@ -141,7 +140,6 @@ Page({ }, onShow: function() { let that = this; - wx.setStorageSync('myDiscount', "myDiscount"); var todayDate = new Date().getTime(); that.setData({ todayDate: todayDate, diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss index 8b81d41..e30d51b 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxss +++ b/pages/bargain/bargainDatail/bargainDatail.wxss @@ -225,7 +225,8 @@ text-align: center; line-height: 200rpx; margin-top: 30rpx; - background: #EC3B2D; + background: linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); + box-shadow: 0px 8px 8px 1px rgba(246,93,51,0.32); color: #fff!important; } .helpDiscount::after{ border: none; } @@ -295,7 +296,7 @@ color: #fff; } .status button:nth-of-type(2){ - background:rgba(190,190,190,1); + background:#fff; border:1px solid rgba(190,190,190,1); border-radius:48rpx; color: #333; diff --git a/pages/user/index.wxml b/pages/user/index.wxml index e32fc0b..6a41bdc 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -76,7 +76,7 @@ - 版本号:3.2.3 + 版本号:3.3.1