From 2c271d81bcb973fc08cdaa7cb327cf3698e2510f Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Tue, 7 Mar 2023 09:13:35 +0800 Subject: [PATCH] ~~ 代发商品的包邮模板的问题 ~~ --- packageE/pages/cart/cart2/cart2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index aad711f..f4ee4c2 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -2189,7 +2189,7 @@ Page({ //--- 秒杀, 团购的时候，判断有没有订单优惠和包邮模板的叠加 --- if( [1,2,6].indexOf(item[jc].prom_type)>-1){ - if(!item[jc].is_order_yh){ + if(!item[jc].is_order_yh && !item[jc].whsle_id){ no_order_yh+=item[jc].goods_price * item[jc].goods_num; if(item[jc].quan_num) no_order_yh-=item[jc].quan_num; //券要把他补回去 @@ -2948,7 +2948,7 @@ Page({ var ord_prom = null; var is_ord_prom_post = 0; - if (condition > 0 && th.data.bn_is_order_yh) { + if (condition > 0 && th.data.bn_is_order_yh && !th.data.bn_goods.whsle_id) { await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { data: { store_id: os.stoid, orderAmount: condition, user_id: getApp().globalData.user_id } }).then(res => { -- libgit2 0.21.4