From f6c1f7b6bc16ed4829a6e85ea376b2fd2367c74d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 11:43:06 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 388 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 316 insertions(+), 72 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 10e16e6..331d3c0 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/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>
@@ -86,30 +106,64 @@
<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="1">积分兑换商品</option>
+ <option value="2">购买积分商品</option>
+ <option value="3">普通商品</option>
+ <option value="4">课程卷商品</option>
+ <option value="5">民宿卷商品</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">商品品类</label>
+ <div class="layui-input-block">
+ <select name="isUnreal" class="goods-type">
+ <option value="1">【虚拟产品】。即购买结束，订单自动完成。</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-form-item febs-hide class-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>
+ <button type="button" class="layui-btn upload" id="uploadVideo" style="margin-bottom: 2px">上传文件</button>
+ <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
+ <div class="layui-form-item febs-hide house-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>
+ <input type="text" name="houseName" autocomplete="off" class="layui-input">
</div>
</div>
+
+ <div class="layui-form-item febs-hide house-set">
+ <label class="layui-form-label">酒店地址：</label>
+ <div class="layui-input-block">
+ <input type="text" name="houseAddress" 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="staticMulti" placeholder="请输入静态倍数"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分-->
+<!-- </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">
@@ -178,8 +232,8 @@
<div class="layui-input-block">
<!-- <textarea id="lay_edit" lay-verify="goodsDetails" 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-good-update" style="border-bottom: 1px solid #ccc;"></div>
+ <div id="editor-container-good-update" style="height: 300px;"></div>
</div>
</div>
</div>
@@ -202,63 +256,127 @@
</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 class="layui-form-mid layui-word-aux">赠送积分：请填写整数。如果不赠送积分则填写：0。</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="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>-->
+<!-- </div>-->
+
+ <blockquote class="layui-elem-quote blue-border">购买商品，赠送卷</blockquote>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">成本价：</label>
+ <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="levelTwoPrice" value="1" title="是" lay-filter="hasRoll" />
+ <input type="radio" name="levelTwoPrice" value="2" title="否" lay-filter="hasRoll" checked/>
</div>
</div>
- <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 class="layui-form-item roll-input febs-hide">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">类型：</label>
+ <div class="layui-input-block">
+ <select name="levelThreePrice">
+ <option value="1">课程卷</option>
+ <option value="2">民宿卷</option>
+ </select>
+ </div>
</div>
</div>
- <div class="layui-form-item carriage-input febs-hide">
+ <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="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>
- <blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
- <div class="layui-col-lg6">
- <label class="layui-form-label">开启多规格：</label>
- <div class="layui-input-block">
- <input type="radio" name="isSku" value="1" title="是"
- lay-filter="isSku"/>
- <input type="radio" name="isSku" value="2" title="否" lay-filter="isSku"
- checked/>
- </div>
- </div>
- <div class="layui-form-item multi-sku-table febs-hide">
- <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="addMallGoodsSkuDtos" autoComplete="off"
- class="layui-input" id="attrName">
- </div>
- </div>
- <div class="layui-col-lg6">
- <button type="button"
- class="layui-btn layui-btn-normal layui-btn" id="test3">
- 添加
- </button>
- </div>
- </div>
-
- <div class="layui-form-item">
+ <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">
- <table id="multiSku" lay-filter="multiSku"></table>
+ <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-col-lg6">-->
+<!-- <label class="layui-form-label">开启多规格：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="radio" name="isSku" value="1" title="是"-->
+<!-- lay-filter="isSku"/>-->
+<!-- <input type="radio" name="isSku" value="2" title="否" lay-filter="isSku"-->
+<!-- checked/>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item multi-sku-table febs-hide">-->
+<!-- <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="addMallGoodsSkuDtos" autoComplete="off"-->
+<!-- class="layui-input" id="attrName">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <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>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <div class="layui-input-block">-->
+<!-- <table id="multiSku" lay-filter="multiSku"></table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -375,6 +493,35 @@
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,
+ });
+
initValue();
})
@@ -386,18 +533,23 @@
, 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: 'sample', title:'样品', width:100}
+ ,{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 +602,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 +655,12 @@
var data = {};
data.styleName = attrNameVal;
+ addTableDate(data);
+ });
+
+ $('#test4').on('click', function () {
+ var data = {};
+ data.sample = "样品";
addTableDate(data);
});
@@ -625,6 +786,28 @@
});
})
}
+ upload.render({
+ elem: '#uploadVideo'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,accept: 'file'
+ ,before: function(obj){
+ layer.msg('上传中', {icon: 16, time: 0});
+ }
+ ,done: function(res){
+ var item = this.item;
+ //如果上传失败
+ if(res.code !== 0){
+ return layer.msg('上传失败');
+ }
+
+ // $(item).parent().prev().find('input').val(res.data[0]);
+ $("#videoUrl").val(res.data.src);
+ layer.msg('上传完毕', {icon: 1});
+ }
+ ,error: function(err){
+ return layer.msg('上传失败');
+ }
+ });
function initValue() {
var images = goodsInfo.images;
@@ -636,6 +819,7 @@
"unit": goodsInfo.unit,
"stock": goodsInfo.stock,
"volume": goodsInfo.volume,
+ "isHot": goodsInfo.isHot,
"goodsParameter": goodsInfo.goodsParameter,
"goodsIntrodution": goodsInfo.goodsIntrodution,
"isNormal": goodsInfo.isNormal,
@@ -643,9 +827,20 @@
"staticProp": goodsInfo.staticProp,
"originalPrice": goodsInfo.originalPrice,
"presentPrice": goodsInfo.presentPrice,
+ "levelOnePrice": goodsInfo.levelOnePrice,
+ "levelTwoPrice": goodsInfo.levelTwoPrice,
+ "levelThreePrice": goodsInfo.levelThreePrice,
+ "videoUrl": goodsInfo.videoUrl,
+ "houseName": goodsInfo.houseName,
+ "houseAddress": goodsInfo.houseAddress,
+ "isUnreal": goodsInfo.isUnreal,
"costPrice": goodsInfo.costPrice,
"isSku": goodsInfo.isSku,
"thumb": goodsInfo.thumb,
+ "carriageType": goodsInfo.carriageType,
+ "carriageAmount": goodsInfo.carriageAmount,
+ "goodsWeight": goodsInfo.goodsWeight,
+ "orderNumber": goodsInfo.orderNumber,
"thumbs": thumbs
});
@@ -653,8 +848,33 @@
arr.push(goodsInfo.categoryId)
category.setValue(arr);
+ var arrCarriageRule = [];
+ arrCarriageRule.push(goodsInfo.carriageRuleId)
+ carriageRule.setValue(arrCarriageRule);
+
if (goodsInfo.isNormal == 2) {
$(".tc-set").show();
+ }
+
+ if (goodsInfo.isNormal == 5) {
+ $(".house-set").show();
+ }
+
+ if (goodsInfo.isNormal == 4) {
+ $(".class-set").show();
+ }
+
+ if (goodsInfo.levelTwoPrice == 1) {
+ $(".roll-input").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) {
@@ -678,14 +898,14 @@
window.editor = E.createEditor({
html: goodsInfo.goodsDetails,
- selector: '#editor-container',
+ selector: '#editor-container-good-update',
config : editorConfig,
mode: 'default'
});
window.toolbar = E.createToolbar({
editor,
- selector: '#toolbar-container',
+ selector: '#toolbar-container-good-update',
mode: 'default'
});
@@ -698,8 +918,10 @@
form.on('submit(goods-update-form-submit)', function (data) {
data.field.goodsType=1;
data.field.mailGoodsSkuDto = tableSkuData;
+ data.field.isSku = 2;
data.field.delSkuId=delSku;
data.field.categoryId = category.getValue('valueStr');
+ data.field.carriageRuleId = carriageRule.getValue('valueStr');
data.field.goodsDetails = editor.getHtml();
$.ajax({
'url': ctx + 'admin/goods/updateMallGoods',
@@ -732,6 +954,28 @@
$(this).hide();
}
})
+ $('.house-set').each(function() {
+ if (data.value == 5) {
+ $(this).show();
+ } else {
+ $(this).hide();
+ }
+ })
+ $('.class-set').each(function() {
+ if (data.value == 4) {
+ $(this).show();
+ } else {
+ $(this).hide();
+ }
+ })
+ });
+
+ form.on('radio(hasRoll)', function(data){
+ if (data.value == 2) {
+ $('.roll-input').hide();
+ } else {
+ $('.roll-input').show();
+ }
});
});
--
Gitblit v1.9.1