| @@ -1,4 +1,4 @@ | |||
| <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> | |||
| <!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | |||
| <view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}"> | |||
| <view class="listitem clearfix" hover-class="none" hover-stop-propagation="false"> | |||
| <image class="fl" src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image> | |||
| @@ -14,7 +14,7 @@ | |||
| <text class="fl">已砍 <text>{{already}}元</text></text> | |||
| <text class="fr" wx:if="{{data.pressCurrentValue/100!=0}}">还剩 <text>{{remain}}元</text></text> | |||
| </view> | |||
| <progress percent="{{((data.price-data.salePrice-data.pressCurrentValue)/(data.price-data.salePrice))*100}}" wx:if="{{data.orderStatus !=8&&data.orderStatus!=1&&data.orderStatus!=9}}" color="#FF3535" class="progressbar"border-radius="10px" backgroundColor="#FECFCF" stroke-width="10" /> | |||
| <progress percent="{{((data.price-data.salePrice-data.pressCurrentValue)/(data.price-data.salePrice))*100}}" wx:if="{{data.orderStatus !=8&&data.orderStatus!=1&&data.orderStatus!=9}}" color="#FD782D" class="progressbar"border-radius="10px" stroke-width="10" /> | |||
| <view class="time" hover-class="none" wx:if="{{data.orderStatus !=8&&data.orderStatus!=1&&data.orderStatus!=9&&data.orderStatus != 7}}" hover-stop-propagation="false"> | |||
| 还剩 <text>{{day}}</text>天:<text>{{hour}}</text>:<text>{{min}}</text>:<text>{{sec}}</text> 结束 | |||
| </view> | |||
| @@ -1,8 +1,8 @@ | |||
| page{ | |||
| height: auto; | |||
| overflow: auto; | |||
| background: #FF6F03; | |||
| background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/bargindetailbg.jpg'); | |||
| background: #F4F5F9; | |||
| /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/bargindetailbg.jpg'); */ | |||
| background-size: cover; | |||
| background-repeat: no-repeat; | |||
| } | |||
| @@ -26,7 +26,7 @@ page{ | |||
| .title{ | |||
| display: block; | |||
| font-size: 30rpx; | |||
| color: #333; | |||
| color: #3C3C3C; | |||
| height: 40rpx; | |||
| line-height: 40rpx; | |||
| padding-top: 20rpx; | |||
| @@ -38,9 +38,10 @@ page{ | |||
| height: 40rpx; | |||
| line-height: 40rpx; | |||
| margin-top: 47rpx; | |||
| color:#3C3C3C; | |||
| } | |||
| .help text{ | |||
| color: red; | |||
| color: #FD782D; | |||
| } | |||
| .listitem .ri { | |||
| margin-left: 26rpx; | |||
| @@ -80,7 +81,7 @@ page{ | |||
| .ri .txt04 { | |||
| width: 100%; | |||
| font-size: 24rpx; | |||
| color: rgba(255, 50, 50, 1); | |||
| color: #FD782D; | |||
| line-height: 44rpx; | |||
| } | |||
| @@ -88,7 +89,7 @@ page{ | |||
| display: inline-block !important; | |||
| font-size: 50rpx; | |||
| font-weight: 500; | |||
| color: rgba(255, 50, 50, 1); | |||
| color: #FD782D; | |||
| } | |||
| .listitem { | |||
| @@ -115,11 +116,11 @@ page{ | |||
| .progesstext>text { | |||
| font-size: 24rpx; | |||
| color: rgba(51, 51, 51, 1); | |||
| color: #3C3C3C; | |||
| } | |||
| .progesstext text text { | |||
| color: #FF3535; | |||
| color: #FD782D; | |||
| } | |||
| .time { | |||
| @@ -137,8 +138,8 @@ page{ | |||
| text-align: center; | |||
| height: 40rpx; | |||
| line-height: 40rpx; | |||
| background: rgba(51, 51, 51, 1); | |||
| border-radius: 10rpx; | |||
| background: #FD782D; | |||
| border-radius: 14rpx; | |||
| margin: 0 4px; | |||
| } | |||
| .head{ | |||
| @@ -148,19 +149,20 @@ page{ | |||
| } | |||
| .head image{ | |||
| width: 70rpx; | |||
| border-radius:10rpx; | |||
| border-radius:50rpx; | |||
| } | |||
| .head text{ | |||
| width: 70rpx; | |||
| position: absolute; | |||
| bottom: 0; | |||
| left: 0; | |||
| /* bottom: 0; */ | |||
| top: -15rpx; | |||
| left: 60rpx; | |||
| right: 0; | |||
| font-size: 20rpx; | |||
| background: #ED3F2E; | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| color: #fff; | |||
| text-align: center; | |||
| border-radius: 20rpx; | |||
| border-radius:9px 9px 9px 0px; | |||
| } | |||
| .text{ | |||
| width: 87%; | |||
| @@ -169,6 +171,7 @@ page{ | |||
| height: 90rpx; | |||
| line-height: 90rpx; | |||
| font-size: 26rpx; | |||
| color: #3C3C3C; | |||
| } | |||
| .text01{ | |||
| width: 100rpx; | |||
| @@ -199,17 +202,17 @@ page{ | |||
| overflow: hidden; | |||
| } | |||
| .person{ | |||
| border-bottom: 1px solid #F0CDB3; | |||
| /* border-bottom: 1px solid #F0CDB3; */ | |||
| padding-bottom: 31rpx; | |||
| padding-top: 31rpx; | |||
| } | |||
| .text02 text:nth-of-type(2){ | |||
| color: #FF3535; | |||
| color: #FD782D; | |||
| text-align: left; | |||
| } | |||
| .people{ | |||
| border-radius:16rpx; | |||
| background: #FFEADA; | |||
| background: #FFF; | |||
| margin-top: 30rpx; | |||
| padding:0 20rpx; | |||
| margin-bottom: 165rpx; | |||
| @@ -232,8 +235,8 @@ page{ | |||
| font-size: 30rpx; | |||
| color: #fff; | |||
| line-height: 95rpx; | |||
| background:linear-gradient(90deg,rgba(229,54,40,1) 0%,rgba(243,75,30,1) 99%); | |||
| box-shadow:0px 8px 8px 1px rgba(204,26,13,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(204,26,13,0.32); */ | |||
| } | |||
| .goback{ | |||
| position: fixed; | |||
| @@ -301,8 +304,8 @@ page{ | |||
| width:650rpx; | |||
| height:85rpx; | |||
| line-height: 85rpx; | |||
| 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); | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| /* box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32); */ | |||
| border-radius:43rpx; | |||
| } | |||
| .fail{ | |||
| @@ -12,7 +12,7 @@ | |||
| <view class="view"> | |||
| <!-- 成长值<text class="score">{{score}}</text> --> | |||
| <progress percent="{{upgradePercent}}" stroke-width="6" activeColor="{{activeColor}}" /> | |||
| <text class='remainchengzhangzhi'>还需{{upgradeScore}}成长值可升级</text> | |||
| <view class='remainchengzhangzhi'>还需{{upgradeScore}}成长值可升级</view> | |||
| </view> | |||
| </view> | |||
| <!-- 积分 --> | |||
| @@ -55,12 +55,12 @@ page { | |||
| .userinfo{ | |||
| position:relative; | |||
| margin: 0 0 30rpx 40rpx; | |||
| width: 690rpx; | |||
| /* padding: 0 0 20rpx; */ | |||
| width:710rpx; | |||
| /* padding: 0 4%; */ | |||
| height: 96rpx; | |||
| border-radius:16rpx; | |||
| display: flex; | |||
| margin: 0 auto 20rpx; | |||
| } | |||
| .infoLeft{ | |||
| height: 100%; | |||
| @@ -191,7 +191,7 @@ page { | |||
| } | |||
| .user-avatar { | |||
| position: absolute; | |||
| left: 24rpx; | |||
| left: 14rpx; | |||
| top:0; | |||
| bottom: 0; | |||
| width: 80rpx; | |||
| @@ -206,7 +206,7 @@ page { | |||
| height:100%; | |||
| } | |||
| .user-data { | |||
| margin-left: 116rpx; | |||
| margin-left: 104rpx; | |||
| letter-spacing: 0.64rpx; | |||
| line-height: 46rpx; | |||
| font-size: 30rpx; | |||
| @@ -258,9 +258,8 @@ page { | |||
| .view { | |||
| font-size: 24rpx; | |||
| color: #999999; | |||
| line-height: 12rpx; | |||
| float: left; | |||
| margin-top: 10rpx; | |||
| /* margin-top: 10rpx; */ | |||
| } | |||
| .view>.score{ | |||
| margin-left:9rpx; | |||
| @@ -385,15 +384,21 @@ page { | |||
| color: #A6A6A6; | |||
| font-size: 22rpx; | |||
| margin-top: 5rpx; | |||
| line-height: 14rpx; | |||
| height: 30rpx; | |||
| line-height: 30rpx; | |||
| float: left; | |||
| margin: 0 10rpx; | |||
| width: 260rpx; | |||
| overflow: hidden; | |||
| text-overflow:ellipsis; | |||
| white-space: nowrap; | |||
| } | |||
| progress{ | |||
| width:190rpx; | |||
| border-radius:60rpx; | |||
| overflow:hidden; | |||
| float: left; | |||
| margin-top: 10rpx; | |||
| } | |||
| .channelBox{ | |||
| width:688rpx; | |||
| @@ -14,8 +14,8 @@ | |||
| <text class="my">我的</text> | |||
| <text class="chengzhang_h" >成长值{{score}}</text> | |||
| <text class="my my_line">|</text> | |||
| <text class="my">更多成长值</text> | |||
| <text class="view" style='color:{{view}}'>一键领取</text> | |||
| <!-- <text class="my">更多成长值</text> --> | |||
| <text class="view" style='color:{{view}}'>更多成长值</text> | |||
| </view> | |||
| <view class="user-btns"> | |||
| <!-- 我的订单 --> | |||
| @@ -61,7 +61,7 @@ page{ | |||
| line-height: 44rpx; | |||
| font-size: 36rpx; | |||
| color: #000; | |||
| margin:20rpx 0 50rpx 149rpx; | |||
| margin:20rpx 0 50rpx 180rpx; | |||
| } | |||
| .user-avatar { | |||
| position: absolute; | |||