From cedd63e6a0275eb7b32f10ab9b2bc22e30fb42c2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 10:42:25 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  265 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 202 insertions(+), 63 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 66094a8..d91bcd3 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -1,8 +1,8 @@
 <div class="layui-fluid layui-anim febs-anim" id="febs-update" lay-title="编辑商品">
     <div class="layui-row febs-container">
         <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-body febs-table-full">
+<!--            <div class="layui-card">-->
+<!--                <div class="layui-card-body febs-table-full">-->
                     <div class="layui-fluid" id="goods-update">
                         <form class="layui-form" action="" lay-filter="goods-update-form">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -32,13 +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>
@@ -124,6 +130,7 @@
                                                                 style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="demo2"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -148,6 +155,7 @@
                                                                 style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="thumbsBanners"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -161,10 +169,23 @@
                                         </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="lay_edit" lay-verify="goodsDetails" name="goodsDetails"
-                                                          class="layui-textarea"></textarea>
+<!--                                                <textarea id="lay_edit" 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: 300px;"></div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -192,6 +213,21 @@
                                             <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">设置运费:</label>
+                                            <div class="layui-input-block">
+                                                <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />
+                                                <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-input febs-hide">
+                                            <label class="layui-form-label">运费:</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">
                                             </div>
                                         </div>
 
@@ -245,8 +281,8 @@
                     </div>
 
                 </div>
-            </div>
-        </div>
+<!--            </div>-->
+<!--        </div>-->
     </div>
 </div>
 <style>
@@ -257,6 +293,13 @@
 
     .layui-table-cell {
         height: auto;
+    }
+
+    .layui-upload-list {
+        margin: 0 !important;
+    }
+    .multi-images {
+        margin: 0 5px !important;
     }
 </style>
 <script type="text/html" id="toolbar">
@@ -277,7 +320,7 @@
 </script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="javascript">
-    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'dropdown', 'laydate', 'layedit', 'upload', 'element', 'table'], function () {
+    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'dropdown', 'laydate', 'layedit', 'upload', 'element', 'table', 'xmSelect'], function () {
         var $ = layui.jquery,
             febs = layui.febs,
             layer = layui.layer,
@@ -300,6 +343,45 @@
         });
 
         formSelects.render();
+
+        var E = window.wangEditor;
+        const editorConfig = { MENU_CONF: {} };
+        editorConfig.MENU_CONF['uploadImage'] = {
+            server: '/admin/goods/uploadFileBase64',
+            fieldName : "file",
+            customInsert(res, insertFn) {
+                insertFn(res.data.src, res.data.title, '')
+            },
+        }
+
+        var category = xmSelect.render({
+            el: '#goods-category',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goodsCategory/categoryTree', null, function(res) {
+            category.update({
+                data : res.data,
+                autoRow: true,
+            });
+
+            initValue();
+        })
 
         var tableSkuData = [];
         var tableIns = table.render({
@@ -367,6 +449,14 @@
                 $('.multi-sku-table').hide();
             } else {
                 $('.multi-sku-table').show();
+            }
+        });
+
+        form.on('radio(hasCarriage)', function(data){
+            if (data.value == 2) {
+                $('.carriage-input').hide();
+            } else {
+                $('.carriage-input').show();
             }
         });
 
@@ -456,58 +546,90 @@
         //多图片上传
         upload.render({
             elem: '#thumbsBanner'
-            , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-            , multiple: true
-            , before: function (obj) {
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,multiple: true
+            ,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">')
+                obj.preview(function(index, file, result){
+                    $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
                 });
             }
-            , done: function (res) {
+            ,done: function(res){
                 var thumbs = $("#thumbs").val();
-                if (thumbs == '') {
+                if(thumbs == ''){
                     $("#thumbs").val(res.data.src);
-                } else {
+                }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({
             elem: '#test2'
-            , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-            , multiple: true
-            , before: function (obj) {
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,multiple: true
+            ,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">')
+                obj.preview(function(index, file, result){
+                    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) {
+            ,done: function(res){
                 $("#thumb").val(res.data.src);
+
+                imgUnBind(".single-image");
+                imgSingleBind();
             }
         });
 
-        initValue();
-        layedit.set({	//设置图片接口
-            uploadImage: {
-                url: 'admin/goods/uploadFileBase64', //接口url
-                type: 'post',
-            }
-        });
-        //创建一个编辑器
-        var index = layedit.build('lay_edit', {
-            height: 300
-        });
-        //提交时把值同步到文本域中
-        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("");
+
+                    imgUnBind(".single-image");
+                    imgSingleBind();
+                });
+            })
+        }
 
         function initValue() {
             var images = goodsInfo.images;
@@ -519,6 +641,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,
@@ -531,43 +655,58 @@
                 "thumbs": thumbs
             });
 
+            var arr = [];
+            arr.push(goodsInfo.categoryId)
+            category.setValue(arr);
+
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
             }
 
             if (goodsInfo.isSku == 1) {
                 $(".multi-sku-table").show();
-            }
 
-            var skus = goodsInfo.skus;
-            for (let i = 0; i < skus.length; i++) {
-                skus[i].index = i+1;
+                var skus = goodsInfo.skus;
+                for (let i = 0; i < skus.length; i++) {
+                    skus[i].index = i+1;
+                }
             }
 
             for (let i = 0; i < images.length; i++) {
-                $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img" style="width: 100px">')
+                $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img multi-images" style="width: 130px">')
             }
 
-            $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img" style="width: 100px">')
-            layedit.setContent(index, "1234", false);
-            tableSkuData = skus;
-            reloadTable(skus);
+            $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img single-image" style="width: 130px">')
+
+
+            imgSingleBind();
+            imgMultiBind();
+
+            window.editor = E.createEditor({
+                html: goodsInfo.goodsDetails,
+                selector: '#editor-container',
+                config : editorConfig,
+                mode: 'default'
+            });
+
+            window.toolbar = E.createToolbar({
+                editor,
+                selector: '#toolbar-container',
+                mode: 'default'
+            });
+
+            if (skus) {
+                tableSkuData = skus;
+                reloadTable(skus);
+            }
         }
 
-        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);
-            }
-        });
-
         form.on('submit(goods-update-form-submit)', function (data) {
-            console.log(tableSkuData);
+            data.field.goodsType=1;
             data.field.mailGoodsSkuDto = tableSkuData;
             data.field.delSkuId=delSku;
+            data.field.categoryId = category.getValue('valueStr');
+            data.field.goodsDetails = editor.getHtml();
             $.ajax({
                 'url': ctx + 'admin/goods/updateMallGoods',
                 'type': 'post',

--
Gitblit v1.9.1