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 |  108 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 94 insertions(+), 14 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 fd10a17..a00f74e 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -32,14 +32,19 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row layui-col-space10 layui-form-item">
+                                        <div class="layui-form-item">
                                             <div class="layui-col-lg6">
                                                 <label class="layui-form-label febs-form-item-require">商品分类:</label>
                                                 <div class="layui-input-block">
-<!--                                                    <select name="categoryId" class="categary-addPeoduct">-->
-<!--                                                        <option value="">请选择</option>-->
-<!--                                                    </select>-->
                                                     <div id="goods-category"></div>
+                                                </div>
+                                            </div>
+
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label">是否主推:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="radio" name="isHot" value="1" title="是"  />
+                                                    <input type="radio" name="isHot" value="2" title="否"  checked />
                                                 </div>
                                             </div>
                                         </div>
@@ -71,6 +76,23 @@
                                         </div>
 
                                         <div class="layui-form-item">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">排序:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="sortCnt"  lay-verify="required|integer" placeholder="" autocomplete="off" class="layui-input">
+                                                    <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>
+
+                                        <div class="layui-form-item">
                                             <label class="layui-form-label">商品介绍:</label>
                                             <div class="layui-input-block">
                                                 <label>
@@ -80,7 +102,7 @@
                                             </div>
                                         </div>
 
-                                        <blockquote class="layui-elem-quote blue-border">商品类型</blockquote>
+                                        <blockquote class="layui-elem-quote blue-border">商品类型:</blockquote>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label febs-form-item-require">商品类型</label>
                                             <div class="layui-input-block">
@@ -93,21 +115,39 @@
                                         </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="staticMulti" 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>
+                                            <label class="layui-form-label febs-form-item-require">静态倍数</label>
                                             <div class="layui-input-block">
-                                                <input type="text" name="staticProp" placeholder="请输入静态占比"
+                                                <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">所有套餐静态占比相加应等于100%</div>
+                                                <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>
@@ -160,6 +200,16 @@
                                             <div class="layui-input-block">
                                                 <input type="text" id="thumbs" lay-verify="required" name="thumbs"
                                                        autoComplete="off" class="layui-input" readOnly>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">商品参数:</label>
+                                            <div class="layui-input-block">
+                                                <label>
+                                                    <textarea name="goodsParameter" rows="5" autoComplete="off"
+                                                              class="layui-textarea"></textarea>
+                                                </label>
                                             </div>
                                         </div>
 
@@ -327,9 +377,16 @@
             elem: '#febs-form-group-date'
         });
 
+        var E = window.wangEditor;
         formSelects.render();
 
-        var E = window.wangEditor;
+        form.verify({
+            integer: [
+                /^[0-9]\d*$/
+                , '只能大于0'
+            ]
+        });
+
         const editorConfig = { MENU_CONF: {} };
         editorConfig.MENU_CONF['uploadImage'] = {
             server: '/admin/goods/uploadFileBase64',
@@ -626,6 +683,8 @@
                 "unit": goodsInfo.unit,
                 "stock": goodsInfo.stock,
                 "volume": goodsInfo.volume,
+                "isHot": goodsInfo.isHot,
+                "goodsParameter": goodsInfo.goodsParameter,
                 "goodsIntrodution": goodsInfo.goodsIntrodution,
                 "isNormal": goodsInfo.isNormal,
                 "staticMulti": goodsInfo.staticMulti,
@@ -634,7 +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
             });
 
@@ -644,6 +711,11 @@
 
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
+                $(".normal-set").hide();
+            }
+
+            if (goodsInfo.hasCarriage == 1) {
+                $(".carriage-input").show();
             }
 
             if (goodsInfo.isSku == 1) {
@@ -721,6 +793,14 @@
                     $(this).hide();
                 }
             })
+
+            $('.normal-set').each(function () {
+                if (data.value == 2) {
+                    $(this).hide();
+                } else {
+                    $(this).show();
+                }
+            })
         });
 
     });

--
Gitblit v1.9.1