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

src/component/selectTab/selectTab.wxml

-<view class="modal-container{{showSelectTabModal ? ' active' : ''}}" bindtap="hidePopup" />
-<view class="modal-content{{showSelectTabModal ? ' active' : ''}}">
+<view class="modal-container{{showSelectTabModal ? ' active' : ''}}" bindtap="hidePopup" catchtouchmove='true'/>
+<view class="modal-content{{showSelectTabModal ? ' active' : ''}}" catchtouchmove='true'>
 
 	<view class="modal-header">
 		<image src="/assets/imgs/7_1_0/arrow-right.png" class="modal-to-back" mode="widthFix" bindtap="hidePopup" />

src/component/selectTab/selectTab.wxss

 /* component/selectTab/selectTab.wxss */
 @import '/app.wxss';
 @import './../../base/base.wxss';
+page{
+  padding-bottom: 100rpx;
+}
 
 .modal-container {
 	position: fixed;

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -63,7 +63,7 @@
       </view>
     </view>
      <!-- 标签 -->
-    <view class="tabs-list">
+    <view class="tabs-list {{tagsName ? 'tags-list' : ''}}">
       <image class="lock-image" src="/assets/imgs/7_1_0/lock.png"></image>
       <view class="tab-item" wx:if="{{tagsName}}">
         <image class="tab-image" src="/assets/imgs/7_1_0/tab.png"></image>

src/component/waterFlowLayout/waterFlowLayout.wxss

@@ -111,11 +111,13 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 0 24rpx;
+}
+.tags-list{
+   padding: 0 24rpx;
 }
 .lock-image{
-  width: 32rpx;
-  height: 32rpx;
+  width: 28rpx;
+  height: 28rpx;
 }
 .tab-image{
   width: 26rpx;

src/subPackage/page/pages/grassCommunity/grassCommunity.wxml

@@ -27,7 +27,7 @@
     </view>
     <view class="title-border" bindtap="selectTab">
       <image class="tab-icon" src="/assets/imgs/7_1_0/tab.png"></image>
-      <input class="tab-input" placeholder="选择标签"  value="{{tabName}}" disabled="" />
+      <input class="tab-input" placeholder="选择标签"  value="{{tabName}}" disabled="true" />
     </view>
 
     <view class="related-goods" bindtap="handleRelatedGoods">