diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 22e6f96..2f56455 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -5,7 +5,7 @@ var regeneratorRuntime = require('../../../../utils/runtime.js');
 var util_pay = require("../../../../utils/pay.js");
 var zh_calc = require("zh_calculate.js");
 var ladder_calc = require("ladder_calculate.js");
-// 防抖函数用定时器   
+// 防抖函数用定时器    
 let timer;
 Page({
   data: {
@@ -1833,7 +1833,7 @@ Page({
   },
 
   calc_per: async function (c_arr) {
-    debugger
+    
     var send_gf = {};
     var duo_zp_num_arr = {};
     var th = this;
@@ -2067,7 +2067,7 @@ Page({
       }
     }
 
-    debugger
+    
     var arr = Object.keys(send_gf);
     var arr2 = Object.keys(th.data.send_gf);
     if (arr2.length > 0) return false;
@@ -2082,7 +2082,7 @@ Page({
 
 
   calclate_lbNum(r_data) {
-    debugger
+    
     if(!r_data) return false;
 
     let send_lb = this.data.send_lb;
@@ -3681,6 +3681,15 @@ Page({
       ob = JSON.stringify(ob);
       th.setData({ [l_txt]: good.zx_libao, [l_txt1]: ob });
     }
+    //每月礼包
+    if (good.month_libao) {
+      var l_txt = "formData.give_monthlb_id";
+      //这个是json格式的
+      var l_txt1 = "formData.g_monthlb_num";
+      var ob = [{ "num": good.month_lb_num, "l_id": good.month_libao }];
+      ob = JSON.stringify(ob);
+      th.setData({ [l_txt]: good.month_libao, [l_txt1]: ob });
+    }
 
     wx.hideLoading();
 
@@ -3965,6 +3974,12 @@ Page({
         order_prom_list.give_zxlb_id = th.data.formData.give_zxlb_id;
         order_prom_list.g_zxlb_num = th.data.formData.g_zxlb_num;
       }
+      //--- 每月礼包 ---
+      if (th.data.formData.give_monthlb_id > 0) {
+        order_prom_list.give_monthlb_id = th.data.formData.give_monthlb_id;
+        order_prom_list.g_monthlb_num = th.data.formData.g_monthlb_num;
+        // order_prom_list.g_monthlb_num = [{ "num": good.month_lb_num, "l_id": th.data.formData.month_libao_id }];
+      }
 
       item.order_prom_list = order_prom_list;
 
@@ -4273,6 +4288,23 @@ Page({
           order_prom_list.g_zxlb_num = JSON.stringify(t_item.g_zxlb_num);
         }
 
+        //-- 送每月礼包的时候 --
+        if (t_item.monthlibao) {
+          order_prom_list.give_monthlb_id = t_item.monthlibao;
+          let marr=[];
+          if (t_item.g_monthlb_num && t_item.g_monthlb_num.length>0) {
+            t_item.g_monthlb_num.map(ite=>{
+                let obj={
+                  num:ite.monthnum,
+                  l_id:ite.month_id,
+                  monthlbtitle:ite.monthlbtitle
+                }
+                marr.push(obj)
+            })
+          }
+          order_prom_list.g_monthlb_num = JSON.stringify(marr);
+        }
+
         if (Object.keys(order_prom_list).length > 0) {
           if (order_prom_list.discount_amount)
             order_prom_list.discount_amount = parseFloat(order_prom_list.discount_amount).toFixed(2);
@@ -4581,10 +4613,10 @@ Page({
       })
       // pdata.keyid = th.data.bn_goods.keyid
     }
-    
+    // debugger
     var str = JSON.stringify(pdata);
     console.log(str,'aaaaaaaaaaaaaaa');
-    //return false;
+    // return false;
 
     wx.showLoading({ title: "加载中" });
     th.setData({ submit: 1, })
@@ -5865,6 +5897,7 @@ Page({
       }
     }).then(res => {
       if (res.data.code == 0) {
+        
         var get_data = res.data.data;
         arr.is_bz = prom.is_bz;             //是不是倍增
         arr.is_xz_yh = arr.is_xz_yh ? arr.is_xz_yh : prom.is_xz_yh;       //是不是优惠
@@ -5902,6 +5935,11 @@ Page({
         arr.zxlbtitle = get_data.zxlbtitle;
         arr.zx_libao = get_data.zxlibao;
         arr.zx_lb_num = get_data.zxlb_num;
+        //立即购买，每月礼包
+        arr.monthlbtitle = get_data.monthlbtitle;
+        arr.month_libao = get_data.monthlibao;
+        arr.month_lb_num = get_data.monthlb_num;
+        //----end-------
 
         arr.prom_id = prom_id;
 
@@ -5985,7 +6023,7 @@ Page({
     var pickid = item.pick_id;
     var map = th.data.prom_goods_map;
     var obj = map[pickid];
-    debugger
+    
     if (map[pickid]) {
       if (map[pickid][item.prom_id]) {
 
@@ -6099,7 +6137,7 @@ Page({
   check_is_youhui: function (r_data, pick_id) {
     let send_lb = this.data.send_lb;
     let lodash = null;
-    debugger
+    
     r_data.forEach(item => {
       if (send_lb[pick_id]) {
         for (let i = 0; i < send_lb[pick_id].length; i++) {
@@ -6242,7 +6280,7 @@ Page({
 
     if (flag == 2) { // flag =2 控制跳转到每月礼包
       // url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
-      url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}`;
+      url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
     }else if (flag == 1) {   
       url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
     } else {
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 3595daf..4144db3 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -430,7 +430,7 @@
 
       <!-- 有送礼包 -->
       <view wx:if="{{bn_goods.s_libao}}">
-        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.s_libao}}" bindtap="viewLbDetails">
+        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.s_libao}}" data-flag="1" bindtap="viewLbDetails">
           <view class="flex ai_c">
             <view class="circle1">赠</view>{{bn_goods.lbtitle}}
             <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
@@ -442,7 +442,7 @@
       </view>
       <!-- 有送专享礼包 -->
       <view wx:if="{{bn_goods.zx_libao}}">
-        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.zx_libao}}" data-flag="1" bindtap="viewLbDetails">
+        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.zx_libao}}"  bindtap="viewLbDetails">
           <view class="flex ai_c">
             <view class="circle1">赠</view>{{bn_goods.zxlbtitle}}
             <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
@@ -452,6 +452,18 @@
           </view>
         </view>
       </view>
+      <!-- 有送每月礼包 -->
+      <view wx:if="{{bn_goods.month_libao}}">
+        <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{bn_goods.month_libao}}" data-flag="2" bindtap="viewLbDetails">
+          <view class="flex ai_c">
+            <view class="circle1">赠</view>{{bn_goods.monthlbtitle}}
+            <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+          </view>
+          <view class="flex ai_c">
+            x{{bn_goods.month_lb_num}}<text class="bg_jj"></text>
+          </view>
+        </view>
+      </view>
 
 
       <!-- 赠品的显示 -->
diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
index 752fa44..ff8c348 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
@@ -297,7 +297,8 @@ Page({
         page: th.data.curpage,
         pageSize: th.data.pageSize,
         is_end:0,
-        timetype:1
+        timetype:1,
+        is_act:0
       },
       success: function (res) {
         if (res.data.code == 0) {
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index f76fa56..79d53eb 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -214,6 +214,43 @@ Page({
         url: '/packageE/pages/togoin/togoin',
       })
     },
+    getListInfo: function (e) {
+      var th = this;
+      getApp().request.get(`/api/weshop/marketing/marketingMonthgiftbagForm/get/${a.stoid}/${th.data.params.id}`, {
+        isShowLoading: true,
+        data: {
+          // store_id: a.stoid, //商家ID
+          // user_id: d.user_id, //用户ID
+          // page: 1,
+          // pageSize: 10,
+          // is_end:0,
+          // timetype:1,
+          // id:th.data.params.id
+        },
+        success: function (res) {
+          if (res.data.code == 0) {
+            // th.data.curpage++;
+            // var arr1 = th.data.wareCard;
+            let obj = res.data.data;
+            let monthgiftbag={
+              remark:obj.remark,
+              cover_img:obj.imageurl,
+              giftTitle:obj.act_name,
+              lbPrice:obj.oldPrice
+            }             
+              let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+               monthgiftbag.remark=remark
+              th.setData({
+                monthgiftbag: monthgiftbag,
+              })
+            }else {
+              getApp().my_warnning("获取活动失败", 0, th);
+            }
+          
+        }
+      })
+  
+    },
     getList: function (e) {
       var th = this;
       getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
@@ -367,7 +404,11 @@ Page({
                 getApp().goto('/packageE/pages/togoin/togoin');
                 return false;
             }
-            this.getList();
+            if (th.data.params && th.data.params.is_act) {
+              this.getListInfo()
+            }else{
+              this.getList();
+            }
         })
 
         setTimeout(()=>{
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
index 25a24ee..a852b38 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
@@ -149,7 +149,7 @@
 	
 		<view class="foot_empty data-v-3a5b7e36"></view>
 		
-	<block wx:if="{{flag != 1}}">
+	<block wx:if="{{flag != 1 && (params && !params.is_act)}}">
 		<block wx:if="{{getUserID && monthgiftbag.giftTitle}}">
 		  <block wx:if="{{isStart==1}}">
 		    <view class="foot_button data-v-3a5b7e36">
@@ -229,7 +229,9 @@
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
+<block wx:if="{{!params || (params && params.is_act !=1)}}">
+  <nav_b id="nav_b" ></nav_b>
+</block>
 
 <include src="../public/buy_com.wxml"></include>
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if="{{!canvasHidden}}"></canvas>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b7f800d..253cf1a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7925,7 +7925,7 @@ Page({
     let flag = e.currentTarget.dataset.flag;
     let url = '';
     if (flag == 2) { // flag =1 控制跳转到专享礼包
-      url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}`;
+      url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
       // url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
     } else if (flag == 1) { // flag =1 控制跳转到专享礼包
       url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;