From 2169d81fc8225308a9b8dcce4d1858da29057187 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Mar 2023 17:28:50 +0800
Subject: [PATCH] 增加活动公告
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 161 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 36 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 0f38712..1a299d2 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>
@@ -78,7 +98,7 @@
<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>
@@ -142,12 +162,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>
@@ -162,33 +191,44 @@
</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">
- <div class="layui-form-mid layui-word-aux">现价设置为0进入零撸专区</div>
</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>
- <div class="layui-input-block">
- <input type="text" name="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
- </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>
- </div>
-
- <div class="layui-form-item carriage-input febs-hide">
<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>
+
+ <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>
@@ -208,8 +248,17 @@
<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 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>
@@ -294,14 +343,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'
});
@@ -338,6 +387,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'
@@ -347,14 +423,16 @@
,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: 'presentPrice', title: '折扣价', edit:'text', width:100}
+ ,{field: 'originalPrice', 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: []
@@ -402,8 +480,12 @@
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;
}
});
@@ -452,6 +534,12 @@
var data = {};
data.styleName = attrNameVal;
+ addTableDate(data);
+ });
+
+ $('#test4').on('click', function () {
+ var data = {};
+ data.sample = "样品";
addTableDate(data);
});
@@ -583,6 +671,7 @@
data.field.goodsType = 1;
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',
--
Gitblit v1.9.1