From 674924edb3372a347ae9b6b4bd03032458a069b2 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 12 Jan 2023 14:46:13 +0800 Subject: [PATCH] cart2 多活动的优化 --- packageE/pages/cart/cart2/cart2.js | 639 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 1 file changed, 205 insertions(+), 434 deletions(-) diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 78c7c87..ed25437 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1940,15 +1940,12 @@ Page({ //调用函数计算每件组合购商品的单价, await zh_calc.calc_zh_split_price(c_arr, th); - //调用函数计算每件阶梯促销商品的单价, await ladder_calc.calc_split_price(c_arr, th); //调用函数计算，优惠券优惠什么商品价格，优惠券优惠什么商品 - await th.get_cart_quan(c_arr); - //-- 经纬度不循环调用接口 -- var lon = 0; var lat = 0; //---循环购物车--- @@ -2105,6 +2102,17 @@ Page({ var back_data = null; var quan_no_goods_arr = null; + var ord_prom =null; + + //---判断是不是有订单优惠--- + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { + data: { store_id: os.stoid, orderAmount: parseFloat(o_price - quan_price - whsle_goods_price - no_order_yh).toFixed(2), user_id: getApp().globalData.user_id } + }).then(res => { + if (res.data.code == 0) { + ord_prom = res.data.data; + } + }) + //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额-- if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) { //看是不是有调用过包邮券 @@ -2150,16 +2158,21 @@ Page({ }) } - var user_addr = th.data.user_addr; - var req_d = { - province: user_addr.province, city: user_addr.city, district: user_addr.district, - wuliu: parseFloat(o_price - quan_price - whsle_goods_price - no_post_temp).toFixed(2), store_id: os.stoid + + //-- 如果没有订单优惠，或者订单优惠中有勾选包邮模板 -- + if(!ord_prom || ord_prom.is_post_temp) { + var user_addr = th.data.user_addr; + var req_d = { + province: user_addr.province, city: user_addr.city, district: user_addr.district, + wuliu: parseFloat(o_price - quan_price - whsle_goods_price - no_post_temp).toFixed(2), store_id: os.stoid + } + 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; + }); } - 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; - }); + } @@ -2336,32 +2349,27 @@ Page({ } var order_m = 0; - //---判断是不是有订单优惠--- - 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) { - var ord_prom = res.data.data; - //么有使用券，或者活动没有限制使用优惠券 - if (quan_price <= 0 || !ord_prom.is_xz_yh) { - 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'];//满额优惠金额 - var bs = 1; - if (ord_prom.is_bz) { - bs = Math.floor(o_condition / ord_prom.money); - } - order_prom_amount = ord_prom['expression']; - break; + + //么有使用券，或者活动没有限制使用优惠券 + if (quan_price <= 0 || !ord_prom.is_xz_yh) { + 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'];//满额优惠金额 + var bs = 1; + if (ord_prom.is_bz) { + bs = Math.floor(o_condition / ord_prom.money); } - } + order_prom_amount = ord_prom['expression']; + break; } - }) + } + + cart_item.order_prom_amount = 0; //--订单优惠的显示-- @@ -2642,7 +2650,6 @@ Page({ } }, - //---------计算立即购买---------- calculatePrice2: async function (qfunc) { var th = this, good = this.data.bn_goods; @@ -2721,11 +2728,30 @@ Page({ gd_arr_list = [...gd_arr_list, ...th.data.buy_now_gift_goods]; } + //-- 把订单优惠的判断提前，bn_is_order_yh是确定要不要订单优惠的控制 -- + var condition = parseFloat(parseFloat(allpice) - cut_price - quan_price).toFixed(2); + var ord_prom = null; + var is_ord_prom_post = 0; + + if(condition>0 && th.data.bn_is_order_yh) { + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { + data: {store_id: os.stoid, orderAmount: condition, user_id: getApp().globalData.user_id} + }).then(res => { + if (res.data.code == 0) { + var data = res.data.data; + ord_prom = data; + } + }) + if (ord_prom && ord_prom.is_post_temp) { + is_ord_prom_post = 1; + } + } + //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1) { //看是不是有调用过包邮券 if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) { - var condition = allpice - cut_price - quan_price; + //--判断要不要显示包邮券,链式调用接口，调取包邮券，已经是减了优惠的金额，见到优惠券的钱--- getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", { data: { @@ -2782,8 +2808,9 @@ Page({ } var back_data = null; - //判断是不是包邮模板 - if (th.data.bn_is_post_temp) { + //判断是不是包邮模板,bn_is_post_temp 和 订单优惠的包邮模板一起控制 + if(th.data.bn_is_post_temp && (!ord_prom || is_ord_prom_post)){ + await getApp().request.promisePost("/api/weshop/order/areaFreight", { is_json: 1, data: req_d }).then(rs => { @@ -2936,46 +2963,38 @@ Page({ o_condition = 0; } - - - - - if (o_condition > 0 && th.data.bn_is_order_yh) { - - th.check_is_order_prom(o_condition, async function () { - var order_prom_amount = 0; - var order_prom_id = 0; - if (th.data.order_prom[th.data.bn_pick] && th.data.order_prom[th.data.bn_pick]['money'] <= o_condition) { - var ord_prom = th.data.order_prom[th.data.bn_pick]; - //么有使用券，或者活动没有限制使用优惠券 - if (coupon_price <= 0 || !ord_prom.is_xz_yh) { - 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: - //-- 如果有优惠促销倍减的时候 -- - var bs = 1; - if (ord_prom.is_bz) { - bs = Math.floor(o_condition / ord_prom.money); - } - - order_m = o_condition - bs * ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; + var order_prom_amount = 0; + var order_prom_id = 0; + if (ord_prom) { + //么有使用券，或者活动没有限制使用优惠券 + if (coupon_price <= 0 || !ord_prom.is_xz_yh) { + 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: + //-- 如果有优惠促销倍减的时候 -- + var bs = 1; + if (ord_prom.is_bz) { + bs = Math.floor(o_condition / ord_prom.money); } - } - } - //--订单优惠的显示-- - var order_prom_txt1 = "formData.order_prom_id"; - var order_prom_txt2 = "formData.order_prom_amount"; - if (order_prom_id > 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 }) + + order_m = 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_id > 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 }) + } //预存金额使用参与计算 if (th.data.udata && th.data.udata.Balance > 0 && order_m * 1 > 0) { @@ -3014,7 +3033,7 @@ Page({ keyid: th.data.bn_goods.keyid } }) - + if (!good.yck_off) { good.yck_off = cart_yc.yck_off } @@ -3077,394 +3096,145 @@ Page({ } - //判断是否同城配送,而且没有调用过 - if (th.data.bn_exp_type == 2 && th.data.user_addr) { - var gd_w = 0, lon = 0, lat = 0; - for (let ib in gd_arr_list) { - let item_b = gd_arr_list[ib]; - gd_w += item_b['weight'] * item_b['buynum']; - } - - //-- 获取距离 -- - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } - }).then(res => { - if (res.data.code == 0) { - var data = JSON.parse(res.data.data); - if (data.status == 0) { - lon = data.result.location.lng; - lat = data.result.location.lat; - } - } - }) + //判断是否同城配送,而且没有调用过 + if (th.data.bn_exp_type == 2 && th.data.user_addr) { + var gd_w = 0, lon = 0, lat = 0; + for (let ib in gd_arr_list) { + let item_b = gd_arr_list[ib]; + gd_w += item_b['weight'] * item_b['buynum']; + } - var req_data = { - store_id: os.stoid, order_amount: parseFloat(order_m), - lon: lon, lat: lat, pickup_id: bn_pick, goods_weight: gd_w + //-- 获取距离 -- + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } + }).then(res => { + if (res.data.code == 0) { + var data = JSON.parse(res.data.data); + if (data.status == 0) { + lon = data.result.location.lng; + lat = data.result.location.lat; } - - var is_next = 1; - - //获取同城配送参数 - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { - is_json: 1, data: req_data - }).then(res => { - if (res.data.code == 0) { - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: res.data.data, }) - - } else { - is_next = 0; - if (qfunc) { - qfunc(); - } else { - wx.showToast({ - title: res.data.msg, - icon: 'none', - duration: 2000 - }) - } - - } - }) - if (!is_next) return false } + }) + var req_data = { + store_id: os.stoid, order_amount: parseFloat(order_m), + lon: lon, lat: lat, pickup_id: bn_pick, goods_weight: gd_w + } - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); - - total_m = total_m.toFixed(2); - order_m = order_m.toFixed(2); - - var atxt = "formData.total_amount"; - th.setData({ [atxt]: total_m, }) - - var txt = "formData.user_money"; - var txt2 = "formData.order_amount"; - var txt3 = "formData.coupon_price"; + var is_next = 1; - //-- 最后的金额小于佣金 -- - if (parseFloat(order_m) < parseFloat(th.data.bn_goods.use_commission)) { + //获取同城配送参数 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { + is_json: 1, data: req_data + }).then(res => { + if (res.data.code == 0) { + var wl_txt = "formData.shipping_price"; + th.setData({ [wl_txt]: res.data.data, }) - if (th.data.bn_use_commission) { + } else { + is_next = 0; + if (qfunc) { + qfunc(); + } else { wx.showToast({ - title: '应付金额小于本单佣金，不可使用！', + title: res.data.msg, icon: 'none', duration: 2000 }) } - th.setData({ - bn_use_commission: 0 - }); - - - } - - var txt4 = "formData.use_commission"; - - if (th.data.bn_use_commission) { - order_m = (parseFloat(order_m) - parseFloat(th.data.bn_goods.use_commission)).toFixed(2); - th.setData({ [txt4]: th.data.bn_goods.use_commission }) - } - - - var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money); - //--------------如果使用余额--------------------- - if (th.data.bn_use_money == 1) { - if (amoney > parseFloat(order_m)) { - order_m = parseFloat(order_m).toFixed(2); - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1, submit: 0 }) - } else { - order_m = parseFloat(order_m) - parseFloat(amoney); - order_m = order_m.toFixed(2); - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1, submit: 0 }) - } - } else { - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1, submit: 0 }) - } - //优惠活动送积分 - if (good.s_intValue) { - txt = "formData.give_integral"; - th.setData({ [txt]: good.s_intValue }); - } - //优惠送券 - if (good.s_coupon_id) { - var i_txt = "formData.give_coupon_id"; - //这个是json格式的 - var i_txt1 = "formData.g_coupon_num"; - var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }]; - ob = JSON.stringify(ob); - th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob }); - } - //优惠礼包 - if (good.s_libao) { - var l_txt = "formData.give_lb_id"; - //这个是json格式的 - var l_txt1 = "formData.g_lb_num"; - var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }]; - ob = JSON.stringify(ob); - th.setData({ [l_txt]: good.s_libao, [l_txt1]: ob }); - } - - //专享礼包 - if (good.zx_libao) { - var l_txt = "formData.give_zxlb_id"; - //这个是json格式的 - var l_txt1 = "formData.g_zxlb_num"; - var ob = [{ "num": good.zx_lb_num, "l_id": good.zx_libao }]; - ob = JSON.stringify(ob); - th.setData({ [l_txt]: good.zx_libao, [l_txt1]: ob }); } }) - } else { - - var order_prom_txt1 = "formData.order_prom_id"; - var order_prom_txt2 = "formData.order_prom_amount"; - th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) - - //预存金额使用参与计算 - if (th.data.udata && th.data.udata.Balance > 0 && order_m * 1 > 0) { - if (!th.data.bn_goods.keyid) { - //获取门店信息 - await getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - ids: th.data.bn_pick - } - }).then(res => { - if (ut.ajax_ok(res)) { - console.log(res); - if (res.data.code == 0) { - let resData = res.data.data.pageData - if (resData && resData[0]) { - let keyid = resData[0].keyid - let txt = 'bn_goods.keyid' - th.setData({ - [txt]: keyid - }) - } - } - } - }) - } - if (th.data.bn_goods.keyid) { - let cart_yc = await th.beforAdvancesum({ - order_amount: order_m, - goods: [{ - goods_sn: th.data.bn_goods.goods_sn, - goods_price: th.data.bn_goods.goods_price, - goods_num: th.data.bn_goods.goods_num, - }], - sto: { - keyid: th.data.bn_goods.keyid - } - }) - - if (!good.yck_off) { - good.yck_off = cart_yc.yck_off - } - good.yck = cart_yc.yck - good.yckid = cart_yc.yckid - good.pre_json = cart_yc.pre_json - let yct1 = 'bn_goods.yck_off'; - let yct2 = 'bn_goods.yck'; - let yct3 = 'bn_goods.yckid'; - let yct4 = 'bn_goods.pre_json'; - th.setData({ - [yct1]: good.yck_off, - [yct2]: good.yck, - [yct3]: good.yckid, - [yct4]: good.pre_json, - }) - - if (good.yck_off && good.yck_off == 2) { - let order_amount = (order_m - good.yck).toFixed(2); - let yck = 0 - if (order_amount * 1 > 0) { - order_m = order_amount; - // all_prestore+=parseFloat(good.yck); - yck = parseFloat(good.yck) - } else { - // all_prestore+=order_m*1 - yck = parseFloat(order_m) - order_m = 0 - } - let atxt10 = "formData.prestore"; //预存金额 - let atxt11 = "formData.pre_json"; //预存json - let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表 - th.setData({ - [atxt10]: yck, - [atxt11]: [good.pre_json], - [atxt12]: [yck], - }) - // formData.prestore - // all_yck_arr.push(yck) //真实预存款抵扣金额 - // all_pre_json.push(good.pre_json) - // all_prestore = parseFloat(all_prestore); //真实预存款抵扣金额总和 - } - } - } else { - let yct1 = 'bn_goods.yck_off'; - let yct2 = 'bn_goods.yck'; - let yct3 = 'bn_goods.yckid'; - let yct4 = 'bn_goods.pre_json'; - let atxt10 = "formData.prestore"; //预存金额 - let atxt11 = "formData.pre_json"; //预存json - let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表 - th.setData({ - [yct2]: 0, - [yct3]: '', - [yct4]: '', - [atxt10]: 0, - [atxt11]: '', - [atxt12]: [], - }) - } + if (!is_next) return false + } - //判断是否同城配送,而且没有调用过 - if (th.data.bn_exp_type == 2 && th.data.user_addr) { - var gd_w = 0, lon = 0, lat = 0; - for (let ib in gd_arr_list) { - let item_b = gd_arr_list[ib]; - gd_w += item_b['weight'] * item_b['buynum']; - } - //-- 获取距离 -- - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } - }).then(res => { - if (res.data.code == 0) { - var data = JSON.parse(res.data.data); - if (data.status == 0) { - lon = data.result.location.lng; - lat = data.result.location.lat; - } - } - }) + total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); + order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); - var req_data = { - store_id: os.stoid, order_amount: parseFloat(order_m), - lon: lon, lat: lat, pickup_id: bn_pick, goods_weight: gd_w - } + total_m = total_m.toFixed(2); + order_m = order_m.toFixed(2); - var is_next = 1; + var atxt = "formData.total_amount"; + th.setData({ [atxt]: total_m, }) - //获取同城配送参数 - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { - is_json: 1, data: req_data - }).then(res => { - if (res.data.code == 0) { - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: res.data.data, }) + var txt = "formData.user_money"; + var txt2 = "formData.order_amount"; + var txt3 = "formData.coupon_price"; - } else { - is_next = 0; - if (qfunc) { - qfunc(); - } else { - wx.showToast({ - title: res.data.msg, - icon: 'none', - duration: 2000 - }) - } + //-- 最后的金额小于佣金 -- + if (parseFloat(order_m) < parseFloat(th.data.bn_goods.use_commission)) { - } + if (th.data.bn_use_commission) { + wx.showToast({ + title: '应付金额小于本单佣金，不可使用！', + icon: 'none', + duration: 2000 }) - if (!is_next) return false } + th.setData({ + bn_use_commission: 0 + }); - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); - var atxt = "formData.total_amount"; - - total_m = total_m.toFixed(2); - order_m = order_m.toFixed(2); - - th.setData({ [atxt]: total_m, }) - - var txt = "formData.user_money"; - var txt2 = "formData.order_amount"; - var txt3 = "formData.coupon_price"; - - //-- 最后的金额小于佣金 -- - if (parseFloat(order_m) < parseFloat(th.data.bn_goods.use_commission)) { - - if (th.data.bn_use_commission) { - wx.showToast({ - title: '应付金额小于本单佣金，不可使用！', - icon: 'none', - duration: 2000 - }) - } - - th.setData({ - bn_use_commission: 0 - }); - } - + } - var txt4 = "formData.use_commission"; - - if (th.data.bn_use_commission) { - order_m = (parseFloat(order_m) - parseFloat(th.data.bn_goods.use_commission)).toFixed(2); - th.setData({ [txt4]: th.data.bn_goods.use_commission }) - } + var txt4 = "formData.use_commission"; + if (th.data.bn_use_commission) { + order_m = (parseFloat(order_m) - parseFloat(th.data.bn_goods.use_commission)).toFixed(2); + th.setData({ [txt4]: th.data.bn_goods.use_commission }) + } - var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money); - //--------------如果使用余额--------------------- - if (th.data.bn_use_money == 1) { - if (amoney > parseFloat(order_m)) { - order_m = parseFloat(order_m).toFixed(2); - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1, submit: 0 }) - } else { - order_m = parseFloat(order_m) - parseFloat(amoney); - order_m = order_m.toFixed(2); - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1, submit: 0 }) - } + var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money); + //--------------如果使用余额--------------------- + if (th.data.bn_use_money == 1) { + if (amoney > parseFloat(order_m)) { + order_m = parseFloat(order_m).toFixed(2); + th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1, submit: 0 }) } else { - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1, submit: 0 }) - } - //优惠活动送积分 - if (good.s_intValue) { - txt = "formData.give_integral"; - th.setData({ [txt]: good.s_intValue }); - } - //优惠送券 - if (good.s_coupon_id) { - var i_txt = "formData.give_coupon_id"; - //这个是json格式的 - var i_txt1 = "formData.g_coupon_num"; - var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }]; - ob = JSON.stringify(ob); - th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob }); - } - //优惠礼包 - if (good.s_libao) { - var l_txt = "formData.give_lb_id"; - //这个是json格式的 - var l_txt1 = "formData.g_lb_num"; - var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }]; - ob = JSON.stringify(ob); - th.setData({ [l_txt]: good.s_libao, [l_txt1]: ob }); - } - - //专享礼包 - if (good.zx_libao) { - var l_txt = "formData.give_zxlb_id"; - //这个是json格式的 - var l_txt1 = "formData.g_zxlb_num"; - var ob = [{ "num": good.zx_lb_num, "l_id": good.zx_libao }]; - ob = JSON.stringify(ob); - th.setData({ [l_txt]: good.zx_libao, [l_txt1]: ob }); - + order_m = parseFloat(order_m) - parseFloat(amoney); + order_m = order_m.toFixed(2); + th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1, submit: 0 }) } + } else { + th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1, submit: 0 }) + } + //优惠活动送积分 + if (good.s_intValue) { + txt = "formData.give_integral"; + th.setData({ [txt]: good.s_intValue }); + } + //优惠送券 + if (good.s_coupon_id) { + var i_txt = "formData.give_coupon_id"; + //这个是json格式的 + var i_txt1 = "formData.g_coupon_num"; + var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }]; + ob = JSON.stringify(ob); + th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob }); + } + //优惠礼包 + if (good.s_libao) { + var l_txt = "formData.give_lb_id"; + //这个是json格式的 + var l_txt1 = "formData.g_lb_num"; + var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }]; + ob = JSON.stringify(ob); + th.setData({ [l_txt]: good.s_libao, [l_txt1]: ob }); + } + + //专享礼包 + if (good.zx_libao) { + var l_txt = "formData.give_zxlb_id"; + //这个是json格式的 + var l_txt1 = "formData.g_zxlb_num"; + var ob = [{ "num": good.zx_lb_num, "l_id": good.zx_libao }]; + ob = JSON.stringify(ob); + th.setData({ [l_txt]: good.zx_libao, [l_txt1]: ob }); } wx.hideLoading(); @@ -3473,6 +3243,7 @@ Page({ }, + requestSubscribe() { const th = this; const template_id = this.data.template_id; -- libgit2 0.21.4