fix

Hentua

2024-01-29 959bd76c3dd17ff7cb0b492c7568b8b54c09dee2

 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html

@@ -32,14 +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>
@@ -50,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>
@@ -87,7 +107,7 @@
                                                <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>
@@ -173,13 +193,24 @@
                                            </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" 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>
@@ -204,25 +235,72 @@
                                        </div>

                                        <div class="layui-form-item">
                                            <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 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>
<!--                                        <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="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />
                                                <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />
                                            </div>
                                        </div>

                                        <div class="layui-form-item carriage-input febs-hide">
                                            <label class="layui-form-label">运费：</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="carriage" 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>

@@ -245,10 +323,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>
@@ -337,17 +421,61 @@
            elem: '#febs-form-group-date'
        });

        formSelects.render();
        // 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);
        //     }
        // });

        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, '')
            },
        }
        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',
@@ -375,8 +503,65 @@
                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,
            });

            initValue();
        })

        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({
@@ -386,18 +571,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: []
        });
@@ -450,8 +639,11 @@
        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;
            }
        });

@@ -500,6 +692,12 @@

            var data = {};
            data.styleName = attrNameVal;
            addTableDate(data);
        });

        $('#test4').on('click', function () {
            var data = {};
            data.sample = "样品";
            addTableDate(data);
        });

@@ -636,6 +834,7 @@
                "unit": goodsInfo.unit,
                "stock": goodsInfo.stock,
                "volume": goodsInfo.volume,
                "isHot": goodsInfo.isHot,
                "goodsParameter": goodsInfo.goodsParameter,
                "goodsIntrodution": goodsInfo.goodsIntrodution,
                "isNormal": goodsInfo.isNormal,
@@ -643,9 +842,17 @@
                "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
            });

@@ -653,8 +860,23 @@
            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.carriageType == 2) {
                $('.carriage-input').hide();
                $('.carriage-rule').show();
            } else {
                $('.carriage-input').show();
                $('.carriage-rule').hide();
                document.getElementById('carriageAmountDefault').value = goodsInfo.carriageAmount;
            }

            if (goodsInfo.isSku == 1) {
@@ -676,31 +898,44 @@
            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'
            });
            // 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);
        }

        form.on('submit(goods-update-form-submit)', function (data) {
            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.goodsDetails = editor.getHtml();
            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',