From ada59d11d10c4a5db3c748c1997ee4992ee54b3a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 14:44:07 +0800
Subject: [PATCH] 套餐

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |   97 ++++++++++++++++++++++++++++--------------------
 1 files changed, 57 insertions(+), 40 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 5208f25..32db4be 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -85,24 +85,25 @@
                                                     <option value="1">普通商品区</option>
                                                     <option value="2">套餐区</option>
                                                 </select>
+                                                <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="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">
@@ -155,16 +156,28 @@
                                             </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>-->
+                                                <!--                                                <textarea id="goodsDetailEditAdd" lay-verify="content" 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" class="toolbar"></div>
+                                                    <div id="text-container" class="text" style="height: 450px;"></div>
                                                 </div>
                                             </div>
                                         </div>
+
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label febs-form-item-require">商品详情:</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--&lt;!&ndash;                                                <textarea id="goodsDetailEdit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>&ndash;&gt;-->
+<!--                                                <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>
                                     <div class="layui-tab-item">
                                         <blockquote class="layui-elem-quote blue-border">价格设置</blockquote>
@@ -179,7 +192,6 @@
                                                 <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>
@@ -297,27 +309,32 @@
 
         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'
-        });
+        const E = window.wangEditor;
+        const editor = new E('#toolbar-container', '#text-container'); // 传入两个元素
+        editor.config.showLinkImg = false;
+        editor.config.uploadFileName = 'file';
+        editor.config.customUploadImg = function (files, insertImgFn) {
+            // files 是 input 中选中的文件列表
+            // insertImgFn 是获取图片 url 后,插入到编辑器的方法
+            // 上传图片,返回结果,将图片插入到编辑器中
+            for (let i = 0; i < files.length; i++){
+                var form = new FormData();
+                form.append("file", files[0]);
+                $.ajax({
+                    url:'/admin/goods/uploadFileBase64',
+                    type: "post",
+                    processData: false,
+                    contentType: false,
+                    data: form,
+                    dataType: 'json',
+                    success(res) {
+                        // 上传代码返回结果之后,将图片插入到编辑器中
+                        insertImgFn(res.data.src, res.data.title, '')
+                    }
+                })
+            }
+        };
+        editor.create();
 
         laydate.render({
             elem: '#febs-form-group-date'
@@ -597,7 +614,7 @@
             data.field.goodsType = 1;
             data.field.addMallGoodsSkuDtos = tableSkuData;
             data.field.categoryId = category.getValue('valueStr');
-            data.field.goodsDetails = editor.getHtml();
+            data.field.goodsDetails = editor.txt.html();
             $.ajax({
                 'url':ctx + 'admin/goods/addMallGoods',
                 'type':'post',

--
Gitblit v1.9.1