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

src/component/goHome/goHome.wxss

@@ -14,6 +14,7 @@
   font-size: 24rpx;
   background-color: rgba(0, 0, 0, 0.2);
 	box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+  z-index: 99;
 }
 .bottom-img .img-top {
   width: 82rpx;

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -13,7 +13,7 @@
     </view>
   </view>
   <template name="water-list">
-  <view class="item" bindtap="gotoDetail" data-id="{{id}}" data-currentType="{{currentType}}">
+  <view class="item" bindtap="gotoDetail" data-id="{{id}}" data-current-type="{{currentType}}">
   
     <view class="no-audited" wx:if="{{currentType != 2}}">
       待审核

src/pages/extendProduct/extendProduct.wxml

@@ -151,14 +151,14 @@
 	<!-- </swiper-item>
 	</swiper> -->
 </view>
-<!-- <share-modal show="{{showShareModal}}" /> -->
-<!-- <card-modal
+<share-modal show="{{showShareModal}}" />
+<card-modal
  show-card-modal="{{showCardModal}}"
  card-title="{{cardTitle}}"
  card-url="{{cardUrl}}"
  page-path="{{pagePath}}"
 />
-<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster> -->
+<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
 <!--goHome-->
 <go-home/>
 

src/pages/myShare/myShare.wxss

@@ -65,6 +65,8 @@ scroll-view{
   position: fixed;
   right: 22rpx;
   bottom: 35rpx;
+  z-index: 99;
+
 }
 
 

src/subPackage/page/pages/grassCommunity/grassCommunity.js

@@ -230,6 +230,9 @@ wxService.page({
         sspList.splice(event.currentTarget.dataset.index, 1)
       }
     }
+    this.setData({
+      'params.sspList': sspList
+    })
   },
 
   // 上传视频
@@ -250,11 +253,15 @@ wxService.page({
         sspList.splice(i,1)
       }
     }
+    this.setData({
+      'params.sspList': sspList
+    })
    
   },
 
   // 发布笔记
   formSubmit(e){
+    console.log('3333', this.data.params.sspList)
     console.log('requesting', this.data.requesting)
     if (this.data.requesting){
       return;
@@ -273,6 +280,13 @@ wxService.page({
       })
       return;
     }
+    if (this.data.params.sspList && this.data.params.sspList[0].videoUrl && !this.data.params.sspList[1].url ) {
+      wx.showToast({
+        title: '请上传至少一张图片',
+        icon: 'none'
+      })
+      return;
+    }
     if (!e.detail.value.headline){
       wx.showToast({
         title: '请添加标题',

src/subPackage/page/pages/myRelease/myRelease.wxss

@@ -49,5 +49,6 @@
   position: fixed;
   right: 22rpx;
   bottom: 35rpx;
+  z-index: 99;
 }