diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 15d4a54..8650f65 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -450,7 +450,7 @@ Page({
             })
 
             //-- 要进行判断指定门店的判断优化,先做普通商品 --
-            if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){
+            if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){
                 var idx0=gg.pick_up_lists.findIndex(function (e){
                     return e.pickup_id==order.pickup_id;
                 })
@@ -655,7 +655,19 @@ Page({
                             var content = good.goods_name + '未找到活动,请取消订单重新购买';
                             th.toast(content);
                             p_ok = 0;
+                        }else if(r_data.promGoodsLists && good.prom_type == 3){
+                            var fir_act = r_data.promGoodsLists[0];
+                            //如果是有限购的时候
+                            if (fir_act.gd_limit_num>0){
+                                if(promgoodsbuynum+good.goods_num > fir_act.gd_limit_num){
+                                    var content = good.goods_name + '超出优惠促销活动商品限购,请取消订单重新购买';
+                                    th.toast(content)
+                                    p_ok = 0;
+                                }
+                            }
+
                         }
+
                         if (!r_data.ladderLists && good.prom_type == 10) {
                             var content = good.goods_name + '未找到活动,请取消订单重新购买';
                             th.toast(content);
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 4e44f64..b86b58b 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -764,7 +764,7 @@ Page({
       })
 
       //-- 要进行判断指定门店的判断优化,先做普通商品 --
-      if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){
+      if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){
           var idx0=gg.pick_up_lists.findIndex(function (e){
             return e.pickup_id==order.pickup_id;
           })
@@ -966,16 +966,32 @@ Page({
                  th.toast(content)
                  p_ok = 0;
               }
+
               if (!r_data.promGoodsLists && good.prom_type == 3) {
                 var content = good.goods_name + '未找到活动,请取消订单重新购买';
                 th.toast(content);
                 p_ok = 0;
+              }else if(r_data.promGoodsLists && good.prom_type == 3){
+                var fir_act = r_data.promGoodsLists[0];
+                //如果是有限购的时候
+                if (fir_act.gd_limit_num>0){
+                  if(promgoodsbuynum+good.goods_num > fir_act.gd_limit_num){
+                    var content = good.goods_name + '超出优惠促销活动商品限购,请取消订单重新购买';
+                    th.toast(content)
+                    p_ok = 0;
+                  }
+                }
+
               }
+
               if (!r_data.ladderLists && good.prom_type == 10) {
                 var content = good.goods_name + '未找到活动,请取消订单重新购买';
                 th.toast(content);
                 p_ok = 0;
               }
+
+
+
             } else {
 
               var content = good.goods_name + '未找到活动,请取消订单重新购买'