From 942c2cc31fa822f7b6d1347d6f9c391d924d085a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 17:23:47 +0800
Subject: [PATCH] 滑动条

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |   65 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 24 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 7c7b589..1693b97 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -56,6 +56,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 +91,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 +168,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>
@@ -182,20 +184,19 @@
                                                 </div>
                                             </div>
                                             <div class="layui-col-lg6">
-                                                <label class="layui-form-label febs-form-item-require">现价:</label>
+                                                <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>
 
-                                        <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>
-                                        </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>-->
+<!--                                        </div>-->
                                         <blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">运费:</label>
@@ -210,7 +211,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>
@@ -240,8 +241,17 @@
                                                         <input type="text" name="addMallGoodsSkuDtos" autocomplete="off" class="layui-input" id="attrName">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-lg6">
-                                                    <button type="button" class="layui-btn layui-btn-normal layui-btn" id="test3" >添加</button>
+                                                <div class="layui-col-lg1">
+                                                    <button type="button"
+                                                            class="layui-btn layui-btn-normal layui-btn" id="test3">
+                                                        添加
+                                                    </button>
+                                                </div>
+                                                <div class="layui-col-lg1">
+                                                    <button type="button"
+                                                            class="layui-btn layui-btn-normal layui-btn" id="test4">
+                                                        新增样品
+                                                    </button>
                                                 </div>
                                             </div>
 
@@ -326,14 +336,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'
         });
 
@@ -406,15 +416,16 @@
             ,cols: [[ //表头
                 {type: 'checkbox'}
                 ,{field: 'index', title: '序号', width:70}
-                ,{field: 'styleName', title: '样式', edit:'text'}
-                ,{field: 'skuName', title: '规格', edit:'text'}
-                ,{field: 'goodsWeight', title: '重量', edit:'text'}
-                ,{field: 'presentPrice', title: '现价', edit:'text'}
-                ,{field: 'originalPrice', title: '原价', edit:'text'}
-                ,{field: 'costPrice', title: '成本价', edit:'text'}
+                ,{field: 'styleName', title: '样式', edit:'text', width:200}
+                ,{field: 'skuName', title: '规格', edit:'text', width:200}
+                ,{field: 'sample', title:'样品', width:100}
+                ,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
+                ,{field: 'presentPrice', title: '折扣价', edit:'text', width:100}
+                ,{field: 'originalPrice', title: '原价', edit:'text', width:100}
+                // ,{field: 'costPrice', title: '成本价', edit:'text', width:100}
                 ,{templet: '#tableImgUpload', title: '缩略图', width:150}
-                ,{field: 'stock', title: '库存', edit:'text'}
-                ,{field: 'skuVolume', title: '销量', edit:'text'}
+                ,{field: 'stock', title: '库存', edit:'text', width:100}
+                ,{field: 'skuVolume', title: '销量', edit:'text', width:100}
                 ,{field: 'skuImage', title: '缩略图地址', hide:true}
             ]]
             ,data: []
@@ -519,6 +530,12 @@
             addTableDate(data);
         });
 
+        $('#test4').on('click', function () {
+            var data = {};
+            data.sample = "样品";
+            addTableDate(data);
+        });
+
         function bindUpload(index) {
             // 普通图片上传
             upload.render({

--
Gitblit v1.9.1