From c0cae0a68ec2d917a9fad1f093a16b6d1d16af3c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Mar 2023 13:41:37 +0800
Subject: [PATCH] 后台修改

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |  244 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 196 insertions(+), 48 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 5cbc964..1a299d2 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -28,14 +28,26 @@
                                                 </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-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>
@@ -45,6 +57,14 @@
                                                 <label class="layui-form-label febs-form-item-require">单位:</label>
                                                 <div class="layui-input-block">
                                                     <input type="text" name="unit"  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="goodsWeight"  lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+
+                                                    <div class="layui-form-mid layui-word-aux">默认单位:克。请填写数字。如:1千克,则填入1000。</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -78,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>
@@ -109,6 +129,7 @@
                                                     <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="demo2"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -128,6 +149,7 @@
                                                     <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="thumbsBanners"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -140,12 +162,21 @@
                                         </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>
+
+                                        <div class="layui-form-item">
                                             <label class="layui-form-label febs-form-item-require">商品详情:</label>
                                             <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>
@@ -160,17 +191,44 @@
                                                 </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>
                                             </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 febs-form-item-require">成本价:</label>
+                                            <label class="layui-form-label">运费:</label>
                                             <div class="layui-input-block">
-                                                <input type="text" name="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                                <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
+                                                <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-input  febs-hide">
+                                            <div class="layui-col-lg6">
+                                                <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>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-rule">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">邮费模板:</label>
+                                                <div class="layui-input-block">
+                                                    <div id="carriage-rule"></div>
+                                                </div>
                                             </div>
                                         </div>
 
@@ -190,8 +248,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>
 
@@ -225,6 +292,12 @@
     }
     .layui-table-cell {
         height:auto;
+    }
+    .layui-upload-list {
+        margin: 0 !important;
+    }
+    .multi-images {
+        margin: 0 5px !important;
     }
 </style>
 <script type="text/html" id="toolbar">
@@ -270,14 +343,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'
         });
 
@@ -293,6 +366,9 @@
             prop : {
                 value : 'id',
                 children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
             },
             radio: true,
             clickClose: true,
@@ -311,6 +387,33 @@
             });
         })
 
+        var carriageRule = xmSelect.render({
+            el: '#carriage-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/carriageRuleTree', null, function(res) {
+            carriageRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+        })
+
         var tableSkuData=[];
         var tableIns = table.render({
             elem: '#multiSku'
@@ -320,14 +423,16 @@
             ,cols: [[ //表头
                 {type: 'checkbox'}
                 ,{field: 'index', title: '序号', width:70}
-                ,{field: 'styleName', title: '样式', edit:'text'}
-                ,{field: 'skuName', 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: []
@@ -369,6 +474,18 @@
                 $('.multi-sku-table').hide();
             } else {
                 $('.multi-sku-table').show();
+            }
+        });
+
+        form.on('radio(hasCarriage)', function(data){
+            if (data.value == 2) {
+                $('.carriage-input').hide();
+                $('.carriage-rule').show();
+                // document.getElementById('carriageAmountDefault').value = 0;
+            } else {
+                $('.carriage-input').show();
+                $('.carriage-rule').hide();
+                // document.getElementById('carriageAmountDefault').value = 0;
             }
         });
 
@@ -420,6 +537,12 @@
             addTableDate(data);
         });
 
+        $('#test4').on('click', function () {
+            var data = {};
+            data.sample = "样品";
+            addTableDate(data);
+        });
+
         function bindUpload(index) {
             // 普通图片上传
             upload.render({
@@ -464,7 +587,7 @@
             ,before: function(obj){
                 //预读本地文件示例,不支持ie8
                 obj.preview(function(index, file, result){
-                    $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
+                    $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
                 });
             }
             ,done: function(res){
@@ -474,8 +597,38 @@
                 }else{
                     $("#thumbs").val(thumbs + ',' + res.data.src);
                 }
+
+                imgUnBind(".multi-images");
+                imgMultiBind();
             }
         });
+
+        function imgUnBind(className) {
+            $(className).each(function() {
+                $(this).unbind('dblclick');
+            })
+        }
+
+        function imgMultiBind() {
+            $(".multi-images").each(function(index, element) {
+                $(this).on("dblclick", function() {
+                    var imgThumb = $(".multi-images")[index];
+                    $(imgThumb).remove();
+
+                    var images = $("#thumbs").val();
+                    var imagesArr;
+                    if (images) {
+                        imagesArr = images.split(",");
+                        imagesArr.splice(index, 1);
+                        images = imagesArr.join(",");
+                    }
+                    $("#thumbs").val(images);
+
+                    imgUnBind(".multi-images");
+                    imgMultiBind();
+                });
+            })
+        }
 
         //图片上传
         upload.render({
@@ -485,45 +638,40 @@
             ,before: function(obj){
                 //预读本地文件示例,不支持ie8
                 obj.preview(function(index, file, result){
-                    $('#demo2').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
+                    if ($("#thumb").val()) {
+                        $('#demo2').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img single-image" style="width: 130px">')
+                    } else {
+                        $('#demo2').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img single-image" style="width: 130px">')
+                    }
+
                 });
             }
             ,done: function(res){
                 $("#thumb").val(res.data.src);
+
+                imgUnBind(".single-image");
+                imgSingleBind();
             }
         });
 
-        // layedit.set({	//设置图片接口
-        //     uploadImage: {
-        //         url: 'admin/goods/uploadFileBase64', //接口url
-        //         type: 'post',
-        //     }
-        // });
-        // //创建一个编辑器
-        // var index = layedit.build('goodsDetailEdit', { height: '300px', });
-        // //提交时把值同步到文本域中
-        // form.verify({
-        //     //content富文本域中的lay-verify值
-        //     goodsDetails: function(value) {
-        //         return layedit.sync(index);
-        //     }
-        // });
+        function imgSingleBind() {
+            $(".single-image").each(function(index, element) {
+                $(this).on("dblclick", function() {
+                    var imgThumb = $(".single-image")[index];
+                    $(imgThumb).remove();
+                    $("#thumb").val("");
 
-
-        // upload.render({
-        //     elem: '#skuImg'+index
-        //     ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-        //     ,done: function(res){
-        //         febs.alert.success(res.data.src);
-        //         $('#imageUrls' + index).attr('src', res.data.src);
-        //         $('#skuImage'+ index).val(res.data.src);
-        //     }
-        // });
+                    imgUnBind(".single-image");
+                    imgSingleBind();
+                });
+            })
+        }
 
         form.on('submit(goods-add-form-submit)', function (data) {
             data.field.goodsType = 1;
             data.field.addMallGoodsSkuDtos = tableSkuData;
             data.field.categoryId = category.getValue('valueStr');
+            data.field.carriageRuleId = carriageRule.getValue('valueStr');
             data.field.goodsDetails = editor.getHtml();
             $.ajax({
                 'url':ctx + 'admin/goods/addMallGoods',

--
Gitblit v1.9.1