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

Fixbug zyw

See merge request !152

src/component/cardModal/cardModal.wxml

 <!--component/cardModal/cardModal.wxml-->
 <view>
-  <view class="commodity_screen2" bindtap='closeCardModal'  style='opacity: 0.5;' hidden="{{!showCardModal}}"></view>
-  <view class="card-modal" hidden="{{!showCardModal}}">
+  <view class="commodity_screen2" bindtap='closeCardModal'  style='opacity: 0.5;' hidden="{{!showCardModal}}" catchtouchmove='true'></view>
+  <view class="card-modal" hidden="{{!showCardModal}}" catchtouchmove='true'>
     <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>

src/component/sharePoster/sharePoster.json

 {
   "component": true,
+  "disableScroll": true,
   "usingComponents": {}
 }
\ No newline at end of file

src/component/sharePoster/sharePoster.wxml

-<view class="commodity_screen2" bindtap='closePoste'  style='opacity: 0.5;' wx:if="{{showpost}}" catchtouchmove='false'></view>
-<view class='poste_box'  bindlongpress='saveShareImg' hidden='{{!showpost}}'>
+<view class="commodity_screen2" bindtap='closePoste'  style='opacity: 0.5;' wx:if="{{showpost}}" catchtouchmove='true'></view>
+<view class='poste_box'  bindlongpress='saveShareImg' hidden='{{!showpost}}' catchtouchmove='true'>
   <view class='poste_content' id='canvas-container'>
-    <canvas canvas-id="myCanvas" style="width:100%;height:{{imgHeight}}px;" />
+    <canvas canvas-id="myCanvas" style="width:100%;height:{{imgHeight}}px;"> <cover-view></cover-view> </canvas>
   </view>
   <view class="save-poster">
     <button class="save-btn" bindtap="saveShareImg">保存海报</button>

src/component/sharePoster/sharePoster.wxss

@@ -150,10 +150,10 @@
   width: 524rpx;
   margin: auto;
   overflow: hidden;
-  margin-top: 153rpx;
-  background-color: #fff;
+  /* margin-top: 153rpx; */
+  /* background-color: #fff; */
   position: fixed;
-  top: 0;
+  top: 153rpx;
   z-index: 9999;
   border-radius: 5rpx;
 }

src/pages/extendProduct/extendProduct.js

@@ -25,7 +25,8 @@ wxService.page({
     extendProList:[],
     myExtendList:[],
     myShareCount:'',
-    extendProBanner: ''
+    extendProBanner: '',
+    proData : []
   },
 
   /**
@@ -133,7 +134,7 @@ wxService.page({
 
   // 获取选择推广的商品
   getChooseExtendPro(type){
-    if (!this.data.proData) {
+    if (!this.data.proData.length) {
       wx.showToast({
         title: '请先选择商品',
         icon: 'none'