Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !146

src/component/cardModal/cardModal.wxml

 <!--component/cardModal/cardModal.wxml-->
-<view class="commodity_screen2" bindtap='closeCardModal'  style='opacity: 0.5;' hidden="{{!showCardModal}}"></view>
-<view class="card-modal" hidden="{{!showCardModal}}">
-  <view class="card-modal-content">
-    <view class="modal-header">
-      <image class="brand-img" src="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg"></image>
-      <view class="brand-title">{{cardTitle}}</view>
-    </view>
-    <view class="card-img-wrap">
-      <image class="card-img" src="{{cardUrl}}"></image>
-    </view>
-  </view>
-  <view class="save-card">
+<cover-view>
+  <cover-view class="commodity_screen2" bindtap='closeCardModal'  style='opacity: 0.5;' hidden="{{!showCardModal}}"></cover-view>
+  <cover-view class="card-modal" hidden="{{!showCardModal}}">
+    <cover-view class="card-modal-content">
+      <cover-view class="modal-header">
+        <cover-image class="brand-img" src="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg"></cover-image>
+        <cover-view class="brand-title">{{cardTitle}}</cover-view>
+      </cover-view>
+      <cover-view class="card-img-wrap">
+        <cover-image class="card-img" src="{{cardUrl}}"></cover-image>
+      </cover-view>
+    </cover-view>
+    <cover-view class="save-card">
       <button class="save-btn" open-type="share">分享小程序卡片</button>
-    <view class="save-btn-desc">适用于发给小伙伴或聊天群</view>
-  </view>
-</view>
-  <view class="quick-share" bindtap="gotoPoster" hidden='{{!showCardModal}}'>
+      <cover-view class="save-btn-desc">适用于发给小伙伴或聊天群</cover-view>
+    </cover-view>
+  </cover-view>
+    <cover-view class="quick-share" bindtap="gotoPoster" hidden='{{!showCardModal}}'>
     生成朋友圈海报
-</view>
+  </cover-view>
+</cover-view>
 <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>
 
 

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -23,10 +23,10 @@
       <view class="item-title">{{headline}}</view> 
     </view>
      <view class="share-wrap">
-        <view class="share-oprate" catchtap="onTapLike" data-id="{{id}}" data-type="{{type}}" data-currentType="{{currentType}}">
+        <view class="share-oprate" catchtap="onTapLike" data-id="{{id}}" data-type="{{type}}" data-current-type="{{currentType}}">
           <image class="share-img" src="{{type ? '/assets/imgs/heart-primary.png'  : '/assets/imgs/heart-default.png'}}"></image>
           <text class="share-number">{{enjoySum || 0}}</text>
-        </view>                                                                                                                               <view class="share-oprate" catchtap="onTapShare" data-title="{{headline}}" data-url="{{url}}" data-headline="{{headline}}" data-describe="{{describe}}" data-id="{{id}}" data-currentType="{{currentType}}">
+        </view>                                                                                                                                        <view class="share-oprate" catchtap="onTapShare" data-title="{{headline}}" data-url="{{url}}" data-headline="{{headline}}" data-describe="{{describe}}" data-id="{{id}}" data-current-type="{{currentType}}">
           <image class="share-img" src="/assets/imgs/share.png"></image> 
           <text class="share-number">{{transmitSum || 0}}</text>
           </view>