| @@ -15,6 +15,7 @@ | |||||
| <view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | <view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | ||||
| 仅限本店使用 | 仅限本店使用 | ||||
| </view> | </view> | ||||
| <view class="coupons-info-manjian1">{{data.merchantName}}</view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="coupons-btn"> | <view class="coupons-btn"> | ||||
| @@ -44,7 +44,7 @@ | |||||
| } | } | ||||
| .coupons-info-price { | .coupons-info-price { | ||||
| padding: 32rpx 0 0; | |||||
| padding: 16rpx 0 0; | |||||
| } | } | ||||
| .i { | .i { | ||||
| @@ -56,7 +56,7 @@ | |||||
| display: inline-block; | display: inline-block; | ||||
| font-size: 36rpx; | font-size: 36rpx; | ||||
| color: #f96563; | color: #f96563; | ||||
| line-height: 50rpx; | |||||
| line-height: 27rpx; | |||||
| font-weight: 600; | font-weight: 600; | ||||
| } | } | ||||
| @@ -115,10 +115,11 @@ | |||||
| width: 138rpx !important; | width: 138rpx !important; | ||||
| line-height: 50rpx !important; | line-height: 50rpx !important; | ||||
| } | } | ||||
| .coupons-btn-gms { | .coupons-btn-gms { | ||||
| background: #999!important; | |||||
| background: #999 !important; | |||||
| border-radius: 10rpx !important; | border-radius: 10rpx !important; | ||||
| opacity: .6; | |||||
| opacity: 0.6; | |||||
| margin: 0 !important; | margin: 0 !important; | ||||
| padding: 0 !important; | padding: 0 !important; | ||||
| font-family: PingFangSC-Semibold; | font-family: PingFangSC-Semibold; | ||||
| @@ -129,6 +130,7 @@ | |||||
| width: 138rpx !important; | width: 138rpx !important; | ||||
| line-height: 50rpx !important; | line-height: 50rpx !important; | ||||
| } | } | ||||
| .subtitle { | .subtitle { | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #6f6f6f; | color: #6f6f6f; | ||||
| @@ -149,6 +151,18 @@ | |||||
| display: inline-block; | display: inline-block; | ||||
| } | } | ||||
| .coupons-info-manjian1 { | |||||
| color: #ccc !important; | |||||
| font-weight: normal; | |||||
| font-size: 20rpx; | |||||
| line-height: 20rpx; | |||||
| display: inline-block; | |||||
| overflow: hidden; | |||||
| white-space: nowrap; | |||||
| text-overflow: ellipsis; | |||||
| width: 300rpx; | |||||
| } | |||||
| /**上拉加载更多**/ | /**上拉加载更多**/ | ||||
| .userinfo { | .userinfo { | ||||
| @@ -45,6 +45,6 @@ | |||||
| <view class="buy-view app-border-top"> | <view class="buy-view app-border-top"> | ||||
| <button bindtap='orderFunc' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0}}">立即支付</button> | <button bindtap='orderFunc' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0}}">立即支付</button> | ||||
| <button bindtap='orderFunc' class='buy' wx:elif="{{data.salePriceStr==0&&data.remainInventory!=0}}">免费领取</button> | <button bindtap='orderFunc' class='buy' wx:elif="{{data.salePriceStr==0&&data.remainInventory!=0}}">免费领取</button> | ||||
| <button class='buy' wx:elif="{{data.remainInventory==0}}" style="background:#999;color: #fff;">免费领取</button> | |||||
| <button class='buy' wx:elif="{{data.remainInventory==0}}" style="background:#999;color: #fff;">已售罄</button> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -76,13 +76,13 @@ Component({ | |||||
| if (key == 0) { | if (key == 0) { | ||||
| var param = { | var param = { | ||||
| pageNum: pageNum, | pageNum: pageNum, | ||||
| pageSize: 16, | |||||
| pageSize: 6, | |||||
| targetAd: 1 | targetAd: 1 | ||||
| }; | }; | ||||
| } else { | } else { | ||||
| var param = { | var param = { | ||||
| pageNum: pageNum, | pageNum: pageNum, | ||||
| pageSize: 16, | |||||
| pageSize: 6, | |||||
| business: key, | business: key, | ||||
| targetAd: 1 | targetAd: 1 | ||||
| }; | }; | ||||
| @@ -136,8 +136,8 @@ | |||||
| position: absolute; | position: absolute; | ||||
| top: 34rpx; | top: 34rpx; | ||||
| bottom: 0; | bottom: 0; | ||||
| right: 20rpx; | |||||
| width: 114rpx; | |||||
| right: 0rpx; | |||||
| width: 138rpx; | |||||
| height: 50rpx; | height: 50rpx; | ||||
| line-height: 50rpx; | line-height: 50rpx; | ||||
| text-align: center; | text-align: center; | ||||