From 82161e4fe47d3c75340fede9070738e1141e421c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 23:38:38 +0800
Subject: [PATCH] fix
---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 104 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 26 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 70576a0..8ac71dd 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -40,11 +40,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 />
+ <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>
@@ -61,6 +68,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>
@@ -98,7 +107,7 @@
<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>
@@ -189,8 +198,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>
@@ -215,12 +224,36 @@
</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>
+<!-- <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>-->
<blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
<div class="layui-form-item">
@@ -269,10 +302,16 @@
class="layui-input" id="attrName">
</div>
</div>
- <div class="layui-col-lg6">
+ <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>
@@ -439,19 +478,22 @@
, defaultToolbar: []
, cols: [[ //表头
{type: 'checkbox'}
- , {field: 'index', title: '序号', width: 70}
- , {field: 'styleName', title: '样式', edit: 'text'}
- , {field: 'skuName', title: '规格', edit: 'text'}
- , {field: 'goodsWeight', 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: '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: []
});
@@ -557,6 +599,12 @@
var data = {};
data.styleName = attrNameVal;
+ addTableDate(data);
+ });
+
+ $('#test4').on('click', function () {
+ var data = {};
+ data.sample = "样品";
addTableDate(data);
});
@@ -701,12 +749,16 @@
"staticProp": goodsInfo.staticProp,
"originalPrice": goodsInfo.originalPrice,
"presentPrice": goodsInfo.presentPrice,
+ "levelOnePrice": goodsInfo.levelOnePrice,
+ "levelTwoPrice": goodsInfo.levelTwoPrice,
+ "levelThreePrice": goodsInfo.levelThreePrice,
"costPrice": goodsInfo.costPrice,
"isSku": goodsInfo.isSku,
"thumb": goodsInfo.thumb,
"carriageType": goodsInfo.carriageType,
"carriageAmount": goodsInfo.carriageAmount,
"goodsWeight": goodsInfo.goodsWeight,
+ "orderNumber": goodsInfo.orderNumber,
"thumbs": thumbs
});
@@ -752,14 +804,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'
});
--
Gitblit v1.9.1