From 4bceb6a4a2cfbe2cfd4648121795ca2917ea5390 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 15 Jan 2024 15:40:39 +0800
Subject: [PATCH] 1、商品详情页面显示组合的页签的优化 2、购物车组合购显示去凑单的优化

---
 pages/cart/cart/cart.js            | 30 +++++++++++++++++++++++++++++-
 pages/goods/goodsInfo/goodsInfo.js | 15 +++++++++------
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index fdb1f8a..86d16f8 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -2443,7 +2443,35 @@ Page({
           all_num += item[c].goods_num;
 
           if (item[c].prom_type == 7) {
-            item[c].act = th.data.zuhe_map[item[c].prom_id];
+              item[c].act = th.data.zuhe_map[item[c].prom_id];
+              if(item[c].zh_b_num===undefined || item[c].zh_b_num===null ){
+                 var prom_goodsbuynum = 0;
+                  //--要获得商品，该用户买了多少件,同步应用，用于限购的计算--
+                  await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                    data: {
+                      store_id: oo.stoid,
+                      user_id: getApp().globalData.user_id,
+                      goods_id: item[c].goods_id,
+                      prom_type: item[c].prom_type,
+                      prom_id: item[c].prom_id,
+                      isnew:1
+                    },
+                  }).then(res => {
+                    if(res.data.code==0 && res.data.data)
+              
+                    if (res.data.data.promgoodsbuynum) {
+                      promgoodsbuynum = res.data.data.promgoodsbuynum;     
+                    }
+                   
+                  })
+
+                  var txt = "requestData[" + a + "].goods[" + c + "].zh_b_num";
+                  th.setData({
+                    [txt]: prom_goodsbuynum
+                  });
+                  
+
+              }
           }
           if (item[c].prom_type == 10) {
             item[c].act = th.data.ladder_map[item[c].prom_id];
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 8493c46..7b396c3 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1160,12 +1160,7 @@ Page({
                 // }
 
 
-                //一件代发商品不去计算优惠
-                //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
-                if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
-                  ee.check_is_youhui(ee.data.gid);
-                }
-
+                
                 t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
 
                 var cur_price = t.data.data.shop_price;
@@ -1207,6 +1202,12 @@ Page({
                   front_g:  ut.deep_cp(t.data.data),
                 });
 
+                //一件代发商品不去计算优惠
+                //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
+                if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
+                    ee.check_is_youhui(ee.data.gid);
+                }
+  
                 //获取统一条形码,普通商品和优惠促销的商品
                 if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) {
                   ee.get_sto();
@@ -3474,7 +3475,9 @@ Page({
                   break
                 }
               }
+              
               console.log(item, 2000);
+
               var cur_price = item.shop_price;
               if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) {
                 var cfile = getApp().globalData.userInfo.card_field;
--
libgit2 0.21.4