Commit 17085975427475dc1279df2bacf6aa2944a91515
1 parent
7bbf86c3
多活动的叠加的优化
Showing
1 changed file
with
6 additions
and
0 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -7123,6 +7123,12 @@ Page({ | @@ -7123,6 +7123,12 @@ Page({ | ||
7123 | getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => { | 7123 | getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => { |
7124 | if (res.data.code == 0 && res.data.data) { | 7124 | if (res.data.code == 0 && res.data.data) { |
7125 | var prom_content = ""; | 7125 | var prom_content = ""; |
7126 | + | ||
7127 | + //暂定优惠促销还不能重叠 | ||
7128 | + if(res.data.data.good_object==0 && r_data.promGoodsLists){ | ||
7129 | + return false; | ||
7130 | + } | ||
7131 | + | ||
7126 | for (let jj in r_data.ladderLists) { | 7132 | for (let jj in r_data.ladderLists) { |
7127 | if (r_data.ladderLists[jj].discount == 10) { | 7133 | if (r_data.ladderLists[jj].discount == 10) { |
7128 | prom_content += "第" + (parseInt(jj) + 1) + "件原价,"; | 7134 | prom_content += "第" + (parseInt(jj) + 1) + "件原价,"; |