Merge branch 'dev_7.1.0' into feature-zyw-sc

src/pages/cart/cart.wxml

@@ -13,7 +13,7 @@
   </view>
 
 <!-- 购物车列表 -->
-  <view class="cart-content">
+  <view class="cart-content" wx:if="{{cartList.length}}">
     <view class="cart-item" wx:for="{{cartList}}" wx:key="{{index}}">
       <view class="cart-list" bindtouchstart="touchS" bindtouchmove="touchM" bindtouchend="touchE" style="{{item.shows}}" data-index="{{index}}">
         <view class="select-radio" catchtap="selectPro" data-index="{{index}}">
@@ -24,67 +24,26 @@
         <view class="pro-info">
           <image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image>
           <view class="pro-right-info">
-            <view class="pro-name">{{item.name}}</view>
-            <view class="pro-sku">{{item.sku}}</view>
+            <view class="pro-name">{{item.productName}}</view>
+            <view class="pro-sku">{{item.skuSpec}}</view>
             <view class="pro-price">
-              <view class="price">{{item.price}}</view>
+              <view class="price">￥{{item.price}}</view>
               <view class="pro-num-edit">
-                    <button class="redus-num" data-index="{{j}}" catchtap="minusNum">-</button>
-                    <input class="pro-num-edit-input" type="number" data-index="{{j}}" catchtap bindblur="blurNum" bindinput="inputNum" value="{{product.quantity}}"></input>
-                    <button class="add-num" data-index="{{j}}" catchtap="addNum">+</button>
-                  </view>
+                <button class="redus-num" data-index="{{j}}" catchtap="minusNum">-</button>
+                <input class="pro-num-edit-input" type="number" data-index="{{j}}" catchtap bindblur="blurNum" bindinput="inputNum" value="{{item.count}}"></input>
+                <button class="add-num" data-index="{{j}}" catchtap="addNum">+</button>
+              </view>
             </view>
           </view>
         </view>
       </view>
-      <view class="delete" bindtap="deletePro">删除</view>
+      <view class="delete" data-index="{{index}}" data-skuId="{{item.skuId}}" bindtap="deletePro">删除</view>
     </view>
-
-    <!-- <view class="cart-item" bindtouchstart="touchS" bindtouchmove="touchM" bindtouchend="touchE" style="{{shows}}" >
-      <view class="cart-list" >
-        <view class="select-radio">
-          <view class="{{isSelect ? 'theme-color' : ''}} circle-radio"  >
-            <image wx:if="{{isSelect}}" class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image>
-          </view>
-        </view>
-        <view class="pro-info">
-          <image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image>
-          <view class="pro-right-info">
-            <view class="pro-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
-            <view class="pro-sku">规格</view>
-            <view class="pro-price">
-              <view class="price">￥256</view>
-              <view class="pro-num-edit">
-                    <button class="redus-num" data-index="{{j}}" catchtap="minusNum">-</button>
-                    <input class="pro-num-edit-input" type="number" data-index="{{j}}" catchtap bindblur="blurNum" bindinput="inputNum" value="{{product.quantity}}"></input>
-                    <button class="add-num" data-index="{{j}}" catchtap="addNum">+</button>
-                  </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="delete">删除</view>
-    </view> -->
   </view>
 
   <!-- 失效宝贝 -->
-  <view class="overdue-pro">
+  <view class="overdue-pro"  wx:if="{{outGoods.length}}">
     <view class="clear-btn">清除失效商品</view>
-    
-    <view class="overdue-list clearflex">
-      <view class="overdue-status">失效</view>
-      <view class="pro-info">
-        <image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image>
-        <view class="pro-right-info">
-          <view class="pro-name overdue-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
-          <view class="pro-sku">规格</view>
-          <view class="pro-price">
-            <view class="price overdue-price">￥256</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
     <view class="overdue-list clearflex">
       <view class="overdue-status">失效</view>
       <view class="pro-info">
@@ -100,7 +59,7 @@
     </view>
   </view>
 
-  <view class="empty">亲，您的购物车还空空的哟～</view>
+  <view class="empty" wx-if="{{cartList !== null && cartList.length == 0}}">亲，您的购物车还空空的哟～</view>
 
   <!-- 底部 -->
   <view class="cart-bottom" style="bottom:{{currentHeight}}px">
@@ -116,7 +75,7 @@
         <text class="total-price">￥306</text>
       </view>
     </view>
-    <view class="theme-color buy-btn">立即购买</view>
+    <view class="theme-color buy-btn" bindtap="goBuy">立即购买</view>
   </view>
 
 </view>