From 6d539963e333d6217ce3002284b8ae24216b5557 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 3 Feb 2023 14:36:50 +0800
Subject: [PATCH] 阶梯促销的购买的优化

---
 packageE/pages/cart/cart2/cart2.js |  1 +
 pages/goods/goodsInfo/goodsInfo.js | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 41cabcc..b64a633 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1297,6 +1297,7 @@ Page({
             case 5:
             case 6:
             case 7:
+            case 10:
               //--此时开始计算商品的使用券相关,如果有等级价还要计算和等级价相关的,
               // 如果有优惠促销，还要把促销的部分计算在内，因为促销还有不能使用优惠券--
               t.data.data.shop_price = gg.goods_price;
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 4b15b1a..1f58c93 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2166,9 +2166,41 @@ Page({
       }
 
       //如果有阶梯促销的时候
-      if(th.data.jieti_prom && newd.prom_type==0){
-        newd.prom_type = 7;
+      if(th.data.jieti_prom && (newd.prom_type==10 || newd.prom_type==0) ){
+        newd.prom_type = 10;
         newd.prom_id = th.data.ladder_act_id;
+
+
+        //----先看会员在购物车中是否加入了该商品,立即购买的-----
+        getApp().request.get("/api/weshop/cart/page", {
+          data: {
+            store_id: e.data.stoid,
+            user_id: oo.user_id,
+            state: 1
+          },
+          success: function (res) {
+            //-------如果购物车中有相关的数据,先清理掉---------
+            if (res.data.code == 0 && res.data.data.total > 0) {
+              for (let j in res.data.data.pageData) {
+                let item_j = res.data.data.pageData[j];
+                var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
+                getApp().request.delete(url, {});
+              }
+            }
+
+            newd.state = 1;
+            getApp().request.post("/api/weshop/cart/save", {
+              data: newd,
+              success: function (t) {
+                th.closeSpecModal();
+                getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
+              }
+            });
+
+          }
+        })
+        return false;
+
       }
 
 
--
libgit2 0.21.4