From 24041c26d78f5b8455ce08e33a82648a975ee04e Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Mon, 29 Aug 2022 18:23:21 +0800 Subject: [PATCH] 啦一下，压缩代码 --- app.js | 26 ++++++++++++++++++++------ pages/cart/cart/cart.js | 14 ++++---------- pages/cart/cart2/cart2.js | 30 ++++-------------------------- pages/cart/cart2_inte/cart2_inte.js | 15 +-------------- pages/cart/cart2_pt/cart2_pt.js | 15 ++------------- 5 files changed, 31 insertions(+), 69 deletions(-) diff --git a/app.js b/app.js index df34f9e..6bf2f79 100644 --- a/app.js +++ b/app.js @@ -1042,17 +1042,31 @@ App({ }, //获取佣金的比例 - get_commission(first_money,second_money,third_money,th) { + get_commission(dis_config,gd_data,goods_num) { + + var fir_num=0; + var sec_num=0; + var thi_num=0; + if(dis_config.pattern==1){ + fir_num=(gd_data.fir_rate || 0)*goods_num; + sec_num=(gd_data.sec_rate || 0)*goods_num; + thi_num=(gd_data.thi_rate || 0)*goods_num; + }else{ + fir_num=parseFloat((gd_data.commission || 0) *goods_num*(dis_config.firstRate || 0)/100).toFixed(2); + sec_num=parseFloat((gd_data.commission || 0)*goods_num*(dis_config.secondRate || 0)/100).toFixed(2); + thi_num=parseFloat((gd_data.commission || 0)*goods_num*(dis_config.thirdRate || 0)/100).toFixed(2); + } + if(getApp().globalData.userInfo.is_distribut){ - var pattern = th.data.dis_config.pattern; // 分销模式 - var first_rate = th.data.dis_config.first_rate; // 一级比例 - var second_rate = th.data.dis_config.second_rate; // 二级比例 - var third_rate = th.data.dis_config.third_rate; // 三级比例 + var pattern = dis_config.pattern; // 分销模式 + var first_rate = dis_config.first_rate; // 一级比例 + var second_rate = dis_config.second_rate; // 二级比例 + var third_rate = dis_config.third_rate; // 三级比例 if(this.globalData.userInfo.first_leader){ return parseFloat(parseFloat(first_money).toFixed(2)); }else{ - return parseFloat((parseFloat(first_money)+parseFloat(second_money)+parseFloat(third_money)).toFixed(2)); + return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2)); } } }, diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index f67c2a8..6fcc4ab 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -50,13 +50,7 @@ Page({ onLoad: function () { var a = this, ee = a; - //----获取系统参数----- - // getApp().getConfig2(function (e) { - // ee.setData({ - // bconfig: e, - // sales_rules: e.sales_rules - // }); - // }) + wx.setNavigationBarTitle({ title: "购物车", @@ -122,7 +116,7 @@ Page({ enabled: 1 } }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + if( ut.ajax_ok(res)){ var a = res.data.data.pageData; var narr=[]; for(var i in a){ @@ -150,7 +144,7 @@ Page({ getApp().request.promiseGet("/api/ms/flash_sale/spikepage", { data: req_d, }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) { + if (ut.ajax_ok(res)) { th.setData({ is_has_flash: 1 }) @@ -269,7 +263,7 @@ Page({ }, }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + if(ut.ajax_ok2(res)) { by_map = {}; for (let i in res.data.data) { let item = res.data.data[i]; diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 0baf088..7807ca8 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1267,19 +1267,8 @@ 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=(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); + + var c_num=getApp().get_commission(th.data.dis_config,t.data.data,gg.goods_num); gd.use_commission=c_num; t.data.data.use_commission=c_num; @@ -1327,19 +1316,8 @@ 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=(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); + + var c_num=getApp().get_commission(th.data.dis_config,t.data.data,gg.goods_num); gd.use_commission=c_num; t.data.data.use_commission=c_num; diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 8148f77..ece1c07 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -401,20 +401,7 @@ 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 = (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); - + var c_num = getApp().get_commission(th.data.dis_config,inte_data, gg.goods_num); t.data.data.use_commission = c_num; } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 145b114..46cb45e 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -283,19 +283,8 @@ 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 = (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); + + var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num); gd.use_commission = c_num; t.data.data.use_commission = c_num; -- libgit2 0.21.4