From 95fce88f9f264b0b7f7fc820922ebd10faef70e5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 19 Sep 2023 15:43:58 +0800
Subject: [PATCH] 赠品包邮的优化

---
 packageE/pages/cart/cart2/cart2.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 037fedf..3d27fc1 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -2259,7 +2259,7 @@ Page({
               newd.is_order_yh = fd_gd.is_order_yh;
               newd.is_post_temp = fd_gd.is_post_temp;
 
-              if(get_data.zb_by>0){
+              if(get_data.zp_by>0){
                 newd.is_past=1;
               }
 
@@ -2354,10 +2354,11 @@ Page({
                   item_map.monthlbtitle = get_data.monthlbtitle;
                 }
 
-                if(get_data.gift_id){
+                //-- 单赠品和多赠品 --
+                if(get_data.gift_id || parseInt(get_data.zp_mode) == 1){
                   item_map.zp_by=rule.zp_by;
+                  get_data.zp_by=rule.zp_by;
                 }
-
                 //-- 其他门店赠品的总和 --
                 var other_gift=0;
                 other_gift=th.get_other_gift(c_arr,get_data.gift_id,pickid);
@@ -2428,6 +2429,7 @@ Page({
                       pickup_id: pickid,
                       giftsinfo: get_data.giftsinfo,
                       zp_num: get_data.zp_num * get_data.bs,
+                      zp_by: get_data.zp_by,
                       gf_pr_name: item_map.name,
                       prom_id: item_map.prom_id,
                       bs: parseInt(get_data.bs),
@@ -7407,6 +7409,8 @@ Page({
         new_pk_list_goods.push(item)
       }
 
+      var set_data = this.data.send_gf[gf_pickup_id][this.data.send_gf_index];
+
       //-- 循环把赠品添加进去 --
       for (var i = 0; i < giftsinfo.length; i++) {
         var gf_item = giftsinfo[i];
@@ -7444,7 +7448,7 @@ Page({
           //newd.is_past=fd.is_past;
           newd.is_xz_yh=fd.is_xz_yh;
           //赠品包邮的优化
-          if(fd.zb_by>0){
+          if(set_data.zp_by && set_data.zp_by>0){
             newd.is_past=1;
           }
 
@@ -7473,7 +7477,7 @@ Page({
         }
       }
 
-      var set_data = this.data.send_gf[gf_pickup_id][this.data.send_gf_index];
+
       set_data.selected = 1;
       var txt9 = "cartlist[" + index + "].goods";
 
--
libgit2 0.21.4