Commit a2a81cccf228bb9b4c22fcaa1c93f7b6795d54c3

Authored by yvan.ni
1 parent ab920fa6

阶梯促销全场的时候,也允许叠加的优化

pages/goods/goodsInfo/goodsInfo.js
@@ -7602,11 +7602,10 @@ Page({ @@ -7602,11 +7602,10 @@ Page({
7602 await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => { 7602 await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
7603 if (res.data.code == 0 && res.data.data) { 7603 if (res.data.code == 0 && res.data.data) {
7604 var prom_content = ""; 7604 var prom_content = "";
7605 -  
7606 //暂定优惠促销还不能重叠 7605 //暂定优惠促销还不能重叠
7607 - if (res.data.data.good_object == 0 && (r_data.promGoodsLists || th.data.zh_act)) {  
7608 - return false;  
7609 - } 7606 + // if (res.data.data.good_object == 0 && (r_data.promGoodsLists || th.data.zh_act)) {
  7607 + // return false;
  7608 + // }
7610 7609
7611 if (res.data.data.good_object == 1) { 7610 if (res.data.data.good_object == 1) {
7612 r_data.promGoodsLists = null; 7611 r_data.promGoodsLists = null;