From 17085975427475dc1279df2bacf6aa2944a91515 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 3 Feb 2023 13:49:52 +0800
Subject: [PATCH] 多活动的叠加的优化

---
 pages/goods/goodsInfo/goodsInfo.js | 6 ++++++
 1 file changed, 6 insertions(+), 0 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 1fbe2b4..4b15b1a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7123,6 +7123,12 @@ Page({
               getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
                 if (res.data.code == 0 && res.data.data) {
                   var prom_content = "";
+
+                  //暂定优惠促销还不能重叠
+                  if(res.data.data.good_object==0 && r_data.promGoodsLists){
+                    return false;
+                  }
+
                   for (let jj in r_data.ladderLists) {
                     if (r_data.ladderLists[jj].discount == 10) {
                       prom_content += "第" + (parseInt(jj) + 1) + "件原价，";
--
libgit2 0.21.4