diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index a3088b6..75d8729 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -706,56 +706,6 @@ Page({ cart_item.prom_pt_json=[{"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0}]; } - - //---如果是系统要平摊至单品的时候--- - if(!th.data.ispt_goods) { - //此处要对商品从表排序一下,按商品件数升序,商品单价降序 - function sort_fun(a, b) { - if (a["goods_num"] === b["goods_num"]) { - if (a["goods_price"] < b["goods_price"]) { - return 1; - } else if (a["goods_price"] > b["goods_price"]) { - return -1; - } else { - return 0; - } - } else { - if (a["goods_num"] > b["goods_num"]) { - return 1; - } else { - return -1; - } - } - } - - //进行排序 - item_map.goods.sort(sort_fun); - //这个位置就要开始平摊优惠到优惠活动的单品 - var account_all = 0; - var per = (item_map.price - item_map.prom_price) / item_map.price; //优惠单价 - - //比例太小的时候,就不进行平摊 - if (per < 0.001) { - item_map.goods[0].account_yu = item_map.price - item_map.prom_price; - } else { - per = Math.floor(1000 * per) / 1000; //保留3位小数 - for (var i in item_map.goods) { - var m_item = item_map.goods[i]; - var m_all_amount = m_item.goods_price * m_item.goods_num - m_item.goods_price * m_item.goods_num * per; - var account = Math.floor(100 * m_all_amount /m_item.goods_num) / 100; - if (account>=0) { - item_map.goods[i].account = account; - account_all += account * m_item.goods_num; //累加总实收 - } - } - //算出余数 - var yu = account_all - item_map.prom_price; - if (yu != 0) { - item_map.goods[0].account_yu = parseFloat(yu.toFixed(2)); - } - } - } - o_price-=(item_map.price-item_map.prom_price); //如果有限制使用优惠券,就要减掉参与的活动商品的钱 if(!item_map.is_xz_yh) q_conditin=o_price; @@ -1532,25 +1482,6 @@ Page({ goods.quan_no= item.coupon_no; } - - - //--- 如果有优惠促销的金额,要把金额先平摊下去 --- - if(th.data.formData.cut_price>0 && !th.data.ispt_goods){ - var per=th.data.formData.cut_price/(goods.goods_price*goods.goods_num) //优惠单价 - //比例太小不平摊 - if(per<0.001){ - goods.account_yu=th.data.formData.cut_price; - item.is_discount_amount=1; - }else{ - per=Math.floor(per*1000)/1000; - var all_amount=goods.goods_price*goods.goods_num-goods.goods_price*goods.goods_num*per; //商品总实收 - var account=Math.floor(all_amount/goods.goods_num*100)/100; //实收单价保留俩位小数 - var account_yu=account*goods.goods_num-(goods.goods_price*goods.goods_num-th.data.formData.cut_price); //算出余数 - goods.account=account; - goods.account_yu=parseFloat(account_yu.toFixed(2)); - item.is_discount_amount=1; - } - } item.order_goods.push(goods); //--如果有赠品的时候,赠品也要提交--- @@ -1673,13 +1604,7 @@ Page({ 'store_id': oo.stoid, }; - //把优惠的平摊结果写进去 - if(g_item.account>=0 || g_item.account_yu>0){ - if(g_item.account>=0) goods.account=g_item.account; - if(g_item.account_yu>=0) goods.account_yu=g_item.account_yu; - item.is_discount_amount=1; - } - + //--把券的钱,写入从表--- if(t_item.quan_youhui_list && t_item.coupon_price ){ for(var kk in t_item.quan_youhui_list ){ @@ -1759,7 +1684,7 @@ Page({ if (pdata.length==0) return; var str = JSON.stringify(pdata); - + wx.showLoading({title: "加载中"}); wx.request({ url: oo.url + '/api/weshop/order/createWxdOrder',