From 73b3813c2d110bf446f251350f120bb1e2b51d0c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 10:45:14 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |  258 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 194 insertions(+), 64 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 61e0930..d9d36f6 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -1,8 +1,8 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-goods" lay-title="新增商品">
+<div class="layui-fluid layui-anim febs-anim" id="febs-goods-add" 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-add">
                         <form class="layui-form" action="" lay-filter="goods-add-form">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -14,6 +14,8 @@
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
                                         <blockquote class="layui-elem-quote blue-border">基本信息设置</blockquote>
+                                        <div class="layui-form-mid layui-word-aux">商品新增后,会自动计算补贴金额,按商品现价计算</div>
+                                        <div class="layui-form-mid layui-word-aux">商品新增后,会自动计算星级等级,按商品现价设置</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>
@@ -28,13 +30,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>
@@ -75,28 +83,28 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label febs-form-item-require">商品类型</label>
                                             <div class="layui-input-block">
-                                                <select name="goodsType" class="goods-type" lay-filter="goods-type-select">
+                                                <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>
 
-                                        <div class="layui-form-item febs-hide tc-set">
-                                            <label class="layui-form-label">静态倍数</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>
-                                            </div>
-                                        </div>
+<!--                                        <div class="layui-form-item febs-hide tc-set">-->
+<!--                                            <label class="layui-form-label">静态倍数</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>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
 
-                                        <div class="layui-form-item febs-hide tc-set">
-                                            <label class="layui-form-label">静态占比(%)</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">
-                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
-                                            </div>
-                                        </div>
+<!--                                        <div class="layui-form-item febs-hide tc-set">-->
+<!--                                            <label class="layui-form-label">静态占比(%)</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">-->
+<!--                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
                                     </div>
 
                                     <div class="layui-tab-item">
@@ -108,6 +116,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>
@@ -127,6 +136,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>
@@ -139,9 +149,22 @@
                                         </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="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>
                                             </div>
                                         </div>
                                     </div>
@@ -169,11 +192,26 @@
                                             </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>-->
+
                                         <blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
                                         <div class="layui-col-lg6">
                                             <label class="layui-form-label">开启多规格:</label>
                                             <div class="layui-input-block">
-                                                <input type="radio" name="isSku" value="1" title="是" lay-filter="isSku" />
+<!--                                                <input type="radio" name="isSku" value="1" title="是" lay-filter="isSku" />-->
                                                 <input type="radio" name="isSku" value="2" title="否" lay-filter="isSku" checked />
                                             </div>
                                         </div>
@@ -201,16 +239,16 @@
                             </div>
 
 
-                            <div class="layui-form-item"  style="text-align:center">
+                            <div class="layui-form-item febs-hide">
                                 <button class="layui-btn" lay-submit="" lay-filter="goods-add-form-submit" id="submit">保存</button>
-                                <button class="layui-btn layui-btn-danger" lay-submit="" lay-filter="goods-add-form-cancel" id="cancel">取消</button>
+<!--                                <button class="layui-btn layui-btn-danger" lay-submit="" lay-filter="goods-add-form-cancel" id="cancel">取消</button>-->
                             </div>
                         </form>
                     </div>
 
                 </div>
-            </div>
-        </div>
+<!--            </div>-->
+<!--        </div>-->
     </div>
 </div>
 <style>
@@ -220,6 +258,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">
@@ -236,7 +280,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,
@@ -246,7 +290,6 @@
             form = layui.form,
             laydate = layui.laydate,
             eleTree = layui.eleTree,
-            member = [[${member}]],
             $view = $('#goods-add'),
             layedit = layui.layedit,
             upload = layui.upload,
@@ -254,11 +297,61 @@
             element = layui.element;
 
         form.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, '')
+            },
+        }
+
+        const editor = E.createEditor({
+            selector: '#editor-container',
+            config : editorConfig,
+            mode: 'default'
+        });
+
+        const toolbar = E.createToolbar({
+            editor,
+            selector: '#toolbar-container',
+            mode: 'default'
+        });
+
         laydate.render({
             elem: '#febs-form-group-date'
         });
 
         formSelects.render();
+
+        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,
+            });
+        })
 
         var tableSkuData=[];
         var tableIns = table.render({
@@ -306,6 +399,8 @@
                 for (let i = 0; i < hasData.length; i++) {
                     hasData[i].index = i + 1;
                 }
+
+                tableSkuData=hasData;
                 reloadTable(hasData);
             }
         });
@@ -316,6 +411,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();
             }
         });
 
@@ -364,7 +467,7 @@
 
             var data = {};
             data.styleName = attrNameVal;
-            var index = addTableDate(data);
+            addTableDate(data);
         });
 
         function bindUpload(index) {
@@ -384,6 +487,8 @@
                             tableSkuData[i].skuImage = res.data.src;
                         }
                     }
+
+                    reloadTable(tableSkuData);
                 }
             });
         }
@@ -409,7 +514,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){
@@ -419,8 +524,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({
@@ -430,45 +565,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('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("");
 
-
-        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.goodsDetails = editor.getHtml();
             $.ajax({
                 'url':ctx + 'admin/goods/addMallGoods',
                 'type':'post',
@@ -477,10 +607,10 @@
                 'traditional': true,//ajax传递数组必须添加属性
                 'data':JSON.stringify(data.field),
                 'success':function (data) {
-                    if(data.code==0){
+                    if(data.code==200){
+                        layer.closeAll();
                         febs.alert.success(data.message);
-                        var index = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(index);
+                        $('#febs-goods').find('#reset').click();
                     }else{
                         febs.alert.warn(data.message);
                     }

--
Gitblit v1.9.1