diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 5f54b62..11ef20b 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -12,10 +12,14 @@ Page({
     iurl: t.globalData.setting.imghost,
     requestData: null,
     checkAllToggle: 0,
-    total_fee: 0,
+    total_fee: 0,  //结算金额
+    total_num: 0,  //结算数量
+    all_num:0,     //购物车中所有商品数量
     allsto: null,
     imgUrl: t.globalData.setting.imghost,
     is_has_flash:0,   //是否又秒杀活动
+    is_edit:0,        //是否编辑
+    is_load:0,        //是否已加载
   },
   onLoad: function() {
     wx.setNavigationBarTitle({title: "购物车",  })
@@ -73,16 +77,14 @@ Page({
         pageSize: 600
       },
       success: function(su) {
-        console.log("333");
-        console.log(th.data.allsto);
-
         //按门店分类的数组
-        var arr = new Array();
-        var carr = su.data.data.pageData;
+        var arr = new Array(),carr = su.data.data.pageData;
+        var all_num=0;
+
         for (var i = 0; i < carr.length; i++) {
           var item = carr[i];
+          all_num+=item.goods_num;
           item.original_img = oo.imghost + item.original_img;
-
           item.selected = 0;
 
           var pcid = item.pick_id;
@@ -124,7 +126,7 @@ Page({
         console.log(arr);
 
         th.setData({
-            requestData: arr,
+            requestData: arr,all_num:all_num,is_load:1,is_edit:0
           }),
           th.doCheckAll(), wx.stopPullDownRefresh();
       }
@@ -207,7 +209,7 @@ Page({
   checkAll: function() {
     var e = this,
       dda = e.data.requestData,
-      tfeel = 0,
+      tfeel = 0,t_num=0,
       text_arr = "";
     for (var i = 0; i < dda.length; i++) {
       var item = dda[i].goods;
@@ -232,8 +234,10 @@ Page({
         e.setData({
           [txt]: !e.data.checkAllToggle,
         })
-        if (!e.data.checkAllToggle)
+        if (!e.data.checkAllToggle) {
           tfeel += item[j].goods_num * item[j].goods_price;
+          t_num += item[j].goods_num;
+        }
       }
     }
 
@@ -243,13 +247,11 @@ Page({
         content: text_arr + '不能与门店中其他商品一起结算，配送方式不一致'
       });
       return false;
-      e.setData({
-        total_fee: tfeel.toFixed(2),
-      });
     } else {
       e.setData({
         checkAllToggle: !e.data.checkAllToggle,
         total_fee: tfeel.toFixed(2),
+        total_num:t_num,
       });
     }
   },
@@ -258,15 +260,11 @@ Page({
   check_th_all_item: function(ele) {
     var e = this,
       pitems = ele.currentTarget.dataset.pitems,
-      item = this.data.requestData[pitems].goods;
-    var sele = this.data.requestData[pitems].selected;
+      item = this.data.requestData[pitems].goods,
+      sele = this.data.requestData[pitems].selected;
 
-    var isok = 1,
-      fir = 0,
-      iarr = item;
+    var isok = 1,fir = 0,iarr = item;
     if (!sele && item.length > 0) {
-
-      console.log(item);
       for (var i = 0; i < iarr.length; i++) {
         if (iarr[i].distr_type != 0) {
           if (fir == 0) {
@@ -346,30 +344,34 @@ Page({
   //----------检查是否全选---------
   doCheckAll: function() {
     var th = this,
-      tfeel = 0,
+      tfeel = 0,t_num=0,
       ischeck = 1,
-      car = this.data.requestData;
+      car = this.data.requestData,all_num=0;
+
     for (var a = 0; a < car.length; a++) {
-      var item = car[a].goods;
-      var is_s_sele = 1;
+      var item = car[a].goods,is_s_sele = 1;
       for (var c = 0; c < item.length; c++) {
+        all_num+=item[c].goods_num;
         if (item[c].selected == 0) {
           ischeck = 0;
           is_s_sele = 0;
         } else {
           tfeel += item[c].goods_num * item[c].goods_price;
+          t_num+= item[c].goods_num;
         }
       }
 
       var txt = "requestData[" + a + "].selected";
       th.setData({
-        [txt]: Number(is_s_sele),
+        [txt]: Number(is_s_sele)
       });
 
     }
     this.setData({
       checkAllToggle: ischeck,
-      total_fee: tfeel.toFixed(2),
+      total_fee: tfeel.toFixed(2)
+      ,all_num:all_num,
+      total_num:t_num
     });
   },
 
@@ -704,7 +706,43 @@ Page({
   radio_chick: function(checked, num) {
     var th = this;
     var requestData = th.data.requestData;
+  },
+
+  //点击编辑后的效果
+  edit_cart:function (e) {
+     var type=parseFloat(e.currentTarget.dataset.type);
+     this.setData({is_edit:type});
+  },
+
+  //--多个删除购物车商品---
+  check_del:function () {
+    var glist = ""; //用逗号隔开的
+    var user_id = getApp().globalData.user_id;
+    var th = this;
 
+    var ab = 0; //选中
+    for (var i = 0; i < this.data.requestData.length; i++) {
+      var i_arr = this.data.requestData[i].goods;
+      for (var j = 0; j < i_arr.length; j++) {
+        if (i_arr[j].selected) {
+          glist += i_arr[j].i_arr[j].id + ",";
+          ab = 1;
+        }
+      }
+    }
+
+    if (ab == 0) {
+      t.my_warnning("未选择商品", 0, th);return false;
+    }
+
+    glist = glist.substring(0, glist.length - 1);
+    //要删除购物车中的商品
+    var url = '/api/weshop/cart/del/' + oo.stoid + '/' + glist;
+    getApp().request.delete(url, {
+      success: function(t) {
+        th.getCardList();
+      }
+    });
 
   }
 
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 98f9793..6402813 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -8,12 +8,13 @@
   <!-- 购物车商品框架 -->
   <view class="login-in">
     <!-- 编辑 -->
-    <view class="padding flex-vertical-between fs26 Storenum">
+    <view class="padding flex-vertical-between fs30 Storenum">
       <view class="flex">
         <view>商品数量:</view>
-        <view class="goods_num">{{requestData.length}}</view>
+        <view class="goods_num">{{all_num}}</view>
       </view>
-      <view>编辑</view>
+      <view wx:if="{{is_edit==0}}" bindtap="edit_cart" data-type="1">编辑</view>
+      <view wx:else bindtap="edit_cart" data-type="0">完成</view>
     </view>
     <block wx:for="{{requestData}}" wx:key="{{index}}" wx:for-index="pidx">
       <!-- 门店底下的商品 -->
@@ -23,7 +24,7 @@
                  checked="{{checkAllToggle||item.selected}}" data-pitems="{{pidx}}"></radio>
           <view class="flex-center">
             <image src="{{iurl}}miniapp/images/stores/store.png"></image>
-            <view class="shmd fs24">{{item.pname}}</view>
+            <view class="shmd fs28" >{{item.pname}}</view>
           </view>
         </view>
         <view class="order-item padding" data-item="{{idx}}" wx:for="{{item.goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{index}}">
@@ -39,8 +40,10 @@
           <view class="goods-cont">
             <view class="goods-name">
               <navigator class="ellipsis-2 fs24" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
-              <view class="Specifications flex-center">{{items.goods_color+items.goods_spec.length
-                <1? '规格1': ''}}{{items.goods_color}}{{items.goods_color.length>0?"/":''}}{{items.goods_spec}}</view>
+
+              <view class="Specifications flex-center" wx:if="{{items.goods_color || items.goods_spec}}">
+                {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
+              <view class="Specifications flex-center" wx:else>规格1</view>
             </view>
 
             <view class="flex alend jc_sb">
@@ -66,7 +69,9 @@
         <radio bindtap="checkAll" color="red" checked="{{checkAllToggle}}"></radio>
         <view class="all fs30">全选</view>
       </view>
-      <view class="consumer">
+
+      <!-- 显示金额的多少 -->
+      <view class="consumer" wx:if="{{is_edit==0}}">
         <view class="fs30 baseline">
           <view class="total">合计:</view>
           <text class="co-red">￥{{total_fee}}</text>
@@ -77,12 +82,13 @@
       </view>
     </view>
     <view>
-      <button wx:if="{{true}}" bindtap="checkout" class="pay-btn">结算(2)</button>
-      <button wx:if="{{false}}" bindtap="checkout" class="pay-btn">删除</button>
+
+      <button wx:if="{{is_edit}}" bindtap="check_del" class="pay-btn">删除</button>
+      <button wx:else bindtap="checkout" class="pay-btn">结算({{total_num}})</button>
     </view>
   </view>
 </view>
-<view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
+<view class="no-data" wx:if="{{(!requestData|| requestData.length==0) && is_load}}">
   <image class="cart-image" src="{{imgUrl}}/miniapp/images/cart-null.png"></image>
   <view class="no-data-title">购物车暂无商品</view>
   <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>