diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 1bd6535..84b1685 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1031,7 +1031,7 @@ Page({
 
 
             //秒杀和团购都能加入购物车
-            if( [1,2].indexOf(item.prom_type)) {
+            if( [1,2].indexOf(item.prom_type)>-1) {
               var prom = null;
               var now = ut.gettimestamp();
 
@@ -4149,11 +4149,23 @@ Page({
       //判断flash_map是不是空,同时判断flash prom.buy_limit
       if(Object.keys(flash_map).length>0){
         for(let i in flash_map){
-          if(flash_map[i].num>flash_map[i].prom.buy_limit && flash_map[i].prom.buy_limit>0){
-            getApp().confirmBox(flash_map[i].prom.title + "秒杀活动的超出活动限购");
-            th.clear_checkouting();
-            return false;
-          }
+
+
+         if(flash_map[i].prom.buy_limit>0) {
+           //查一下团购已经购买了多少减
+           var f_buyed = 0;
+           //获取当前商品活动库存
+           var fl_rs=await th.get_buy_num_ser_2(flash_map[i].prom.goods_id,1,flash_map[i].prom.id);
+           if(fl_rs.data.code==0 && fl_rs.data.data  && fl_rs.data.data.promcardbuynum){
+             f_buyed=fl_rs.data.data.promcardbuynum
+           }
+
+           if (flash_map[i].num+f_buyed> flash_map[i].prom.buy_limit) {
+             getApp().confirmBox(flash_map[i].prom.title + "秒杀活动的超出活动限购");
+             th.clear_checkouting();
+             return false;
+           }
+         }
           let redis_num=0;
           //获取当前商品活动库存
           await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +oo.stoid + "/1/" + i, {
@@ -4171,11 +4183,24 @@ Page({
       //group_map,同时判断group prom.buy_limit
       if(Object.keys(group_map).length>0){
         for(let jg in group_map){
-            if(group_map[jg].num>group_map[jg].prom.buy_limit && group_map[jg].prom.buy_limit>0){
-              getApp().confirmBox(group_map[jg].prom.title + "团购活动的超出活动限购");
-              th.clear_checkouting();
-              return false;
-            }
+
+           if(group_map[jg].prom.buy_limit>0){
+             //查一下团购已经购买了多少减
+             var gr_buyed=0;
+             //获取当前商品活动库存
+             var gb_rs=await th.get_buy_num_ser_2(group_map[jg].prom.goods_id,2,group_map[jg].prom.id);
+             if(gb_rs.data.code==0 && gb_rs.data.data && gb_rs.data.data.promcardbuynum){
+               gr_buyed=gb_rs.data.data.promcardbuynum
+             }
+             if(group_map[jg].num+gr_buyed>group_map[jg].prom.buy_limit){
+               getApp().confirmBox(group_map[jg].prom.title + "团购活动的超出活动限购");
+               th.clear_checkouting();
+               return false;
+             }
+
+           }
+
+
             let redis_num=0;
             //获取当前商品活动库存
             await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +oo.stoid+ "/2/" + jg, {
@@ -5800,10 +5825,24 @@ Page({
 
     }
 
-
     app.goto(url);
+  },
 
-  }
+  //-- 在结算的时候，判断有没有超出限购 --
+  get_buy_num_ser_2: async function (goods_id,prom_type,prom_id) {
+    var th = this, user_id = getApp().globalData.user_id;
+    //----获取活动购买数----
+    return await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+      data: {
+        store_id: os.stoid,
+        user_id: user_id,
+        card_id: goods_id,
+        prom_type: prom_type,
+        prom_id: prom_id,
+        isnew:1
+      },
+    });
+  },
 
 
 
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 889eabc..3682702 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -399,7 +399,7 @@
 	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods"  wx:for-index="pinx" url="{{ofil.card_url(item)}}">
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
-	          <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image>
+	            <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="cardList[{{index}}].list[{{pinx}}].img_url"></image>
 				<view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
 				<view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
 	        </navigator>
@@ -456,7 +456,8 @@
 	        </view>
 					
 	        <view class="links flex-right-vertical fs24 padding">
-	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
+	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}"
+					 class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
 	          <view bindtap="cancle" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{tabIndex}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" wx:if="{{(item.order_status==0)}}" data-index="{{tabIndex}}">取消订单</view>
 
 	            <!-- 尾款的支付时候，不显示订单详情 -->