discount and activity

@@ -21,7 +21,7 @@
         <view class="discount-content">
         <view class="discount-content">
             <view class="activity">
             <view class="activity">
                 <block wx:for="{{seller.activity}}" wx:key="activity">
                 <block wx:for="{{seller.activity}}" wx:key="activity">
-                    <view class="flex-ll activity-item"
+                    <view class="flex-lr activity-item"
                           style="align-items: flex-start">
                           style="align-items: flex-start">
                         <view class="activity-left">{{util.activityName(item.type)}}</view>
                         <view class="activity-left">{{util.activityName(item.type)}}</view>
                         <view class="activity-right">
                         <view class="activity-right">
@@ -30,7 +30,7 @@
                         </view>
                         </view>
                     </view>
                     </view>
                 </block>
                 </block>
-                <view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}"
+                <view class="flex-lr activity-item" wx:if="{{seller.receive_condition_2}}"
                       style="align-items: flex-start">
                       style="align-items: flex-start">
                     <view class="activity-left">消费返</view>
                     <view class="activity-left">消费返</view>
                     <view class="activity-right">
                     <view class="activity-right">
@@ -38,7 +38,7 @@
                         <view class="activity-right-info">注：仅可以线上买单时使用</view>
                         <view class="activity-right-info">注：仅可以线上买单时使用</view>
                     </view>
                     </view>
                 </view>
                 </view>
-                <view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}"
+                <view class="flex-lr activity-item" wx:if="{{seller.isopen_md==1}}"
                       style="align-items: flex-start">
                       style="align-items: flex-start">
                     <view class="activity-left">平台红包</view>
                     <view class="activity-left">平台红包</view>
                     <view class="activity-right">可叠加使用平台红包</view>
                     <view class="activity-right">可叠加使用平台红包</view>

@@ -15,6 +15,7 @@
 .discount-content{
 .discount-content{
   max-height: 792rpx;
   max-height: 792rpx;
   overflow-y: auto;
   overflow-y: auto;
+  overflow-x: visible;
 }
 }
 .discount.discountHide{
 .discount.discountHide{
   animation: discountHide 0.3s;
   animation: discountHide 0.3s;
@@ -36,7 +37,7 @@
   height: 29rpx;
   height: 29rpx;
   position: absolute;
   position: absolute;
   right:0;
   right:0;
-  top:6rpx;
+  top:28rpx;
 }
 }
 .activity{
 .activity{
   margin-top: 40rpx;
   margin-top: 40rpx;
@@ -58,7 +59,10 @@
   border-radius: 10rpx;
   border-radius: 10rpx;
 
 
   box-sizing: border-box;
   box-sizing: border-box;
-  padding: 26rpx 40rpx;
+  padding: 24rpx 40rpx;
+
+  width: calc(100% - 20rpx);
+  margin-left: 10rpx;
 }
 }
 .activity-left{
 .activity-left{
   height:28rpx;
   height:28rpx;
@@ -73,14 +77,15 @@
   /*min-width: 60rpx;*/
   /*min-width: 60rpx;*/
   white-space:nowrap;
   white-space:nowrap;
   text-align: center;
   text-align: center;
+  position: relative;
 }
 }
 .activity-right{
 .activity-right{
-  font-size:26rpx;
-  font-family:PingFangSC-Medium,PingFang SC;
+  font-size: 28rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
   font-weight:500;
   font-weight:500;
   color:rgba(53,53,53,1);
   color:rgba(53,53,53,1);
-  line-height:36rpx;
-  margin-left: 40rpx;
+  line-height: 40rpx;
+  width: calc(100% - 112rpx);
 }
 }
 .mycards-txt{
 .mycards-txt{
   height:42rpx;
   height:42rpx;
@@ -267,5 +272,5 @@
   font-weight: 400;
   font-weight: 400;
   color: #999999;
   color: #999999;
   line-height: 34rpx;
   line-height: 34rpx;
-  margin-top: 10rpx;
+  margin-top: 8rpx;
 }
 }

 <!--pages/reserve/detail.wxml-->
 <!--pages/reserve/detail.wxml-->
 <include src="detail.skeleton.wxml" wx:if="{{!seller}}"/>
 <include src="detail.skeleton.wxml" wx:if="{{!seller}}"/>
-<layout wx:else="" style="position: {{hasDisplayDiscount?'fixed':''}};">
+<layout wx:else="" style="{{hasDisplayDiscount?'position: fixed;width:100vw;height:100vk;':''}}">
     <nav hasHome>{{seller.sellername}}</nav>
     <nav hasHome>{{seller.sellername}}</nav>
     <!-- 包间预定 -->
     <!-- 包间预定 -->
     <view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">
     <view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">