From c681ae8c728244d20235ba82dd510ffa161ab66d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 10:31:02 +0800
Subject: [PATCH] 商品现价改成折扣价 隐藏了成本价 重量的备注设置为克
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 29 +++++++-------
src/main/resources/templates/febs/views/modules/system/agentDetail.html | 8 ++--
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 30 ++++++++-------
3 files changed, 34 insertions(+), 33 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 cb8961d..1693b97 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -57,7 +57,7 @@
<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千克，则填入1。150克，则填入0.15</div>
+ <div class="layui-form-mid layui-word-aux">默认单位：克。请填写数字。如：1千克，则填入1000。</div>
</div>
</div>
</div>
@@ -168,8 +168,8 @@
<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>
@@ -184,20 +184,19 @@
</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>
+<!-- <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>
@@ -337,14 +336,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'
});
@@ -421,9 +420,9 @@
,{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: 'presentPrice', title: '折扣价', edit:'text', width:100}
,{field: 'originalPrice', title: '原价', edit:'text', width:100}
- ,{field: 'costPrice', 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}
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 eec8ee8..6de6d6b 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -61,6 +61,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>
@@ -189,8 +191,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>
@@ -206,7 +208,7 @@
</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">
@@ -214,13 +216,13 @@
</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>
+<!-- <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">
@@ -450,9 +452,9 @@
,{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: 'presentPrice', title: '折扣价', edit:'text', width:100}
,{field: 'originalPrice', title: '原价', edit:'text', width:100}
- ,{field: 'costPrice', 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}
@@ -765,14 +767,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'
});
diff --git a/src/main/resources/templates/febs/views/modules/system/agentDetail.html b/src/main/resources/templates/febs/views/modules/system/agentDetail.html
index 8a9d1b5..217e985 100644
--- a/src/main/resources/templates/febs/views/modules/system/agentDetail.html
+++ b/src/main/resources/templates/febs/views/modules/system/agentDetail.html
@@ -14,8 +14,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<div style="border: 1px solid #ccc;width: 400px;">
- <div id="toolbar-container" style="border-bottom: 1px solid #ccc;width: 400px;"></div>
- <div id="editor-container" style="height: 450px;width: 400px;"></div>
+ <div id="toolbar-container-agent-detail" style="border-bottom: 1px solid #ccc;width: 400px;"></div>
+ <div id="editor-container-agent-detail" style="height: 450px;width: 400px;"></div>
</div>
</div>
</div>
@@ -70,14 +70,14 @@
function initAgentDetailValue() {
window.editor = E.createEditor({
html: agentDetail.agentDetail,
- selector: '#editor-container',
+ selector: '#editor-container-agent-detail',
config : editorConfig,
mode: 'default'
});
window.toolbar = E.createToolbar({
editor,
- selector: '#toolbar-container',
+ selector: '#toolbar-container-agent-detail',
mode: 'default'
});
}
--
Gitblit v1.9.1