From 7e6bbd05a75b07cb0717812d0b51aad128361012 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 19 May 2022 18:43:42 +0800
Subject: [PATCH] fix some problem

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |  136 +++++++++++++++++++++++++++++++--------------
 1 files changed, 94 insertions(+), 42 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 e957b9a..5cbc964 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">
@@ -32,9 +32,10 @@
                                             <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>
+<!--                                                    <select name="categoryId" class="categary-addPeoduct" >-->
+<!--                                                        <option value="">请选择</option>-->
+<!--                                                    </select>-->
+                                                    <div id="goods-category"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -141,7 +142,11 @@
                                         <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>
@@ -201,16 +206,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>
@@ -236,7 +241,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,
@@ -253,11 +258,58 @@
             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'
+            },
+            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({
@@ -441,38 +493,38 @@
             }
         });
 
-        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);
-            }
-        });
+        // 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);
+        //     }
+        // });
 
 
-        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);
-            }
-        });
+        // 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-add-form-submit)', function (data) {
-            console.log(tableSkuData);
+            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',
@@ -481,10 +533,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