diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index e7426d4..39c1e1b 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -377,8 +377,74 @@ Page({
 			  th.toast(content);
 			  return false;
 			}
-			
-			//如果优惠促销和搭配购的时候
+
+            //当是组合优惠的时候
+            if(good.prom_type==7){
+                //如果有组合购
+                var isok = 1;
+                var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
+                await getApp().request.promiseGet(url, {}).then(res => {
+                    if(res.data.code==0 && res.data.data){
+                        if(res.data.data.is_show!=1){
+                            isok=0;
+                        }
+                        //如果活动已经结束
+                        if(res.data.data.is_end==1){
+                            isok=0;
+                        }
+                        //已经结束
+                        if(ut.gettimestamp()>res.data.data.end_time){
+                            isok=0;
+                        }
+                        //还未开始
+                        if(ut.gettimestamp()<res.data.data.start_time){
+                            isok=0;
+                        }
+
+                    }else{
+                        //未找到商品的活动
+                        isok = 0;
+                    }
+
+                })
+                if (!isok){
+                    var  content=gg.goods_name+'活动已经结束,请取消订单';
+                    th.toast(content);
+                    return false;
+                }
+
+                var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                var req_data = {
+                    page: 1,
+                    pageSize: 1,
+                    store_id: os.stoid,
+                    zh_id: good.prom_id,
+                    goods_id:good.goods_id
+                }
+                await getApp().request.promiseGet(url1, {
+                    data: req_data
+                }).then(res => {
+                    if (ut.ajax_ok(res)) {
+                        var gdlist = res.data.data.pageData[0];
+                        good.buyqty=gdlist.buyqty;
+                    }
+                })
+
+                var num=good['buyqty'];
+                console.log(1111);
+                console.log(num);
+                //---- 要计算商品的限购 -----
+                if(good['buyqty']>0){
+                    if(good.goods_num+promgoodsbuynum>good['buyqty']){
+
+                        var  content= good['goods_name']+"超出活动限购\n";
+                        th.toast(content);
+                        return false;
+                    }
+                }
+            }
+
+            //如果优惠促销和搭配购的时候
 			if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
 				var p_ok=1;
 			    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {