From bf633448be8f1a27f861484f6f9a840d8435148f Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sat, 14 Dec 2019 19:03:29 +0800
Subject: [PATCH] =?UTF-8?q?feat[litemall-wx]:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E6=98=93=E5=9B=BE=E6=A0=87=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/app.json             |  2 ++
 litemall-wx/pages/cart/cart.wxml |  7 ++---
 litemall-wx/pages/cart/cart.wxss | 51 +++++++-------------------------
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/litemall-wx/app.json b/litemall-wx/app.json
index c6eb3fe4..7da09429 100644
--- a/litemall-wx/app.json
+++ b/litemall-wx/app.json
@@ -88,6 +88,8 @@
   "debug": true,
   "usingComponents": {
     "van-tag": "./lib/vant-weapp/tag/index",
+    "van-icon": "./lib/vant-weapp/icon/index",
+    "van-checkbox": "./lib/vant-weapp/checkbox/index",
     "van-steps": "./lib/vant-weapp/steps/index"
   },
   "sitemapLocation": "sitemap.json"
diff --git a/litemall-wx/pages/cart/cart.wxml b/litemall-wx/pages/cart/cart.wxml
index 1cdf8e71..15bcda19 100644
--- a/litemall-wx/pages/cart/cart.wxml
+++ b/litemall-wx/pages/cart/cart.wxml
@@ -1,7 +1,6 @@
 <view class="container">
   <view class="no-login" wx:if="{{!hasLogin}}">
     <view class="c">
-      <image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
       <text>还没有登录</text>
       <button style="background-color:#A9A9A9" bindtap="goLogin">去登录</button>
     </view>
@@ -14,7 +13,7 @@
     </view>
     <view class="no-cart" wx:if="{{cartGoods.length <= 0}}">
       <view class="c">
-        <image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
+        <text>空空如也~</text>
         <text>去添加点什么吧</text>
       </view>
     </view>
@@ -23,7 +22,7 @@
         <view class="group-item">
           <view class="goods">
             <view class="item {{isEditCart ? 'edit' : ''}}" wx:for="{{cartGoods}}" wx:key="id">
-              <view class="checkbox {{item.checked ? 'checked' : ''}}" bindtap="checkedItem" data-item-index="{{index}}"></view>
+              <van-checkbox value="{{ item.checked }}" bind:change="checkedItem" data-item-index="{{index}}"></van-checkbox>
               <view class="cart-goods">
                 <image class="img" src="{{item.picUrl}}"></image>
                 <view class="info">
@@ -48,7 +47,7 @@
 
       </view>
       <view class="cart-bottom">
-        <view class="checkbox {{checkedAllStatus ? 'checked' : ''}}" bindtap="checkedAll">全选({{cartTotal.checkedGoodsCount}})</view>
+        <van-checkbox value="{{ checkedAllStatus }}" bind:change="checkedAll">全选（{{cartTotal.checkedGoodsCount}}）</van-checkbox>
         <view class="total">{{!isEditCart ? '￥'+cartTotal.checkedGoodsAmount : ''}}</view>
         <view class='action_btn_area'>
           <view class="{{!isEditCart ? 'edit' : 'sure'}}" bindtap="editCart">{{!isEditCart ? '编辑' : '完成'}}</view>
diff --git a/litemall-wx/pages/cart/cart.wxss b/litemall-wx/pages/cart/cart.wxss
index 1fae7097..b445d5a8 100644
--- a/litemall-wx/pages/cart/cart.wxss
+++ b/litemall-wx/pages/cart/cart.wxss
@@ -24,7 +24,6 @@ page {
 }
 
 .service-policy .item {
-  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/servicePolicyRed-518d32d74b.png) 0 center no-repeat;
   background-size: 10rpx;
   padding-left: 15rpx;
   display: flex;
@@ -100,15 +99,7 @@ page {
 .no-cart .c {
   width: 100%;
   height: auto;
-  margin-top: 200rpx;
-}
-
-.no-cart .c image {
-  margin: 0 auto;
-  display: block;
-  text-align: center;
-  width: 258rpx;
-  height: 258rpx;
+  margin-top: 400rpx;
 }
 
 .no-cart .c text {
@@ -148,18 +139,13 @@ page {
   overflow: hidden;
 }
 
-.cart-view .item .checkbox {
+.cart-view .item .van-checkbox {
   float: left;
-  height: 34rpx;
-  width: 34rpx;
-  margin: 65rpx 18rpx 65rpx 26rpx;
-  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-0e09baa37e.png) no-repeat;
-  background-size: 34rpx;
+  margin: 65rpx 18rpx 65rpx 18rpx;
 }
 
-.cart-view .item .checkbox.checked {
-  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-checked-822e54472a.png) no-repeat;
-  background-size: 34rpx;
+.cart-view .item .van-checkbox .van-icon {
+  color: #fff;
 }
 
 .cart-view .item .cart-goods {
@@ -228,24 +214,12 @@ page {
   float: left;
 }
 
-.cart-view .item .open {
-  height: 28rpx;
-  width: 150rpx;
-  display: block;
-  float: right;
-  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/arrowDown-d48093db25.png) right center no-repeat;
-  background-size: 25rpx;
-  font-size: 25rpx;
-  color: #333;
-}
-
 .cart-view .item.edit .t {
   display: none;
 }
 
 .cart-view .item.edit .attr {
   text-align: right;
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/arrow-right1-e9828c5b35.png) right center no-repeat;
   padding-right: 25rpx;
   background-size: 12rpx 20rpx;
   margin-bottom: 24rpx;
@@ -367,19 +341,14 @@ page {
   display: flex;
 }
 
-.cart-bottom .checkbox {
-  height: 34rpx;
-  padding-left: 60rpx;
-  line-height: 34rpx;
+.cart-bottom .van-checkbox {
+  float: left;
   margin: 33rpx 18rpx 33rpx 26rpx;
-  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-0e09baa37e.png) no-repeat;
-  background-size: 34rpx;
-  font-size: 29rpx;
+    font-size: 29rpx;
 }
 
-.cart-bottom .checkbox.checked {
-  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-checked-822e54472a.png) no-repeat;
-  background-size: 34rpx;
+.cart-bottom .van-checkbox .van-icon {
+  color: #fff;
 }
 
 .cart-bottom .total {