diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index fd21201..9d06804 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1298,7 +1298,7 @@ Page({ for (var j = 0; j < ord_goods.length; j++) { if (ord_goods[j].is_gift) continue; if (ord_goods[j].prom_type == 3 && ord_goods[j].prom_id == item_map.prom_id) { - ord_goods[j].is_xz_yh = item_map.is_xz_yh; + ord_goods[j].is_xz_yh =ord_goods[j].is_xz_yh?ord_goods[j].is_xz_yh:item_map.is_xz_yh; ord_goods[j].is_past = item_map.is_past; ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir; ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir; @@ -3769,7 +3769,6 @@ Page({ //-----获取购物车进来的劵------- get_cart_quan: async function (order_prom_list_cart) { var th = this; - var is_xz_yh = 1; var user_id = getApp().globalData.user_id; //等待值的出现 //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () { @@ -3828,8 +3827,6 @@ Page({ if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele = 1; } - is_xz_yh = 0; - var item_price = gd.goods_price * gd.goods_num; var item_price2 = item_price; @@ -3905,10 +3902,8 @@ Page({ arr[ind].ckeck_quan_price = ckeck_quan_price - (cut_price ? cut_price : 0); arr[ind].check_quan_ware_list = check_quan_ware_list; arr[ind].check_quan_price_list = check_quan_price_list; - arr[ind].is_xz_yh = is_xz_yh; - //是否关闭使用优惠券 - if (th.data.is_close_quan != 1 && !is_xz_yh) { + if (th.data.is_close_quan != 1 ) { //--调用接口,获取优惠券的列表,3秒钟内控制接口请求-- var url = "/api/weshop/couponList/getUseCouponList"; await app.request.promiseGet(url, { @@ -4040,7 +4035,7 @@ Page({ if (res.data.code == 0) { var get_data = res.data.data; arr.is_bz = prom.is_bz; //是不是倍增 - arr.is_xz_yh = prom.is_xz_yh; //是不是优惠 + arr.is_xz_yh =arr.is_xz_yh?arr.is_xz_yh:prom.is_xz_yh; //是不是优惠 arr.bs = get_data.bs; //是不是倍数 arr.is_past = get_data.is_past; //是不是包邮 arr.prom_price = get_data.price >= 0 ? get_data.price : price;