From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

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..a00f74e 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">
@@ -120,7 +120,7 @@
                                                 <select name="goodsLevel" class="goods-level">
                                                     <option value="1">会员套餐</option>
                                                     <option value="2">代理套餐</option>
-                                                    <option value="2">股东套餐</option>
+                                                    <option value="3">股东套餐</option>
                                                 </select>
                                             </div>
                                         </div>
@@ -139,6 +139,15 @@
                                                 <input type="text" name="normalPer" placeholder="请输入直推比例"
                                                        autoComplete="off" class="layui-input">
                                                 <div class="layui-form-mid layui-word-aux">普通商品直推奖励</div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item normal-set">
+                                            <label class="layui-form-label febs-form-item-require">分红比例(%)</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="normalBonus" placeholder="请输入分红比例"
+                                                       autoComplete="off" class="layui-input">
+                                                <div class="layui-form-mid layui-word-aux">普通商品分红,输入0则不分红。</div>
                                             </div>
                                         </div>
                                     </div>
@@ -368,16 +377,16 @@
             elem: '#febs-form-group-date'
         });
 
+        var E = window.wangEditor;
         formSelects.render();
 
         form.verify({
             integer: [
-                /^[1-9]\d*$/
-                , '只能输入正整数'
+                /^[0-9]\d*$/
+                , '只能大于0'
             ]
         });
 
-        var E = window.wangEditor;
         const editorConfig = { MENU_CONF: {} };
         editorConfig.MENU_CONF['uploadImage'] = {
             server: '/admin/goods/uploadFileBase64',
@@ -691,6 +700,8 @@
                 "sortCnt": goodsInfo.sortCnt,
                 "scorePercent": goodsInfo.scorePercent,
                 "goodsLevel": goodsInfo.goodsLevel,
+                "normalPer": goodsInfo.normalPer,
+                "normalBonus": goodsInfo.normalBonus,
                 "thumbs": thumbs
             });
 

--
Gitblit v1.9.1