diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 32e07b0..bec63e0 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -12,18 +12,23 @@ Page({
     iurl: t.globalData.setting.imghost,
     requestData: null,
     checkAllToggle: 0,
-    total_fee: 0,  //结算金额
-    total_num: 0,  //结算数量
-    all_num: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,        //是否已加载
-    up_dating:0       //更新中
+    is_has_flash: 0, //是否又秒杀活动
+    is_edit: 0, //是否编辑
+    is_load: 0, //是否已加载
+    up_dating: 0, //更新中
+    isreduce: 0, //商品数量是否可减
+    isadd: 0, //是否可以加商品数量
   },
+
   onLoad: function() {
-    wx.setNavigationBarTitle({title: "购物车",  })
+    wx.setNavigationBarTitle({
+      title: "购物车",
+    })
     var a = this;
     //判断是否有登陆
     t.auth.hadAuth() && t.getUserInfo(function() {
@@ -31,22 +36,24 @@ Page({
     });
   },
   onShow: function() {
-      var th=this;
-      this.getCardList();
-      //--获取是否又秒杀活动--
-      getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
-        data: {
-          store_id: oo.stoid,
-          timetype: 2,
-          is_end: 0,
-          is_show: 1,
-          pageSize: 1
-        },
-      }).then(res => {
-          if(res.data.code==0 && res.data.data && res.data.data.pageData.length>0){
-            th.setData({is_has_flash:1})
-          }
-      });
+    var th = this;
+    this.getCardList();
+    //--获取是否又秒杀活动--
+    getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
+      data: {
+        store_id: oo.stoid,
+        timetype: 2,
+        is_end: 0,
+        is_show: 1,
+        pageSize: 1
+      },
+    }).then(res => {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) {
+        th.setData({
+          is_has_flash: 1
+        })
+      }
+    });
 
   },
 
