Merge branch 'jeffrey/feat/coupon-center' of http://git.ahamu.cn:9202/xing.li/share_activity into jeffrey/feat/coupon-center

pages/welfareMall/activityInfo/activityInfo.wxml

@@ -57,7 +57,7 @@
 
 </view>
 
-<view  class="bottom_title flex-column" style="margin-bottom: 100px;">
+<view  class="bottom_title flex-column" style="margin-bottom: 130px;">
 <view class="flex-row bottom_title_top">
 <image src="/images/welfareMall/use_info.png" class="bottom_icon"></image>
 <view class="bottom_tilte_text">使用说明</view>

pages/welfareMall/activityInfo/activityInfo.wxss

@@ -213,7 +213,6 @@ margin-top:30px;
    justify-content: center!important;
    border-top-left-radius: 20px;
    border-top-right-radius: 20px;
-    align-items: flex-end;
-   z-index: 999;
+  align-items: flex-end;
    border-top:solid 1px #E8e8e8;
 }

pages/welfareMall/activityList/activityList.wxml

@@ -13,7 +13,7 @@
 </view>
 
 
-<view class="coupon_item flex-row" wx:for="{{list}}" wx:key="unique">
+<view class="coupon_item flex-row" wx:for="{{list}}" wx:key="unique"  bindtap="goCouponDetail" data-id="{{item.activityId}}">
     <image src="{{item.coverImg}}" class="coupon_item_img"></image>
     <view class="coupon_item_right flex-column">
     <view class="flex-column">
@@ -26,8 +26,8 @@
     </view>
       <view class="coupon_i_r_bottom flex-row">
         <view class="coupon_price">价值 ￥{{item.formatShowPrice}}</view>
-        <view class="coupon_buy" bindtap="goCouponDetail" data-id="{{item.activityId}}" wx:if="{{item.isPay!=0}}">{{item.formatPrice}}元抢</view>
-        <view class="coupon_buy" bindtap="goCouponDetail" data-id="{{item.activityId}}" wx:else>免费领取</view>
+        <view class="coupon_buy" wx:if="{{item.isPay!=0}}">{{item.formatPrice}}元抢</view>
+        <view class="coupon_buy"  wx:else>免费领取</view>
       </view>
     </view>
   </view>