From 7ee9e88fe36fc815d493220777941d1e0c5d388f Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Tue, 30 May 2023 17:35:25 +0800
Subject: [PATCH] 每月礼包

---
 packageE/pages/cart/cart2/cart2.js   | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 packageE/pages/cart/cart2/cart2.wxml | 16 +++++++++++++++-
 pages/cart/cart/cart.wxml            |  1 +
 pages/goods/goodsInfo/goodsInfo.js   |  9 ++++++---
 pages/goods/goodsInfo/goodsInfo.wxml |  4 +++-
 5 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 532e9bc..22e6f96 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -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) {
+    debugger
     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--------
         }
       }
     }
 
-
+    debugger
     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) {
-
+    debugger
     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
     })
 
   },
@@ -5937,7 +5985,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]) {
 
@@ -6051,6 +6099,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++) {
@@ -6190,10 +6239,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}`;
+    }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);
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 45ff5f7..3595daf 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -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">
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 60e8fab..f05e3d6 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -138,6 +138,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>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index abe1d5f..b7f800d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -481,7 +481,7 @@ Page({
         appoint_pick_keyid: json_d.appoint_pick_keyid
 
       });
-
+      
       //------几人评价-------
       //n.init(th, "", "comments");
 
@@ -3641,7 +3641,7 @@ Page({
           th.setData({
             all_pick_list: e.data.data.pageData
           });
-
+          
           //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
           if (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 () {
@@ -7924,7 +7924,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}`;
+      // 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 控制跳转到的页面不显示按钮
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 09923ec..e8303dd 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -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>
@@ -1361,6 +1362,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">
--
libgit2 0.21.4