From 12112eaff727c3a4554b19840e735e2b60cbd1f2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 05 Jan 2024 11:19:07 +0800
Subject: [PATCH] 团队列表
---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 371 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 263 insertions(+), 108 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 e0ef5d6..466fc2a 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -106,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">
@@ -192,17 +226,26 @@
</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="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-good-update" style="border-bottom: 1px solid #ccc;"></div>
- <div id="editor-container-good-update" style="height: 300px;"></div>
+ <div id="toolbar-container" class="toolbar"></div>
+ <div id="text-container" class="text" 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="lay_edit" lay-verify="goodsDetails" name="goodsDetails" class="layui-textarea"></textarea>–>-->
+<!-- <div style="border: 1px solid #ccc;">-->
+<!-- <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>-->
</div>
<div class="layui-tab-item">
<blockquote class="layui-elem-quote blue-border">价格设置</blockquote>
@@ -214,37 +257,38 @@
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="presentPrice" 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 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>-->
+<!-- <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">-->
+<!-- <input type="text" name="levelTwoPrice" 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>
+<!-- <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>-->
@@ -253,6 +297,27 @@
<!-- 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">
@@ -282,45 +347,45 @@
</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>
+<!-- <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 class="layui-form-item">-->
+<!-- <div class="layui-input-block">-->
+<!-- <table id="multiSku" lay-filter="multiSku"></table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -400,16 +465,41 @@
});
formSelects.render();
-
- 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 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',
@@ -482,11 +572,11 @@
,{field: 'skuName', title: '规格', edit:'text', width:200}
,{field: 'sample', title:'样品', width:100}
,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
- // ,{field: 'presentPrice', title: '折扣价', edit:'text', width:100}
,{field: 'originalPrice', 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: '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}
@@ -730,6 +820,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;
@@ -752,6 +864,10 @@
"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,
@@ -759,6 +875,7 @@
"carriageAmount": goodsInfo.carriageAmount,
"goodsWeight": goodsInfo.goodsWeight,
"orderNumber": goodsInfo.orderNumber,
+ "goodsDetails": goodsInfo.goodsDetails,
"thumbs": thumbs
});
@@ -772,6 +889,18 @@
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) {
@@ -802,32 +931,36 @@
imgSingleBind();
imgMultiBind();
- 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'
- });
+ // 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);
+
}
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();
+ // data.field.goodsDetails = editor.getHtml();
+ data.field.goodsDetails = editor.txt.html();
$.ajax({
'url': ctx + 'admin/goods/updateMallGoods',
'type': 'post',
@@ -859,6 +992,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