Merge branch 'dev_oa_lu6' into dev

WXD-SEASON\season
2 parents 660d0b17 7853cd33
Showing 11 changed files with 261 additions and 31 deletions
components/diy_video/diy_video.wxml
packageA/pages/profile/profile.js
packageA/pages/profile/profile.wxml
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
pages/cart/cart/cart.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
 <view class="vd_view">
-   <video class="vd_web" src="{{videoUrl}}"></video>
+   <video class="vd_web" poster="{{object.bgsrc}}" src="{{videoUrl}}"></video>
 </view>
 \ No newline at end of file
@@ -77,7 +77,7 @@ Page({
         lat: null, //维度
         lon: null, //经度
         loading: 0,
-
+        oldBirtthDayLength:0,   //生日日期个数
     },
     //通过路径跳转到其他页面
     goto: function (e) {
@@ -1126,20 +1126,81 @@ Page({
         let address = this.getInput(e);
         this.data.address = address;
     },
-
+    //获取生日
+    getbind(e) {
+      console.log("获取生日222222222");
+      console.log(e);
+      let b = this.getInput(e);
+      let length = b.length;
+      let oldBirtthDayLength=this.data.oldBirtthDayLength
+      if (length > oldBirtthDayLength) {
+        if (b.length==4) {
+          b+='-' 
+        }
+        if (b.length==7) {
+          b+='-' 
+        }
+        // if (b.length==6 && b[5] >1) {
+        //   console.log(b[5]);
+
+        // }
+      }
+      this.setData({
+        datet: b,
+        oldBirtthDayLength:length,
+      });
+    },
     //获取生日
     bindChange: function (e) {
+       console.log("获取生日11111111");
+        console.log(e);
         let strBirthday = e.detail.value;
         let age = this.verifyBirthday(strBirthday);
         if (age <= 10) {
             app.my_warnning("会员年龄不能小于10岁(含10岁)", 0, this);
+            this.setData({
+              datet: '',
+          });
         } else if (age >= 70) {
             app.my_warnning("会员年龄不能超过70岁(含70岁)", 0, this);
-        } else {
             this.setData({
-                datet: e.detail.value,
-            });
+              datet: '',
+          });
+        } else {
+            let value = e.detail.value
+  
+            if (value.length==8) {
+              value+='01'
+            }
+            if (value.length==7) {
+              value+='-01'
+            }
+            if (value.length==9) {
+              let ov=value[value.length-1]
+              let nv=value.slice(0,-1)
+              if (ov==0) {
+                nv+='01'
+              }else{
+                nv+='0'+ov
+              }
+              value=nv
+            }
+            // let reg= /^(\d{4})-(\d{2})-(\d{2})$/;
+            let reg=  /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/
+            console.log('日期验证');
+            console.log(value);
+            console.log(reg.test(value));
+            if (reg.test(value)) {
+              this.setData({
+                datet: value,
+              }); 
+            }else{
+              app.my_warnning("出生日期格式不对", 0, this);
+              this.setData({
+                datet: '',
+              });
+            }
         }
     },
@@ -90,14 +90,16 @@
 			  <view class="shrink0">出生日期:</view>
 			  <view class="flex fs28 Birth pdl20 jc_fe">
 			    <view class="user-txt-right pdl20 flex ai-center">
-							<checkbox-group bindchange="isLunar">
+            <input bindinput="getbind" bindblur="bindChange" maxlength="10" type="number" value="{{datet}}"  class="user-txt-right pdl20 f1 t-r" placeholder="请输入出生日期"></input>
+            <picker class="pdl20" bindchange='bindChange' mode="date" start="{{year-70}}-1-1" end="{{year}}-12-31">
+								<!-- <view class="flex ai-center">{{datet?datet:"请选择时间"}}<view class="angle">∟</view></view> -->
+                <image src="{{iurl}}/miniapp/images/calendar.png" style="width: 40rpx;height: 40rpx;"></image>
+			        </picker>
+							<checkbox-group bindchange="isLunar" class="pdl20">
 								<label class="flex ai-center">
 									<checkbox value="{{isLunar}}" checked="{{isLunar}}"/>农历
 								</label>
 							</checkbox-group>
-			        <picker class="pdl20" bindchange='bindChange' mode="date" start="{{year-70}}-1-1" end="{{year}}-12-31">
-								<view class="flex ai-center">{{datet?datet:"请选择时间"}}<view class="angle">∟</view></view>
-			        </picker>
 			    </view>
@@ -5,7 +5,7 @@ var regeneratorRuntime = require(&#39;../../../../utils/runtime.js&#39;);
 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: {
@@ -137,6 +137,7 @@ Page({
     show_duo_gift: 0,
     send_gf: {}, //多赠品的计算
     send_lb: {},
+    month_lb: {}, //每月礼包数据
     dis_config: null,
     bn_use_commission: 0, //是不是使用佣金
     cart_use_commission: 0,
@@ -198,6 +199,7 @@ Page({
       is_by: {},
       send_gf: {},
       send_lb: {},
+      month_lb: {},
     })
   },
@@ -1831,6 +1833,7 @@ Page({
   },
   calc_per: async function (c_arr) {
+    
     var send_gf = {};
     var duo_zp_num_arr = {};
     var th = this;
@@ -1856,7 +1859,7 @@ Page({
         for (var ii in ob) {
           var item_map = ob[ii];
           if (item_map.bs == undefined || item_map.bs == null) {
-            //等待，获取一下优惠活动的信息
+            //等待，获取一下优惠活动的信息 
             await getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
               data: {
                 price: parseFloat(item_map.price).toFixed(2), prom_id: item_map.prom_id,
@@ -1875,7 +1878,9 @@ Page({
                 item_map.s_coupon_num = get_data.coupon_num;
                 item_map.lbtitle = get_data.lbtitle;
                 item_map.zxlbtitle = get_data.zxlbtitle;
-
+                //每月礼包
+                item_map.monthlbtitle = get_data.monthlbtitle;
+                //------end-------
                 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
                   && get_data.zp_num * item_map.bs <= get_data.limit_num
                   && get_data.zp_num * item_map.bs <= get_data.gift_storecount
@@ -1901,6 +1906,10 @@ Page({
                 //专享礼包
                 item_map.zx_libao = get_data.zxlibao;
                 item_map.zx_lb_num = get_data.zxlb_num;
+                //每月礼包
+                item_map.monthlibao = get_data.monthlibao;
+                item_map.monthlb_num = get_data.monthlb_num;
+                //------end-------
                 if (parseInt(get_data.zp_mode) == 1) {
                   if (!send_gf[pickid]) send_gf[pickid] = [];
@@ -2043,11 +2052,22 @@ Page({
               cart_item.g_zxlb_num.push({ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num, 'zxlbtitle': item_map.zxlbtitle })
             }
           }
+          //每月礼包
+          if (item_map.monthlibao) {
+            if (!cart_item.monthlibao) {
+              cart_item.monthlibao = item_map.monthlibao + "";
+              cart_item.g_monthlb_num = [{ 'month_id': item_map.monthlibao, "monthnum": item_map.monthlb_num, 'monthlbtitle': item_map.monthlbtitle }];
+            } else {
+              cart_item.monthlibao += "," + item_map.monthlibao;
+              cart_item.g_monthlb_num.push({ 'month_id': item_map.monthlibao, "monthnum": item_map.monthlb_num, 'monthlbtitle': item_map.monthlbtitle })
+            }
+          }
+          //------------end--------
         }
       }
     }
-
+    
     var arr = Object.keys(send_gf);
     var arr2 = Object.keys(th.data.send_gf);
     if (arr2.length > 0) return false;
@@ -2062,10 +2082,12 @@ Page({
   calclate_lbNum(r_data) {
-
+    
     if(!r_data) return false;
     let send_lb = this.data.send_lb;
+    let month_lb = this.data.month_lb;
+
     //g_lb_num我的礼包 g_zxlb_num专享礼包
     r_data.forEach(r_d => {
       let arr = [];
@@ -2112,9 +2134,35 @@ Page({
           send_lb[r_d.pickup_id] = arr;
         }
       }
+      //每月礼包
+      let monthArr=[]
+      if (r_d.g_monthlb_num) {
+        let g_lb = r_d.g_monthlb_num;
+        for (let i = 0; i < g_lb.length; i++) {
+          let item = g_lb[i];
+          let new_lb = g_lb.filter(lb => {
+            return item.month_id === lb.month_id;
+          });
+          if (new_lb.length == 1) {
+            monthArr.push(item);
+          } else {
+            item.num = new_lb.reduce((pre, next) => {
+              return pre + next.num;
+            }, 0);
+            monthArr.push(item);
+            g_lb = g_lb.filter(ii => {
+              return ii.month_id !== item.month_id;
+            });
+          }
+          month_lb[r_d.pickup_id] = monthArr;
+        }
+      }
+      //-----end--------
+
     })
     this.setData({
       send_lb,
+      month_lb
     })
   },
@@ -3633,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();
@@ -3918,6 +3975,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;
@@ -4243,6 +4306,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);
@@ -4569,10 +4649,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, })
@@ -5853,6 +5933,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;       //是不是优惠
@@ -5890,6 +5971,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;
@@ -6087,6 +6173,7 @@ Page({
   check_is_youhui: function (r_data, pick_id) {
     let send_lb = this.data.send_lb;
     let lodash = null;
+    
     r_data.forEach(item => {
       if (send_lb[pick_id]) {
         for (let i = 0; i < send_lb[pick_id].length; i++) {
@@ -6226,10 +6313,14 @@ Page({
     let id = e.currentTarget.dataset.id; // 获取礼包id
     let flag = e.currentTarget.dataset.flag;
     let url = '';
-    if (flag == 1) { // flag =1 控制跳转到专享礼包
-      url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
-    } else {
+
+    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}&is_act=1`;
+    }else if (flag == 1) {   
       url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
+    } else {
+      url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
     };
     // console.log('myurl', url);
     getApp().goto(url);
@@ -209,7 +209,7 @@
         <!-- 有送礼包 -->
         <view wx:if="{{send_lb[item.pickup_id]}}">
           <block wx:for="{{send_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
-            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.l_id}}" data-flag="{{send.flag}}" bindtap="viewLbDetails">
               <view class="flex ai_c">
                 <view class="circle1">赠</view>{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
                 <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
@@ -220,6 +220,20 @@
             </view>
           </block>
         </view>
+        <!-- 每月礼包 -->
+        <view wx:if="{{month_lb[item.pickup_id]}}">
+          <block wx:for="{{month_lb[item.pickup_id]}}" wx:key="id" wx:for-item="send">
+            <view class="coupon-mes flex jc_sb" style="margin: 10rpx 0; padding-right: 35rpx" data-id="{{send.month_id}}" data-flag="2" bindtap="viewLbDetails">
+              <view class="flex ai_c">
+                <view class="circle1">赠</view>{{send.monthlbtitle}}
+                <!-- <view class="circle1" wx:if="{{item.zxlb_id>0}}">赠</view>{{item.zxlbtitle}} -->
+              </view>
+              <view class="flex ai_c">
+                x{{send.monthnum}}<text class="bg_jj"></text>
+              </view>
+            </view>
+          </block>
+        </view>
         <!-- 赠品的显示 -->
         <view wx:if="{{send_gf[item.pickup_id]}}">
           <block wx:for="{{send_gf[item.pickup_id]}}" wx:for-item="iter">
@@ -416,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}} -->
@@ -428,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}} -->
@@ -438,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>
       <!-- 赠品的显示 -->
@@ -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) {
@@ -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(()=>{
@@ -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>
@@ -139,6 +139,7 @@
                   <text wx:if="{{item.content.is_gift==1}}">送赠品|</text>
                   <text wx:if="{{item.content.is_libao==1}}">送礼包|</text>
                   <text wx:if="{{item.content.is_zxlibao==1}}">送专享礼包|</text>
+                  <text wx:if="{{item.content.is_monthgiftbag==1}}">送每月礼包|</text>
                   <text></text>
               </view>
                 <view class="co-red" data-prom_id="{{item.prom_id}}" bindtap="go_cou_dang">去凑单></view>
@@ -481,7 +481,7 @@ Page({
         appoint_pick_keyid: json_d.appoint_pick_keyid
       });
-
+      
       //------几人评价-------
       //n.init(th, "", "comments");
@@ -3680,7 +3680,7 @@ Page({
           th.setData({
             all_pick_list: e.data.data.pageData
           });
-
+          
           //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
           if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.is_newsales_rules && !th.data.sele_g.whsle_id && ([1,2,4,6,8,9].indexOf(th.data.prom_type)==-1 || is_normal == 1)) {
             setTimeout(function () {
@@ -7972,7 +7972,10 @@ Page({
     let id = e.currentTarget.dataset.id; // 获取礼包id
     let flag = e.currentTarget.dataset.flag;
     let url = '';
-    if (flag == 1) { // flag =1 控制跳转到专享礼包
+    if (flag == 2) { // flag =1 控制跳转到专享礼包
+      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`;
     } else {
       url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
@@ -3,7 +3,7 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
-<!-- 商品内容区域,普通商品,秒杀,拼团 -->
+<!-- 商品内容区域,普通商品,秒杀,拼团 --> 
 <block wx:if="{{isshow}}">
   <view class="container">
     <!-- 拼单规则规则 -->
@@ -535,6 +535,7 @@
                     <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view>
                     <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.zxlb_id>0}}" data-id="{{item.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">送{{item.zxlbtitle}}</view>
+                    <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.monthgiftbag_id>0}}" data-id="{{item.monthgiftbag_id}}" data-flag="2" bindtap="viewLbDetails">送{{item.monthgiftbag_title}}</view>
                   </view>
                 </view>
               </view>
@@ -1368,6 +1369,7 @@
         <text wx:if="{{hui_condition.gift_id}}">，送赠品</text>
         <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
         <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
+        <text wx:if="{{hui_condition.monthgiftbag_id>0}}">，送每月礼包</text>
       </view>
     </view>
     <view class="spec-cart-btns">