Merge branch 'master' of hyq/kmall-pt into master

wx-mall/pages/cart/cart.wxml

@@ -15,14 +15,14 @@
     </view>
   </view>
   <view class="cart-view" wx:if="{{cartGoods.length > 0}}">
-    <view class="group-item" wx:if="{{couponInfoList.length > 0}}">
+    <!-- <view class="group-item" wx:if="{{couponInfoList.length > 0}}">
       <view class="coupon-info header" wx:for="{{couponInfoList}}" wx:key="{{item}}">
         <text class="txt" wx:if="{{item.type===0}}">{{item.msg}}</text>
         <navigator wx:if="{{item.type===1}}" url="../catalog/catalog" open-type="switchTab">
           <text class="txt">{{item.msg}}，去凑单  >>></text>
         </navigator>
       </view>
-    </view>
+    </view> -->
     <view class="list">
       <view class="group-item">
         <view class="goods">