Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/component/imageSwiper/imageSwiper.js

@@ -76,7 +76,7 @@ Component({
 		duration: 1000,
 		isAuthorization: false, // false 不显示 true 显示
 		baseImgUrl: '',
-		maxHeight: 0,
+		maxHeight: 180,
 		padding: 0,
 		heights: [],
 		imageHeights: {}, // 记录所有图片的实际高度

src/shoppingGuid/page/pages/welfare/welfare.wxml

@@ -91,7 +91,7 @@
         <view>{{item.typeText}}</view>
       </view>
       <view class='coupon-item-rg'>
-        <view class='qrcode' data-item="{{item}}" bindtap='onTapShowQrcode'>
+        <view class='qrcode' data-item="{{item}}" bindtap='onTapShowQrcode' wx:if="{{item.drawType == 2}}">
           <image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/walare_qrcode.png' mode='aspectFit'></image>
         </view>
         <view class='coupon-title'>{{item.title}}</view>
@@ -99,7 +99,7 @@
           <view class='text-btn'>
             <text class='theme-text-color'>数量：{{item.stock}}</text>
           </view>
-          <button class='info-btn' data-item="{{item}}" bindtap='onTapToSendConpon'>定向发送</button>
+          <button class='info-btn' wx:if="{{item.drawType == 1}}" data-item="{{item}}" bindtap='onTapToSendConpon'>定向发送</button>
         </view>
       </view>
     </view>