From 93cd196b1d659a2687025a0ff5034cb935a4208d Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Mon, 17 Apr 2023 09:22:05 +0800 Subject: [PATCH] 多促销的优化 --- packageE/pages/cart/cart2/cart2.js | 14 ++++++-------- pages/cart/cart/cart.js | 413 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------- pages/cart/cart/cart.wxml | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- pages/cart/cart/cart.wxss | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/cart/cart/g_filter.wxs | 10 +++++++++- pages/cart/cart/zh_calculate.js | 4 +++- pages/goods/goodsInfo/goodsInfo.js | 2 +- 7 files changed, 497 insertions(+), 167 deletions(-) diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index cbf9ff0..0249297 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -688,7 +688,7 @@ Page({ var sort_type=''; if(!auto_promote_sale){ - sort_type='prom_id'; + sort_type='prom_type'; }else{ var auto_promote_sale=auto_promote_sale.split(','); //-- 循环处理 -- @@ -700,12 +700,12 @@ Page({ } //-- 排序一下,进行升序 -- - function comp(a, b,sort_type) { + function comp(a, b) { return a[sort_type]-b[sort_type]; //升序 } //使用sort排序 - prom_list.sort(comp); + prom_list.sort(comp(sort_type)); }, //-----真的获取购物车,入口-------- @@ -1811,11 +1811,11 @@ Page({ "user_id": user_id, } - await getApp().request.promiseGet(url, {data: req_d}).then(res => { + await getApp().request.promiseGet(url, {data: req_d}).then(e => { if (e.data.code == 0 && e.data.data && e.data.data.length > 0) { var arr = e.data.data; if (arr.length) { - arr3 = arr.filter(function (e) { + var arr3 = arr.filter(function (e) { return e.s_time < ut.gettimestamp() && e.prom_type == 7; }) if (arr3 && arr3.length) { @@ -1923,7 +1923,7 @@ Page({ } //调用接口判断优惠， - var m_res=await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gd.goods_id + "/0" + "/" + user_id, {}); + var m_res=await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + item1.goods_id + "/0" + "/" + user_id, {}); if(m_res && m_res.data.code == 0 && m_res.data.data){ var r_data = res.data.data; @@ -7230,7 +7230,6 @@ Page({ if (cart_commission) { th.setData({ cart_commission }); } - th.data.old_cartlist = cart_arr; }, @@ -7245,5 +7244,4 @@ Page({ return false; } - }); diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 014359a..48932cb 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -57,6 +57,7 @@ Page({ async buy_pro_group(item1, is_state) { //-- 代发商品不参与任何活动 -- if(item1.whsle_id) return false; + var th=this; var url = '/api/weshop/activitylist/listGoodActInfo2New'; var user_id = getApp().globalData.user_id; var zh_id = 0; @@ -69,11 +70,11 @@ Page({ "user_id": user_id, } - await getApp().request.promiseGet(url, {data: req_d}).then(res => { + await getApp().request.promiseGet(url, {data: req_d}).then(e => { if (e.data.code == 0 && e.data.data && e.data.data.length > 0) { var arr = e.data.data; if (arr.length) { - arr3 = arr.filter(function (e) { + var arr3 = arr.filter(function (e) { return e.s_time < ut.gettimestamp() && e.prom_type == 7; }) if (arr3 && arr3.length) { @@ -127,6 +128,10 @@ Page({ //-- 如果满足条件，才会显示活动 -- if (is_zh_ok) { + + //-- 组合的数组填充一下 -- + th.data.zuhe_map[zh_pro0.id] = zh_pro0; + var url1 = "/api/weshop/prom/zhbuyGoods/page"; var req_data = { page: 1, pageSize: 2000, @@ -143,7 +148,7 @@ Page({ }) var zh_gd_fd = gdlist.find(function (e) { - return e.goods_id == item.goods_id; + return e.goods_id == item1.goods_id; }) if (is_zh_ok) { @@ -181,7 +186,7 @@ Page({ if (is_state == 1) { //-- 看有没有必买商品不满足的时候 -- var f_gd = gdlist.find(function (e) { - return e.zhqty > 0 && e.goods_id != item.goods_id; + return e.zhqty > 0 && e.goods_id != item1.goods_id; }) if (f_gd) { is_zh_ok = 0; @@ -202,10 +207,10 @@ Page({ } //调用接口判断优惠， - var m_res=await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gd.goods_id + "/0" + "/" + user_id, {}); + var m_res=await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + item1.goods_id + "/0" + "/" + user_id, {}); if(m_res && m_res.data.code == 0 && m_res.data.data){ - var r_data = res.data.data; + var r_data = m_res.data.data; //-- 如果是搭配购的时候 -- if (r_data.collocationList) { if(!item1.more_cx) item1.more_cx=[]; @@ -217,10 +222,28 @@ Page({ //-- 判断会员能不能参与阶梯促销 -- await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => { if (res.data.code == 0 && res.data.data) { + th.data.ladder_map[act_id] = res.data.data; if(!item1.more_cx) item1.more_cx=[]; item1.more_cx.push({prom_type:10,prom_id: act_id}); } }) + + if(th.data.ladder_map[act_id]){ + //-- 获取阶梯规则 -- + var url1 = "/api/weshop/prom/ladderList/list"; + var req_data0 = { + store_id: os.stoid, + form_id: act_id, + } + await getApp().request.promiseGet(url1, { + data: req_data0 + }).then(rs1 => { + if (rs1.data.code == 0 && rs1.data.data) { + var gdlist = rs1.data.data; + th.data.ladder_map[act_id].ladder_list = gdlist; + } + }) + } } //-- 优惠促销的时候 -- 此时要注意活动的限购次数，以及活动的购买金额或者购买数量有没有满足 if (r_data.promGoodsLists) { @@ -246,7 +269,7 @@ Page({ } }else{ //-- 按数量进行计算 -- - var all_price = item.goods_price * item1.goods_num; + var all_price = item1.goods_price * item1.goods_num; if (parseFloat(fir_act.condition) > parseFloat(parseFloat(all_price).toFixed(2))) { item1.more_cx.push(push_item); } @@ -260,7 +283,6 @@ Page({ } } - }, onLoad: function () { @@ -306,6 +328,7 @@ Page({ var is_open_offline = json_d.is_pricing_open; th.setData({ bconfig: e, + json_d:json_d, freight_free: e.freight_free, weight_free: e.weight_free, sales_rules: e.sales_rules, @@ -639,6 +662,9 @@ Page({ var th = this; th.data.in_zhact_gdmap = {}; th.data.ladder_map = {}; + th.data.zuhe_map={}; + th.data.zuhe_map_good={}; + var rd = Math.random().toString(36).substr(2, 15); var user_id = getApp().globalData.user_id; @@ -1999,9 +2025,6 @@ Page({ all_num = 0; - th.data.zuhe_map={}; - th.data.zuhe_map_good={}; - //-- 购物车 -- if (car && car.length > 0) { th.data.in_zhact_gdmap = {}; @@ -2009,95 +2032,109 @@ Page({ var item = car[a].goods, is_s_sele = 1; //-- 先批量判断一下活动的类型，同时要同步跟新 -- - await th.cart_cx_group(item,a); - - var offline_price = 0; - var offline_num = 0; - for (var c = 0; c < item.length; c++) { - if (item[c].is_gift) continue; - all_num += item[c].goods_num; - - //不管怎么样都要移出去 - var obj = JSON.parse(JSON.stringify(item[c])); - zh_calc.remove_zhprom(car, a, obj); - ladder_calc.remove_ladder_prom(car, a, obj); - - if (item[c].selected == 0) { - ischeck = 0; - is_s_sele = 0; - if (item[c].prom_type == 7) { - obj.goods_num = 0; - zh_calc.add_zhprom(car, a, obj); + await th.cart_cx_group(item,car[a],(show_can_cx)=>{ + var offline_price = 0; + var offline_num = 0; + for (var c = 0; c < item.length; c++) { + if (item[c].is_gift) continue; + all_num += item[c].goods_num; + + if(item[c].prom_type==7){ + item[c].act=th.data.zuhe_map[item[c].prom_id]; } - if (item[c].prom_type == 10) { - obj.goods_num = 0; - ladder_calc.add_ladder_prom(car, a, obj); + if(item[c].prom_type==10){ + item[c].act=th.data.ladder_map[item[c].prom_id]; } + //不管怎么样都要移出去 + var obj = JSON.parse(JSON.stringify(item[c])); + zh_calc.remove_zhprom(car, a, obj); + ladder_calc.remove_ladder_prom(car, a, obj); + + if (item[c].selected == 0) { + ischeck = 0; + is_s_sele = 0; + if (item[c].prom_type == 7) { + obj.goods_num = 0; + zh_calc.add_zhprom(car, a, obj); + } + if (item[c].prom_type == 10) { + obj.goods_num = 0; + ladder_calc.add_ladder_prom(car, a, obj); + } - } else { - if (item[c].prom_type == 7) { - //先把商品放入组合计算的专用的区域 - console.log('是组合商品---') - console.log(car); - console.log(a) - console.log(obj) - console.log('......................') - zh_calc.add_zhprom(car, a, obj); - } else if (item[c].prom_type == 10) { - ladder_calc.add_ladder_prom(car, a, obj); - } - else { - tfeel += item[c].goods_num * item[c].goods_price; + + } else { + if (item[c].prom_type == 7) { + //先把商品放入组合计算的专用的区域 + console.log('是组合商品---') + console.log(car); + console.log(a) + console.log(obj) + console.log('......................') + zh_calc.add_zhprom(car, a, obj); + } else if (item[c].prom_type == 10) { + ladder_calc.add_ladder_prom(car, a, obj); + } + else { + tfeel += item[c].goods_num * item[c].goods_price; + } + t_num += item[c].goods_num; } - t_num += item[c].goods_num; - } - //-- 如果这个商品是线下取价的时候 -- - if (item[c].is_offline && item[c].prom_type != 7) { - offline_price += (item[c].goods_price - item[c].offline_price) * item[c].goods_num; - offline_num += item[c].goods_num; + //-- 如果这个商品是线下取价的时候 -- + if (item[c].is_offline && item[c].prom_type != 7) { + offline_price += (item[c].goods_price - item[c].offline_price) * item[c].goods_num; + offline_num += item[c].goods_num; + } } - } - //总的价格,把组合商品的价格拿出来 - var zh_calc_res = zh_calc.calculate_zh(car, a, th); - console.log('.组合价-----------') - console.log(zh_calc_res) - //总的价格,把阶梯促销商品的价格拿出来 - var ladder_calc_res = ladder_calc.calculate_ladder(car, a, th); + //总的价格,把组合商品的价格拿出来 + var zh_calc_res = zh_calc.calculate_zh(car, a, th); + console.log('.组合价-----------') + console.log(zh_calc_res) + //总的价格,把阶梯促销商品的价格拿出来 + var ladder_calc_res = ladder_calc.calculate_ladder(car, a, th); - tfeel += zh_calc_res.tfeel; - offline_price += zh_calc_res.offline_price; - offline_num += zh_calc_res.offline_num; + tfeel += zh_calc_res.tfeel; + offline_price += zh_calc_res.offline_price; + offline_num += zh_calc_res.offline_num; - tfeel += ladder_calc_res.tfeel; - offline_price += ladder_calc_res.offline_price; - offline_num += ladder_calc_res.offline_num; + tfeel += ladder_calc_res.tfeel; + offline_price += ladder_calc_res.offline_price; + offline_num += ladder_calc_res.offline_num; - var txt = "requestData[" + a + "].selected"; - th.setData({ - [txt]: Number(is_s_sele) - }); + var txt = "requestData[" + a + "].selected"; + th.setData({ + [txt]: Number(is_s_sele) + }); - //当有线下取价的时候 - if (offline_price) { - var txt1 = "requestData[" + a + "].offline_price"; - var txt2 = "requestData[" + a + "].offline_num"; + var txt1 = "requestData[" + a + "].show_can_cx"; th.setData({ - [txt1]: offline_price.toFixed(2), - [txt2]: offline_num, + [txt1]: show_can_cx }); - } else { - if (car[a].offline_price > 0) { + + //当有线下取价的时候 + if (offline_price) { var txt1 = "requestData[" + a + "].offline_price"; var txt2 = "requestData[" + a + "].offline_num"; th.setData({ - [txt1]: 0, - [txt2]: 0 + [txt1]: offline_price.toFixed(2), + [txt2]: offline_num, }); + } else { + if (car[a].offline_price > 0) { + var txt1 = "requestData[" + a + "].offline_price"; + var txt2 = "requestData[" + a + "].offline_num"; + th.setData({ + [txt1]: 0, + [txt2]: 0 + }); + } } - } + }); + + } } @@ -2126,6 +2163,9 @@ Page({ th.setData({ [txt]: Number(is_s_sele) }); + + + } } @@ -4297,16 +4337,76 @@ Page({ }, //-- 判读一下促销分组的问题 -- - async cart_cx_group(goods,index){ + async cart_cx_group(goods,car_item,func){ + + if(car_item.change_act){ + + car_item.change_act=0; + var show_can_cx=car_item.show_can_cx; + + for(var k in show_can_cx){ + var k_item=show_can_cx[k]; + var ck_prom_type=null; + //-- 如果是多活动，先把活动按照后台的顺序排序一下， + //-- 同时确定一下商品最终要用什么活动来购买计算。 --就是要进行切换 -- + if(k_item.act_arr.length>1){ + var json_d =this.data.json_d; + var auto_promote_sale=json_d.auto_promote_sale; + var sort_type=''; + + if(!auto_promote_sale){ + sort_type='prom_type'; + }else{ + var auto_promote_sale=auto_promote_sale.split(','); + //-- 循环处理 -- + k_item.act_arr.map(function (e){ + var fd=auto_promote_sale.indexOf(e.prom_type+''); + e.sort=fd; + }) + sort_type='sort'; + } + //-- 排序一下,进行升序 -- + function comp(a, b) { + return a[sort_type]-b[sort_type]; //升序 + } + //活动要排序一下 + k_item.act_arr.sort(comp); + + //确定一下活动,先看一下有没有选择的活动 + ck_prom_type=k_item.act_arr.find(function (el){ + return el.sele; + }) + + } + //-- 此时已经确定了商品的活动是什么类型的，可以确定购物车中商品的具体活动进行金额的计算 -- + if(!ck_prom_type) ck_prom_type=k_item.act_arr[0]; + + //-- 此时要把购物车中的商品确定活动 -- + for (var b=0; b-1; + }) + if(fg>-1){ + goods[fg].prom_type=ck_prom_type.prom_type; + goods[fg].prom_id=ck_prom_type.prom_id; + } + } + + } + + func(show_can_cx); + } + var th=this; - //-- 促销活动对象表 --- + //-- 促销活动对象表,最初的map表，包含活动类型，活动id，goods商品 --- var cx_act_map=[]; for(var i=0; i-1) continue; //-- 把活动进行规整 -- var more_cx=c_item.more_cx; @@ -4319,7 +4419,7 @@ Page({ if(fd){ fd.goods.push(c_item); }else{ - var p_item={key:key,prom_type:c_item.prom_type,prom_id:c_item.prom_id,goods:[],act:n_item}; + var p_item={key:key,prom_type:n_item.prom_type,prom_id:n_item.prom_id,goods:[],act:n_item}; p_item.goods.push(c_item); cx_act_map.push(p_item); } @@ -4327,16 +4427,13 @@ Page({ goods[i].prom_type=0; goods[i].prom_id=0; } - //-- 如果活动数量大于1个，那么活动就要排序一下，有商品种类数最多排再前面，降序进行排列 -- if(cx_act_map.length>1){ //门店分类要排序下 - function compare() { - return function (a, b) { + function compare(a, b) { var value1 = a.goods.length; var value2 = b.goods.length; return value2 - value1; - } } cx_act_map.sort(compare); } @@ -4347,8 +4444,8 @@ Page({ var item_act_map=cx_act_map[ii]; //如果活动有交集的时候，商品数量一样多（不是完全相同时，就是参与的商品有交集），就按照后台确定的活动顺序 - //如果活动的商品一样（那就是多活动切换），优先计算的活动按照后台确定的活动顺序 //如果活动商品数量少的和 活动数量多的 有交集，那么数量少的不显示，也不计算 + //如果活动的商品一样（那就是多活动切换），优先计算的活动按照后台确定的活动顺序 if(!th.check_ok_cx_pro(item_act_map,can_calc_cx)){ continue; } @@ -4363,6 +4460,24 @@ Page({ all_pri+=t_goods[f].goods_num*t_goods[f].goods_price; } + var yh_ok=1; + switch (fir_act.prom_type){ + case 0: + if(all_pri { zh_pro0 = rh.data.data; }) @@ -4409,13 +4525,116 @@ Page({ } + //-- 此时来给满足条件的活动进行分组~~相同参与商品和数量的归纳再一起， -- + //-- 同时相同商品数量的活动，还要看取那一个来进行计算金额。 默认的时候是按照后台的顺序。-- + //-- 有选择的时候，就按照切换选择了什么就按照什么来计算 -- + var show_can_cx={}; if(can_calc_cx.length){ - + for(var p=0;p1){ + var json_d =this.data.json_d; + var auto_promote_sale=json_d.auto_promote_sale; + var sort_type=''; + + if(!auto_promote_sale){ + sort_type='prom_type'; + }else{ + var auto_promote_sale=auto_promote_sale.split(','); + //-- 循环处理 -- + k_item.act_arr.map(function (e){ + var fd=auto_promote_sale.indexOf(e.prom_type+''); + e.sort=fd; + }) + sort_type='sort'; + } + //-- 排序一下,进行升序 -- + function comp(a, b) { + return a[sort_type]-b[sort_type]; //升序 + } + //活动要排序一下 + k_item.act_arr.sort(comp); + + //确定一下活动,先看一下有没有选择的活动 + ck_prom_type=k_item.act_arr.find(function (el){ + return el.sele; + }) + + } + //-- 此时已经确定了商品的活动是什么类型的，可以确定购物车中商品的具体活动进行金额的计算 -- + if(!ck_prom_type) ck_prom_type=k_item.act_arr[0]; + + //-- 此时要把购物车中的商品确定活动 -- + for (var b=0; b-1; + }) + if(fg>-1){ + goods[fg].prom_type=ck_prom_type.prom_type; + goods[fg].prom_id=ck_prom_type.prom_id; + } + } + } + //-- 显示到前端，并切换 -- + //th.setData({show_can_cx}) + //--- 调用回调函数 --- + func(show_can_cx); + }, + //-- 查看活动参与的商品是不是有重复交集的地方，是不是一样的商品数量，can_calc_cx这个数组也是按照商品的数量降序排列的-- + check_ok_cx_pro(item_act_map,can_calc_cx){ + //-- 加入第一个，返回真 -- + if(!can_calc_cx.length) return true; + var th_goods=item_act_map.goods; + for(var i=0;ith_goods.length){ + return false; + } + } + return true; + }, + //-- 判断是不是有交集,返回交集的数量 -- + hasJiao(arr1, arr2){ + var num=0; + arr1.map(function (e){ + var idx=arr2.findIndex(function (g){ + return g.goods_id==e.goods_id; + }) + if(idx>-1) num++; + }) + return num; + } }); \ No newline at end of file diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index 60e8fab..e917be3 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -38,7 +38,7 @@ - + @@ -53,75 +53,101 @@ - - - - - - - - - - - - - 赠品 - - - 自选 - 自提 - 物流 - - - - - - 还需购买{{items.zhqty-items.goods_num}}件 - - - 需购买{{items.zhqty}}件 + + + + + + + + - + + + + + 赠品 + + + 自选 + 自提 + 物流 + - - - - {{items.goods_name}} + + + + 还需购买{{items.zhqty-items.goods_num}}件 + + + 需购买{{items.zhqty}}件 + + - - - {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}} - 规格1 - - - {{items.goods_num}}件 - - 组合限购{{items.buyqty}}件 - + + + + {{items.goods_name}} - - - - ￥ - {{items.goods_price}} + + + {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}} + 规格1 + + + {{items.goods_num}}件 + + 组合限购{{items.buyqty}}件 + - 券后 ￥{{g_filter.toFix(items.offline_price,2)}} + + + + ￥ + {{items.goods_price}} - - - 一 - - + - + 券后 ￥{{g_filter.toFix(items.offline_price,2)}} + + + + + 一 + + + + + + + - - - + + + + + + 促销 + + + 优惠促销 + 搭配促销 + 组合购 + 阶梯促销 + + + + + + + + + + + diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss index 699321e..c06eba5 100644 --- a/pages/cart/cart/cart.wxss +++ b/pages/cart/cart/cart.wxss @@ -399,3 +399,80 @@ page { text-align: center; line-height: 30rpx; left: 0;bottom: 0;color: #fff; font-size: 20rpx; } + + +.cx-frame { + /* border-top:3rpx solid #eee; */ + /* width:99%; + height: 95rpx; + line-height: 95rpx; + padding-left:24rpx; */ + padding: 20rpx; +} + +.cx-frame .cx-sizs { + /* width: 68rpx; */ + /* height: 100%; */ + /* line-height: 100rpx; */ + /* overflow: hidden; */ + /* margin-left: 10rpx; */ +} + +.xc-coupon-fram { + position: relative; + margin-right: 16rpx; + /* width:200rpx; */ + /* padding-top:30rpx; */ + +} + +.xc-coupon-fram .xc-coupon { + /* width:175rpx ; + height: 40rpx; + line-height: 40rpx; */ + background-color: #d60021; + /* margin:0 auto; */ + color: #fff; + padding: 6rpx 20rpx; + +} + +.xc-coupon-fram .xc-circular { + width: 16rpx; + height: 16rpx; + background-color: white; + position: absolute; + top: 50%; + /* left: -10rpx; */ + transform: translateY(-50%); +} + +.cx-obtain-coupon { + /* width: 65rpx; + height: 100%; + padding-left:15rpx; */ + color: #d70025; + display: flex; + align-items: center; + /* position: absolute; + right: 5rpx; */ +} + +.bg_jj { + width: 14rpx; + height: 14rpx; + border-top: 2rpx solid #d70026; + border-right: 2rpx solid #d70026; + transform: rotateZ(45deg); + display: inline-block; + margin-bottom: 3rpx; +} + +.bg_jj.down { + transform: rotateZ(135deg); +} + +.bg_jj.up { + transform: rotateZ(-45deg); + margin-top: 6rpx; +} diff --git a/pages/cart/cart/g_filter.wxs b/pages/cart/cart/g_filter.wxs index e0426fe..3930850 100644 --- a/pages/cart/cart/g_filter.wxs +++ b/pages/cart/cart/g_filter.wxs @@ -28,11 +28,19 @@ var g_filters = { } val = parseFloat(val); return val.toFixed(count) - } + }, + + //判断商品是不是有活动切换 + is_more_act:function (items,show_can_cx){ + if([1,2,4,6,8,9].indexOf(items.prom_type)>-1) return false; + if(!show_can_cx) return false; + return true; + } } module.exports = { has_char: g_filters.has_char, beg_time: g_filters.beg_time, end_time: g_filters.end_time, toFix: g_filters.toFix, + is_more_act: g_filters.is_more_act, } \ No newline at end of file diff --git a/pages/cart/cart/zh_calculate.js b/pages/cart/cart/zh_calculate.js index a34f38b..54813a8 100644 --- a/pages/cart/cart/zh_calculate.js +++ b/pages/cart/cart/zh_calculate.js @@ -534,10 +534,12 @@ module.exports = { return 0; } var goods =gdlist; + var all_num=0; + var need_to_buy=0; for (var i in goods) { var item = goods[i]; var cart_num = get_num(item).goods_num; - var zh_b_num = get_num2(item).zh_b_num; + var zh_b_num = get_num(item).zh_b_num; if (!cart_num) { if (item.zhqty) { need_to_buy += item.zhqty; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index d5a7e5a..f294d6e 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -3026,7 +3026,7 @@ Page({ this.sele_spec_chech_activity(nor); //如果是秒杀，拼团等互动，就不重新算界面 - if([1,2,4,6,8,9].indexOf(this.data.base_nor_prom_type)>0){ return false; } + if([1,2,4,6,8,9].indexOf(this.data.base_nor_prom_type)>-1){ return false; } this.check_has_flash(gid); var url = '/api/weshop/activitylist/listGoodActInfo2New'; -- libgit2 0.21.4