@@ -79,12 +86,13 @@ Page({
       },
       success: function(su) {
         //按门店分类的数组
-        var arr = new Array(),carr = su.data.data.pageData;
-        var all_num=0;
+        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;
+          all_num += item.goods_num;
           item.original_img = oo.imghost + item.original_img;
           item.selected = 0;
 
@@ -127,7 +135,10 @@ Page({
         console.log(arr);
 
         th.setData({
-            requestData: arr,all_num:all_num,is_load:1,is_edit:0
+            requestData: arr,
+            all_num: all_num,
+            is_load: 1,
+            is_edit: 0
           }),
           th.doCheckAll(), wx.stopPullDownRefresh();
       }
@@ -173,28 +184,28 @@ Page({
 
   //-------------加数量---------------------
   addNum: function(t) {
-
-    if(this.data.up_dating==1) return false;
-    this.data.up_dating=1;
+    if (this.data.up_dating == 1) return false;
+    this.data.up_dating = 1;
 
     var a = t.currentTarget.dataset.item;
     var b = t.currentTarget.dataset.pitems;
     a = this.data.requestData[b].goods[a];
 
-    if (!(a.goods_num >= a.store_count)) {
-      var e = {
-        goods_num: a.goods_num + 1,
-        id: a.id,
-        goods_id: a.goods_id,
-        store_id: oo.stoid
-      };
-      isShowLoading: 0;
-      this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
-    }else{
-      wx.showModal({
-        title: '提示',
-        content: '购买的数量不能超出库存数量',
-      });
+    if (a.goods_num<a.store_count) {
+        var e = {
+          goods_num: a.goods_num + 1,
+          id: a.id,
+          goods_id: a.goods_id,
+          store_id: oo.stoid
+        };
+        isShowLoading: 0;
+        this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
+    } else {
+        wx.showModal({
+          title: '提示',
+          content: '购买的数量不能超出库存数量',
+        });
+        this.data.up_dating = 0;
     }
   },
   //-------------减数量---------------------
@@ -219,7 +230,8 @@ Page({
   checkAll: function() {
     var e = this,
       dda = e.data.requestData,
-      tfeel = 0,t_num=0,
+      tfeel = 0,
+      t_num = 0,
       text_arr = "";
     for (var i = 0; i < dda.length; i++) {
       var item = dda[i].goods;
@@ -261,7 +273,7 @@ Page({
       e.setData({
         checkAllToggle: !e.data.checkAllToggle,
         total_fee: tfeel.toFixed(2),
-        total_num:t_num,
+        total_num: t_num,
       });
     }
   },
@@ -273,7 +285,9 @@ Page({
       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) {
       for (var i = 0; i < iarr.length; i++) {
         if (iarr[i].distr_type != 0) {
@@ -354,20 +368,23 @@ Page({
   //----------检查是否全选---------
   doCheckAll: function() {
     var th = this,
-      tfeel = 0,t_num=0,
+      tfeel = 0,
+      t_num = 0,
       ischeck = 1,
-      car = this.data.requestData,all_num=0;
+      car = this.data.requestData,
+      all_num = 0;
 
     for (var a = 0; a < car.length; a++) {
-      var item = car[a].goods,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;
+        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;
+          t_num += item[c].goods_num;
         }
       }
 
@@ -379,9 +396,9 @@ Page({
     }
     this.setData({
       checkAllToggle: ischeck,
-      total_fee: tfeel.toFixed(2)
-      ,all_num:all_num,
-      total_num:t_num
+      total_fee: tfeel.toFixed(2),
+      all_num: all_num,
+      total_num: t_num
     });
   },
 
@@ -392,7 +409,7 @@ Page({
     console.log('update');
     console.log(t);
     rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, {
-      isShowLoading:0,
+      isShowLoading: 0,
       async success(d) {
         var limit = d.data.data.viplimited;
         var store_count = d.data.data.store_count;
@@ -427,6 +444,7 @@ Page({
           e.setData({
             [txt]: cbuy > 0 ? cbuy : 0,
           });
+          e.doCheckAll();
           return false;
         }
 
@@ -439,6 +457,7 @@ Page({
           e.setData({
             [txt]: store_count
           });
+          e.doCheckAll();
           return false;
         }
 
@@ -459,6 +478,7 @@ Page({
                 e.setData({
                   [txt]: false_data.goods_num - false_data.buy_num
                 });
+                e.doCheckAll();
                 return false;
               }
 
@@ -472,6 +492,7 @@ Page({
                 e.setData({
                   [txt]: false_data.redisnum
                 });
+                e.doCheckAll();
                 return false;
               }
 
@@ -485,9 +506,9 @@ Page({
                 e.setData({
                   [txt]: false_data.false_data.buy_limit
                 });
+                e.doCheckAll();
                 return false;
               }
-
               e.update_cart(t, pitem, item);
             }
           })
@@ -503,10 +524,9 @@ Page({
     var e = this;
     getApp().request.put("/api/weshop/cart/update", {
       data: t,
-      isShowLoading:0,
       success: function(ee) {
         var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-        e.data.up_dating=0
+        e.data.up_dating = 0
         e.setData({
           [txt]: t.goods_num,
         });
@@ -722,13 +742,15 @@ Page({
   },
 
   //点击编辑后的效果
-  edit_cart:function (e) {
-     var type=parseFloat(e.currentTarget.dataset.type);
-     this.setData({is_edit:type});
+  edit_cart: function(e) {
+    var type = parseFloat(e.currentTarget.dataset.type);
+    this.setData({
+      is_edit: type
+    });
   },
 
   //--多个删除购物车商品---
-  check_del:function () {
+  check_del: function() {
     var glist = ""; //用逗号隔开的
     var user_id = getApp().globalData.user_id;
     var th = this;
@@ -744,13 +766,24 @@ Page({
       }
     }
 
-    if (ab == 0) { t.my_warnning("未选择商品", 0, th);return false; }
+    if (ab == 0) {
+      t.my_warnning("未选择商品", 0, th);
+      return false;
+    }
     glist = glist.substring(0, glist.length - 1);
     //要删除购物车中的商品
-    var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' +user_id+"/"+ glist;
+    var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' + user_id + "/" + glist;
     getApp().request.delete(url, {
-      success: function(t) { th.getCardList();}
+      success: function(t) {
+        th.getCardList();
+      }
     });
+  },
+  //跳到首页
+  goto: function(e) {
+    wx.switchTab({
+      url: '/pages/index/index/index',
+    })
   }
 
 });
\ No newline at end of file
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 0b82851..32b886d 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -1,14 +1,12 @@
+<!-- 广告图片 -->
+<navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
+  <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
+</navigator>
 <view class="container" wx:if="{{requestData.length>0}}">
-
-  <!-- 广告图片 -->
-  <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
-    <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
-  </navigator>
-
   <!-- 购物车商品框架 -->
   <view class="login-in">
     <!-- 编辑 -->
-    <view class="padding flex-vertical-between fs30 Storenum">
+    <view class="padding flex-vertical-between fs30 Storenum store">
       <view class="flex">
         <view>商品数量:</view>
         <view class="goods_num">{{all_num}}</view>
@@ -19,31 +17,34 @@
     <block wx:for="{{requestData}}" wx:key="{{index}}" wx:for-index="pidx">
       <!-- 门店底下的商品 -->
       <view class="store">
-        <view class="shmd_m padding">
-          <radio color="red" bindtap="check_th_all_item" class="goods-ico flex-center"
-                 checked="{{checkAllToggle||item.selected}}" data-pitems="{{pidx}}"></radio>
+        <view class="shmd_m">
+          <!-- 门店 -->
+          <radio color="red" bindtap="check_th_all_item" class="order-raido flex-center" checked="{{checkAllToggle||item.selected}}" data-pitems="{{pidx}}"></radio>
+
           <view class="flex-center">
             <image src="{{iurl}}miniapp/images/stores/store.png"></image>
-            <view class="shmd fs30" >{{item.pname}}</view>
+            <view class="shmd fs30">{{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}}">
-          <view bindtap="check_th_item" class="goods-ico" data-check="{{items.selected}}" data-item="{{idx}}" data-pitems="{{pidx}}">
+        <view class="order-item" data-item="{{idx}}" wx:for="{{item.goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{index}}">
+          <view bindtap="check_th_item" class="order-raido flex-vertical " data-check="{{items.selected}}" data-item="{{idx}}" data-pitems="{{pidx}}">
             <radio color="red" checked="{{checkAllToggle||items.selected}}"></radio>
           </view>
           <navigator class="goods-img rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
             <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image>
-             <view class="abs flex-center fs26" wx:if="{{items.distr_type==0}}">自选</view>
-             <view class="abs flex-center fs26" wx:if="{{items.distr_type==1}}">自提</view>
-             <view class="abs flex-center fs26" wx:if="{{items.distr_type==2}}">物流</view>
+            <view class="abs flex-center fs26" wx:if="{{items.distr_type==0}}">自选</view>
+            <view class="abs flex-center fs26" wx:if="{{items.distr_type==1}}">自提</view>
+            <view class="abs flex-center fs26" wx:if="{{items.distr_type==2}}">物流</view>
           </navigator>
           <view class="goods-cont">
             <view class="goods-name">
-              <navigator class="ellipsis-2 fs30"  url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
+              <navigator class="ellipsis-2 fs30" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
 
-              <view class="Specifications flex-center ellipsis-1" wx:if="{{items.goods_color || items.goods_spec}}">
-                {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
-              <view class="Specifications flex-center ellipsis-1" wx:else>规格1</view>
+              <view class="Specifications flex-center">
+                <view class="ellipsis-1" wx:if="{{items.goods_color || items.goods_spec}}">
+                  {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
+                <view class="ellipsis-1" wx:else>规格1</view>
+              </view>
             </view>
 
             <view class="flex alend jc_sb">
@@ -65,8 +66,8 @@
 
   <view class="pay-for flex-vertical-between">
     <view class="allradio flex-vertical-between">
-      <view class="flex-vertical">
-        <radio bindtap="checkAll" color="red" checked="{{checkAllToggle}}"></radio>
+      <view class="flex-vertical" bindtap="checkAll">
+        <radio class="order-raido" color="red" checked="{{checkAllToggle}}"></radio>
         <view class="all fs30">全选</view>
       </view>
 
@@ -88,11 +89,18 @@
     </view>
   </view>
 </view>
-<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>
-</view>
 
+<!-- 购物车为空 -->
+<view class="empty_order" wx:if="{{(!requestData|| requestData.length==0) && is_load}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/stores/nocart.png"></image>
+  </view>
+  <view class="flex-level fs32 xc-ash">购物车竟然是空的</view>
+  <view class="flex-level">
+    <navigator url="/pages/index/index/index" bindtap="goto">
+      <view class="flex-center fs30 white">去首页逛逛</view>
+    </navigator>
+  </view>
+</view>
 
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index a8f033e..44c8d63 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -1,5 +1,5 @@
 page {
-  background-color: #fff;
+  background-color: rgb(245, 245, 245);
   font-family: crosoft yahei;
 }
 
@@ -30,18 +30,18 @@ page {
   height: 100%;
   align-items: center;
   justify-content: center;
-  background-color: #fff;
-  padding-bottom: 100rpx;
+  background-color: rgb(255, 255, 255);
+  margin-bottom: 99rpx;
 }
 
 radio {
   transform: scale(0.8);
-  margin-right: 30rpx;
 }
 
 .login-in {
   width: 100%;
   box-sizing: border-box;
+  background-color: rgb(255, 255, 255);
 }
 
 .order-item {
@@ -49,11 +49,19 @@ radio {
   height: 246rpx;
   border-top: 3rpx solid rgb(245, 245, 245);
   align-items: center;
+  padding-right: 30rpx;
 }
 
 .goods-ico {
   display: flex;
   align-items: center;
+  padding: 0rpx 30rpx;
+}
+
+.order-raido {
+  height: 100%;
+  padding-left: 30rpx;
+  padding-right: 25rpx;
 }
 
 .goods-img {
@@ -61,21 +69,22 @@ radio {
   height: 180rpx;
   font-size: 0;
   overflow: hidden;
+  border: 2rpx solid rgb(236, 236, 236);
 }
 
 .goods-cont {
-  width: 400rpx;
+  width: 385rpx;
   height: 165rpx;
   font-size: 28rpx;
   margin-left: 35rpx;
-  padding-top: 10rpx;
+  padding-top: 7rpx;
   padding-bottom: 5rpx;
 }
 
 .goods-name {
   line-height: 32rpx;
   color: #333;
-  height: 130rpx;
+  height: 125rpx;
 }
 
 .goods-attribute {
@@ -85,12 +94,6 @@ radio {
   color: #999;
 }
 
-/* .goods-price {
-  height: 40rpx;
-  line-height: 40rpx;
-  margin-top: 10rpx;
-} */
-
 .btn-del {
   position: absolute;
   right: 0;
@@ -107,9 +110,9 @@ radio {
 }
 
 .count>view, .count>input {
-  width: 40rpx;
-  height: 35rpx;
-  line-height: 34rpx; 
+  width: 50rpx;
+  height: 40rpx;
+  line-height: 40rpx;
   text-align: center;
   display: flex;
   font-size: 18rpx;
@@ -118,7 +121,7 @@ radio {
 }
 
 .count>.goodadd {
-  width: 64rpx;
+  width: 67rpx;
   font-size: 24rpx;
 }
 
@@ -202,9 +205,13 @@ radio {
   margin-top: 26rpx;
 }
 
-.shmd { margin-left: 5rpx;}
+.shmd {
+  margin-left: 5rpx;
+}
 
-.store{ border-top: 7rpx solid rgb(245, 245, 245);}
+.store {
+  border-bottom: 7rpx solid rgb(245, 245, 245);
+}
 
 .login-in .Storenum {
   height: 80rpx;
@@ -216,8 +223,8 @@ radio {
 }
 
 .allradio {
-  padding-left: 30rpx;
   width: 600rpx;
+  height: 100%;
 }
 
 .allradio .all {
@@ -225,10 +232,10 @@ radio {
 }
 
 .Specifications {
-  padding: 3rpx 5rpx;
+  padding: 3rpx 8rpx;
   margin-top: 8rpx;
   font-size: 22rpx;
-  max-width: 105rpx;
+  max-width: 115rpx;
   height: 30rpx;
   line-height: 29rpx;
   background-color: rgb(236, 236, 236);
@@ -238,6 +245,10 @@ radio {
   color: rgb(63, 63, 63);
 }
 
+.ellipsis-2 {
+  max-height: 64rpx;
+}
+
 .abs {
   top: 15rpx;
   left: -39rpx;
@@ -248,3 +259,28 @@ radio {
   color: rgb(255, 255, 255);
   line-height: 40rpx;
 }
+
+/* 购物车为空 */
+
+.empty_order image {
+  width: 329rpx;
+  height: 229rpx;
+  margin-top: 140rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 25rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 60rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 56rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}