From ba998f663062af8f941d8476ead047e3077de7cd Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Tue, 28 Dec 2021 09:03:09 +0800 Subject: [PATCH] OA单提交 --- pages/cart/cart/cart.js | 13 +++++++++---- pages/cart/cart2/cart2.js | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------- pages/cart/cart2/ladder_calculate.js | 1 + pages/user/order_detail/order_detail.js | 7 +++---- 4 files changed, 63 insertions(+), 25 deletions(-) diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 3573ece..53c46f6 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -2546,7 +2546,12 @@ Page({ [rq_text]: list }); } - return false; + + var rq_text2 = "requestData[" + cindex + "].make_up_arr"; + this.setData({ + [rq_text2]:null, + }) + } /*-- var map2=new Map(); @@ -2794,13 +2799,13 @@ Page({ var item=res.data.data[0]; switch (item.prom_type){ case 9: - good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id; + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.act_id; break; case 8: - good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id break; default: - good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1"; + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type=1"; break } } diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 400d31d..8614b31 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -2115,10 +2115,12 @@ Page({ } } //--订单优惠的显示-- + var order_prom_txt1 = "formData.order_prom_id"; + var order_prom_txt2 = "formData.order_prom_amount"; if (order_prom_id > 0) { - var order_prom_txt1 = "formData.order_prom_id"; - var order_prom_txt2 = "formData.order_prom_amount"; th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount}) + }else{ + th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0}) } total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); @@ -2742,7 +2744,6 @@ Page({ if (pdata.length == 0) return; var str = JSON.stringify(pdata); - wx.showLoading({title: "加载中"}); wx.request({ url: oo.url + '/api/weshop/order/createWxdOrder', @@ -3639,7 +3640,9 @@ Page({ //就要把相应的值，写入cartlist数组中-- var ckeck_quan_price = 0, check_quan_price_list = '', - check_quan_ware_list = ''; + check_quan_ware_list = '', + check_quan_price_list_arr=[], + check_quan_ware_list_arr=[]; for (var i in goodlist) { var gd = goodlist[i]; @@ -3678,25 +3681,44 @@ Page({ 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_price = gd.goods_price * gd.goods_num; + var item_price2=item_price; + //-- 如果有平摊下去，有实收价格的时候，就要用account来计算价格 -- if (gd.account_fir != null && gd.account_fir != undefined) { - //item_price = gd.account_fir * gd.goods_num; + item_price2 = gd.account_fir * gd.goods_num; } - ckeck_quan_price += item_price; - //--组装价格list-- - if (check_quan_price_list) { - check_quan_price_list += "," + item_price; - } else { - check_quan_price_list = item_price; + if(gd.ld_account){ + item_price2 = gd.ld_account * gd.goods_num; } - //--组装商品的线下erpwareid-- - if (check_quan_ware_list) { - check_quan_ware_list += "," + encodeURIComponent(gd['erpwareid']); - } else { - check_quan_ware_list = encodeURIComponent(gd['erpwareid']); + + ckeck_quan_price += item_price; + //如果商品有重复的过滤，一般是组合购和阶梯购的情况下 + var idx=check_quan_ware_list_arr.findIndex(function(ele){ + return ele== encodeURIComponent(gd['erpwareid']); + }) + + if(idx>-1){ + check_quan_price_list_arr[idx]+=item_price2; + }else{ + check_quan_ware_list_arr.push(encodeURIComponent(gd['erpwareid'])); + check_quan_price_list_arr.push(item_price2); } + //--组装价格list-- + /*-- + if (check_quan_price_list) { + check_quan_price_list += "," + item_price; + } else { + check_quan_price_list = item_price; + } + //--组装商品的线下erpwareid-- + if (check_quan_ware_list) { + check_quan_ware_list += "," + encodeURIComponent(gd['erpwareid']); + } else { + check_quan_ware_list = encodeURIComponent(gd['erpwareid']); + }---*/ } //优惠券优惠的金额要控制到优惠券的选择条件 @@ -3713,12 +3735,23 @@ Page({ if(prom_pt_json){ for(let oj in prom_pt_json){ let item_j=prom_pt_json[oj]; + + //要对一下阶梯优惠促销的功能 if(item_j.ladder_prom_id){ + + //看一下要不要限制使用优惠券 + if (th.data.ladder_map[item_j.ladder_prom_id] && th.data.ladder_map[item_j.ladder_prom_id].is_usecoupon){ + continue; + } + cut_price += parseFloat(item_j.dis); } } } + if(check_quan_price_list_arr.length) check_quan_price_list=check_quan_price_list_arr.join(','); + if(check_quan_ware_list_arr.length) check_quan_ware_list=check_quan_ware_list_arr.join(',') + 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; diff --git a/pages/cart/cart2/ladder_calculate.js b/pages/cart/cart2/ladder_calculate.js index 4c23827..e902b51 100644 --- a/pages/cart/cart2/ladder_calculate.js +++ b/pages/cart/cart2/ladder_calculate.js @@ -69,6 +69,7 @@ module.exports = { new_g.goods_num = 1; //如果有平摊到单品的时候，account要显示 if(!th.data.ispt_goods) new_g.account = account.toFixed(2); + new_g.ld_account = account.toFixed(2); new_g.discount = item_j.discount; new_g.goods_price =new_price; new_g.ladder_list_id =item_j.id; diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 12ec7c8..a8a3b1e 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1604,7 +1604,6 @@ Page({ //跳转到商品 go_gd:function (e) { - var user_id=getApp().globalData.user_id; if(!user_id) user_id=0; @@ -1621,13 +1620,13 @@ Page({ var item=res.data.data[0]; switch (item.prom_type){ case 9: - good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id; + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.act_id; break; case 8: - good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id break; default: - good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1"; + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type=1"; break } } -- libgit2 0.21.4