Showing
3 changed files
with
38 additions
and
34 deletions
| @@ -14,32 +14,31 @@ | @@ -14,32 +14,31 @@ | ||
| 14 | 优惠 | 14 | 优惠 |
| 15 | <view class="close"></view> | 15 | <view class="close"></view> |
| 16 | </view> | 16 | </view> |
| 17 | - <view class="activity"> | ||
| 18 | - <view class="txt">活动</view> | ||
| 19 | - <view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}" | ||
| 20 | - style="align-items: flex-start"> | ||
| 21 | - <view class="activity-left">消费返</view> | ||
| 22 | - <view class="activity-right">在线买单{{seller.receive_condition_str}}红包</view> | ||
| 23 | - </view> | ||
| 24 | - <view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}" | ||
| 25 | - style="align-items: flex-start"> | ||
| 26 | - <view class="activity-left">平台红包</view> | ||
| 27 | - <view class="activity-right">可叠加使用平台红包</view> | 17 | + <view class="discount-content"> |
| 18 | + <view class="activity"> | ||
| 19 | + <view class="txt">活动</view> | ||
| 20 | + <view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}" | ||
| 21 | + style="align-items: flex-start"> | ||
| 22 | + <view class="activity-left">消费返</view> | ||
| 23 | + <view class="activity-right">在线买单{{seller.receive_condition_str}}红包</view> | ||
| 24 | + </view> | ||
| 25 | + <view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}" | ||
| 26 | + style="align-items: flex-start"> | ||
| 27 | + <view class="activity-left">平台红包</view> | ||
| 28 | + <view class="activity-right">可叠加使用平台红包</view> | ||
| 29 | + </view> | ||
| 28 | </view> | 30 | </view> |
| 29 | - </view> | ||
| 30 | - <block wx:if="{{mycards.length>0}}"> | ||
| 31 | - <view class="mycards-txt">已领取的红包</view> | ||
| 32 | - <scroll-view | ||
| 33 | - scroll-y | ||
| 34 | - class="mycards" | ||
| 35 | - > | ||
| 36 | - <view class="mycards-item" wx:for="{{mycards}}" wx:key="mycards"> | ||
| 37 | - <quan quan="{{item}}"> | ||
| 38 | - <view class="button-use" bindtap="useCard">立即使用</view> | ||
| 39 | - </quan> | ||
| 40 | - <view class="quan-tips">仅可在“{{seller.sellername}}”预订包间、在线买单时使用</view> | 31 | + <block wx:if="{{mycards.length>0}}"> |
| 32 | + <view class="mycards-txt">已领取的红包</view> | ||
| 33 | + <view class="mycards"> | ||
| 34 | + <view class="mycards-item" wx:for="{{mycards}}" wx:key="mycards"> | ||
| 35 | + <quan quan="{{item}}"> | ||
| 36 | + <view class="button-use" bindtap="useCard">立即使用</view> | ||
| 37 | + </quan> | ||
| 38 | + <view class="quan-tips">仅可在“{{seller.sellername}}”预订包间、在线买单时使用</view> | ||
| 39 | + </view> | ||
| 41 | </view> | 40 | </view> |
| 42 | - </scroll-view> | ||
| 43 | - </block> | 41 | + </block> |
| 42 | + </view> | ||
| 44 | </view> | 43 | </view> |
| 45 | </view> | 44 | </view> |
| @@ -7,9 +7,14 @@ | @@ -7,9 +7,14 @@ | ||
| 7 | border-radius: 40rpx 40rpx 0rpx 0rpx; | 7 | border-radius: 40rpx 40rpx 0rpx 0rpx; |
| 8 | color: #353535; | 8 | color: #353535; |
| 9 | width: 100%; | 9 | width: 100%; |
| 10 | - padding: 40rpx 40rpx; | 10 | + padding: 20rpx 40rpx 40rpx; |
| 11 | animation: discountShow 0.3s; | 11 | animation: discountShow 0.3s; |
| 12 | box-sizing: border-box; | 12 | box-sizing: border-box; |
| 13 | + min-height: 648rpx; | ||
| 14 | +} | ||
| 15 | +.discount-content{ | ||
| 16 | + max-height: 832rpx; | ||
| 17 | + overflow-y: auto; | ||
| 13 | } | 18 | } |
| 14 | .discount.discountHide{ | 19 | .discount.discountHide{ |
| 15 | animation: discountHide 0.3s; | 20 | animation: discountHide 0.3s; |
| @@ -19,8 +24,8 @@ | @@ -19,8 +24,8 @@ | ||
| 19 | } | 24 | } |
| 20 | .discount-name{ | 25 | .discount-name{ |
| 21 | font-size: 32rpx; | 26 | font-size: 32rpx; |
| 22 | - height: 44rpx; | ||
| 23 | - line-height: 44rpx; | 27 | + height: 84rpx; |
| 28 | + line-height: 84rpx; | ||
| 24 | width: 100%; | 29 | width: 100%; |
| 25 | position: relative; | 30 | position: relative; |
| 26 | text-align: center; | 31 | text-align: center; |
| @@ -34,7 +39,7 @@ | @@ -34,7 +39,7 @@ | ||
| 34 | top:6rpx; | 39 | top:6rpx; |
| 35 | } | 40 | } |
| 36 | .activity{ | 41 | .activity{ |
| 37 | - margin-top: 60rpx; | 42 | + margin-top: 40rpx; |
| 38 | } | 43 | } |
| 39 | .activity .txt{ | 44 | .activity .txt{ |
| 40 | width:60rpx; | 45 | width:60rpx; |
| @@ -80,7 +85,7 @@ | @@ -80,7 +85,7 @@ | ||
| 80 | } | 85 | } |
| 81 | .mycards{ | 86 | .mycards{ |
| 82 | margin-top: 20rpx; | 87 | margin-top: 20rpx; |
| 83 | - max-height: 430rpx; | 88 | + /*max-height: 430rpx;*/ |
| 84 | } | 89 | } |
| 85 | .quan-tips{ | 90 | .quan-tips{ |
| 86 | height:50rpx; | 91 | height:50rpx; |
| @@ -112,13 +117,13 @@ | @@ -112,13 +117,13 @@ | ||
| 112 | } | 117 | } |
| 113 | @keyframes discountShow | 118 | @keyframes discountShow |
| 114 | { | 119 | { |
| 115 | - from {bottom: -870rpx;} | 120 | + from {bottom: -876rpx;} |
| 116 | to {bottom: 0rpx;} | 121 | to {bottom: 0rpx;} |
| 117 | } | 122 | } |
| 118 | @keyframes discountHide | 123 | @keyframes discountHide |
| 119 | { | 124 | { |
| 120 | - from {height: auto;} | ||
| 121 | - to {height: 0rpx;} | 125 | + from {bottom: 0;} |
| 126 | + to {bottom: -876rpx;} | ||
| 122 | } | 127 | } |
| 123 | 128 | ||
| 124 | .toast{ | 129 | .toast{ |
| @@ -357,7 +357,7 @@ | @@ -357,7 +357,7 @@ | ||
| 357 | "id": 39, | 357 | "id": 39, |
| 358 | "name": "pages/reserve/detail 在线订座 ", | 358 | "name": "pages/reserve/detail 在线订座 ", |
| 359 | "pathName": "pages/reserve/detail", | 359 | "pathName": "pages/reserve/detail", |
| 360 | - "query": "id=1", | 360 | + "query": "id=80", |
| 361 | "scene": null | 361 | "scene": null |
| 362 | }, | 362 | }, |
| 363 | { | 363 | { |
-
Please register or login to post a comment