C端调整

@@ -98,7 +98,7 @@
 }
 }
 .activity .activity-item{
 .activity .activity-item{
   height: 36rpx;
   height: 36rpx;
-  padding: 0 30rpx;
+  padding: 0 10rpx;
   line-height: 36rpx;
   line-height: 36rpx;
   overflow: hidden;
   overflow: hidden;
   max-height: 36rpx;
   max-height: 36rpx;

@@ -16,6 +16,7 @@ Component({
    */
    */
   data: {
   data: {
     hidden:false,
     hidden:false,
+    a2lHeight:0,
   },
   },
   attached(){
   attached(){
     this.show();
     this.show();
@@ -53,5 +54,10 @@ Component({
         url:util.http_build_query(this.data.map,'./discount'),
         url:util.http_build_query(this.data.map,'./discount'),
       })
       })
     },
     },
-  }
+    setA2LHeight(h=0){
+      this.setData({
+        a2lHeight:h,
+      })
+    }
+  },
 })
 })

 <!--components/tips/add-to-lite.wxml-->
 <!--components/tips/add-to-lite.wxml-->
-<cover-view class="discount" style="top:{{statusBarHeightFull+40}}px;" bindtap="gotoDiscount">
+<cover-view class="discount" style="top:{{statusBarHeightFull+a2lHeight}}px;" bindtap="gotoDiscount">
     <cover-view style="position: relative;height: 100%;">
     <cover-view style="position: relative;height: 100%;">
         <cover-image class="discount-img" src="http://qn.colorcun.com/reserve/images/%E6%83%A0-%E5%85%A5%E5%8F%A3.png"></cover-image>
         <cover-image class="discount-img" src="http://qn.colorcun.com/reserve/images/%E6%83%A0-%E5%85%A5%E5%8F%A3.png"></cover-image>
         <cover-view style="position: relative;" wx:if="{{!hidden}}">
         <cover-view style="position: relative;" wx:if="{{!hidden}}">

@@ -201,7 +201,7 @@ Page({
   },
   },
   discountShow(){
   discountShow(){
     this.setData({
     this.setData({
-      pagesHeight:'600rpx'
+      pagesHeight:'500rpx'
     })
     })
   }
   }
 })
 })

@@ -14,7 +14,7 @@
         </block>
         </block>
     </swiper>
     </swiper>
 </view>
 </view>
-<view class="pages" style="height: {{pagesHeight}};">
+<view class="pages" style="height: {{pagesHeight}};overflow:{{pagesHeight=='auto'?'visible':'hidden'}}">
     <view class="seller">
     <view class="seller">
         <view class="base flex-vc">
         <view class="base flex-vc">
             <view class="name">{{seller.sellername}}</view>
             <view class="name">{{seller.sellername}}</view>

@@ -5,7 +5,6 @@
   font-size: 30rpx;
   font-size: 30rpx;
   color:#353535;
   color:#353535;
   padding-bottom: 200rpx;
   padding-bottom: 200rpx;
-  overflow: hidden;
 }
 }
 .seller-banner{
 .seller-banner{
   width: 100%;
   width: 100%;
@@ -85,15 +84,19 @@
 
 
 .peitao .icon.meal_fee{
 .peitao .icon.meal_fee{
   background-image: url("http://qn.colorcun.com/reserve/images/%E6%97%A0%E9%A4%90%E4%BD%8D%E8%B4%B9.png");
   background-image: url("http://qn.colorcun.com/reserve/images/%E6%97%A0%E9%A4%90%E4%BD%8D%E8%B4%B9.png");
+  background-size: 24rpx 24rpx;
 }
 }
 .peitao .icon.unsubscribe{
 .peitao .icon.unsubscribe{
   background-image: url("http://qn.colorcun.com/reserve/images/%E9%9A%8F%E6%97%B6%E9%80%80.png");
   background-image: url("http://qn.colorcun.com/reserve/images/%E9%9A%8F%E6%97%B6%E9%80%80.png");
+  background-size: 24rpx 24rpx;
 }
 }
 .peitao .icon.minimum{
 .peitao .icon.minimum{
   background-image: url("http://qn.colorcun.com/reserve/images/%E6%97%A0%E6%9C%80%E4%BD%8E%E6%B6%88%E8%B4%B9.png");
   background-image: url("http://qn.colorcun.com/reserve/images/%E6%97%A0%E6%9C%80%E4%BD%8E%E6%B6%88%E8%B4%B9.png");
+  background-size: 24rpx 24rpx;
 }
 }
 .peitao .icon.belt{
 .peitao .icon.belt{
   background-image: url("http://qn.colorcun.com/reserve/images/%E5%8F%AF%E8%87%AA%E5%B8%A6%E9%85%92%E6%B0%B4.png");
   background-image: url("http://qn.colorcun.com/reserve/images/%E5%8F%AF%E8%87%AA%E5%B8%A6%E9%85%92%E6%B0%B4.png");
+  background-size: 24rpx 24rpx;
 }
 }
 
 
 
 
@@ -256,6 +259,7 @@
   background-color: #FEF1EA;
   background-color: #FEF1EA;
   width:110%;
   width:110%;
   margin: 0 -5%;
   margin: 0 -5%;
+  font-size: 24rpx;
 }
 }
 .activity{
 .activity{
   width:90%;
   width:90%;
@@ -267,7 +271,6 @@
 }
 }
 .activity-right{
 .activity-right{
   min-width: 120rpx;
   min-width: 120rpx;
-  font-size: 28rpx;
   color: #C28C56;
   color: #C28C56;
 }
 }
 .activity-first{
 .activity-first{

@@ -569,4 +569,14 @@ Page({
       })
       })
     })
     })
   },
   },
+  a2lshow(e){
+    console.log('a2lshow',e)
+    let ds=this.selectComponent('#ds');
+    if(!ds){
+      return setTimeout(()=>{
+        this.a2lshow(e)
+      },500)
+    }
+    ds.setA2LHeight(e.type=='hide'?0:40);
+  },
 })
 })

@@ -68,5 +68,5 @@
 <getpos bindpos="onpos" id="getpos"></getpos>
 <getpos bindpos="onpos" id="getpos"></getpos>
 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
 <cover-view class="tab-patch"></cover-view>
 <cover-view class="tab-patch"></cover-view>
-<a2l bindshow="a2lshow" bindhide="a2lhide"></a2l>
-<ds wx:if="{{hasSetActivity}}" map="{{map}}"></ds>
+<ds wx:if="{{hasSetActivity}}" map="{{map}}" id="ds"></ds>
+<a2l bindshow="a2lshow" bindhide="a2lshow"></a2l>