diff --git a/pages/bargain/bargain.json b/pages/bargain/bargain.json index 251c304..6aab341 100644 --- a/pages/bargain/bargain.json +++ b/pages/bargain/bargain.json @@ -3,7 +3,7 @@ "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#FF6F03", "usingComponents": { - "c-banner": "../../components/banner/index", + "c-banner": "../../components/spellbanner/index", "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" } diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index 344b20e..144c5cd 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -1,10 +1,10 @@ - - + + + + 发起砍价 已售罄 - {{content}} + {{content}} - + @@ -47,13 +47,21 @@ - {{content}} + {{content}} - + + + + 暂无数据 + + + + 暂无数据 + 砍价商品 我的砍价 diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index 2d59d3f..2f644b0 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -74,8 +74,8 @@ page{ padding: 21rpx; background: #fff; border-radius: 20rpx; - margin-bottom: 20rpx; - margin-top: 20rpx; + margin-bottom: 30rpx; + margin-top: 30rpx; } .botton{ position: absolute; @@ -162,6 +162,7 @@ page{ } .page{ padding-bottom: 100rpx; + position: relative; } .mr{ height: 40rpx; @@ -334,7 +335,14 @@ page{ line-height: 40rpx; text-align: center; } - + .top{ + width: 710rpx; + height: 260rpx; + background: #fff; + border-radius: 16rpx; + overflow: hidden; + margin: 30rpx auto 0; +} .nocoupon button { background: #00c0ff; color: #fff; @@ -348,7 +356,7 @@ page{ height: 80rpx; line-height: 80rpx; font-size: 26rpx; - color: #999; + color: #fff; } .loading image { @@ -382,7 +390,44 @@ page{ top:109rpx; right:72rpx; } - +.no-data01{ + width: 690rpx; + padding-top: 174rpx; + height: calc(100vh - 460rpx); + background: #fff; + margin: 0 auto; + border-radius:15rpx; + box-sizing: border-box; + margin-top: 320rpx; +} +.no-data{ + width: 690rpx; + padding-top: 174rpx; + height: calc(100vh - 140rpx); + background: #fff; + margin: 0 auto; + border-radius:15rpx; + box-sizing: border-box; +} +.no-data01 image{ + width: 261rpx; + height: 272rpx; + display: block; + margin: 0 auto; +} +.no-data image{ + width: 261rpx; + height: 272rpx; + display: block; + margin: 0 auto; +} +.no-data-text{ + text-align: center; + font-size:34rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(0,0,0,1); +} .dingdan { margin-top: 33rpx; } @@ -424,16 +469,6 @@ page{ height: 0!important; overflow: hidden; } -.top{ - position: absolute; - top: 30rpx; - width: 710rpx; - height: 260rpx; - background: #fff; - left: 20rpx; - border-radius: 16rpx; - overflow: hidden; -} .bottom{ width: 690rpx; height: 85rpx; diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss index a952051..987c487 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxss +++ b/pages/bargain/bargainDatail/bargainDatail.wxss @@ -38,7 +38,6 @@ page{ height: 40rpx; line-height: 40rpx; margin-top: 47rpx; - margin-bottom: 40rpx; } .help text{ color: red; @@ -98,6 +97,7 @@ page{ border-radius: 15rpx; background: #fff; margin-bottom: 30rpx; + margin-top:20rpx; } .progress { @@ -199,7 +199,7 @@ page{ overflow: hidden; } .person{ - border-bottom: 1px solid #F9F9F9; + border-bottom: 1px solid #F0CDB3; padding-bottom: 31rpx; padding-top: 31rpx; } @@ -209,7 +209,7 @@ page{ } .people{ border-radius:16rpx; - background: #fff; + background: #FFEADA; margin-top: 30rpx; padding:0 20rpx; margin-bottom: 130rpx;