From 8a0a6bb05752d08153ac9cffb09a5760ca1c10b6 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 21 Apr 2023 01:33:37 +0800
Subject: [PATCH] 分红设置

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html    |   14 +++++++-------
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |   14 +++++++-------
 src/main/resources/templates/febs/views/modules/system/bonusSetting.html  |   19 +++++++++++++++----
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 9d45d25..0d6e177 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -75,13 +75,13 @@
                                                     <div class="layui-form-mid layui-word-aux">设置商品排序位置,想排列在前,设置的数字越小</div>
                                                 </div>
                                             </div>
-<!--                                            <div class="layui-col-lg6">-->
-<!--                                                <label class="layui-form-label febs-form-item-require">抵扣现金(%):</label>-->
-<!--                                                <div class="layui-input-block">-->
-<!--                                                    <input type="text" name="scorePercent"  lay-verify="required|integer" placeholder="" autocomplete="off" class="layui-input">-->
-<!--                                                    <div class="layui-word-aux">设置50,即商品价格1000,积分可抵扣的最大金额为1000*50%=500,填写整数,如【50】</div>-->
-<!--                                                </div>-->
-<!--                                            </div>-->
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">抵扣现金(%):</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="scorePercent"  lay-verify="required|integer" placeholder="" autocomplete="off" class="layui-input">
+                                                    <div class="layui-word-aux">设置50,即商品价格1000,积分可抵扣的最大金额为1000*50%=500,填写整数,如【50】</div>
+                                                </div>
+                                            </div>
                                         </div>
 
                                         <div class="layui-form-item">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 008ed59..4a7761c 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -83,13 +83,13 @@
                                                     <div class="layui-form-mid layui-word-aux">设置商品排序位置,想排列在前,设置的数字越小</div>
                                                 </div>
                                             </div>
-<!--                                            <div class="layui-col-lg6">-->
-<!--                                                <label class="layui-form-label febs-form-item-require">抵扣现金(%):</label>-->
-<!--                                                <div class="layui-input-block">-->
-<!--                                                    <input type="text" name="scorePercent"  lay-verify="required|integer" placeholder="" autocomplete="off" class="layui-input">-->
-<!--                                                    <div class="layui-word-aux">设置50,即商品价格1000,积分可抵扣的最大金额为1000*50%=500,填写整数,如【50】</div>-->
-<!--                                                </div>-->
-<!--                                            </div>-->
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">抵扣现金(%):</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="scorePercent"  lay-verify="required|integer" placeholder="" autocomplete="off" class="layui-input">
+                                                    <div class="layui-word-aux">设置50,即商品价格1000,积分可抵扣的最大金额为1000*50%=500,填写整数,如【50】</div>
+                                                </div>
+                                            </div>
                                         </div>
 
                                         <div class="layui-form-item">
diff --git a/src/main/resources/templates/febs/views/modules/system/bonusSetting.html b/src/main/resources/templates/febs/views/modules/system/bonusSetting.html
index 9fe455b..5de179d 100644
--- a/src/main/resources/templates/febs/views/modules/system/bonusSetting.html
+++ b/src/main/resources/templates/febs/views/modules/system/bonusSetting.html
@@ -14,28 +14,28 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label  febs-form-item-require">全网分红比例(%):</label>
                         <div class="layui-input-block">
-                            <input type="text" name="AGENT_BONUS" lay-verify="required|integer" autocomplete="off" class="layui-input" >
+                            <input type="text" name="ALL_BONUS" lay-verify="required|integer" autocomplete="off" class="layui-input" >
                         </div>
                         <div class="layui-word-aux" style="margin-left: 150px;">设置为0则不分红</div>
                     </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label  febs-form-item-require">每天分红释放比例:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="allCashOut" lay-verify="required|integer" autocomplete="off" class="layui-input" >
+                            <input type="text" name="BONUS_RELEASE" lay-verify="required|integer" autocomplete="off" class="layui-input" >
                         </div>
                         <div class="layui-word-aux" style="margin-left: 150px;">每天从分红池中释放分红的比例,设置为0则不释放</div>
                     </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label  febs-form-item-require">代理全网分红比例:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="allCashOut" lay-verify="required|integer" autocomplete="off" class="layui-input" >
+                            <input type="text" name="AGENT_ALL_BONUS" lay-verify="required|integer" autocomplete="off" class="layui-input" >
                         </div>
                         <div class="layui-word-aux" style="margin-left: 150px;"></div>
                     </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label  febs-form-item-require">股东全网分红比例:</label>
                         <div class="layui-input-block">
-                            <input type="text" name="allCashOut" lay-verify="required|integer" autocomplete="off" class="layui-input" >
+                            <input type="text" name="PARNER_ALL_BONUS" lay-verify="required|integer" autocomplete="off" class="layui-input" >
                         </div>
                         <div class="layui-word-aux" style="margin-left: 150px;"></div>
                     </div>
@@ -98,6 +98,7 @@
         });
 
         dicDataReq("DIRECT_BONUS_SETTING");
+        dicDataReq("MEIYE_BONUS_TYPE");
         function dicDataReq(type) {
             $.get(ctx + 'admin/common/findDicByType/' + type, function (r) {
                 if (r.code === 200) {
@@ -112,6 +113,16 @@
                             data : data
                         });
                     }
+
+                    if ("MEIYE_BONUS_TYPE" == type) {
+                        var bonusType = {};
+                        console.log(1111);
+                        for (let i = 0; i < data.length; i++) {
+                            bonusType[data[i].code] = data[i].value;
+                        }
+                        console.log(bonusType);
+                        form.val("bonus-setting-form", bonusType);
+                    }
                 }
             });
         }

--
Gitblit v1.9.1