diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 04cb149..4edd122 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -75,6 +75,7 @@ Page({ card_name: '', //显示的卡的名称 card_cut_price: null, //减价多少钱 is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 + act:null, //幸运购的活动 }, onLoad: function (t) { @@ -95,11 +96,11 @@ Page({ // 获取幸运购活动团team_id - this.get_teamId({ - store_id: oo.stoid, - user_id: getApp().globalData.user_id, - aid: t.group_id, - }); + // this.get_teamId({ + // store_id: oo.stoid, + // user_id: getApp().globalData.user_id, + // aid: t.group_id, + // }); @@ -335,7 +336,19 @@ Page({ userinfo: e.data.data }); //获取立即购买的商品信息 - th.get_buy_goods(); + + + var op_data={ + store_id: oo.stoid, + user_id: getApp().globalData.user_id, + aid: th.data.param.group_id, + }; + + th.get_teamId(op_data,function (){ + th.get_buy_goods(); + }) + + //获取提现金额 getApp().request.get("/api/weshop/withdrawals/summoney", { @@ -715,7 +728,10 @@ Page({ good = this.data.bn_goods; //-----------计算商品总价-------------- - var allpice = th.data.param.goods_price; + //var allpice = th.data.param.goods_price; + var allpice = (th.data.act.group_price/100).toFixed(2); + + allpice = parseFloat(allpice).toFixed(2); var txt = "formData.all_price"; th.setData({ @@ -735,6 +751,22 @@ Page({ goods_piece = -1; var out_of_weight = null; //超出多少重量 + + //-- 判断订单优惠的叠加 -- + var ord_prom=null; + var o_condition=allpice; + if(th.data.act.is_order_yh){ + + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { + data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id } + }).then(res => { + if (res.data.code == 0) { + ord_prom = res.data.data; + } + }) + } + + //-----------当地址不为空，且是物流时，计算物流费用,同时阶梯团不计算拼团价格---------- if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { @@ -744,12 +776,18 @@ Page({ province: user_addr.province, city: user_addr.city, district: user_addr.district, wuliu: parseFloat(allpice).toFixed(2), store_id: os.stoid } + + //-- 判断包邮 -- var back_data = null; - await getApp().request.promisePost("/api/weshop/order/areaFreight", { - is_json: 1, data: req_d - }).then(rs => { - if (rs.data.code == 0) back_data = rs.data.data; - }); + if(!ord_prom || ord_prom.is_post_temp) { + if (th.data.act.is_post_temp ) { + await getApp().request.promisePost("/api/weshop/order/areaFreight", { + is_json: 1, data: req_d + }).then(rs => { + if (rs.data.code == 0) back_data = rs.data.data; + }); + } + } var gd_arr_list = []; gd_arr_list.push(good); @@ -893,11 +931,43 @@ Page({ if (!is_next) return false } + //-- 如果是订单优惠的时候,allpice要拿来减掉一些 -- + var order_prom_id=0; + var order_prom_amount=0; + if(ord_prom){ + order_prom_id = ord_prom['id']; + switch (ord_prom['type']) { + case 0: + allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 + order_prom_amount = (o_condition - allpice).toFixed(2); + break; + case 1: + //-- 如果有优惠促销倍减的时候 -- + var bs = 1; + if (ord_prom.is_bz) { + bs = Math.floor(o_condition / ord_prom.money); + } + allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额 + order_prom_amount = ord_prom['expression']; + break; + } + } + + //--订单优惠的显示-- + var order_prom_txt1 = "formData.order_prom_id"; + var order_prom_txt2 = "formData.order_prom_amount"; + if (order_prom_amount > 0) { + 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 }) + } + + //-----------------总价----------------- // 幸运购 01 - // var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price); - var total_m = parseFloat(th.data.param.goods_price) + parseFloat(th.data.formData.shipping_price); + var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price); + //var total_m = parseFloat(th.data.param.goods_price) + parseFloat(th.data.formData.shipping_price); total_m = parseFloat(total_m).toFixed(2); var atxt = "formData.total_amount"; @@ -1151,6 +1221,15 @@ Page({ 'order_goods': new Array(), }; + //--判断有没有优惠活动-- + if (th.data.formData.order_prom_amount > 0) { + var order_prom_list = {}; + order_prom_list.order_prom_id = th.data.formData.order_prom_id; + order_prom_list.order_prom_amount = th.data.formData.order_prom_amount; + item.order_prom_list = order_prom_list; + } + + //如果不是阶梯团，或者是普通购买，01 // if ((th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { if (th.data.bn_goods.is_normal == 1) { @@ -1805,7 +1884,8 @@ Page({ // 获取team_id - get_teamId(options) { + get_teamId(options,func) { + var th=this; let aid = options.aid; let store_id = options.store_id; let user_id = options.user_id; @@ -1814,10 +1894,16 @@ Page({ success: function (res) { if (res.data.code == 0) { let team_id = res.data.data.pageData[0]['team_id']; + th.setData({ + act:res.data.data.pageData[0] + }) + wx.setStorage({ key: 'team_id', data: team_id, }); + + func(); }; } }); diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml index 010898a..11dc720 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -189,6 +189,13 @@ - ￥ {{formData.user_money}}元 + + + 订单优惠 + - ￥ {{filters.toFix(formData.order_prom_amount,2)}}元 + + +