From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  574 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 476 insertions(+), 98 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 66094a8..1733b60 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -1,8 +1,8 @@
 <div class="layui-fluid layui-anim febs-anim" id="febs-update" 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-update">
                         <form class="layui-form" action="" lay-filter="goods-update-form">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -32,13 +32,26 @@
                                                 </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-lg3">
+                                                <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 class="layui-col-lg3">
+                                                <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">
                                                 </div>
                                             </div>
                                         </div>
@@ -49,6 +62,14 @@
                                                 <div class="layui-input-block">
                                                     <input type="text" name="unit" 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="goodsWeight"  lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+
+                                                    <div class="layui-form-mid layui-word-aux">默认单位:克。请填写数字。如:1千克,则填入1000。</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -86,29 +107,26 @@
                                                 <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">-->
+<!--                                            <label class="layui-form-label">推销员返积分比例(%)</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">-->
+<!--                                            </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">
@@ -124,6 +142,7 @@
                                                                 style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="demo2"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -148,6 +167,7 @@
                                                                 style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="thumbsBanners"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -161,10 +181,34 @@
                                         </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="goodsDetailsUpdate" 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-update" style="border-bottom: 1px solid #ccc;"></div>&ndash;&gt;-->
+<!--&lt;!&ndash;                                                    <div id="editor-container-good-update" style="height: 300px;"></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="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" class="toolbar"></div>
+                                                    <div id="text-container" class="text" style="height: 450px;"></div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -188,10 +232,82 @@
                                         </div>
 
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label febs-form-item-require">成本价:</label>
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">成本价:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="costPrice" 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="staticProp" lay-verify="required" placeholder="请输入积分折扣" lay-reqText="请输入积分折扣" autocomplete="off" class="layui-input">
+                                                    <div class="layui-form-mid layui-word-aux">折扣积分=售价*积分折扣(%)*积分换算比例</div>
+                                                    <div class="layui-form-mid layui-word-aux">不允许使用积分设置成:0%</div>
+                                                    <div class="layui-form-mid layui-word-aux">全部使用积分设置成:大于等于100%</div>
+                                                </div>
+                                            </div>
+                                        </div>
+<!--                                        <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="levelOnePrice" 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="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </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>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+
+                                        <blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">运费:</label>
                                             <div class="layui-input-block">
-                                                <input type="text" name="costPrice" lay-verify="required" placeholder=""
-                                                       autoComplete="off" class="layui-input">
+                                                <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
+                                                <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-input  febs-hide">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label">固定运费:</label>
+                                                <div class="layui-input-block">
+                                                    <input id="carriageAmountDefault" type="text" name="carriageAmount" placeholder="" autocomplete="off" class="layui-input">
+                                                    <div class="layui-form-mid layui-word-aux">远费设置为0元,商品将显示为免运费。</div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-rule">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">邮费模板:</label>
+                                                <div class="layui-input-block">
+                                                    <div id="carriage-rule"></div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
+                                        <div class="layui-form-item coupon-rule">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label">优惠卷:</label>
+                                                <div class="layui-input-block">
+                                                    <div id="coupon-rule"></div>
+                                                </div>
                                             </div>
                                         </div>
 
@@ -214,10 +330,16 @@
                                                                class="layui-input" id="attrName">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-lg6">
+                                                <div class="layui-col-lg3">
                                                     <button type="button"
                                                             class="layui-btn layui-btn-normal layui-btn" id="test3">
                                                         添加
+                                                    </button>
+                                                </div>
+                                                <div class="layui-col-lg3">
+                                                    <button type="button"
+                                                            class="layui-btn layui-btn-normal layui-btn" id="test4">
+                                                        新增样品
                                                     </button>
                                                 </div>
                                             </div>
@@ -245,8 +367,8 @@
                     </div>
 
                 </div>
-            </div>
-        </div>
+<!--            </div>-->
+<!--        </div>-->
     </div>
 </div>
 <style>
@@ -257,6 +379,13 @@
 
     .layui-table-cell {
         height: auto;
+    }
+
+    .layui-upload-list {
+        margin: 0 !important;
+    }
+    .multi-images {
+        margin: 0 5px !important;
     }
 </style>
 <script type="text/html" id="toolbar">
@@ -277,7 +406,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,
@@ -299,7 +428,150 @@
             elem: '#febs-form-group-date'
         });
 
