Commit 85d80e2f1c014658470d130102f5df9d2b9be66a
Merge branch 'dev_oa_su20' into dev
Showing
2 changed files
with
5 additions
and
3 deletions
packageD/pages/user/coupons/coupons.wxml
| ... | ... | @@ -118,10 +118,12 @@ |
| 118 | 118 | <view class="popup"> |
| 119 | 119 | <view class="popup-title"> |
| 120 | 120 | <block wx:if="{{details[useIndex].isby == 1}}">包邮券</block> |
| 121 | + <block wx:else> | |
| 121 | 122 | <block wx:if="{{details[useIndex].ActName}}">{{details[useIndex].ActName}}</block> |
| 122 | 123 | <block wx:else> |
| 123 | - {{filter.getNum(details[useIndex].Sum)}}元微券 | |
| 124 | + {{filter.getNum(details[useIndex].Sum)}}元微券 | |
| 124 | 125 | </block> |
| 126 | + </block> | |
| 125 | 127 | </view> |
| 126 | 128 | <!-- <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view> --> |
| 127 | 129 | <!-- 条形码 --> | ... | ... |
packageD/pages/user/coupons/coupons.wxss
| ... | ... | @@ -323,7 +323,7 @@ color:#999999; |
| 323 | 323 | } |
| 324 | 324 | /* 点击条形 */ |
| 325 | 325 | .bar-container { |
| 326 | - padding: 40rpx 20rpx 20rpx 20rpx; | |
| 326 | + padding: 40rpx 0rpx 20rpx 20rpx; | |
| 327 | 327 | } |
| 328 | 328 | .barcode { |
| 329 | 329 | width: 100%; |
| ... | ... | @@ -582,7 +582,7 @@ page { |
| 582 | 582 | |
| 583 | 583 | .popup-container { |
| 584 | 584 | position: fixed; |
| 585 | - width: 70%; | |
| 585 | + width: 90%; | |
| 586 | 586 | border-radius: 12rpx; |
| 587 | 587 | top: 50%; |
| 588 | 588 | left: 50%; | ... | ... |