Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka

KKSU

2024-02-01 3c37944680c7af794d0827ffe2737b3d86a4d3d9

Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka

 src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java

@@ -69,6 +69,11 @@
    /**
     * 会员日
     */
    VIP_SCORE_RULE("VIP_SCORE_RULE", "VIP_SCORE_RULE"),

    /**
     * 会员日
     */
    UNALIVE_COUPON("UNALIVE_COUPON", "UNALIVE_COUPON");

    private String type;

 src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java

@@ -63,6 +63,8 @@
        commonService.addDataDic(DataDictionaryEnum.VIP_DATE.getType(), DataDictionaryEnum.VIP_DATE.getCode(), vipSettingVo.getVipDate(), null, false);

        commonService.addDataDic(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode(), vipSettingVo.getItems(), "失活会员优惠券配置", true);

        commonService.addDataDic(DataDictionaryEnum.VIP_SCORE_RULE.getType(), DataDictionaryEnum.VIP_SCORE_RULE.getCode(), vipSettingVo.getRule(), "会员规则", false);
        return new FebsResponse().success();
    }


 src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java

@@ -166,6 +166,9 @@
            List<VipSettingUnAliveSettingBo> items = JSONObject.parseArray(couponData.getValue(), VipSettingUnAliveSettingBo.class);
            setting.setItems(items);
        }

        DataDictionaryCustom rule = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.VIP_SCORE_RULE.getType(), DataDictionaryEnum.VIP_SCORE_RULE.getCode());
        setting.setRule(rule.getValue());
        model.addAttribute("vipSetting", setting);
        return FebsUtil.view("modules/vip/vip-setting");
    }

 src/main/java/cc/mrbird/febs/vip/vo/VipSettingVo.java

@@ -11,4 +11,6 @@
    private String vipDate;

    private List<VipSettingUnAliveSettingBo> items;

    private String rule;
}

 src/main/resources/templates/febs/views/modules/vip/vip-setting.html

@@ -21,8 +21,15 @@
                            <table id="unAliveCouponItem" lay-filter="unAliveCouponItem"></table>
                        </div>
                    </div>
                </div>

                    <blockquote class="layui-elem-quote blue-border">会员规则</blockquote>
                    <div class="layui-form-item">
                        <div style="border: 1px solid #ccc;">
                            <div id="toolbar-container" class="toolbar"></div>
                            <div id="editor-container" class="text" style="height: 450px;"></div>
                        </div>
                    </div>
                </div>
                <div class="layui-card-footer">
                    <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="vip-setting-form-submit" id="submit">保存</button>
                </div>
@@ -130,6 +137,7 @@

        form.on('submit(vip-setting-form-submit)', function (data) {
            data.field.items = unAliveCouponItemsData;
            data.field.rule = editor.txt.html();
            $.ajax({
                'url':ctx + 'admin/vip/config/vipSetting',
                'type':'post',
@@ -163,6 +171,30 @@
                }
            }
        });
        const E = window.wangEditor;
        const editor = new E('#toolbar-container', '#editor-container'); // 传入两个元素
        editor.config.showLinkImg = false;
        editor.config.uploadFileName = 'file';
        editor.config.customUploadImg = function (files, insertImgFn) {
            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();


        function addTableDate(data) {
            var hasData = table.cache['unAliveCouponItem'];
@@ -240,6 +272,9 @@
                unAliveCouponItemsData = details;
                reloadTable(details);
            }


            editor.txt.html(vipSetting.rule);
        }
    });
</script>