+        // layedit.set({	//设置图片接口
+        //     uploadImage: {
+        //         url: 'admin/goods/uploadFileBase64', //接口url
+        //         type: 'post',
+        //     }
+        // });
+        //
+        // //创建一个编辑器
+        // var indexUpdate = layedit.build('goodsDetailsUpdate',{
+        //     height: 300
+        // });
+        // form.verify({
+        //     //content富文本域中的lay-verify值
+        //     content: function(value) {
+        //         return layedit.sync(indexUpdate);
+        //     }
+        // });
+
         formSelects.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: {} };
+        // editorConfig.MENU_CONF['uploadImage'] = {
+        //     server: '/admin/goods/uploadFileBase64',
+        //     fieldName : "file",
+        //     customInsert(res, insertFn) {
+        //         insertFn(res.data.src, res.data.title, '')
+        //     },
+        // }
+
+        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,
+            });
+
+            // initValue();
+        })
+
+        var couponRule = xmSelect.render({
+            el: '#coupon-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            // radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/couponTreeSet', null, function(res) {
+            couponRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+
+
+            setTimeout(() => {
+                initValue();
+            }, 500);
+        })
+
+        var carriageRule = xmSelect.render({
+            el: '#carriage-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/carriageRuleTree', null, function(res) {
+            carriageRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+        })
+
 
         var tableSkuData = [];
         var tableIns = table.render({
@@ -309,18 +581,22 @@
             , defaultToolbar: []
             , cols: [[ //表头
                 {type: 'checkbox'}
-                , {field: 'index', title: '序号', width: 70}
-                , {field: 'styleName', title: '样式', edit: 'text'}
-                , {field: 'skuName', title: '规格', edit: 'text'}
-                , {field: 'presentPrice', title: '现价', edit: 'text'}
-                , {field: 'originalPrice', title: '原价', edit: 'text'}
-                , {field: 'costPrice', title: '成本价', edit: 'text'}
-                , {templet: '#tableImgUpload', title: '缩略图', width: 150}
-                , {field: 'stock', title: '库存', edit: 'text'}
-                , {field: 'skuVolume', title: '销量', edit: 'text'}
-                , {field: 'skuImage', title: '缩略图地址', hide: true}
-                , {field: 'id', title: 'skuId', hide: true}
-                , {field: 'styleId', title: 'styleId', hide: true}
+                ,{field: 'index', title: '序号', width: 70}
+                ,{field: 'styleName', title: '样式', edit:'text', width:200}
+                ,{field: 'skuName', title: '规格', edit:'text', width:200}
+                ,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
+                ,{field: 'originalPrice', title: '原价', edit:'text', width:100}
+                ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
+                // ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100}
+                // ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100}
+                // ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100}
+                ,{field: 'costPrice', title: '成本价', edit:'text', width:100}
+                ,{templet: '#tableImgUpload', title: '缩略图', width:150}
+                ,{field: 'stock', title: '库存', edit:'text', width:100}
+                ,{field: 'skuVolume', title: '销量', edit:'text', width:100}
+                ,{field: 'skuImage', title: '缩略图地址', hide: true}
+                ,{field: 'id', title: 'skuId', hide: true}
+                ,{field: 'styleId', title: 'styleId', hide: true}
             ]]
             , data: []
         });
@@ -367,6 +643,17 @@
                 $('.multi-sku-table').hide();
             } else {
                 $('.multi-sku-table').show();
+            }
+        });
+
+        form.on('radio(hasCarriage)', function(data){
+            if (data.value == 2) {
+                $('.carriage-input').hide();
+                $('.carriage-rule').show();
+            } else {
+                $('.carriage-input').show();
+                $('.carriage-rule').hide();
+                document.getElementById('carriageAmountDefault').value = 0;
             }
         });
 
@@ -418,6 +705,12 @@
             addTableDate(data);
         });
 
