From 0cbc17f0c1db20613670b113b4f48a6ddcb52631 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 16:21:21 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 458 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 375 insertions(+), 83 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 5cbc964..2d4a127 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -28,14 +28,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>
@@ -45,6 +57,14 @@
<label class="layui-form-label febs-form-item-require">单位：</label>
<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>
@@ -77,27 +97,53 @@
<label class="layui-form-label febs-form-item-require">商品类型</label>
<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="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">
@@ -109,6 +155,7 @@
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
<div class="layui-upload-list" id="demo2"></div>
</blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
</div>
</div>
</div>
@@ -128,6 +175,7 @@
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
<div class="layui-upload-list" id="thumbsBanners"></div>
</blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
</div>
</div>
</div>
@@ -140,12 +188,21 @@
</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="goodsDetailEdit" 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: 450px;"></div>
+ <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>
@@ -166,41 +223,121 @@
</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-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">
+ <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">
- <table id="multiSku" lay-filter="multiSku"></table>
+ <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">是否赠送：</label>
+ <div class="layui-input-block">
+ <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 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>
+ <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="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-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-lg1">-->
+<!-- <button type="button"-->
+<!-- class="layui-btn layui-btn-normal layui-btn" id="test3">-->
+<!-- 添加-->
+<!-- </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">-->
+<!-- <div class="layui-input-block">-->
+<!-- <table id="multiSku" lay-filter="multiSku"></table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -225,6 +362,12 @@
}
.layui-table-cell {
height:auto;
+ }
+ .layui-upload-list {
+ margin: 0 !important;
+ }
+ .multi-images {
+ margin: 0 5px !important;
}
</style>
<script type="text/html" id="toolbar">
@@ -270,14 +413,14 @@
}
const editor = E.createEditor({
- selector: '#editor-container',
+ selector: '#editor-container-good-add',
config : editorConfig,
mode: 'default'
});
const toolbar = E.createToolbar({
editor,
- selector: '#toolbar-container',
+ selector: '#toolbar-container-good-add',
mode: 'default'
});
@@ -293,6 +436,9 @@
prop : {
value : 'id',
children : 'child'
+ },
+ iconfont: {
+ parent: 'hidden',
},
radio: true,
clickClose: true,
@@ -311,6 +457,33 @@
});
})
+ 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({
elem: '#multiSku'
@@ -320,14 +493,19 @@
,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'}
+ ,{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'}
- ,{field: 'skuVolume', title: '销量', edit:'text'}
+ ,{field: 'stock', title: '库存', edit:'text', width:100}
+ ,{field: 'skuVolume', title: '销量', edit:'text', width:100}
,{field: 'skuImage', title: '缩略图地址', hide:true}
]]
,data: []
@@ -369,6 +547,26 @@
$('.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();
+ // document.getElementById('carriageAmountDefault').value = 0;
+ } else {
+ $('.carriage-input').show();
+ $('.carriage-rule').hide();
+ // document.getElementById('carriageAmountDefault').value = 0;
+ }
+ });
+
+ form.on('radio(hasRoll)', function(data){
+ if (data.value == 2) {
+ $('.roll-input').hide();
+ } else {
+ $('.roll-input').show();
}
});
@@ -420,6 +618,12 @@
addTableDate(data);
});
+ $('#test4').on('click', function () {
+ var data = {};
+ data.sample = "样品";
+ addTableDate(data);
+ });
+
function bindUpload(index) {
// 普通图片上传
upload.render({
@@ -443,6 +647,54 @@
});
}
+
+
+ //图片上传
+ // upload.render({
+ // elem: '#test2'
+ // ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ // ,multiple: true
+ // ,before: function(obj){
+ // //预读本地文件示例，不支持ie8
+ // 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});
+ // }
+ // });
+
+ upload.render({
+ elem: '#uploadVideo'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,accept: 'file'
+ // ,multiple: true
+ ,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('上传失败');
+ }
+ });
+
//(下拉框)
$.get(ctx + 'admin/goodsCategory/categorys/allTree', function (data) {
for (var k in data)
@@ -464,7 +716,7 @@
,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">')
+ $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
});
}
,done: function(res){
@@ -474,8 +726,38 @@
}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({
@@ -485,45 +767,41 @@
,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">')
+ 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){
$("#thumb").val(res.data.src);
+
+ imgUnBind(".single-image");
+ imgSingleBind();
}
});
- // layedit.set({ //设置图片接口
- // uploadImage: {
- // url: 'admin/goods/uploadFileBase64', //接口url
- // type: 'post',
- // }
- // });
- // //创建一个编辑器
- // var index = layedit.build('goodsDetailEdit', { height: '300px', });
- // //提交时把值同步到文本域中
- // 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("");
-
- // 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);
- // }
- // });
+ imgUnBind(".single-image");
+ imgSingleBind();
+ });
+ })
+ }
form.on('submit(goods-add-form-submit)', function (data) {
data.field.goodsType = 1;
+ data.field.isSku = 2;
data.field.addMallGoodsSkuDtos = tableSkuData;
data.field.categoryId = category.getValue('valueStr');
+ data.field.carriageRuleId = carriageRule.getValue('valueStr');
data.field.goodsDetails = editor.getHtml();
$.ajax({
'url':ctx + 'admin/goods/addMallGoods',
@@ -556,6 +834,20 @@
$(this).hide();
}
})
+ $('.class-set').each(function() {
+ if (data.value == 4) {
+ $(this).show();
+ } else {
+ $(this).hide();
+ }
+ })
+ $('.house-set').each(function() {
+ if (data.value == 5) {
+ $(this).show();
+ } else {
+ $(this).hide();
+ }
+ })
});
});
</script>
\ No newline at end of file
--
Gitblit v1.9.1