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/goodsUpdateNew.html |  119 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 72 insertions(+), 47 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 fd10a17..a796e1f 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -32,14 +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>
@@ -89,27 +94,28 @@
                                                     <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">
@@ -164,12 +170,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="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: 300px;"></div>
+                                                    <div id="toolbar-container" class="toolbar"></div>
+                                                    <div id="text-container" class="text" style="height: 450px;"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -329,15 +346,32 @@
 
         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, '')
-            },
-        }
+        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();
 
         var category = xmSelect.render({
             el: '#goods-category',
@@ -626,6 +660,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,
@@ -635,6 +671,7 @@
                 "costPrice": goodsInfo.costPrice,
                 "isSku": goodsInfo.isSku,
                 "thumb": goodsInfo.thumb,
+                "goodsDetails": goodsInfo.goodsDetails,
                 "thumbs": thumbs
             });
 
@@ -665,23 +702,11 @@
             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);
             }
+            editor.txt.html(goodsInfo.goodsDetails);
         }
 
         form.on('submit(goods-update-form-submit)', function (data) {
@@ -689,7 +714,7 @@
             data.field.mailGoodsSkuDto = tableSkuData;
             data.field.delSkuId=delSku;
             data.field.categoryId = category.getValue('valueStr');
-            data.field.goodsDetails = editor.getHtml();
+            data.field.goodsDetails = editor.txt.html();
             $.ajax({
                 'url': ctx + 'admin/goods/updateMallGoods',
                 'type': 'post',

--
Gitblit v1.9.1