From 85f6036ad23c66b97bc7c253f4d04c762fe2fde3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 10 Jan 2025 11:43:45 +0800
Subject: [PATCH] feat(activity): 优化活动列表展示和状态管理
---
src/main/resources/templates/febs/views/modules/system/profitSetting.html | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/system/profitSetting.html b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
index ac1948f..34c54c2 100644
--- a/src/main/resources/templates/febs/views/modules/system/profitSetting.html
+++ b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
@@ -8,6 +8,7 @@
<li class="layui-this">分红设置</li>
<li>代理分红</li>
<li>排名分红</li>
+ <li>间推分红</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show" id="bonus-global-setting">
@@ -17,6 +18,10 @@
</div>
<div class="layui-tab-item">
<table id="rankBonus" lay-filter="rankBonus"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table id="indirectDistrib" lay-filter="indirectDistrib"></table>
+ <div class="layui-word-aux">间推分红即为隔代收益，将直推奖励按照对应比例依次向上级返利，直至结算到一元为止</div>
</div>
</div>
</div>
@@ -47,11 +52,6 @@
margin-bottom: 20px !important;
}
</style>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" lay-event="delSku">删除</button>
- </div>
-</script>
<script type="text/html" id="bonusSystem">
{{# layui.each(d, function(index, item){ }}
<div class="layui-form-item">
@@ -64,7 +64,7 @@
{{# }}}
{{# if(item.code == 'THANKFUL_BONUS') { }}
- <div class="layui-word-aux" style="margin-left: 150px;">将推荐人收益(代理，直推，排名)的对应比例加权平分给下面直推</div>
+ <div class="layui-word-aux" style="margin-left: 150px;">将推荐人的收益(代理，直推，排名)的对应比例加权平分给下面直推</div>
{{# }}}
</div>
{{# }) }}
@@ -81,7 +81,8 @@
, $bonusSystem = $("#bonus-global-setting")
, laytpl = layui.laytpl
, agentBonusArr
- , rankBonusArr;
+ , rankBonusArr
+ , indirectBonusArr;
form.verify(validate);
form.render();
@@ -92,6 +93,8 @@
{field: 'description', title: '代理', edit:'text'}
,{field: 'prop', title: '返利比例(%)', edit:'text'}
,{field: 'achieve', title: '团队业绩(万元)', edit:'text'}
+ ,{field: 'direct', title: '直推(个)', edit:'text'}
+ ,{field: 'lastAgentCnt', title: '上一级代理(个)', edit:'text'}
,{field: 'type', title: '比例', edit:'text', hide:'true'}
,{field: 'code', title: '比例', edit:'text', hide:'true'}
]]
@@ -106,7 +109,9 @@
if (agentBonusArr[i].code === data.code) {
var valueData = {};
valueData.teamIncome = data.achieve;
- valueData.profitProp = data.prop
+ valueData.profitProp = data.prop;
+ valueData.directCnt = data.direct;
+ valueData.lastAgentCnt = data.lastAgentCnt;
agentBonusArr[i].value = JSON.stringify(valueData);
}
}
@@ -135,9 +140,36 @@
}
});
+ table.render({
+ elem: '#indirectDistrib'
+ ,cols: [[ //表头
+ {field: 'pushCnt', title: '直推人数', edit:'text'}
+ ,{field: 'prop', title: '返利比例(%)', edit:'text'}
+ ,{field: 'type', title: '比例', edit:'text', hide:'true'}
+ ,{field: 'code', title: '比例', edit:'text', hide:'true'}
+ ]]
+ ,data: []
+ });
+
+ table.on('edit(indirectDistrib)', function(obj){
+ var value = obj.value //得到修改后的值
+ ,data = obj.data //得到所在行所有键值
+ ,field = obj.field; //得到字段
+
+ for (let i = 0; i < indirectBonusArr.length; i++) {
+ if (indirectBonusArr[i].code === data.code) {
+ var valueData = {};
+ valueData.pushCnt = data.pushCnt;
+ valueData.prop = data.prop;
+ indirectBonusArr[i].value = JSON.stringify(valueData);
+ }
+ }
+ });
+
dicDataReq("BONUS_TYPE");
dicDataReq("AGENT_LEVEL_REQUIRE");
dicDataReq("RANK_AWARD");
+ dicDataReq("INDIRECT_BONUS_SETTING");
function dicDataReq(type) {
$bonusSystem.empty();
$.get(ctx + 'admin/common/findDicByType/' + type, function (r) {
@@ -153,6 +185,8 @@
for (let i = 0; i < data.length; i++) {
data[i].prop = JSON.parse(data[i].value).profitProp;
data[i].achieve = JSON.parse(data[i].value).teamIncome;
+ data[i].direct = JSON.parse(data[i].value).directCnt;
+ data[i].lastAgentCnt = JSON.parse(data[i].value).lastAgentCnt;
}
agentBonusArr = data;
table.reload('agentBonus', {
@@ -166,6 +200,17 @@
data : data
});
}
+
+ if ("INDIRECT_BONUS_SETTING" == type) {
+ for (let i = 0; i < data.length; i++) {
+ data[i].prop = JSON.parse(data[i].value).prop;
+ data[i].pushCnt = JSON.parse(data[i].value).pushCnt;
+ }
+ indirectBonusArr = data;
+ table.reload('indirectDistrib', {
+ data : data
+ });
+ }
}
});
}
@@ -173,6 +218,7 @@
form.on('submit(profit-setting-form-submit)', function (data) {
data.field.agentBonus = agentBonusArr;
data.field.rankBonus = rankBonusArr;
+ data.field.indrectDistrib = indirectBonusArr;
$.ajax({
'url':ctx + 'admin/system/bonusSystemSetting',
'type':'post',
--
Gitblit v1.9.1