diff --git a/app.js b/app.js index 9dc5acd..31e5340 100644 --- a/app.js +++ b/app.js @@ -51,7 +51,7 @@ App({ config: null, //门店参数 config2: null, //门店配置 code: null, - user_id:null,// 6520210,//6520119 qa 4687 6519901 zs 10153869 + user_id:null,// qa-6519858,// buy_now: null, picklist: null, //门店列表 wuliuprice: null, //物流价格表 @@ -1024,6 +1024,58 @@ App({ if(!this.globalData.scene) return false; if(this.globalData.sp_scene.indexOf(this.globalData.scene)==-1) return false; return true; + }, + + is_distribut:async function (th){ + var isok=1; + var dis=null; + await this.promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ + dis=rs.data.data; + if( dis && dis.switch==0){ + isok=0; + } + }) + if(!isok) return false; + await this.promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=2",{}).then(rs=>{ + if(rs.data.code==0){ + var arr = rs.data.data.pageData; + if (arr.length > 0) { + var item=arr[0]; + if(item.is_sy==0){ + var now = Date.parse(new Date());now = now / 1000; + if(item.end_time { diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 1fe23a4..f2d3a23 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -145,7 +145,7 @@ 兑换截止时间：{{filter.show_default(item.changeDate, '不限')}} - {{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}} + {{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}} diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 532f3d8..4376ca3 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -503,6 +503,7 @@ Page({ } } + //在分组的时候，就不要再调用接口，await for (var i = 0; i < carr.length; i++) { var item = carr[i]; @@ -655,13 +656,28 @@ Page({ } } + var cart_commission=0; //-- 循环计算一下线下取价 -- for (var k = 0; k < arr.length; k++) { var c_item = arr[k]; var item = arr[k].goods; var offline_price = 0; var offline_num = 0; + + //计算佣金的商品 + var commission_gds=[]; for (var c = 0; c < item.length; c++) { + + if(!item[c].is_gift){ + var hr={ + goods_id:item[c].goods_id, + goods_num:item[c].goods_num, + prom_type:item[c].prom_type, + prom_id:item[c].prom_id, + } + commission_gds.push(hr); + } + if (th.data.sales_rules != 2) { item[c].offline_price = 0; } @@ -676,6 +692,27 @@ Page({ c_item.offline_num = offline_num; c_item.is_offline = 1; } + + //获取购物车的佣金,此处要优化调用接口，获取佣金 + var req_d = { + user_id:getApp().globalData.user_id,goods_ids:commission_gds,store_id: os.stoid + } + var back_data=null; + await getApp().request.promisePost("/api/weshop/order/getrebateSum", { + is_json: 1, data: req_d + }).then(rs => { + if (rs.data.code == 0) back_data =rs.data.data; + }); + + if(back_data && parseFloat(back_data)) { + c_item.can_usecommise = parseFloat(back_data); + cart_commission += c_item.can_usecommise; + } + + } + + if(cart_commission){ + th.setData({cart_commission}); } @@ -862,6 +899,29 @@ Page({ t.data.data.prom_id = 0; t.data.data.prom_type = 0; + //如果有开启佣金抵扣，同时会员是分销商的时候 + if(!gg.collocation_goods && getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + + //如果立即购买那边过来，就要读取接口，查看活动的优惠内容 if (gg.prom_type == 3) { t.data.data.prom_id = gg.prom_id; @@ -966,7 +1026,44 @@ Page({ order_amount: 0, user_note: 0 }; + + + var cart_commission=0; + //-- 循环计算一下线下取价 -- + //计算佣金的商品 + var commission_gds=[]; + for (var c = 0; c < narr.length; c++) { + + var hr={ + goods_id:item[c].goods_id, + goods_num:item[c].goods_num, + prom_type:0, + prom_id:0, + } + commission_gds.push(hr); + + } + //获取购物车的佣金,此处要优化调用接口，获取佣金 + var req_d = { + user_id:getApp().globalData.user_id,goods_ids:commission_gds,store_id: os.stoid + } + var back_data=null; + await getApp().request.promisePost("/api/weshop/order/getrebateSum", { + is_json: 1, data: req_d + }).then(rs => { + if (rs.data.code == 0) back_data =rs.data.data; + }); + + if(back_data && parseFloat(back_data)) { + ie.can_usecommise =parseFloat(back_data); + cart_commission = ie.can_usecommise; + } + cart_arr.push(ie); + if(cart_commission){ + th.setData({cart_commission}); + } + th.data.old_cartlist = cart_arr; } th.setData({ @@ -1007,6 +1104,12 @@ Page({ t.data.data.shop_price = tt.data.data.prom_user_price; th.data.ckeck_quan_price = 0; gd.is_xz_yh = 1; + + t.data.data.fir_rate=tt.data.data.fir_rate; + t.data.data.sec_rate=tt.data.data.sec_rate; + t.data.data.thi_rate=tt.data.data.thi_rate; + t.data.data.commission=tt.data.data.commission; + } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; @@ -1015,6 +1118,28 @@ Page({ th.data.check_quan_ware_list = t.data.data.erpwareid + ""; } + //-- 计算获得佣金的金额 -- + if( getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + th.setData({ bn_goods: gd, bn_pickname: gg.pick_name, @@ -1041,11 +1166,39 @@ Page({ if (tt.data.code == 0) { //t.data.data.shop_price = tt.data.data.prom_price; t.data.data.shop_price = tt.data.data.price; + + t.data.data.fir_rate=tt.data.data.fir_rate; + t.data.data.sec_rate=tt.data.data.sec_rate; + t.data.data.thi_rate=tt.data.data.thi_rate; + t.data.data.commission=tt.data.data.commission; } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; } + //-- 计算获得佣金的金额 -- + if( getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + + if (tt.data.data.isQuan) { th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; @@ -1670,6 +1823,10 @@ Page({ cart_item.total_amount = cart_item.total_amount.toFixed(2); cart_item.order_amount = cart_item.order_amount.toFixed(2); + if(th.data.cart_use_commission){ + cart_item.order_amount-=cart_item.can_usecommise; + } + //搭配购在使用余额 if (th.data.bn_use_money == 1 && th.data.is_b_now == 1) { @@ -2032,6 +2189,13 @@ Page({ var txt = "formData.user_money"; var txt2 = "formData.order_amount"; var txt3 = "formData.coupon_price"; + 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) { @@ -2089,10 +2253,18 @@ Page({ var txt = "formData.user_money"; var txt2 = "formData.order_amount"; var txt3 = "formData.coupon_price"; + 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 > order_m) { + 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 }) } else { 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 6800d59..a446e4e 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -111,9 +111,9 @@ Page({ - this.setData({//01 - // kt_type: appD.kt_type - }); + // this.setData({//01 + // // kt_type: appD.kt_type + // }); // 01 // if (appD.is_pt_tz) th.data.is_pt_tz = appD.is_pt_tz; @@ -121,6 +121,9 @@ Page({ //先获取物流，再获取用户信息，再展示页面 // this.get_wuliu(th.get_info(th.show_page)); + + //判断是不是佣金抵扣 + getApp().is_distribut(this); }, onUnload: function () { @@ -335,6 +338,29 @@ Page({ et = th.data.bn_exp_type; } + //如果有开启佣金抵扣，同时会员是分销商的时候 + if(getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + t.data.data.use_commission=c_num; + + } + + + th.setData({ bn_goods: t.data.data, @@ -385,6 +411,29 @@ Page({ et = th.data.bn_exp_type; } + + //如果有开启佣金抵扣，同时会员是分销商的时候 + if(getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + t.data.data.use_commission=c_num; + + } + + th.setData({ bn_goods: t.data.data, bn_pickname: gg.pick_name, @@ -729,11 +778,32 @@ Page({ var txt = "formData.user_money"; var txt2 = "formData.order_amount"; + var txt4= "formData.use_commission"; + + if(parseFloat(order_m) 0) { - if (parseFloat(th.data.yuer) > total_m) { + if (parseFloat(th.data.yuer) > parseFloat(order_m)) { th.setData({ - [txt]: total_m, + [txt]: order_m, [txt2]: 0, is_show_sub:1,sub:0 }) @@ -882,6 +952,11 @@ Page({ item.pt_listno = th.data.qh; } + //-- 如果有使用佣金抵扣的话 -- + if(th.data.bn_use_commission){ + item.use_commission=th.data.bn_goods.use_commission; + } + var gg = to.get_b_now(); var goods = { @@ -1493,6 +1568,14 @@ Page({ }, + //立即购买的时候，使用余额 + set_bn_commission:function(){ + var th = this; + th.setData({ bn_use_commission: !th.data.bn_use_commission }); + th.calculatePrice2(); + }, + + 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 37fc228..b1ff3c3 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -129,8 +129,20 @@ + + + + + 使用佣金 :￥{{bn_goods.use_commission}} + + + - + + + + + diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 8e9a674..4d8c024 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -115,7 +115,8 @@ Page({ order_sn: '', order_id: '', - + exp_price:0, + order_prom_amount:0 }, onLoad: function (t) { @@ -138,6 +139,9 @@ Page({ getApp().goto("/pages/togoin/togoin"); } + //判断是不是佣金抵扣 + getApp().is_distribut(this); + }, onUnload: function () { this.setData({ isclose: 1 }) @@ -517,6 +521,25 @@ Page({ } + //如果有开启佣金抵扣，同时会员是分销商的时候 + if(getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(goods.fir_rate || 0)*order_goods.goods_num; + sec_num=(goods.sec_rate || 0)*order_goods.goods_num; + thi_num=(goods.thi_rate || 0)*order_goods.goods_num; + }else{ + fir_num=parseFloat((goods.commission || 0) *order_goods.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((goods.commission || 0)*order_goods.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((goods.commission || 0)*order_goods.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + goods.use_commission=c_num; + } + var g_url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + order_goods.goods_id + "&pre_id=" + pre_arr.id; if (act.is_end || th.data.act.end_time < ut.gettimestamp()) { @@ -769,12 +792,23 @@ Page({ } o_condition1 = parseFloat(o_condition1) - parseFloat(th.data.presell.presell_deposit); + if (o_condition1 < 0) o_condition1 = 0; + else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){ + o_condition1-=th.data.bn_use_commission; + } + th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, }) }) } else { o_condition = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit); if (o_condition < 0) o_condition = 0; + + if (o_condition1 < 0) o_condition1 = 0; + else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){ + o_condition1-=th.data.bn_use_commission; + } + th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, }) } } @@ -2120,14 +2154,59 @@ Page({ ord_price = parseFloat(ord_price) - parseFloat(th.data.presell.presell_deposit); if (ord_price < 0) ord_price = 0; - th.setData({ exp_price: exp_price, order_m: ord_price + parseFloat(exp_price), show_submit: 1, }) + var the_price=ord_price + parseFloat(exp_price); + + if(the_price + + + + + 使用佣金 :￥{{goods.use_commission}} + + + + 商品金额 diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 495095e..0280add 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -125,6 +125,10 @@ Page({ in_zhact_gdmap: {}, //不同门店参与同一活动的限购 hid_inp: 1, user_note: {}, + + dis_config:null, + bn_use_commission:0, //是不是使用佣金 + }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) @@ -138,6 +142,9 @@ Page({ } }); + //判断是不是佣金抵扣 + getApp().is_distribut(this); + }, onUnload: function () { this.setData({ isclose: 1 }) @@ -510,6 +517,29 @@ Page({ return false; } + + //如果有开启佣金抵扣，同时会员是分销商的时候 + if(getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + //这个位置要拿活动的预售价 t.data.data.shop_price = prelist.presell_money; th.setData({ @@ -945,10 +975,32 @@ Page({ var txt = "formData.user_money"; var txt2 = "formData.order_amount"; var txt3 = "formData.coupon_price"; + + if(parseFloat(order_m) order_m) { + 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,dis_btn:0 }) } else { @@ -1046,6 +1098,33 @@ Page({ var txt = "formData.user_money"; var txt2 = "formData.order_amount"; var txt3 = "formData.coupon_price"; + + if(parseFloat(order_m) + + + + + + 使用佣金 :￥{{bn_goods.use_commission}} + + + + diff --git a/packageC/pages/presell/cart/filter.wxs b/packageC/pages/presell/cart/filter.wxs index c0e8d13..9fbb622 100644 --- a/packageC/pages/presell/cart/filter.wxs +++ b/packageC/pages/presell/cart/filter.wxs @@ -6,6 +6,11 @@ var format = function (text) { return text.replace(reg, '\n') } +function get_sum(val1,val2,val3){ + return parseFloat(val1)+parseFloat(val2)-parseFloat(val3) +} + module.exports = { - format: format + format: format, + get_sum:get_sum } diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxss b/packageC/pages/presell/goodsInfo/goodsInfo.wxss index 24d9bd8..44a2593 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxss +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxss @@ -2915,3 +2915,60 @@ button.custom-service::after{ margin-right: 10rpx; } + +.swiper-container { + position: absolute; + top: 70rpx; + left: 0; + padding: 20rpx 10rpx; + width: 100%; + box-sizing: border-box; + z-index: 98; +} + +.swiper { + height: 60rpx; + color: white; + font-size: 26rpx; +} + +.swiper-item { + /* width: auto !important; + background-color: rgba(0,0,0,.4); + border-radius: 60rpx; */ + position: relative; +} + +.swiper-item .item { + position: absolute; +} + +.item { + /* position: absolute; */ + display: flex; + align-items: center; + /* justify-content: center; */ + border-radius: 60rpx; + background-color: rgba(0,0,0,.4); + /* position: absolute; */ +} + +.avatar-container { + width: 60rpx; + height: 60rpx; + border-radius: 50%; + overflow: hidden; + flex-shrink: 0; +} +.avatar-container image { + width: 100%; + height: 100%; +} + +.hideArea { + position: absolute; + left: -1000px; + top: -1000px; +} + + diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index c21e385..42b4f98 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -9,6 +9,7 @@ var ladder_calc = require("ladder_calculate.js"); let timer; Page({ data: { + url: t.globalData.setting.url, resourceUrl: t.globalData.setting.resourceUrl, imgUrl: t.globalData.setting.imghost, @@ -133,6 +134,10 @@ Page({ show_duo_gift: 0, send_gf: {}, //多赠品的计算 send_lb: {}, + dis_config:null, + bn_use_commission:0, //是不是使用佣金 + cart_use_commission:0, + cart_commission:0 }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) @@ -163,6 +168,10 @@ Page({ th.setData({ template_id: template_id }); } }) + + //判断是不是佣金抵扣 + getApp().is_distribut(this); + }, onUnload: function () { this.setData({ isclose: 1 }) @@ -745,13 +754,26 @@ Page({ } } + var cart_commission=0; //-- 循环计算一下线下取价 -- for (var k = 0; k < arr.length; k++) { var c_item = arr[k]; var item = arr[k].goods; var offline_price = 0; var offline_num = 0; + //计算佣金的商品 + var commission_gds=[]; for (var c = 0; c < item.length; c++) { + + if(!item[c].is_gift){ + var hr={ + goods_id:item[c].goods_id, + goods_num:item[c].goods_num, + prom_type:item[c].prom_type, + prom_id:item[c].prom_id, + } + commission_gds.push(hr); + } if (th.data.sales_rules != 2) { item[c].offline_price = 0; } @@ -766,8 +788,28 @@ Page({ c_item.offline_num = offline_num; c_item.is_offline = 1; } + + //获取购物车的佣金,此处要优化调用接口，获取佣金 + var req_d = { + user_id:getApp().globalData.user_id,goods_ids:commission_gds,store_id: os.stoid + } + var back_data=null; + await getApp().request.promisePost("/api/weshop/order/getrebateSum", { + is_json: 1, data: req_d + }).then(rs => { + if (rs.data.code == 0) back_data =rs.data.data; + }); + + if(back_data && parseFloat(back_data)) { + c_item.can_usecommise = parseFloat(back_data); + cart_commission += c_item.can_usecommise; + } + } + if(cart_commission){ + th.setData({cart_commission}); + } //每一个门店内的组合购要进行拆分, //还得把组合商品的多余商品的线下价格算一算 @@ -956,6 +998,7 @@ Page({ gd.prom_id =gg.prom_id=0; } + switch (gd.prom_type) { case 0: case 3: @@ -985,6 +1028,29 @@ Page({ t.data.data.prom_id = 0; t.data.data.prom_type = 0; + + //如果有开启佣金抵扣，同时会员是分销商的时候 + if(!gg.collocation_goods && getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + //如果立即购买那边过来，就要读取接口，查看活动的优惠内容 if (gg.prom_type == 3) { t.data.data.prom_id = gg.prom_id; @@ -1030,6 +1096,7 @@ Page({ bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et }); + //计算价格 th.calculatePrice2(); //获取优惠券 @@ -1086,7 +1153,6 @@ Page({ et = 0; } - var ie = { pickup_id: gg.pick_id, pname: gg.pick_name, @@ -1102,7 +1168,44 @@ Page({ order_amount: 0, user_note: "" }; - cart_arr.push(ie); + + var cart_commission=0; + //-- 循环计算一下线下取价 -- + //计算佣金的商品 + var commission_gds=[]; + for (var c = 0; c < narr.length; c++) { + + var hr={ + goods_id:item[c].goods_id, + goods_num:item[c].goods_num, + prom_type:0, + prom_id:0, + } + commission_gds.push(hr); + + } + //获取购物车的佣金,此处要优化调用接口，获取佣金 + var req_d = { + user_id:getApp().globalData.user_id,goods_ids:commission_gds,store_id: os.stoid + } + var back_data=null; + await getApp().request.promisePost("/api/weshop/order/getrebateSum", { + is_json: 1, data: req_d + }).then(rs => { + if (rs.data.code == 0) back_data =rs.data.data; + }); + + if(back_data && parseFloat(back_data)) { + ie.can_usecommise =parseFloat(back_data); + cart_commission = ie.can_usecommise; + } + + cart_arr.push(ie); + if(cart_commission){ + th.setData({cart_commission}); + } + + th.data.old_cartlist = cart_arr; } th.setData({ @@ -1146,6 +1249,13 @@ Page({ t.data.data.shop_price = tt.data.data.prom_user_price; th.data.ckeck_quan_price = 0; gd.is_xz_yh = 1; + + t.data.data.fir_rate=tt.data.data.fir_rate; + t.data.data.sec_rate=tt.data.data.sec_rate; + t.data.data.thi_rate=tt.data.data.thi_rate; + t.data.data.commission=tt.data.data.commission; + + } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; @@ -1154,6 +1264,29 @@ Page({ th.data.check_quan_ware_list = t.data.data.erpwareid + ""; } + //-- 计算获得佣金的金额 -- + if( getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + + th.setData({ bn_goods: gd, bn_pickname: gg.pick_name, @@ -1180,11 +1313,40 @@ Page({ if (tt.data.code == 0) { //t.data.data.shop_price = tt.data.data.prom_price; t.data.data.shop_price = tt.data.data.price; + + t.data.data.fir_rate=tt.data.data.fir_rate; + t.data.data.sec_rate=tt.data.data.sec_rate; + t.data.data.thi_rate=tt.data.data.thi_rate; + t.data.data.commission=tt.data.data.commission; + } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; } + //-- 计算获得佣金的金额 -- + if( getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk){ + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(th.data.dis_config.pattern==1){ + fir_num=(t.data.data.fir_rate || 0)*gg.goods_num; + sec_num=(t.data.data.sec_rate || 0)*gg.goods_num; + thi_num=(t.data.data.thi_rate || 0)*gg.goods_num; + }else{ + fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2); + } + var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th); + + gd.use_commission=c_num; + t.data.data.use_commission=c_num; + + } + + if (tt.data.data.isQuan) { th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; @@ -2061,6 +2223,29 @@ Page({ cart_item.total_amount = cart_item.total_amount.toFixed(2); cart_item.order_amount = cart_item.order_amount.toFixed(2); + //-- 最后的金额小于佣金 -- + if(cart_item.order_amount order_m) { + 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 { @@ -2685,10 +2898,35 @@ Page({ var txt = "formData.user_money"; var txt2 = "formData.order_amount"; var txt3 = "formData.coupon_price"; + + //-- 最后的金额小于佣金 -- + if(parseFloat(order_m) order_m) { + 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 { @@ -2823,6 +3061,11 @@ Page({ //是不是重新提交 if (th.data.is_continue == 1) item.is_continue = 1; + //-- 如果有使用佣金抵扣的话 -- + if(th.data.bn_use_commission){ + item.use_commission=th.data.bn_goods.use_commission; + } + //获取立即购买的商品的信息 var gg = to.get_b_now(); //--商品的房间号-- @@ -2979,6 +3222,7 @@ Page({ pt_res = res.data.data; } }) + if (pt_res) { //平摊赋值 goods.account = pt_res[0].fisrt_account; @@ -3101,6 +3345,11 @@ Page({ item.coupon_price = 0; } + //-- 如果有使用佣金抵扣的话 -- + if(th.data.cart_use_commission){ + item.use_commission=t_item.can_usecommise; + } + var order_prom_list = {}; //--判断有没有优惠活动-- if (t_item.order_prom_amount > 0) { @@ -3372,7 +3621,6 @@ Page({ if (pdata.length == 0) return; var str = JSON.stringify(pdata); - wx.showLoading({ title: "加载中" }); th.setData({ submit: 1,}) wx.request({ @@ -3668,6 +3916,20 @@ Page({ th.setData({ bn_use_money: !th.data.bn_use_money }); th.calculatePrice2(); }, + + //立即购买的时候，使用余额 + set_bn_commission:function(){ + var th = this; + th.setData({ bn_use_commission: !th.data.bn_use_commission }); + th.calculatePrice2(); + }, + //加入购物车使用余额 + set_cart_commission:function(){ + var th = this; + th.setData({ cart_use_commission: !th.data.cart_use_commission }); + th.calculatePrice(); + }, + set_js_useyuer: function () { var th = this; th.setData({ js_use_money: !th.data.js_use_money }); @@ -3675,7 +3937,6 @@ Page({ }, - //----------立即购买，选择物流------------- bindPickerChange: function (e) { var ind = e.detail.value diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index 4cb6d0c..4ee2f70 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -279,6 +279,16 @@ + + + + + + + 使用佣金 :￥{{cart_commission}} + + + @@ -494,6 +504,15 @@ + + + + + + 使用佣金 :￥{{bn_goods.use_commission}} + + + diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 504dd6e..82f9b89 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -142,6 +142,10 @@ Page({ }, 1); + //判断是不是佣金抵扣 + getApp().is_distribut(this); + + }, onUnload: function () { this.setData({ isclose: 1 }) }, onHide: function () { @@ -393,6 +397,30 @@ Page({ var inte_data = tt.data.data.pageData[0]; t.data.data.shop_price = inte_data.addmoney; t.data.data.integral = inte_data.integral; + + //-- 计算获得佣金的金额 -- + if (getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { + var fir_num = 0; + var sec_num = 0; + var thi_num = 0; + if (th.data.dis_config.pattern == 1) { + fir_num = (inte_data.fir_rate || 0) * gg.goods_num; + sec_num = (inte_data.sec_rate || 0) * gg.goods_num; + thi_num = (inte_data.thi_rate || 0) * gg.goods_num; + } else { + fir_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2); + sec_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2); + thi_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2); + } + var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th); + + t.data.data.use_commission = c_num; + + } + + + th.setData({ bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, index: m_wind, bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et @@ -655,11 +683,36 @@ Page({ var txt2 = "formData.order_amount"; var txt4 = "formData.integral"; + + //-- 最后的金额小于佣金 -- + if(parseFloat(order_m) order_m) { - order_m = order_m.toFixed(2); + if (amoney > parseFloat(order_m)) { + order_m = parseFloat(order_m).toFixed(2); th.setData({ [txt]: order_m, [txt2]: 0, [txt4]: all_integral, show_submit: 1,submit:0 }) } else { order_m = parseFloat(order_m - amoney); @@ -754,7 +807,13 @@ Page({ //是不是重新提交 if (th.data.is_continue == 1) item.is_continue = 1; - //获取立即购买的商品的信息 + //-- 如果有使用佣金抵扣的话 -- + if(th.data.bn_use_commission){ + item.use_commission=th.data.bn_goods.use_commission; + } + + + //获取立即购买的商品的信息 var gg = to.get_b_now(); //--商品的房间号-- if (gg.room_id && gg.room_id > 0) { @@ -1191,6 +1250,14 @@ Page({ buycard: function () { getApp().goto("/pages/user/plus/plus"); getApp().globalData.plus_buy_back = 1; + }, + + //使用佣金抵扣 + set_bn_commission:function () { + var th = this; + th.setData({bn_use_commission: !th.data.bn_use_commission}); + th.calculatePrice2(); } + }); diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml index 2c81f9a..ee86b88 100644 --- a/pages/cart/cart2_inte/cart2_inte.wxml +++ b/pages/cart/cart2_inte/cart2_inte.wxml @@ -130,6 +130,16 @@ + + + + + + 使用佣金 :￥{{bn_goods.use_commission}} + + + diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 9e73cac..9faac8c 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -1,459 +1,529 @@ var t = getApp(), app = t, a = t.request, e = require("../../../utils/common.js"), - s = require("../../../utils/util.js"),ut=s, o = require("../../../utils/md5.js"), to = getApp(); + s = require("../../../utils/util.js"), ut = s, o = require("../../../utils/md5.js"), to = getApp(); var oo = t.globalData.setting, os = oo; var regeneratorRuntime = require('../../../utils/runtime.js'); var util_pay = require("../../../utils/pay.js"); Page({ - data: { - url: t.globalData.setting.url, - resourceUrl: t.globalData.setting.resourceUrl, - imgUrl: t.globalData.setting.imghost, - goods: null, - order: null, - orderPrices: null, - coupons: null, - coupon: null, - invoiceToggle: !0, - payWithUserMoney: !0, - payWithPoints: !0, - maxWord: 0, - enterAddressPage: !1, - firstEnter: !0, - //页面获取的参数 - param: null, - postdata: null, - //提交订单的格式 - formData: { - order_amount: 0,//支付金额 - total_amount: 0,//总价 - all_price: 0,//商品卖的总价 - pay_points: 0,//使用积分 - user_money: 0,//使用余额 - couponCode: "",//使用优惠券(多单就用逗号隔开) - shipping_price: 0,//物流费用 + data: { + url: t.globalData.setting.url, + resourceUrl: t.globalData.setting.resourceUrl, + imgUrl: t.globalData.setting.imghost, + goods: null, + order: null, + orderPrices: null, + coupons: null, + coupon: null, + invoiceToggle: !0, + payWithUserMoney: !0, + payWithPoints: !0, + maxWord: 0, + enterAddressPage: !1, + firstEnter: !0, + //页面获取的参数 + param: null, + postdata: null, + //提交订单的格式 + formData: { + order_amount: 0,//支付金额 + total_amount: 0,//总价 + all_price: 0,//商品卖的总价 + pay_points: 0,//使用积分 + user_money: 0,//使用余额 + couponCode: "",//使用优惠券(多单就用逗号隔开) + shipping_price: 0,//物流费用 + }, + is_no_by: {}, + /*----------------立即购买---------------------*/ + is_b_now: 0, //0是购物车结算 1立即购买 + bn_goods: null, //立即购买时候的调用商品 + bn_use_money: 0,//是否使用余额 + bn_exp_type: 1, //0是物流 1自提 + bn_pick: 0, //选择的门店 + bn_pickname: "", //选择的门店名称 + bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 + /*------------------------*/ + user_addr: null,//物流 + userinfo: null, //获取会员 + /*----------物流选择--------*/ + wu_arr: null, + index: 0, + + //判断页面是返回回来的还是 首次进入的 + isclose: 1, + kt_type: 0, //开团类型 + is_pt_tz: 0,//是否开团团长 + qh: '', //期号 + pt_listno: '',//期号 + is_normal: 0, + is_express: 0,//选择物流的控制器 + yuer: 0, + + rank_switch: 0, //是不是开同等级卡 + show_card: null, //显示的等级卡 + card_name: '', //显示的卡的名称 + card_cut_price: null,//减价多少钱 + show_btn: 0, + + dis_config: null, + bn_use_commission: 0 //是不是使用佣金 + }, - is_no_by:{}, - /*----------------立即购买---------------------*/ - is_b_now: 0, //0是购物车结算 1立即购买 - bn_goods: null, //立即购买时候的调用商品 - bn_use_money: 0,//是否使用余额 - bn_exp_type: 1, //0是物流 1自提 - bn_pick: 0, //选择的门店 - bn_pickname: "", //选择的门店名称 - bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 - /*------------------------*/ - user_addr: null,//物流 - userinfo: null, //获取会员 - /*----------物流选择--------*/ - wu_arr: null, - index: 0, - - //判断页面是返回回来的还是 首次进入的 - isclose: 1, - kt_type: 0, //开团类型 - is_pt_tz: 0,//是否开团团长 - qh: '', //期号 - pt_listno: '',//期号 - is_normal: 0, - is_express: 0,//选择物流的控制器 - yuer: 0, - - rank_switch: 0, //是不是开同等级卡 - show_card: null, //显示的等级卡 - card_name: '', //显示的卡的名称 - card_cut_price: null,//减价多少钱 - show_btn:0, - }, - onLoad: function (t) { - console.log("onLoad_pt_cart"); - var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, }); - var appD = getApp().get_b_now(); - - th.data.postdata = appD; - //如果期号有值 - if (appD.qh) { - th.data.qh = appD.qh; - th.data.pt_listno = appD.qh; - } - //th.data.kt_type=appD.kt_type; - th.setData({ kt_type: appD.kt_type }); - if (appD.is_pt_tz) th.data.is_pt_tz = appD.is_pt_tz; - th.data.param = t; - //先获取物流，再获取用户信息，再展示页面 - //th.get_wuliu(th.get_info(th.show_page)); - }, - onUnload: function () { this.setData({ isclose: 1 }) }, - - //------获取会员信息-----先获取用户信息，在进行下一步--- - get_info: function (func) { - var user_id = t.globalData.user_id; - to.auth.get_u(func); - }, - - //-------------------获取物流--------------- - get_wuliu(func) { - var th = this; - console.log("getwuliu4545"); - to.getwuliu(function (e) { - if (th.data.is_default_logistics) { - //如果第一个不是开启默认，说明要让用户自己选 - if (!e[0].is_default) { - th.setData({ is_default_logistics: 0 }); + onLoad: function (t) { + console.log("onLoad_pt_cart"); + var th = this; + this.setData({is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,}); + var appD = getApp().get_b_now(); + + th.data.postdata = appD; + //如果期号有值 + if (appD.qh) { + th.data.qh = appD.qh; + th.data.pt_listno = appD.qh; } - } - th.setData({ wu_arr: e }) - typeof func == "function" && func(); - }) - }, - - //------获取会员收货地址----- - getuser_addr: function (func) { - if (to.globalData.baddr != null) { - var user_addr = to.globalData.baddr; - to.globalData.baddr = null; - func(user_addr); - } else { - a.get("/api/weshop/useraddress/page", { - data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600 }, - success: function (su) { - - var user_addr = su.data.data.pageData; - var item = null; - var def_item = null; - for (var i = 0; i < user_addr.length; i++) { - if (user_addr[i]['is_default'] == 1) { def_item = user_addr[i]; } - if (user_addr[i]['is_pickup'] == 1) { item = user_addr[i]; } - } - if (item == null) item = def_item; - if (item == null) item = user_addr[0]; - if (item == undefined) item = null; - func(item); + //th.data.kt_type=appD.kt_type; + th.setData({kt_type: appD.kt_type}); + if (appD.is_pt_tz) th.data.is_pt_tz = appD.is_pt_tz; + th.data.param = t; + //先获取物流，再获取用户信息，再展示页面 + //th.get_wuliu(th.get_info(th.show_page)); + //判断是不是佣金抵扣 + getApp().is_distribut(this); + }, + onUnload: function () { + this.setData({isclose: 1}) + }, + + //------获取会员信息-----先获取用户信息，在进行下一步--- + get_info: function (func) { + var user_id = t.globalData.user_id; + to.auth.get_u(func); + }, + + //-------------------获取物流--------------- + get_wuliu(func) { + var th = this; + console.log("getwuliu4545"); + to.getwuliu(function (e) { + if (th.data.is_default_logistics) { + //如果第一个不是开启默认，说明要让用户自己选 + if (!e[0].is_default) { + th.setData({is_default_logistics: 0}); + } + } + th.setData({wu_arr: e}) + typeof func == "function" && func(); + }) + }, + + //------获取会员收货地址----- + getuser_addr: function (func) { + if (to.globalData.baddr != null) { + var user_addr = to.globalData.baddr; + to.globalData.baddr = null; + func(user_addr); + } else { + a.get("/api/weshop/useraddress/page", { + data: {user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600}, + success: function (su) { + + var user_addr = su.data.data.pageData; + var item = null; + var def_item = null; + for (var i = 0; i < user_addr.length; i++) { + if (user_addr[i]['is_default'] == 1) { + def_item = user_addr[i]; + } + if (user_addr[i]['is_pickup'] == 1) { + item = user_addr[i]; + } + } + if (item == null) item = def_item; + if (item == null) item = user_addr[0]; + if (item == undefined) item = null; + func(item); + } + }); } - }); - } - }, - //----------------展示页面,是再获取用户信息之后-------------- - show_page: function () { - var th = this; - //th.setData({ userinfo: to.globalData.userInfo}); 会员信息要时时获取 - var user = getApp().globalData.userInfo; - getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, { - data: { r: Math.random() }, - success: function (e) { - - getApp().globalData.userInfo = e.data.data; - th.setData({ userinfo: e.data.data }); - //获取立即购买的商品信息 - th.get_buy_goods(); - - //获取提现金额 - //noinspection JSUnresolvedFunction - getApp().request.get("/api/weshop/withdrawals/summoney", { - data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 }, - success: function (su) { - if (su.data.code == 0) { - var yuer = parseFloat(th.data.userinfo.user_money - - (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(2); - if (yuer < 0) yuer = 0; - //noinspection JSUnresolvedVariable - th.setData({ txmon: su.data.data.summoney, yuer: yuer }); + }, + //----------------展示页面,是再获取用户信息之后-------------- + show_page: function () { + var th = this; + //th.setData({ userinfo: to.globalData.userInfo}); 会员信息要时时获取 + var user = getApp().globalData.userInfo; + getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, { + data: {r: Math.random()}, + success: function (e) { + + getApp().globalData.userInfo = e.data.data; + th.setData({userinfo: e.data.data}); + //获取立即购买的商品信息 + th.get_buy_goods(); + + //获取提现金额 + //noinspection JSUnresolvedFunction + getApp().request.get("/api/weshop/withdrawals/summoney", { + data: {user_id: to.globalData.user_id, store_id: oo.stoid, status: 0}, + success: function (su) { + if (su.data.code == 0) { + var yuer = parseFloat(th.data.userinfo.user_money - + (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(2); + if (yuer < 0) yuer = 0; + //noinspection JSUnresolvedVariable + th.setData({txmon: su.data.data.summoney, yuer: yuer}); + } + } + }); } - } }); - } - }); - }, - - //-----获取立即购买的商品信息---- - get_buy_goods: function () { - var th = this, a = getApp().request; - var gg = th.data.postdata; - //调用商品 - a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, { - success:async function (t) { - var gd = t.data.data; - if (!gd) return false; + }, + //-----获取立即购买的商品信息---- + get_buy_goods: function () { + var th = this, a = getApp().request; + var gg = th.data.postdata; + //调用商品 + a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, { + success: async function (t) { + var gd = t.data.data; + if (!gd) return false; + + + //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- + if (gd.is_same_city && th.data.is_same_city && gd.whsle_id <= 0) { + + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + gg.pick_id, {}).then(res => { + if (res.data.code == 0) { + var pk = res.data.data; + if (pk && pk.is_same_city) { + th.setData({show_same_city: 1}) + } + } - //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- - if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ + }) - await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{ - if(res.data.code==0){ - var pk=res.data.data; - if(pk && pk.is_same_city){ - th.setData({show_same_city:1}) - } - } + } - }) + t.data.data.original_img = oo.imghost + t.data.data.original_img; + t.data.data['buynum'] = gg.goods_num; + console.log(t.data.data); + var distr_t = 0, et = 0; - } + if (t.data.data.is_minishop == 1 && getApp().is_sp_hao()) { - t.data.data.original_img = oo.imghost + t.data.data.original_img; - t.data.data['buynum'] = gg.goods_num; - console.log(t.data.data); - var distr_t = 0, et = 0; + if (t.data.data.distr_type == 1 || gg.pick_dis == 1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) - if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ + setTimeout(function () { + wx.navigateBack({delta: 1}) + }, 1000) - if(t.data.data.distr_type==1 || gg.pick_dis==1) { - wx.showToast({ - title: "视频号仅支持物流", - icon: 'none', - duration: 2000 - }) - setTimeout(function(){ - wx.navigateBack({delta: 1}) - },1000) + return false + } + t.data.data.distr_type = 2; + th.setData({show_same_city: 0}) - return false - } + } - t.data.data.distr_type=2; - th.setData({show_same_city:0}) + if (t.data.data.distr_type == 0) { + distr_t = gg.pick_dis; + } else { + distr_t = t.data.data.distr_type; + } + switch (distr_t) { + case 0: + et = 1; + //-- 系统后台有设置要默认的 -- + if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) et = 0; + break; + case 1: + et = 1; + break; + case 2: + et = 0; + break; + } - } + t.data.data.shop_price = gg.goods_price; + //--如果是普通购买的时候-- + if (gg.is_normal == 1) { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + t.data.data.is_normal = 1; + + var gd = t.data.data; + //-- 用商品的手店价来显示 -- + gg.goods_price = gd.shop_price; + //---是不是购买等级卡成功的返回---等级卡显示的判断--- + var is_card_back = getApp().globalData.is_card_back; + if (is_card_back) { + gg.goods_price = gd[th.data.card_name]; + t.data.data.shop_price = gg.goods_price; + getApp().globalData.is_card_back = 0; + th.setData({card_cut_price: 0}); + } else { + //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 + if (th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo.card_field) { + var cut_p = gg.goods_price - gd[th.data.card_name]; + th.setData({card_cut_price: cut_p}); + } + } - if (t.data.data.distr_type == 0) { - distr_t = gg.pick_dis; - } else { - distr_t = t.data.data.distr_type; - } - switch (distr_t) { - case 0: - et = 1; - //-- 系统后台有设置要默认的 -- - if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) et = 0; - break; - case 1: - et = 1; - break; - case 2: - et = 0; - break; - } + if (th.data.bn_goods) { + et = th.data.bn_exp_type; + } - t.data.data.shop_price = gg.goods_price; - //--如果是普通购买的时候-- - if (gg.is_normal == 1) { - t.data.data.prom_id = 0; - t.data.data.prom_type = 0; - t.data.data.is_normal = 1; - - var gd = t.data.data; - //-- 用商品的手店价来显示 -- - gg.goods_price = gd.shop_price; - //---是不是购买等级卡成功的返回---等级卡显示的判断--- - var is_card_back = getApp().globalData.is_card_back; - if (is_card_back) { - gg.goods_price = gd[th.data.card_name]; - t.data.data.shop_price = gg.goods_price; - getApp().globalData.is_card_back = 0; - th.setData({ card_cut_price: 0 }); - } else { - //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 - if (th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo.card_field) { - var cut_p = gg.goods_price - gd[th.data.card_name]; - th.setData({ card_cut_price: cut_p }); - } - } - if (th.data.bn_goods) { - et = th.data.bn_exp_type; - } + //-- 计算获得佣金的金额 -- + if (getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { + var fir_num = 0; + var sec_num = 0; + var thi_num = 0; + if (th.data.dis_config.pattern == 1) { + fir_num = (t.data.data.fir_rate || 0) * gg.goods_num; + sec_num = (t.data.data.sec_rate || 0) * gg.goods_num; + thi_num = (t.data.data.thi_rate || 0) * gg.goods_num; + } else { + fir_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2); + sec_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2); + thi_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2); + } + var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th); + gd.use_commission = c_num; + t.data.data.use_commission = c_num; - th.setData({ - bn_goods: t.data.data, bn_pickname: gg.pick_name, - bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal: 1, bn_exp_type: et - }); + } + th.setData({ + bn_goods: t.data.data, bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal: 1, bn_exp_type: et + }); - th.calculatePrice2(); - } else { - //--阶梯团很特殊，不能用总表来拿价格-- - getApp().request.get("/api/weshop/teamlist/get/" + oo.stoid + "/" + gd.prom_id, { - success: function (tt) { - - if (tt.data.code == 0) { - var pt_data = tt.data.data; - var now = s.gettimestamp(); - - if (pt_data.is_end == 1) { - t.data.data.prom_id = 0; - t.data.data.prom_type = 0; - t.data.data.is_normal = 1; - } else if (now > pt_data.end_time) { - t.data.data.prom_id = 0; - t.data.data.prom_type = 0; - t.data.data.is_normal = 1; + th.calculatePrice2(); } else { - t.data.data.shop_price = tt.data.data.price; //活动价格 - t.data.data.is_normal = 0; - if (pt_data.kttype == 3) { - t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买 - } - } - } else { - t.data.data.prom_id = 0; - t.data.data.prom_type = 0; - t.data.data.is_normal = 1; - } - if (th.data.bn_goods) { - et = th.data.bn_exp_type; - } + //--阶梯团很特殊，不能用总表来拿价格-- + getApp().request.get("/api/weshop/teamlist/get/" + oo.stoid + "/" + gd.prom_id, { + success: function (tt) { + + if (tt.data.code == 0) { + var pt_data = tt.data.data; + var now = s.gettimestamp(); + + if (pt_data.is_end == 1) { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + t.data.data.is_normal = 1; + } else if (now > pt_data.end_time) { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + t.data.data.is_normal = 1; + } else { + t.data.data.shop_price = tt.data.data.price; //活动价格 + t.data.data.is_normal = 0; + + t.data.data.fir_rate = tt.data.data.fir_rate; + t.data.data.sec_rate = tt.data.data.sec_rate; + t.data.data.thi_rate = tt.data.data.thi_rate; + t.data.data.commission = tt.data.data.commission; + + + if (pt_data.kttype == 3) { + t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买 + } + } + } else { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + t.data.data.is_normal = 1; + } + + if (th.data.bn_goods) { + et = th.data.bn_exp_type; + } + + + //-- 计算获得佣金的金额 -- + if (getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { + var fir_num = 0; + var sec_num = 0; + var thi_num = 0; + if (th.data.dis_config.pattern == 1) { + fir_num = (t.data.data.fir_rate || 0) * gg.goods_num; + sec_num = (t.data.data.sec_rate || 0) * gg.goods_num; + thi_num = (t.data.data.thi_rate || 0) * gg.goods_num; + } else { + fir_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2); + sec_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2); + thi_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2); + } + var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th); + + gd.use_commission = c_num; + t.data.data.use_commission = c_num; + + } + - th.setData({ - bn_goods: t.data.data, bn_pickname: gg.pick_name, - bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et - }); + th.setData({ + bn_goods: t.data.data, bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et + }); - //计算价格 - th.calculatePrice2(); + //计算价格 + th.calculatePrice2(); + } + }); + } + } + }); + }, + + //----------子页返回父页触发---------- + onShow: function () { + var th = this; + if (th.data.isclose == 0) { + wx.navigateTo({ + url: "/pages/index/index/index" + }) + } else { + this.getuser_addr(function (ie) { + //更换地址回来要重新调用计算价钱的接口 + th.setData({user_addr: ie}); + if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { + th.setData({add_back: 1}); + if (th.data.bn_goods) th.calculatePrice2(); + } + }) + //--更新默认地址--,看一下是不是跳到地址页面 + if (!getApp().globalData.is_cart_old) { + this.update_code(); + } else { + getApp().globalData.is_cart_old = 0; } - }); - } - } - }); - }, - - //----------子页返回父页触发---------- - onShow: function () { - var th = this; - if (th.data.isclose == 0) { - wx.navigateTo({ - url: "/pages/index/index/index" - }) - } else { - this.getuser_addr(function (ie) { - //更换地址回来要重新调用计算价钱的接口 - th.setData({ user_addr: ie }); - if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { - th.setData({ add_back: 1 }); - if (th.data.bn_goods) th.calculatePrice2(); } - }) - //--更新默认地址--,看一下是不是跳到地址页面 - if (!getApp().globalData.is_cart_old) { - this.update_code(); - } else { - getApp().globalData.is_cart_old = 0; - } - } - //先获取是否有关闭使用优惠券 - getApp().getConfig2(function (ee) { - var json_d = JSON.parse(ee.switch_list); - th.data.json_d = json_d; - th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 - var is_default_logistics = json_d.is_default_logistics; - var is_same_city = json_d.is_same_city; - - th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules,is_same_city:is_same_city, - rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); - - var rank_switch = json_d.rank_switch; - var max_price = -1; - var show_card = null; - var name = ""; - //如果有开等级卡的时候, - //因为都是调接口，要返回在计算 - if (rank_switch == 2) { - //-- 获取所有的等级卡, -- - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, - {}).then(res => { - if (res.data.code == 0) { - var plusCard = res.data.data; - //-- 循环判断，拿到最贵的那张卡 -- - for (var ih in plusCard) { - if (plusCard[ih].IsStopBuy == true) { continue; } - if (max_price < 0) { - max_price = plusCard[ih].CardFee; - name = 'card' + plusCard[ih]['CorrPrice']; - show_card = plusCard[ih]; - } else { - if (max_price < plusCard[ih].CardFee) { - max_price = plusCard[ih].CardFee; - name = 'card' + plusCard[ih]['CorrPrice']; - show_card = plusCard[ih]; - } - } - } + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function (ee) { + var json_d = JSON.parse(ee.switch_list); + th.data.json_d = json_d; + th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 + var is_default_logistics = json_d.is_default_logistics; + var is_same_city = json_d.is_same_city; + + th.setData({ + is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, is_same_city: is_same_city, + rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics + }); + + var rank_switch = json_d.rank_switch; + var max_price = -1; + var show_card = null; + var name = ""; + //如果有开等级卡的时候, + //因为都是调接口，要返回在计算 + if (rank_switch == 2) { + //-- 获取所有的等级卡, -- + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, + {}).then(res => { + if (res.data.code == 0) { + var plusCard = res.data.data; + //-- 循环判断，拿到最贵的那张卡 -- + for (var ih in plusCard) { + if (plusCard[ih].IsStopBuy == true) { + continue; + } + if (max_price < 0) { + max_price = plusCard[ih].CardFee; + name = 'card' + plusCard[ih]['CorrPrice']; + show_card = plusCard[ih]; + } else { + if (max_price < plusCard[ih].CardFee) { + max_price = plusCard[ih].CardFee; + name = 'card' + plusCard[ih]['CorrPrice']; + show_card = plusCard[ih]; + } + } + } - if (show_card) { - name = name.toLowerCase(); - th.setData({ card_name: name, show_card: show_card }) - } + if (show_card) { + name = name.toLowerCase(); + th.setData({card_name: name, show_card: show_card}) + } + } + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_wuliu(th.get_info(th.show_page)); + }) + } else { + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_wuliu(th.get_info(th.show_page)); } - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - }) - } else { - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - } - }, 1) - - }, - //---------------检查是否有收货地址------------------- - checkAddressList: function () { - var t = this; - return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({ - title: "请先填写或选择收货地址~", - success: function (a) { - a.confirm ? t.enterAddressPage() : wx.navigateBack(); - }, - fail: function () { - wx.navigateBack(); - } - }), !1); - }, - showInvoice: function () { - this.setData({ - invoiceToggle: !this.data.invoiceToggle - }); - }, - keyUpChangePay1: function (t) { - this.setData({ - payWithUserMoney: !(t.detail.value.length > 0) - }); - }, - keyUpChangePay2: function (t) { - this.setData({ - payWithPoints: !(t.detail.value.length > 0) - }); - }, - keyUpChangeNum: function (t) { - this.setData({ - maxWord: t.detail.value.length - }); - }, - //---------计算立即购买---------- - calculatePrice2:async function () { - - this.setData({submit:1}); - wx.showLoading({ - title: "处理中.", - mask:true - }) - - var th = this, good = this.data.bn_goods; - //-----------计算商品总价-------------- - var allpice = good.shop_price * good.buynum; - allpice = parseFloat(allpice).toFixed(2); - var txt = "formData.all_price"; - th.setData({ [txt]: allpice, }); - - //to.getwuliuprice(async function (rs) { + }, 1) + + }, + //---------------检查是否有收货地址------------------- + checkAddressList: function () { + var t = this; + return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({ + title: "请先填写或选择收货地址~", + success: function (a) { + a.confirm ? t.enterAddressPage() : wx.navigateBack(); + }, + fail: function () { + wx.navigateBack(); + } + }), !1); + }, + showInvoice: function () { + this.setData({ + invoiceToggle: !this.data.invoiceToggle + }); + }, + keyUpChangePay1: function (t) { + this.setData({ + payWithUserMoney: !(t.detail.value.length > 0) + }); + }, + keyUpChangePay2: function (t) { + this.setData({ + payWithPoints: !(t.detail.value.length > 0) + }); + }, + keyUpChangeNum: function (t) { + this.setData({ + maxWord: t.detail.value.length + }); + }, + //---------计算立即购买---------- + calculatePrice2: async function () { + + this.setData({submit: 1}); + wx.showLoading({ + title: "处理中.", + mask: true + }) + + var th = this, good = this.data.bn_goods; + //-----------计算商品总价-------------- + var allpice = good.shop_price * good.buynum; + allpice = parseFloat(allpice).toFixed(2); + var txt = "formData.all_price"; + th.setData({[txt]: allpice,}); + + //to.getwuliuprice(async function (rs) { console.log('calculatePrice2222'); //console.log(rs); @@ -463,7 +533,7 @@ Page({ //-----------当地址不为空，且是物流时，计算物流费用,同时阶梯团不计算拼团价格---------- 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)) { - var user_addr=th.data.user_addr; + var user_addr = th.data.user_addr; var req_d = { province: user_addr.province, city: user_addr.city, district: user_addr.district, wuliu: parseFloat(allpice).toFixed(2), store_id: os.stoid @@ -480,13 +550,13 @@ Page({ var cut_good_weight = 0; for (let i in gd_arr_list) { let item = gd_arr_list[i]; - + if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { - if(item['exp_sum_type'] == 2) { - if (goods_weight < 0) goods_weight = 0; - cut_good_weight += item['weight'] * item['buynum']; - goods_weight += item['weight'] * item['buynum']; + if (item['exp_sum_type'] == 2) { + if (goods_weight < 0) goods_weight = 0; + cut_good_weight += item['weight'] * item['buynum']; + goods_weight += item['weight'] * item['buynum']; } if (back_data.weight_free > 0) { out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; @@ -522,93 +592,101 @@ Page({ //如果是正值的时候 if (out_of_weight >= 0) out_of_weight = -cut_good_weight; else out_of_weight = -back_data.weight_free * 1000; - - - var code = th.data.wu_arr[th.data.index].code; - - //--------------开始计算物流------------------ - var shipping_price=0; - // var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - // goods_piece, th.data.user_addr, back_data, rs); - - var w_data={ - store_id:os.stoid, code:code, - o_shipping_price:o_shipping_price, - goods_weight:goods_weight, - out_of_weight:out_of_weight,goods_piece:goods_piece, - user_addr_province:th.data.user_addr.province, - user_addr_city:th.data.user_addr.city, - user_addr_district:th.data.user_addr.district, - is_by_all:back_data && back_data.is_by_all?1:0, - no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + + + var code = th.data.wu_arr[th.data.index].code; + + //--------------开始计算物流------------------ + var shipping_price = 0; + // var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data, rs); + + var w_data = { + store_id: os.stoid, code: code, + o_shipping_price: o_shipping_price, + goods_weight: goods_weight, + out_of_weight: out_of_weight, goods_piece: goods_piece, + user_addr_province: th.data.user_addr.province, + user_addr_city: th.data.user_addr.city, + user_addr_district: th.data.user_addr.district, + is_by_all: back_data && back_data.is_by_all ? 1 : 0, + no_free_goods: back_data && back_data.no_free_goods && back_data.no_free_goods.length > 0 ? 1 : 0, } - var is_ok=0; - await getApp().request.promisePost('/api/weshop/order/getOrderWuLiPrice', {data:w_data,is_json:1}).then(res=>{ - if(res.data.code==0){ - shipping_price=res.data.data; is_ok=1; + var is_ok = 0; + await getApp().request.promisePost('/api/weshop/order/getOrderWuLiPrice', { + data: w_data, + is_json: 1 + }).then(res => { + if (res.data.code == 0) { + shipping_price = res.data.data; + is_ok = 1; } }) - if(!is_ok){ + if (!is_ok) { wx.hideLoading(); wx.showToast({ - title: "计算物流错误", icon: 'none',duration: 2000 + title: "计算物流错误", icon: 'none', duration: 2000 }) //th.setData({ show_submit:0 }); return false; } - shipping_price = parseFloat(shipping_price).toFixed(2); - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: shipping_price, }) + shipping_price = parseFloat(shipping_price).toFixed(2); + var wl_txt = "formData.shipping_price"; + th.setData({[wl_txt]: shipping_price,}) - } else if(th.data.bn_exp_type == 1 ) { - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: 0, }) + } else if (th.data.bn_exp_type == 1) { + var wl_txt = "formData.shipping_price"; + th.setData({[wl_txt]: 0,}) } - //判断是否同城配送,而且没有调用过 - if(th.data.bn_exp_type==2 && th.data.user_addr){ - var lon=0;var lat=0; - //-- 获取距离 -- - 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 gd_w=good['weight'] * good['buynum']; - //-- 获取距离 -- - var req_data={ - store_id:os.stoid, - order_amount:allpice, - lon:lon,lat:lat, - pickup_id:th.data.bn_pick, - goods_weight:gd_w - } - - 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; - wx.showToast({ - title: res.data.msg, icon: 'none', duration: 2000 - }) - } - }) - if(!is_next) return false - } + //判断是否同城配送,而且没有调用过 + if (th.data.bn_exp_type == 2 && th.data.user_addr) { + var lon = 0; + var lat = 0; + //-- 获取距离 -- + 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 gd_w = good['weight'] * good['buynum']; + //-- 获取距离 -- + var req_data = { + store_id: os.stoid, + order_amount: allpice, + lon: lon, lat: lat, + pickup_id: th.data.bn_pick, + goods_weight: gd_w + } + + 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; + wx.showToast({ + title: res.data.msg, icon: 'none', duration: 2000 + }) + } + }) + if (!is_next) return false + } //-----------------总价----------------- @@ -616,467 +694,509 @@ Page({ total_m = parseFloat(total_m).toFixed(2); var atxt = "formData.total_amount"; - th.setData({ [atxt]: total_m, }) + th.setData({[atxt]: total_m,}) var order_m = total_m; var txt = "formData.user_money"; var txt2 = "formData.order_amount"; + var txt4 = "formData.use_commission"; + + if(parseFloat(order_m) 0) { - if (parseFloat(th.data.yuer) > total_m) { - th.setData({ [txt]: total_m, [txt2]: 0,submit:0,show_btn:1 }) - } else { - order_m = parseFloat(order_m) - parseFloat(th.data.yuer); - order_m = order_m.toFixed(2); - th.setData({ [txt]: th.data.yuer, [txt2]: order_m,submit:0,show_btn:1 }) - } + if (parseFloat(th.data.yuer) > parseFloat(order_m)) { + th.setData({[txt]: order_m, [txt2]: 0, submit: 0, show_btn: 1}) + } else { + order_m = parseFloat(order_m) - parseFloat(th.data.yuer); + order_m = order_m.toFixed(2); + th.setData({[txt]: th.data.yuer, [txt2]: order_m, submit: 0, show_btn: 1}) + } } else { - th.setData({ [txt]: 0, [txt2]: order_m,submit:0,show_btn:1 }) + th.setData({[txt]: 0, [txt2]: order_m, submit: 0, show_btn: 1}) } wx.hideLoading(); - //}); + //}); - }, - //--------------------提交订单----------------------- - submitForm: async function (t) { - if (this.data.is_summit_ing == 1) return false; //--提交中退出-- - this.data.is_summit_ing = 1; + }, + //--------------------提交订单----------------------- + submitForm: async function (t) { + if (this.data.is_summit_ing == 1) return false; //--提交中退出-- + this.data.is_summit_ing = 1; + + var th = this, pdata = new Array(); + var ff = true; + //------------立即购买------------- + console.log("buy_new"); + + //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 + if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { + ff = false; + getApp().my_warnning("请选择收货地址", 0, this); + this.data.is_summit_ing = 0; + } + if (!ff) return false; + var addr = th.data.user_addr; + if (th.data.bn_exp_type == 1) addr = null; + + console.log(th.data.formData); + console.log(th.data.wu_arr); + console.log(th.data.bn_exp_type); + + if (th.data.bn_exp_type == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { + if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { + getApp().my_warnning("读取物流失败", 0, this); + this.data.is_summit_ing = 0; + return false; + } + } - var th = this, pdata = new Array(); - var ff = true; - //------------立即购买------------- - console.log("buy_new"); + //阶梯团强制带1，自提~~~ + if (th.data.kt_type == 3) { + th.data.bn_exp_type = 1; + } - //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 - if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - ff = false; - getApp().my_warnning("请选择收货地址", 0, this); - this.data.is_summit_ing = 0; - } - if (!ff) return false; - var addr = th.data.user_addr; - if (th.data.bn_exp_type == 1) addr = null; - - console.log(th.data.formData); - console.log(th.data.wu_arr); - console.log(th.data.bn_exp_type); - - if (th.data.bn_exp_type == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { - getApp().my_warnning("读取物流失败", 0, this); - this.data.is_summit_ing = 0; - return false; - } - } + var item = { + 'user_id': to.globalData.user_id, + 'consignee': addr == null ? "" : addr.consignee, + 'province': addr == null ? 0 : addr.province, + 'city': addr == null ? 0 : addr.city, + 'district': addr == null ? 0 : addr.district, + 'twon': addr == null ? 0 : addr.twon, + 'address': addr == null ? "" : addr.address, + 'more_address': addr == null ? "" : addr.more_address, + 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile, + 'email': '', + 'invoice_title': '', + 'goods_price': th.data.formData.all_price, //商品总价 + 'shipping_price': th.data.formData.shipping_price, //物流金额 + 'user_money': th.data.formData.user_money, //使用余额 + 'total_amount': th.data.formData.total_amount, //订单总价 + 'order_amount': th.data.formData.order_amount, //应付 + 'user_note': t.detail.value.user_note, //用户备注 + 'store_id': oo.stoid, //商家 + 'pickup_id': th.data.bn_pick, //门店 + 'exp_type': th.data.bn_exp_type, //配送方式 + 'is_normal': th.data.bn_goods.is_normal, //是否是普通购买 + 'pt_prom_id': th.data.bn_goods.prom_id, //拼单ID + 'is_pt_tz': th.data.is_pt_tz, //开团类型 + 'order_goods': new Array(), + }; + + //如果不是阶梯团，或者是普通购买， + if ((th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { + item['shipping_code'] = th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code; + item['shipping_name'] = th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name; + } - //阶梯团强制带1，自提~~~ - if (th.data.kt_type == 3) { - th.data.bn_exp_type = 1; - } + if (!th.data.bn_goods.is_normal) { + item.is_zsorder = th.data.kt_type + 1; //开团类型 + } + //老会员成为分销下线需要的参数 + if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) { + //判断一下分享人是不是分享商 + await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.first_leader, {}).then(res => { + if (res.data.code == 0) { + var user = res.data.data; + if (user.is_distribut == 1) { + item.first_leader = parseInt(getApp().globalData.first_leader); + } + } + }) + } - var item = { - 'user_id': to.globalData.user_id, - 'consignee': addr == null ? "" : addr.consignee, - 'province': addr == null ? 0 : addr.province, - 'city': addr == null ? 0 : addr.city, - 'district': addr == null ? 0 : addr.district, - 'twon': addr == null ? 0 : addr.twon, - 'address': addr == null ? "" : addr.address, - 'more_address': addr == null ? "" : addr.more_address, - 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile, - 'email': '', - 'invoice_title': '', - 'goods_price': th.data.formData.all_price, //商品总价 - 'shipping_price': th.data.formData.shipping_price, //物流金额 - 'user_money': th.data.formData.user_money, //使用余额 - 'total_amount': th.data.formData.total_amount, //订单总价 - 'order_amount': th.data.formData.order_amount, //应付 - 'user_note': t.detail.value.user_note, //用户备注 - 'store_id': oo.stoid, //商家 - 'pickup_id': th.data.bn_pick, //门店 - 'exp_type': th.data.bn_exp_type, //配送方式 - 'is_normal': th.data.bn_goods.is_normal, //是否是普通购买 - 'pt_prom_id': th.data.bn_goods.prom_id, //拼单ID - 'is_pt_tz': th.data.is_pt_tz, //开团类型 - 'order_goods': new Array(), - }; - - //如果不是阶梯团，或者是普通购买， - if ((th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - item['shipping_code'] = th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code; - item['shipping_name'] = th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name; - } + if (th.data.qh != '') { + item.team_qh = th.data.qh; + item.pt_listno = th.data.qh; + } - if (!th.data.bn_goods.is_normal) { - item.is_zsorder = th.data.kt_type + 1; //开团类型 - } - //老会员成为分销下线需要的参数 - if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) { - //判断一下分享人是不是分享商 - await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.first_leader, {}).then(res => { - if (res.data.code == 0) { - var user = res.data.data; - if (user.is_distribut == 1) { - item.first_leader = parseInt(getApp().globalData.first_leader); - } + //-- 如果有使用佣金抵扣的话 -- + if(th.data.bn_use_commission){ + item.use_commission=th.data.bn_goods.use_commission; } - }) - } - if (th.data.qh != '') { - item.team_qh = th.data.qh; - item.pt_listno = th.data.qh; - } - var gg = to.get_b_now(); - var goods = { - 'goods_id': gg.goods_id, - 'goods_name': gg.goods_name, - 'goods_sn': gg.goods_sn, - 'goods_num': gg.goods_num, - 'market_price': th.data.bn_goods.market_price, - 'goods_price': th.data.bn_goods.shop_price, - 'member_goods_price': th.data.bn_goods.shop_price, - 'store_id': oo.stoid, - 'prom_type': th.data.bn_goods.prom_type, //促销活动类型 - 'prom_id': th.data.bn_goods.prom_id, //促销活动id - }; - - if(getApp().globalData.skinface_id){ - goods.skinface_id=getApp().globalData.skinface_id; - } - - if(th.data.bn_goods.whsle_id){ - item.is_whsle=1; - goods.is_whsle_goods=1; - } - - //--导购分享过来的id-- - if (gg.guide_id) { - goods.guide_id = gg.guide_id; - goods.guide_type = gg.guide_type; - //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => { - if (res.data.code == 0) { - goods.guide_name = res.data.data.salesman; - goods.guide_sn = res.data.data.salesman_no; - } - }) - } + var gg = to.get_b_now(); + var goods = { + 'goods_id': gg.goods_id, + 'goods_name': gg.goods_name, + 'goods_sn': gg.goods_sn, + 'goods_num': gg.goods_num, + 'market_price': th.data.bn_goods.market_price, + 'goods_price': th.data.bn_goods.shop_price, + 'member_goods_price': th.data.bn_goods.shop_price, + 'store_id': oo.stoid, + 'prom_type': th.data.bn_goods.prom_type, //促销活动类型 + 'prom_id': th.data.bn_goods.prom_id, //促销活动id + }; - //--商品的房间号-- - if (gg.room_id && gg.room_id > 0) { - item.room_ids = gg.room_id; - goods.room_id = gg.room_id; - } + if (getApp().globalData.skinface_id) { + goods.skinface_id = getApp().globalData.skinface_id; + } - if (th.data.bn_goods.is_normal) { goods.is_pd_normal = 1; } - - item.order_goods.push(goods); - pdata.push(item); - - if (pdata.length == 0) return; - var str = JSON.stringify(pdata); - console.log("支付数据"); - console.log(str); - //return false; - wx.showLoading({ title: "加载中" }); - wx.request({ - url: oo.url + '/api/weshop/order/createWxdOrder', - data: str, - method: 'POST', - header: { - 'content-type': 'application/json' - },// 设置请求的 header - success: function (res) { + if (th.data.bn_goods.whsle_id) { + item.is_whsle = 1; + goods.is_whsle_goods = 1; + } - wx.hideLoading(); - if (res.statusCode == 200) { - var data = res.data; - if (data.code == 0) { - console.log(th.data.is_b_now); - //如果是购物车结算，还要删除购物车 - if (th.data.is_b_now == 0) { - console.log(th.data.cartlist_y); - var list = th.data.cartlist_y; - for (var i = 0; i < list.length; i++) { - //删除购物车 - getApp().request.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {}); - } - } - var order_amount = 0; - pdata.forEach(function (em, ind) { - order_amount += em.order_amount; + //--导购分享过来的id-- + if (gg.guide_id) { + goods.guide_id = gg.guide_id; + goods.guide_type = gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => { + if (res.data.code == 0) { + goods.guide_name = res.data.data.salesman; + goods.guide_sn = res.data.data.salesman_no; + } }) - //要进行判断，如果是用微信支付，就要跳转到支付界面 - if (order_amount > 0) { - th.setData({ isclose: 0 }); - //void e.jumpToCart4({ - // order_sn: data.data, - // type:1, - // }, 1); - util_pay.pay(data.data, function () { - setTimeout(function () { - wx.reLaunch({ - //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - url: "/pages/team/team_success/team_success?ordersn=" + data.data, - }) - }, 1000) - }, function () { - //支付失败 - setTimeout(function () { - //wx.navigateBack({ delta: 1 }) - wx.reLaunch({ - url: "/pages/user/order_list/order_list", - }) - }, 1000) - - }, oo.stoid, 1); + } - } else { - var dd = { - parent_sn: data.data, - store_id: oo.stoid, - type: 1, - }; - //return false; - getApp().request.post("/api/weshop/order/pay/createOrder", { - data: dd, - success: function (t) { - console.log(t); - // app.my_warnning("支付成功", 1, th); - wx.showToast({ - title: '支付成功', - icon: 'success', - duration: 2000 - }); - setTimeout(function () { - th.setData({ isclose: 0 }); - - if (th.data.is_normal == 1) { - /*-- - wx.navigateTo({ - url: "/pages/user/order_list/order_list", - })--*/ - var url = "/pages/payment/pay_success/pay_success?type=1&order_sn=" + data.data; - wx.reLaunch({ - url: url - }) + //--商品的房间号-- + if (gg.room_id && gg.room_id > 0) { + item.room_ids = gg.room_id; + goods.room_id = gg.room_id; + } + + if (th.data.bn_goods.is_normal) { + goods.is_pd_normal = 1; + } + + item.order_goods.push(goods); + pdata.push(item); + + if (pdata.length == 0) return; + var str = JSON.stringify(pdata); + console.log("支付数据"); + console.log(str); + //return false; + wx.showLoading({title: "加载中"}); + wx.request({ + url: oo.url + '/api/weshop/order/createWxdOrder', + data: str, + method: 'POST', + header: { + 'content-type': 'application/json' + },// 设置请求的 header + success: function (res) { + + wx.hideLoading(); + if (res.statusCode == 200) { + var data = res.data; + if (data.code == 0) { + console.log(th.data.is_b_now); + //如果是购物车结算，还要删除购物车 + if (th.data.is_b_now == 0) { + console.log(th.data.cartlist_y); + var list = th.data.cartlist_y; + for (var i = 0; i < list.length; i++) { + //删除购物车 + getApp().request.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {}); + } + } + var order_amount = 0; + pdata.forEach(function (em, ind) { + order_amount += em.order_amount; + }) + //要进行判断，如果是用微信支付，就要跳转到支付界面 + if (order_amount > 0) { + th.setData({isclose: 0}); + //void e.jumpToCart4({ + // order_sn: data.data, + // type:1, + // }, 1); + util_pay.pay(data.data, function () { + setTimeout(function () { + wx.reLaunch({ + //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, + url: "/pages/team/team_success/team_success?ordersn=" + data.data, + }) + }, 1000) + }, function () { + //支付失败 + setTimeout(function () { + //wx.navigateBack({ delta: 1 }) + wx.reLaunch({ + url: "/pages/user/order_list/order_list", + }) + }, 1000) + + }, oo.stoid, 1); + + } else { + var dd = { + parent_sn: data.data, + store_id: oo.stoid, + type: 1, + }; + //return false; + getApp().request.post("/api/weshop/order/pay/createOrder", { + data: dd, + success: function (t) { + console.log(t); + // app.my_warnning("支付成功", 1, th); + wx.showToast({ + title: '支付成功', + icon: 'success', + duration: 2000 + }); + setTimeout(function () { + th.setData({isclose: 0}); + + if (th.data.is_normal == 1) { + /*-- + wx.navigateTo({ + url: "/pages/user/order_list/order_list", + })--*/ + var url = "/pages/payment/pay_success/pay_success?type=1&order_sn=" + data.data; + wx.reLaunch({ + url: url + }) + + } else { + wx.reLaunch({ + url: "/pages/team/team_success/team_success?ordersn=" + data.data, + }) + } + + + }, 1000) + } + }); + } } else { - wx.reLaunch({ - url: "/pages/team/team_success/team_success?ordersn=" + data.data, - }) + th.data.is_summit_ing = 0; //是否提交中 + getApp().confirmBox(data.msg); } + } else { + th.data.is_summit_ing = 0; //是否提交中 + console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); + } + }, + fail: function () { + th.data.is_summit_ing = 0; //是否提交中 + wx.hideLoading(); + console.log("index.js wx.request CheckCallUser fail"); + }, + complete: function () { + } + }) + }, + useCoupon: function () { + if (this.data.order.couponNum <= 0) { + //return t.showWarning("无可用优惠券"); + getApp().my_warnning("无可用优惠券", 0, this); + return; + } + var a = { + lid: this.data.coupon ? this.data.coupon.id : "0" + }; + wx.navigateTo({ + url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a) + }); + }, + //检查区域是不是包邮 + check_area: function (arr) { + var user_addr = this.data.user_addr; + if (!user_addr) return 0; + for (var i in arr) { + var item = arr[i]; + if (user_addr.twon == item || user_addr.district == item + || user_addr.city == item || user_addr.province == item) { + return 0; + } + } + return 1; + }, + //检查立即购买的商品是不是不包邮 + check_good: function (arr, goods_id) { + if (!goods_id) goods_id = this.data.goods.goods_id; + for (var i in arr) { + var item = arr[i]; + if (goods_id == item) return 0; + } + return 1; + }, + check_by_area: function (region_list) { + var arr = region_list.split(","); + var check = this.check_area(arr); + return !check; + }, + check_by_goods: function (goods_list, goods_id) { + var arr = goods_list.split(","); + var check = this.check_good(arr, goods_id); + return !check; + }, + enterAddressPage: function () { + getApp().globalData.is_cart_old = 1; + this.data.enterAddressPage = !0, wx.navigateTo({ + url: "/pages/user/address_list/address_list" + }); + }, - }, 1000) + //--------立即购买时，选择自提和物流----------- + setexptype_w: function (t) { + var th = this; + var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt; + th.setData({[txt]: ty}); + var iszt = 1; + if (ty == 0) { + th.setData({is_all_zt: 0}); + } else { + for (var i = 0; i < th.data.cartlist.length; i++) { + var item = th.data.cartlist[i]; + if (item.exp_type == 0) { + iszt = 0; + break; } - }); } - } - else { - th.data.is_summit_ing = 0; //是否提交中 - getApp().confirmBox(data.msg); - } - } else { - th.data.is_summit_ing = 0; //是否提交中 - console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); - } - }, - fail: function () { - th.data.is_summit_ing = 0; //是否提交中 - wx.hideLoading(); - console.log("index.js wx.request CheckCallUser fail"); - }, - complete: function () { } - }) - }, - useCoupon: function () { - if (this.data.order.couponNum <= 0) { - //return t.showWarning("无可用优惠券"); - getApp().my_warnning("无可用优惠券", 0, this); - return; - } - var a = { - lid: this.data.coupon ? this.data.coupon.id : "0" - }; - wx.navigateTo({ - url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a) - }); - }, - //检查区域是不是包邮 - check_area: function (arr) { - var user_addr = this.data.user_addr; - if (!user_addr) return 0; - for (var i in arr) { - var item = arr[i]; - if (user_addr.twon == item || user_addr.district == item - || user_addr.city == item || user_addr.province == item) { - return 0; - } - } - return 1; - }, - - //检查立即购买的商品是不是不包邮 - check_good: function (arr, goods_id) { - if (!goods_id) goods_id = this.data.goods.goods_id; - for (var i in arr) { - var item = arr[i]; - if (goods_id == item) return 0; - } - return 1; - }, - check_by_area: function (region_list) { - var arr = region_list.split(","); - var check = this.check_area(arr); - return !check; - }, - check_by_goods: function (goods_list, goods_id) { - var arr = goods_list.split(","); - var check = this.check_good(arr, goods_id); - return !check; - }, - enterAddressPage: function () { - getApp().globalData.is_cart_old = 1; - this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" - }); - }, - - //--------立即购买时，选择自提和物流----------- - setexptype_w: function (t) { - var th = this; - var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt; - th.setData({ [txt]: ty }); - var iszt = 1; - if (ty == 0) { - th.setData({ is_all_zt: 0 }); - } else { - for (var i = 0; i < th.data.cartlist.length; i++) { - var item = th.data.cartlist[i]; - if (item.exp_type == 0) { iszt = 0; break; } - } - th.setData({ is_all_zt: iszt }); - } - //----计算此时购物车的价格---- - th.calculatePrice(); - }, - - //--------立即购买时，选择自提和物流---------- - setexptype: function (t) { - var th = this; - var ty = t.currentTarget.dataset.t; - th.setData({ bn_exp_type: ty }); - //当物流为空的时候。 - if (ty == 0 && th.data.wu_arr == null) { - return th.get_wuliu(th.calculatePrice2()); - } - th.calculatePrice2() - console.log('setexptype'); - }, - - //--------立即购买时，使用余额-------- - set_bn_useyuer: function () { - var th = this; - th.setData({ bn_use_money: !th.data.bn_use_money }); - th.calculatePrice2(); - }, - set_js_useyuer: function () { - var th = this; - th.setData({ js_use_money: !th.data.js_use_money }); - th.calculatePrice(); - }, - - //----------立即购买，选择物流------------- - bindPickerChange: function (e) { - var ind = e.detail.value - this.setData({ index: ind }); - this.calculatePrice2(); - }, - - //----------购物车结算，选择物流------------- - bindPickerChange_w: function (e) { - var ind = e.detail.value, txt = e.currentTarget.dataset.txt; - this.setData({ [txt]: ind }); - this.calculatePrice(); - }, - - cart_set_err: function (e) { - var txt = e.currentTarget.dataset.err; - var ob = {}; - ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; - this.setData(ob); - }, - - //// 开启物流的弹窗 - show_wu_arr: function (e) { - this.setData({ open_express: 1 }); - }, - - //更新下默认，在onshow里面 - update_code() { - var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - - var uii = setInterval(function () { - if (th.data.wu_arr) { - clearInterval(uii); - for (var k = 0; k < th.data.wu_arr.length; k++) { - var item = th.data.wu_arr[k]; - if (def_exp_code == item.code) { - m_wind = k; - } + th.setData({is_all_zt: iszt}); } - //--如果是立即购买-- - th.setData({ index: m_wind, is_express: m_wind }); - } - }, 500) - }, - - // 关闭物流的弹窗 - close_express: function () { - this.setData({ open_express: 0 }); - }, - // 选择物流 - click_express_name: function (e) { - var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode; - var index = e.currentTarget.dataset.idxe; - var ob = { is_express: index, is_shipping_code: shippingcode, index: index }; - this.setData(ob); - }, - - //点击确定物流 - determine_expres: function (e) { - this.setData({ open_express: 0 }); - this.calculatePrice2(); - }, - //设置默认物流 - select_default_logistics: function () { - var th = this; - var is_shipping_code = this.data.is_shipping_code - getApp().request.put("/api/weshop/users/update", { - data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code }, - success: function (rse) { - if (rse.data.code == 0) { - getApp().globalData.userInfo.def_exp_code = is_shipping_code; - th.setData({ open_express: 0 }); - //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- - //if(th.data.is_b_now==1) th.calculatePrice2(); - //else th.calculatePrice(); - th.calculatePrice2(); + //----计算此时购物车的价格---- + th.calculatePrice(); + }, + + //--------立即购买时，选择自提和物流---------- + setexptype: function (t) { + var th = this; + var ty = t.currentTarget.dataset.t; + th.setData({bn_exp_type: ty}); + //当物流为空的时候。 + if (ty == 0 && th.data.wu_arr == null) { + return th.get_wuliu(th.calculatePrice2()); } - } - }) - }, + th.calculatePrice2() + console.log('setexptype'); + }, + //--------立即购买时，使用余额-------- + set_bn_useyuer: function () { + var th = this; + th.setData({bn_use_money: !th.data.bn_use_money}); + th.calculatePrice2(); + }, - //跳转到购买卡 - buycard: function () { - getApp().goto("/pages/user/plus/plus"); - getApp().globalData.plus_buy_back = 1; - } + set_bn_commission: function () { + var th = this; + th.setData({bn_use_commission: !th.data.bn_use_commission}); + th.calculatePrice2(); + }, + + + set_js_useyuer: function () { + var th = this; + th.setData({js_use_money: !th.data.js_use_money}); + th.calculatePrice(); + }, + + //----------立即购买，选择物流------------- + bindPickerChange: function (e) { + var ind = e.detail.value + this.setData({index: ind}); + this.calculatePrice2(); + }, + + //----------购物车结算，选择物流------------- + bindPickerChange_w: function (e) { + var ind = e.detail.value, txt = e.currentTarget.dataset.txt; + this.setData({[txt]: ind}); + this.calculatePrice(); + }, + + cart_set_err: function (e) { + var txt = e.currentTarget.dataset.err; + var ob = {}; + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + }, + + //// 开启物流的弹窗 + show_wu_arr: function (e) { + this.setData({open_express: 1}); + }, + + //更新下默认，在onshow里面 + update_code() { + var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + + var uii = setInterval(function () { + if (th.data.wu_arr) { + clearInterval(uii); + for (var k = 0; k < th.data.wu_arr.length; k++) { + var item = th.data.wu_arr[k]; + if (def_exp_code == item.code) { + m_wind = k; + } + } + //--如果是立即购买-- + th.setData({index: m_wind, is_express: m_wind}); + } + }, 500) + }, + + // 关闭物流的弹窗 + close_express: function () { + this.setData({open_express: 0}); + }, + // 选择物流 + click_express_name: function (e) { + var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode; + var index = e.currentTarget.dataset.idxe; + var ob = {is_express: index, is_shipping_code: shippingcode, index: index}; + this.setData(ob); + }, + + //点击确定物流 + determine_expres: function (e) { + this.setData({open_express: 0}); + this.calculatePrice2(); + }, + //设置默认物流 + select_default_logistics: function () { + var th = this; + var is_shipping_code = this.data.is_shipping_code + getApp().request.put("/api/weshop/users/update", { + data: {user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code}, + success: function (rse) { + if (rse.data.code == 0) { + getApp().globalData.userInfo.def_exp_code = is_shipping_code; + th.setData({open_express: 0}); + //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- + //if(th.data.is_b_now==1) th.calculatePrice2(); + //else th.calculatePrice(); + th.calculatePrice2(); + } + } + }) + }, + + + //跳转到购买卡 + buycard: function () { + getApp().goto("/pages/user/plus/plus"); + getApp().globalData.plus_buy_back = 1; + } }); diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index 7f700e4..7d2437f 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -130,6 +130,14 @@ + + + + + 使用佣金 :￥{{bn_goods.use_commission}} + + + diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 68a50c0..07a1950 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -42,6 +42,9 @@ Page({ teamgroup: null, submit:1, //默认按钮是灰色 show_submit:0, //不线上 + + dis_config: null, + bn_use_commission: 0 //是不是使用佣金 }, /** @@ -69,6 +72,9 @@ Page({ th.get_wuliu(th.get_info(th.show_page)); }, 1) + //判断是不是佣金抵扣 + getApp().is_distribut(this); + }, /** * 生命周期函数--监听页面显示 @@ -327,6 +333,30 @@ Page({ } order.order_goods = order_goods; + + //-- 计算获得佣金的金额 -- + if (getApp().globalData.userInfo.is_distribut + && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { + var fir_num = 0; + var sec_num = 0; + var thi_num = 0; + if (th.data.dis_config.pattern == 1) { + fir_num = (inte_data.fir_rate || 0) * order_goods.goods_num; + sec_num = (inte_data.sec_rate || 0) * order_goods.goods_num; + thi_num = (inte_data.thi_rate || 0) * order_goods.goods_num; + } else { + fir_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2); + sec_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2); + thi_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2); + } + var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th); + + goods.use_commission = c_num; + + } + + + this.setData({ order: order, distr_type: distr_type, @@ -337,14 +367,32 @@ Page({ teamlist: teamlist, }); - //--计算物流-- - if (exp_type == 0) { - th.calculate_wuliu(); - } else { - var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money; - allpice = allpice.toFixed(2); - th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1 }) - } + //--计算价格-- + th.calculatePrice2(); + }, + + + calculatePrice2:function(){ + wx.showLoading(); + var th=this; + th.setData({submit:1}) + //--计算物流-- + if (th.data.exp_type == 0) { + th.calculate_wuliu(); + } else { + + + var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money; + if(th.data.bn_use_commission){ + allpice-=th.data.goods.use_commission; + } + allpice = allpice.toFixed(2); + + + + th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1 }) + wx.hideLoading(); + } }, //--图片失败，默认图片-- @@ -395,7 +443,6 @@ Page({ //--弹起支付框-- to_pay() { - //如果有再计算价格的过程中，不能提交订单 if(this.data.submit){ return false} @@ -404,9 +451,6 @@ Page({ return getApp().my_warnning("请选择收货地址", 0, this); } - - - this.setData({ show_pay_type: 1 }); }, @@ -453,6 +497,11 @@ Page({ dd.scene=getApp().globalData.scene; } + if(th.data.bn_use_commission){ + dd.use_commission=th.data.goods.use_commission; + } + + var arr = []; arr.push(dd); console.log(JSON.stringify(arr)); @@ -544,8 +593,16 @@ Page({ good.buynum=th.data.order.order_goods['goods_num']; var gd_arr_list = []; gd_arr_list.push(good); + + + + //--全部金额-- var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.pt_tail_money; + if(th.data.bn_use_commission){ + allpice-=th.data.goods.use_commission; + } + //-----------当地址不为空，且是物流时，计算物流费用---------- if (th.data.user_addr != null && th.data.exp_type == 0 && good.is_free_shipping == 0) { @@ -643,15 +700,57 @@ Page({ var exp_price = parseFloat(shipping_price).toFixed(2); allpice = parseFloat(exp_price) + parseFloat(allpice); + + if( allpice - + 尾款金额 ￥{{order.tail_money}} @@ -110,16 +110,31 @@ + + + + + + 使用佣金 :￥{{goods.use_commission}} + + + + + + - 支付合计：¥{{filters.toFix(order.tail_money+exp_price,2)}} + 支付合计：¥{{filters.toFix(order.tail_money+exp_price-(bn_use_commission?goods.use_commission:0) ,2)}} 支付尾款 + + + diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index 8964637..2de1ba1 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -66,7 +66,15 @@ (配送不匹配) - (库存不足) + (库存不足) + + (库存不足) + + (配送不匹配) + (库存不足) + + + 地址:{{def_pick_store.fulladdress}} diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 1237861..a4f3416 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -68,7 +68,7 @@ Page({ requestOrderDetail: function(e) { var o = this,oid=e,th=this; r.get(o.data.url + "/api/weshop/order/get/"+os.stoid+"/"+e, { - success: function(e) { + success: async function(e) { var r = e.data.data; r.addTimeFormat = t.format(r.add_time); if (r.order_status == 0 && r.pay_status==0 ){ @@ -119,6 +119,15 @@ Page({ } + r.use_commission=0; + //-- 如果有数据的话 -- + await getApp().request.promiseGet("/api/weshop/orderMore/get/"+os.stoid + "/"+r.order_sn, { + + }).then(res=>{ + if(res.data.code == 0 && res.data.data){ + r.use_commission=res.data.data.use_commission; + } + }) //------获取订单商品------- diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 39badaa..bbe3271 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -139,10 +139,16 @@ 订单总价 - ￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元 + ￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission,2)}}元 + + + 使用佣金 + ￥ {{filters.toFix(order.use_commission,2)}}元 + + 使用余额 ￥ {{filters.toFix(order.user_money+order.pt_tail_money,2)}}元 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index fa416f3..1174760 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -337,9 +337,24 @@ Page({ }); data[ind]['g_num'] = g_num; }) + + + data[ind].use_commission=0; + //-- 如果有数据的话 -- + await getApp().request.promiseGet("/api/weshop/orderMore/get/"+os.stoid + "/"+item.order_sn, { + + }).then(res=>{ + if(res.data.code == 0 && res.data.data){ + data[ind].use_commission=res.data.data.use_commission; + } + }) + + th.setData({orderList: data,}); }); + + e.data.currentPage++ , wx.stopPullDownRefresh(); }, null, {store_id: os.stoid, user_id: oo.user_id}); diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index efa2dcc..d1c347d 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -186,7 +186,7 @@ 合计(改): ￥ - {{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}} + {{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission,2)}} @@ -195,14 +195,14 @@ 定金(改): ￥ - {{filters.toFix(item.order_amount+item.user_money,2)}} + {{filters.toFix(item.order_amount+item.user_money+item.use_commission,2)}} 合计(改): ￥ - {{filters.toFix(item.order_amount+item.user_money,2)}} + {{filters.toFix(item.order_amount+item.user_money+item.use_commission,2)}} +{{item.coupon_price}}元优惠券 +{{item.integral}}积分 @@ -210,7 +210,7 @@ 待支付尾款: ￥ - {{filters.toFix(item.pt_tail_money-item.shipping_price,2)}} + {{filters.toFix(item.pt_tail_money+item.use_commission-item.shipping_price,2)}}