Commit 2c271d81bcb973fc08cdaa7cb327cf3698e2510f
1 parent
d9f89b55
~~ 代发商品的包邮模板的问题 ~~
Showing
1 changed file
with
2 additions
and
2 deletions
packageE/pages/cart/cart2/cart2.js
... | ... | @@ -2189,7 +2189,7 @@ Page({ |
2189 | 2189 | |
2190 | 2190 | //--- 秒杀, 团购的时候,判断有没有订单优惠和包邮模板的叠加 --- |
2191 | 2191 | if( [1,2,6].indexOf(item[jc].prom_type)>-1){ |
2192 | - if(!item[jc].is_order_yh){ | |
2192 | + if(!item[jc].is_order_yh && !item[jc].whsle_id){ | |
2193 | 2193 | no_order_yh+=item[jc].goods_price * item[jc].goods_num; |
2194 | 2194 | if(item[jc].quan_num) no_order_yh-=item[jc].quan_num; //券要把他补回去 |
2195 | 2195 | |
... | ... | @@ -2948,7 +2948,7 @@ Page({ |
2948 | 2948 | var ord_prom = null; |
2949 | 2949 | var is_ord_prom_post = 0; |
2950 | 2950 | |
2951 | - if (condition > 0 && th.data.bn_is_order_yh) { | |
2951 | + if (condition > 0 && th.data.bn_is_order_yh && !th.data.bn_goods.whsle_id) { | |
2952 | 2952 | await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { |
2953 | 2953 | data: { store_id: os.stoid, orderAmount: condition, user_id: getApp().globalData.user_id } |
2954 | 2954 | }).then(res => { | ... | ... |