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 |   75 ++++++++++++++++++++++++++-----------
 1 files changed, 52 insertions(+), 23 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 6d52229..a00f74e 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -115,30 +115,41 @@
                                         </div>
 
                                         <div class="layui-form-item febs-hide tc-set">
-                                            <label class="layui-form-label">贡献值:</label>
+                                            <label class="layui-form-label febs-form-item-require">套餐类型</label>
                                             <div class="layui-input-block">
-                                                <input type="text" name="star" lay-verify="required"  placeholder="请输入贡献值" autocomplete="off" class="layui-input">
-                                                <div class="layui-form-mid layui-word-aux">支付后,用户获取对应的贡献值</div>
+                                                <select name="goodsLevel" class="goods-level">
+                                                    <option value="1">会员套餐</option>
+                                                    <option value="2">代理套餐</option>
+                                                    <option value="3">股东套餐</option>
+                                                </select>
                                             </div>
                                         </div>
-<!--                                        <div class="layui-form-item febs-hide tc-set">-->
-<!--                                            <label class="layui-form-label">静态倍数</label>-->
-<!--                                            <div class="layui-input-block">-->
-<!--                                                <input type="text" name="staticMulti" placeholder="请输入静态倍数"-->
-<!--                                                       autoComplete="off" class="layui-input">-->
-<!--                                                <div class="layui-form-mid layui-word-aux">支付后,赠送(购买金额*静态倍数)的赠送积分-->
-<!--                                                </div>-->
-<!--                                            </div>-->
-<!--                                        </div>-->
 
-<!--                                        <div class="layui-form-item febs-hide tc-set">-->
-<!--                                            <label class="layui-form-label">静态占比(%)</label>-->
-<!--                                            <div class="layui-input-block">-->
-<!--                                                <input type="text" name="staticProp" placeholder="请输入静态占比"-->
-<!--                                                       autoComplete="off" class="layui-input">-->
-<!--                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
-<!--                                            </div>-->
-<!--                                        </div>-->
+                                        <div class="layui-form-item febs-hide tc-set">
+                                            <label class="layui-form-label febs-form-item-require">静态倍数</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="staticMulti" 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="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>
 
                                     <div class="layui-tab-item">
@@ -366,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',
@@ -682,10 +693,15 @@
                 "presentPrice": goodsInfo.presentPrice,
                 "costPrice": goodsInfo.costPrice,
                 "isSku": goodsInfo.isSku,
+                "hasCarriage": goodsInfo.hasCarriage,
+                "carriage": goodsInfo.carriage,
                 "thumb": goodsInfo.thumb,
                 "star": goodsInfo.star,
                 "sortCnt": goodsInfo.sortCnt,
                 "scorePercent": goodsInfo.scorePercent,
+                "goodsLevel": goodsInfo.goodsLevel,
+                "normalPer": goodsInfo.normalPer,
+                "normalBonus": goodsInfo.normalBonus,
                 "thumbs": thumbs
             });
 
@@ -695,6 +711,11 @@
 
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
+                $(".normal-set").hide();
+            }
+
+            if (goodsInfo.hasCarriage == 1) {
+                $(".carriage-input").show();
             }
 
             if (goodsInfo.isSku == 1) {
@@ -772,6 +793,14 @@
                     $(this).hide();
                 }
             })
+
+            $('.normal-set').each(function () {
+                if (data.value == 2) {
+                    $(this).hide();
+                } else {
+                    $(this).show();
+                }
+            })
         });
 
     });

--
Gitblit v1.9.1