diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml index e8182f9..3c10909 100644 --- a/packageA/pages/jfbuy/jfbuy.wxml +++ b/packageA/pages/jfbuy/jfbuy.wxml @@ -52,7 +52,7 @@ 零售价：￥{{item.market_price}} - 销量：{{item.buy_num}} + 销量：{{item.buy_num+item.virtual}} diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 2b3e327..6ffa3a9 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -684,17 +684,19 @@ Page({ var o_condition1=0; if (th.data.order_prom[bn_pick]) { var ord_prom = th.data.order_prom[bn_pick]; - order_prom_id = ord_prom['id']; - switch (ord_prom['type']) { - case 0: - var all_1=o_condition; - o_condition1 = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折 - order_prom_amount = (all_1 - o_condition1).toFixed(2); - break; - case 1: - o_condition1 = ord_price - ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; + if(!ord_prom.is_xz_yh || quan_price<=0) { + order_prom_id = ord_prom['id']; + switch (ord_prom['type']) { + case 0: + var all_1 = o_condition; + o_condition1 = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折 + order_prom_amount = (all_1 - o_condition1).toFixed(2); + break; + case 1: + o_condition1 = ord_price - ord_prom['expression'];//满额优惠金额 + order_prom_amount = ord_prom['expression']; + break; + } } } //--订单优惠的显示-- @@ -2247,7 +2249,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ data:{store_id:os.stoid,goods_id:gg.goods_id} }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; } }) @@ -2342,7 +2344,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; } }) diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 0572787..075c2c2 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -774,16 +774,18 @@ Page({ var order_prom_id = 0; if (th.data.order_prom[th.data.bn_pick]) { var ord_prom = th.data.order_prom[th.data.bn_pick]; - order_prom_id = ord_prom['id']; - switch (ord_prom['type']) { - case 0: - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 - order_prom_amount = (o_condition - order_m).toFixed(2); - break; - case 1: - order_m = o_condition - ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; + if(!ord_prom.is_xz_yh || quan_price<=0) { + order_prom_id = ord_prom['id']; + switch (ord_prom['type']) { + case 0: + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 + order_prom_amount = (o_condition - order_m).toFixed(2); + break; + case 1: + order_m = o_condition - ord_prom['expression'];//满额优惠金额 + order_prom_amount = ord_prom['expression']; + break; + } } } //--订单优惠的显示-- diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index f06ec07..3e22280 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -525,7 +525,7 @@ Page({ } else { - item1.act = th.data.zhhe_act_map[item1.prom_id]; + item1.act = th.data.zhhe_act_map[item1.prom_id]; } } if(item1.prom_type==10){ @@ -561,7 +561,7 @@ Page({ } }) if (!isok){ - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id; getApp().request.delete(url, {}); th.data.ladder_map[item1.prom_id]=-1; continue; @@ -625,7 +625,9 @@ Page({ if (arr.length > 0) { for (var j = 0; j < arr.length; j++) { if (arr[j].pickup_id == pcid) { - //if(item.is_gift!=1){ + + //赠品的配送方式要和优惠的主商品一样 + if(item.is_gift!=1){ //确定配送方式 if (arr[j].distr_t == 0) { arr[j].distr_t = car_item.distr_type; @@ -646,7 +648,8 @@ Page({ arr[j].exp_type = e_t; if (e_t == 0) th.setData({is_all_zt: 0}); else if(e_t==1) th.setData({is_all_zt: 1}); - //} + } + //-- 把等级卡会优惠多少钱装进去 -- if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1; @@ -689,6 +692,7 @@ Page({ } //如果是物流的话，全部自提的控制要弄成0 if (e_t == 0) th.setData({is_all_zt: 0}); + else if (e_t == 1) th.setData({is_all_zt: 1}); var narr = new Array(); narr.push(car_item); @@ -1725,16 +1729,19 @@ Page({ }).then(res => { if (res.data.code == 0) { var ord_prom = res.data.data; - order_prom_id = ord_prom['id']; - switch (ord_prom['type']) { - case 0: - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 - order_prom_amount = (o_condition - order_m).toFixed(2); - break; - case 1: - //order_m = o_condition - ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; + //如果订单没有勾选使用优惠券不参与此活动，或者没有用优惠券 + if(!ord_prom.is_xz_yh || quan_price<=0) { + order_prom_id = ord_prom['id']; + switch (ord_prom['type']) { + case 0: + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 + order_prom_amount = (o_condition - order_m).toFixed(2); + break; + case 1: + //order_m = o_condition - ord_prom['expression'];//满额优惠金额 + order_prom_amount = ord_prom['expression']; + break; + } } } }) @@ -2080,16 +2087,20 @@ Page({ var order_prom_id = 0; if (th.data.order_prom[th.data.bn_pick]) { var ord_prom = th.data.order_prom[th.data.bn_pick]; - order_prom_id = ord_prom['id']; - switch (ord_prom['type']) { - case 0: - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 - order_prom_amount = (o_condition - order_m).toFixed(2); - break; - case 1: - order_m = o_condition - ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; + //如果订单没有勾选使用优惠券不参与此活动 + if(!ord_prom.is_xz_yh || quan_price<=0) { + + order_prom_id = ord_prom['id']; + switch (ord_prom['type']) { + case 0: + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 + order_prom_amount = (o_condition - order_m).toFixed(2); + break; + case 1: + order_m = o_condition - ord_prom['expression'];//满额优惠金额 + order_prom_amount = ord_prom['expression']; + break; + } } } //--订单优惠的显示-- @@ -2525,6 +2536,7 @@ Page({ if (t_item.coupon_price) { item.coupon_price = t_item.coupon_price; item.coupon_no = th.data.using_quan[t_item.pickup_id].coupon_no; + t_item.quan_no=item.coupon_no; } else if (t_item.quan_no) { item.coupon_no = t_item.quan_no; item.coupon_price = 0; @@ -2593,15 +2605,16 @@ Page({ //房间号的ids var room_ids = ""; + //-- 把券的钱，写入从表 --- + if (t_item.quan_youhui_list && t_item.coupon_price) { - //-- 把券的钱，写入从表 --- - if (t_item.quan_youhui_list && t_item.coupon_price) { for (var kk in t_item.quan_youhui_list) { var you_item = t_item.quan_youhui_list[kk]; //-- 对券的价格进行平摊 -- await th.split_set_goods_quanprice(you_item,t_item); } } + //-------------让商品添加到商品列表-------------------- for (var k = 0; k < t_item.goods.length; k++) { var g_item = t_item.goods[k]; @@ -2624,6 +2637,7 @@ Page({ goods.offline_cut = (g_item.goods_price - g_item.offline_price).toFixed(2); goods.pricing_type = g_item.pricing_type; } + if(g_item.quan_num){ goods.quan_num=g_item.quan_num; goods.quan_no=g_item.quan_no; @@ -2717,6 +2731,7 @@ Page({ if (pdata.length == 0) return; var str = JSON.stringify(pdata); + wx.showLoading({title: "加载中"}); wx.request({ url: oo.url + '/api/weshop/order/createWxdOrder', @@ -3654,7 +3669,7 @@ Page({ var item_price = gd.goods_price * gd.goods_num; //-- 如果有平摊下去，有实收价格的时候，就要用account来计算价格 -- if (gd.account_fir != null && gd.account_fir != undefined) { - item_price = gd.account_fir * gd.goods_num; + //item_price = gd.account_fir * gd.goods_num; } ckeck_quan_price += item_price; @@ -3671,15 +3686,17 @@ Page({ check_quan_ware_list = encodeURIComponent(gd['erpwareid']); } } + //优惠券优惠的金额要控制到优惠券的选择条件 var cut_price = 0; for (var i in th.data.prom_goods_map[pickup_id]) { var obj = th.data.prom_goods_map[pickup_id][i]; - if (obj.coupon_sele) { + if (obj.coupon_sele && obj.prom_price) { cut_price += obj.price - obj.prom_price; } } + //阶梯优惠使用券 var prom_pt_json= ep.prom_pt_json; if(prom_pt_json){ for(let oj in prom_pt_json){ @@ -3689,8 +3706,8 @@ Page({ } } } - - arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price; + + 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; @@ -3703,7 +3720,7 @@ Page({ data: { storeId: oo.stoid, userId: app.globalData.user_id, - BuySum: arr[ind].ckeck_quan_price, + BuySum: parseFloat(arr[ind].ckeck_quan_price?arr[ind].ckeck_quan_price:0).toFixed(2), WareIds: check_quan_ware_list, pageSize: 100 } @@ -3752,7 +3769,7 @@ Page({ data: { storeId: oo.stoid, userId: app.globalData.user_id, - BuySum: th.data.ckeck_quan_price, + BuySum: parseFloat(th.data.ckeck_quan_price?th.data.ckeck_quan_price:0).toFixed(2), WareIds: encodeURIComponent(th.data.check_quan_ware_list), pageSize: 100 }, @@ -4110,8 +4127,9 @@ Page({ getApp().goto(url); }, - //进行对商品的平摊g_item是单个商品，you_item是这个商品分多少优惠券的钱，goods是商品列表 - split_set_goods_quanprice:async function (you_item,t_item) { + //进行对商品的平摊g_item是单个商品，you_item是这个商品分多少优惠券的钱，goods是商品列表 + split_set_goods_quanprice:async function (you_item,t_item) { + var coupon_price=you_item.WareCashSum; var goods=t_item.goods; var arr=[];