+        $('#test4').on('click', function () {
+            var data = {};
+            data.sample = "样品";
+            addTableDate(data);
+        });
+
         function bindUpload(index) {
             // 普通图片上传
             upload.render({
@@ -456,58 +749,90 @@
         //多图片上传
         upload.render({
             elem: '#thumbsBanner'
-            , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-            , multiple: true
-            , before: function (obj) {
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,multiple: true
+            ,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">')
+                obj.preview(function(index, file, result){
+                    $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
                 });
             }
-            , done: function (res) {
+            ,done: function(res){
                 var thumbs = $("#thumbs").val();
-                if (thumbs == '') {
+                if(thumbs == ''){
                     $("#thumbs").val(res.data.src);
-                } else {
+                }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({
             elem: '#test2'
-            , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-            , multiple: true
-            , before: function (obj) {
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,multiple: true
+            ,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">')
+                obj.preview(function(index, file, result){
+                    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) {
+            ,done: function(res){
                 $("#thumb").val(res.data.src);
+
+                imgUnBind(".single-image");
+                imgSingleBind();
             }
         });
 
-        initValue();
-        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("");
+
+                    imgUnBind(".single-image");
+                    imgSingleBind();
+                });
+            })
+        }
 
         function initValue() {
             var images = goodsInfo.images;
@@ -519,55 +844,108 @@
                 "unit": goodsInfo.unit,
                 "stock": goodsInfo.stock,
                 "volume": goodsInfo.volume,
+                "isHot": goodsInfo.isHot,
+                "goodsParameter": goodsInfo.goodsParameter,
                 "goodsIntrodution": goodsInfo.goodsIntrodution,
                 "isNormal": goodsInfo.isNormal,
                 "staticMulti": goodsInfo.staticMulti,
                 "staticProp": goodsInfo.staticProp,
                 "originalPrice": goodsInfo.originalPrice,
                 "presentPrice": goodsInfo.presentPrice,
+                "levelOnePrice": goodsInfo.levelOnePrice,
+                "levelTwoPrice": goodsInfo.levelTwoPrice,
+                "levelThreePrice": goodsInfo.levelThreePrice,
                 "costPrice": goodsInfo.costPrice,
                 "isSku": goodsInfo.isSku,
                 "thumb": goodsInfo.thumb,
+                "carriageType": goodsInfo.carriageType,
+                "carriageAmount": goodsInfo.carriageAmount,
+                "goodsWeight": goodsInfo.goodsWeight,
+                "orderNumber": goodsInfo.orderNumber,
+                "goodsDetails": goodsInfo.goodsDetails,
                 "thumbs": thumbs
             });
+
+            var arr = [];
+            arr.push(goodsInfo.categoryId)
+            category.setValue(arr);
+
+            var arrCarriageRule = [];
+            arrCarriageRule.push(goodsInfo.carriageRuleId)
+            carriageRule.setValue(arrCarriageRule);
+
+            couponRule.setValue(goodsInfo.couponIds);
 
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
             }
 
-            if (goodsInfo.isSku == 1) {
-                $(".multi-sku-table").show();
+            if (goodsInfo.carriageType == 2) {
+                $('.carriage-input').hide();
+                $('.carriage-rule').show();
+            } else {
+                $('.carriage-input').show();
+                $('.carriage-rule').hide();
+                document.getElementById('carriageAmountDefault').value = goodsInfo.carriageAmount;
             }
 
-            var skus = goodsInfo.skus;
-            for (let i = 0; i < skus.length; i++) {
-                skus[i].index = i+1;
+            if (goodsInfo.isSku == 1) {
+                $(".multi-sku-table").show();
+
+                var skus = goodsInfo.skus;
+                for (let i = 0; i < skus.length; i++) {
+                    skus[i].index = i+1;
+                }
             }
 
             for (let i = 0; i < images.length; i++) {
-                $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img" style="width: 100px">')
+                $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img multi-images" style="width: 130px">')
             }
 
-            $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img" style="width: 100px">')
-            layedit.setContent(index, "1234", false);
-            tableSkuData = skus;
-            reloadTable(skus);
+            $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img single-image" style="width: 130px">')
+
+
+            imgSingleBind();
+            imgMultiBind();
+
+            // window.editor = E.createEditor({
+            //     html: goodsInfo.goodsDetails,
+            //     selector: '#editor-container-good-update',
+            //     config : editorConfig,
+            //     mode: 'default'
+            // });
+            //
+            // window.toolbar = E.createToolbar({
+            //     editor,
+            //     selector: '#toolbar-container-good-update',
+            //     mode: 'default'
+            // });
+
+            if (skus) {
+                tableSkuData = skus;
+                reloadTable(skus);
+            }
+
+            editor.txt.html(goodsInfo.goodsDetails);
+            // layedit.setContent(indexUpdate,, false);
         }
 
-        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-update-form-submit)', function (data) {
-            console.log(tableSkuData);
+            let couponRuleList = couponRule.getValue();
+            if (couponRuleList.length > 0) {
+                var couponIds = [];
+                layui.each(couponRuleList, function (key, item) {
+                    couponIds.push(item.id)
+                });
+                data.field.couponIds=couponIds;
+            }
+            data.field.goodsType=1;
             data.field.mailGoodsSkuDto = tableSkuData;
             data.field.delSkuId=delSku;
+            data.field.categoryId = category.getValue('valueStr');
+            data.field.carriageRuleId = carriageRule.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