From 784ef9a3f01e6c398d97fcdbc9c7e91f0ded2ad1 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 14:42:52 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |   74 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 19 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 78817b4..10c3e1f 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -36,11 +36,18 @@
                                                 </div>
                                             </div>
 
-                                            <div class="layui-col-lg6">
+                                            <div class="layui-col-lg3">
                                                 <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 class="layui-col-lg3">
+                                                <label class="layui-form-label febs-form-item-require">序号:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="number" name="orderNumber" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
@@ -56,6 +63,8 @@
                                                 <label class="layui-form-label febs-form-item-require">重量:</label>
                                                 <div class="layui-input-block">
                                                     <input type="text" name="goodsWeight"  lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+
+                                                    <div class="layui-form-mid layui-word-aux">默认单位:克。请填写数字。如:1千克,则填入1000。</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -89,7 +98,7 @@
                                             <div class="layui-input-block">
                                                 <select name="isNormal" class="goods-type" lay-filter="goods-type-select">
                                                     <option value="1">普通商品区</option>
-                                                    <option value="2">套餐区</option>
+<!--                                                    <option value="2">套餐区</option>-->
                                                 </select>
                                             </div>
                                         </div>
@@ -166,8 +175,8 @@
                                             <div class="layui-input-block">
 <!--                                                <textarea id="goodsDetailEdit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>-->
                                                 <div style="border: 1px solid #ccc;">
-                                                    <div id="toolbar-container" style="border-bottom: 1px solid #ccc;"></div>
-                                                    <div id="editor-container" style="height: 450px;"></div>
+                                                    <div id="toolbar-container-good-add" style="border-bottom: 1px solid #ccc;"></div>
+                                                    <div id="editor-container-good-add" style="height: 450px;"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -185,15 +194,39 @@
                                                 <label class="layui-form-label febs-form-item-require">现价:</label>
                                                 <div class="layui-input-block">
                                                     <input type="text" name="presentPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
-                                                    <div class="layui-form-mid layui-word-aux">现价设置为0进入零撸专区</div>
                                                 </div>
                                             </div>
                                         </div>
+<!--                                        <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>-->
+<!--                                        <div class="layui-row layui-col-space10 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="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </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="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-row layui-col-space10 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="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </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="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">成本价:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                                </div>
                                             </div>
                                         </div>
                                         <blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
@@ -210,7 +243,7 @@
                                                 <label class="layui-form-label">固定运费:</label>
                                                 <div class="layui-input-block">
                                                     <input id="carriageAmountDefault" type="text" name="carriageAmount" placeholder="" autocomplete="off" class="layui-input">
-                                                    <div class="layui-form-mid layui-word-aux">远费设置为0元,前台商品将显示为免运费。</div>
+                                                    <div class="layui-form-mid layui-word-aux">远费设置为0元,商品将显示为免运费。</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -246,12 +279,12 @@
                                                         添加
                                                     </button>
                                                 </div>
-                                                <div class="layui-col-lg1">
-                                                    <button type="button"
-                                                            class="layui-btn layui-btn-normal layui-btn" id="test4">
-                                                        新增样品
-                                                    </button>
-                                                </div>
+<!--                                                <div class="layui-col-lg1">-->
+<!--                                                    <button type="button"-->
+<!--                                                            class="layui-btn layui-btn-normal layui-btn" id="test4">-->
+<!--                                                        新增样品-->
+<!--                                                    </button>-->
+<!--                                                </div>-->
                                             </div>
 
                                             <div class="layui-form-item">
@@ -335,14 +368,14 @@
         }
 
         const editor = E.createEditor({
-            selector: '#editor-container',
+            selector: '#editor-container-good-add',
             config : editorConfig,
             mode: 'default'
         });
 
         const toolbar = E.createToolbar({
             editor,
-            selector: '#toolbar-container',
+            selector: '#toolbar-container-good-add',
             mode: 'default'
         });
 
@@ -417,10 +450,13 @@
                 ,{field: 'index', title: '序号', width:70}
                 ,{field: 'styleName', title: '样式', edit:'text', width:200}
                 ,{field: 'skuName', title: '规格', edit:'text', width:200}
-                ,{field: 'sample', title:'样品', width:100}
+                // ,{field: 'sample', title:'样品', width:100}
                 ,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
-                ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
+                // ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100}
+                // ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100}
+                // ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100}
                 ,{field: 'originalPrice', title: '原价', edit:'text', width:100}
+                ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
                 ,{field: 'costPrice', title: '成本价', edit:'text', width:100}
                 ,{templet: '#tableImgUpload', title: '缩略图', width:150}
                 ,{field: 'stock', title: '库存', edit:'text', width:100}

--
Gitblit v1.9.1