商家红包活动

@@ -14,32 +14,31 @@
             优惠
             <view class="close"></view>
         </view>
-        <view class="activity">
-            <view class="txt">活动</view>
-            <view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}"
-                  style="align-items: flex-start">
-                <view class="activity-left">消费返</view>
-                <view class="activity-right">在线买单{{seller.receive_condition_str}}红包</view>
-            </view>
-            <view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}"
-                  style="align-items: flex-start">
-                <view class="activity-left">平台红包</view>
-                <view class="activity-right">可叠加使用平台红包</view>
+        <view class="discount-content">
+            <view class="activity">
+                <view class="txt">活动</view>
+                <view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}"
+                      style="align-items: flex-start">
+                    <view class="activity-left">消费返</view>
+                    <view class="activity-right">在线买单{{seller.receive_condition_str}}红包</view>
+                </view>
+                <view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}"
+                      style="align-items: flex-start">
+                    <view class="activity-left">平台红包</view>
+                    <view class="activity-right">可叠加使用平台红包</view>
+                </view>
             </view>
-        </view>
-        <block wx:if="{{mycards.length>0}}">
-            <view class="mycards-txt">已领取的红包</view>
-            <scroll-view
-                    scroll-y
-                    class="mycards"
-            >
-                <view class="mycards-item" wx:for="{{mycards}}" wx:key="mycards">
-                    <quan quan="{{item}}">
-                        <view class="button-use" bindtap="useCard">立即使用</view>
-                    </quan>
-                    <view class="quan-tips">仅可在“{{seller.sellername}}”预订包间、在线买单时使用</view>
+            <block wx:if="{{mycards.length>0}}">
+                <view class="mycards-txt">已领取的红包</view>
+                <view class="mycards">
+                    <view class="mycards-item" wx:for="{{mycards}}" wx:key="mycards">
+                        <quan quan="{{item}}">
+                            <view class="button-use" bindtap="useCard">立即使用</view>
+                        </quan>
+                        <view class="quan-tips">仅可在“{{seller.sellername}}”预订包间、在线买单时使用</view>
+                    </view>
                 </view>
-            </scroll-view>
-        </block>
+            </block>
+        </view>
     </view>
 </view>

@@ -7,9 +7,14 @@
   border-radius: 40rpx 40rpx 0rpx 0rpx;
   color: #353535;
   width: 100%;
-  padding: 40rpx 40rpx;
+  padding: 20rpx 40rpx 40rpx;
   animation: discountShow 0.3s;
   box-sizing: border-box;
+  min-height: 648rpx;
+}
+.discount-content{
+  max-height: 832rpx;
+  overflow-y: auto;
 }
 .discount.discountHide{
   animation: discountHide 0.3s;
@@ -19,8 +24,8 @@
 }
 .discount-name{
   font-size: 32rpx;
-  height: 44rpx;
-  line-height: 44rpx;
+  height: 84rpx;
+  line-height: 84rpx;
   width: 100%;
   position: relative;
   text-align: center;
@@ -34,7 +39,7 @@
   top:6rpx;
 }
 .activity{
-  margin-top: 60rpx;
+  margin-top: 40rpx;
 }
 .activity .txt{
   width:60rpx;
@@ -80,7 +85,7 @@
 }
 .mycards{
   margin-top: 20rpx;
-  max-height: 430rpx;
+  /*max-height: 430rpx;*/
 }
 .quan-tips{
   height:50rpx;
@@ -112,13 +117,13 @@
 }
 @keyframes discountShow
 {
-  from {bottom: -870rpx;}
+  from {bottom: -876rpx;}
   to {bottom: 0rpx;}
 }
 @keyframes discountHide
 {
-  from {height: auto;}
-  to {height: 0rpx;}
+  from {bottom: 0;}
+  to {bottom: -876rpx;}
 }
 
 .toast{

@@ -357,7 +357,7 @@
 					"id": 39,
 					"name": "pages/reserve/detail   在线订座  ",
 					"pathName": "pages/reserve/detail",
-					"query": "id=1",
+					"query": "id=80",
 					"scene": null
 				},
 				{