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/goodsAddNew.html | 278 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 214 insertions(+), 64 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 78817b4..36a817c 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -36,11 +36,18 @@
</div>
</div>
- <div class="layui-col-lg6">
+ <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>
@@ -56,6 +63,8 @@
<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>
@@ -89,26 +98,27 @@
<div class="layui-input-block">
<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">折扣积分=售价*积分折扣（%）*积分换算比例</div>-->
+<!-- <div class="layui-form-mid layui-word-aux">不允许使用积分设置成：0%</div>-->
+<!-- <div class="layui-form-mid layui-word-aux">全部使用积分设置成：大于等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -161,13 +171,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="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>–>-->
+<!-- </div>-->
+<!-- </div>-->
+
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">商品详情：</label>
<div class="layui-input-block">
-<!-- <textarea id="goodsDetailEdit" 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: 450px;"></div>
+ <div id="toolbar-container" class="toolbar"></div>
+ <div id="text-container" class="text" style="height: 450px;"></div>
</div>
</div>
</div>
@@ -185,16 +206,50 @@
<label class="layui-form-label febs-form-item-require">现价：</label>
<div class="layui-input-block">
<input type="text" name="presentPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">现价设置为0进入零撸专区</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>-->
<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 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-form-item">
@@ -210,7 +265,7 @@
<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 class="layui-form-mid layui-word-aux">远费设置为0元，商品将显示为免运费。</div>
</div>
</div>
</div>
@@ -220,6 +275,16 @@
<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>
@@ -246,12 +311,12 @@
添加
</button>
</div>
- <div class="layui-col-lg1">
- <button type="button"
- class="layui-btn layui-btn-normal layui-btn" id="test4">
- 新增样品
- </button>
- </div>
+<!-- <div class="layui-col-lg1">-->
+<!-- <button type="button"-->
+<!-- class="layui-btn layui-btn-normal layui-btn" id="test4">-->
+<!-- 新增样品-->
+<!-- </button>-->
+<!-- </div>-->
</div>
<div class="layui-form-item">
@@ -321,33 +386,75 @@
upload = layui.upload,
validate = layui.validate,
element = layui.element;
-
+ // form.verify(validate);
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: {} };
- editorConfig.MENU_CONF['uploadImage'] = {
- server: '/admin/goods/uploadFileBase64',
- fieldName : "file",
- customInsert(res, insertFn) {
- insertFn(res.data.src, res.data.title, '')
- },
- }
-
- const editor = E.createEditor({
- selector: '#editor-container',
- config : editorConfig,
- mode: 'default'
- });
-
- const toolbar = E.createToolbar({
- editor,
- selector: '#toolbar-container',
- mode: 'default'
- });
+ // 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 editor = E.createEditor({
+ // selector: '#editor-container-good-add',
+ // config : editorConfig,
+ // mode: 'default'
+ // });
+ //
+ // const toolbar = E.createToolbar({
+ // editor,
+ // selector: '#toolbar-container-good-add',
+ // mode: 'default'
+ // });
laydate.render({
elem: '#febs-form-group-date'
+ });
+ layedit.set({ //设置图片接口
+ uploadImage: {
+ url: 'admin/goods/uploadFileBase64', //接口url
+ type: 'post',
+ }
+ });
+ //创建一个编辑器
+ var indexAdd = layedit.build('goodsDetailEditAdd',{
+ height: 300
+ });
+ form.verify({
+ //content富文本域中的lay-verify值
+ content: function(value) {
+ return layedit.sync(indexAdd);
+ }
});
formSelects.render();
@@ -362,6 +469,8 @@
iconfont: {
parent: 'hidden',
},
+ tips: '请选择',
+ filterable: true,
radio: true,
clickClose: true,
tree: {
@@ -406,6 +515,33 @@
});
})
+ 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,
+ });
+ })
+
var tableSkuData=[];
var tableIns = table.render({
elem: '#multiSku'
@@ -417,10 +553,13 @@
,{field: 'index', title: '序号', width:70}
,{field: 'styleName', title: '样式', edit:'text', width:200}
,{field: 'skuName', title: '规格', edit:'text', width:200}
- ,{field: 'sample', title:'样品', width:100}
+ // ,{field: 'sample', title:'样品', width:100}
,{field: 'goodsWeight', 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: 'originalPrice', title: '原价', edit:'text', width:100}
+ ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
,{field: 'costPrice', title: '成本价', edit:'text', width:100}
,{templet: '#tableImgUpload', title: '缩略图', width:150}
,{field: 'stock', title: '库存', edit:'text', width:100}
@@ -661,10 +800,21 @@
form.on('submit(goods-add-form-submit)', function (data) {
data.field.goodsType = 1;
+ 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.addMallGoodsSkuDtos = tableSkuData;
data.field.categoryId = category.getValue('valueStr');
data.field.carriageRuleId = carriageRule.getValue('valueStr');
- data.field.goodsDetails = editor.getHtml();
+ // let content = layedit.getContent();
+ // alert(content);
+ // data.field.goodsDetails = content;
+ data.field.goodsDetails = editor.txt.html();
$.ajax({
'url':ctx + 'admin/goods/addMallGoods',
'type':'post',
@@ -688,14 +838,14 @@
return false;
});
- form.on('select(goods-type-select)', function(data){
- $('.tc-set').each(function() {
- if (data.value == 2) {
- $(this).show();
- } else {
- $(this).hide();
- }
- })
- });
+ // form.on('select(goods-type-select)', function(data){
+ // $('.tc-set').each(function() {
+ // if (data.value == 2) {
+ // $(this).show();
+ // } else {
+ // $(this).hide();
+ // }
+ // })
+ // });
});
</script>
\ No newline at end of file
--
Gitblit v1.9.1