From c3f2f93821ac8d351fe7c9d1f0f28c39b36cfef1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Mar 2023 18:01:06 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/resources/templates/febs/views/modules/system/profitSetting.html |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 2733f40..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,7 +8,7 @@
                             <li class="layui-this">分红设置</li>
                             <li>代理分红</li>
                             <li>排名分红</li>
-                            <li>间推分配</li>
+                            <li>间推分红</li>
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show" id="bonus-global-setting">
@@ -21,6 +21,7 @@
                             </div>
                             <div class="layui-tab-item">
                                 <table id="indirectDistrib" lay-filter="indirectDistrib"></table>
+                                <div class="layui-word-aux">间推分红即为隔代收益,将直推奖励按照对应比例依次向上级返利,直至结算到一元为止</div>
                             </div>
                         </div>
                     </div>
@@ -51,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">
@@ -68,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>
     {{# }) }}
@@ -98,6 +94,7 @@
                 ,{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'}
             ]]
@@ -114,6 +111,7 @@
                     valueData.teamIncome = data.achieve;
                     valueData.profitProp = data.prop;
                     valueData.directCnt = data.direct;
+                    valueData.lastAgentCnt = data.lastAgentCnt;
                     agentBonusArr[i].value = JSON.stringify(valueData);
                 }
             }
@@ -188,6 +186,7 @@
                             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', {

--
Gitblit v1.9.1