From c014190d15b41704085d2e96b3fb51d39d8c2016 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 13:39:07 +0800
Subject: [PATCH] refactor(mall): 优化订单商品名称的显示格式

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |   88 +++++++++++++++++++++++++++++++------------
 1 files changed, 63 insertions(+), 25 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 e85810a..3419a77 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -15,28 +15,29 @@
                                     <div class="layui-tab-item layui-show">
                                         <blockquote class="layui-elem-quote blue-border">基本信息设置</blockquote>
                                         <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>
-                                                <div class="layui-input-block">
-                                                    <input type="text" name="goodsName" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-lg6">
-                                                <label class="layui-form-label febs-form-item-require">商品编号:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" name="goodsNo" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <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">
                                                     <div id="goods-category"></div>
                                                 </div>
                                             </div>
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">商品名称:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="goodsName" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+<!--                                            <div class="layui-col-lg6">-->
+<!--                                                <label class="layui-form-label febs-form-item-require">商品编号:</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="goodsNo" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+                                        </div>
+                                        <div class="layui-form-item">
 
-                                            <div class="layui-col-lg3">
+                                            <div class="layui-col-lg6">
                                                 <label class="layui-form-label">是否主推:</label>
                                                 <div class="layui-input-block">
                                                     <input type="radio" name="isHot" value="1" title="是" />
@@ -44,7 +45,7 @@
                                                 </div>
                                             </div>
 
-                                            <div class="layui-col-lg3">
+                                            <div class="layui-col-lg6">
                                                 <label class="layui-form-label febs-form-item-require">序号:</label>
                                                 <div class="layui-input-block">
                                                     <input type="number" name="orderNumber" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
@@ -103,11 +104,10 @@
                                             </div>
                                         </div>
 
-                                        <div class="layui-form-item febs-hide tc-set">
-                                            <label class="layui-form-label">静态倍数</label>
+                                        <div class="layui-form-item">
+                                            <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>
+                                                <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">
                                             </div>
                                         </div>
 
@@ -170,14 +170,25 @@
                                             </div>
                                         </div>
 
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label febs-form-item-require">商品详情:</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <textarea id="goodsDetailEditAdd" lay-verify="content" name = "goodsDetails" class="layui-textarea"></textarea>-->
+<!--&lt;!&ndash;                                                <div style="border: 1px solid #ccc;">&ndash;&gt;-->
+<!--&lt;!&ndash;                                                    <div id="toolbar-container-good-add" style="border-bottom: 1px solid #ccc;"></div>&ndash;&gt;-->
+<!--&lt;!&ndash;                                                    <div id="editor-container-good-add" style="height: 450px;"></div>&ndash;&gt;-->
+<!--&lt;!&ndash;                                                </div>&ndash;&gt;-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+
                                         <div class="layui-form-item">
                                             <label class="layui-form-label febs-form-item-require">商品详情:</label>
                                             <div class="layui-input-block">
-                                                <textarea id="goodsDetailEditAdd" lay-verify="content" name = "goodsDetails" class="layui-textarea"></textarea>
-<!--                                                <div style="border: 1px solid #ccc;">-->
-<!--                                                    <div id="toolbar-container-good-add" style="border-bottom: 1px solid #ccc;"></div>-->
-<!--                                                    <div id="editor-container-good-add" style="height: 450px;"></div>-->
-<!--                                                </div>-->
+<!--                                                <textarea id="goodsDetailEditAdd" lay-verify="content" name = "goodsDetails" class="layui-textarea"></textarea>-->
+                                                <div style="border: 1px solid #ccc;">
+                                                    <div id="toolbar-container" class="toolbar"></div>
+                                                    <div id="text-container" class="text" style="height: 450px;"></div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -366,6 +377,32 @@
             element = layui.element;
 
         form.render();
+        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 E = window.wangEditor;
         // const editorConfig = { MENU_CONF: {} };
@@ -766,6 +803,7 @@
             // let content = layedit.getContent();
             // alert(content);
             // data.field.goodsDetails = content;
+            data.field.goodsDetails = editor.txt.html();
             $.ajax({
                 'url':ctx + 'admin/goods/addMallGoods',
                 'type':'post',

--
Gitblit v1.9.1