From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 16:15:59 +0800
Subject: [PATCH] 直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功
---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 29 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 fd10a17..65fee44 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -32,14 +32,19 @@
</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-lg6">
+ <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>
@@ -164,12 +169,33 @@
</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="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>-->
+<!-- </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" style="border-bottom: 1px solid #ccc;"></div>
- <div id="editor-container" style="height: 300px;"></div>
+ <div id="toolbar-container" class="toolbar"></div>
+ <div id="text-container" class="text" style="height: 450px;"></div>
</div>
</div>
</div>
@@ -329,15 +355,42 @@
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',
@@ -626,6 +679,8 @@
"unit": goodsInfo.unit,
"stock": goodsInfo.stock,
"volume": goodsInfo.volume,
+ "isHot": goodsInfo.isHot,
+ "goodsParameter": goodsInfo.goodsParameter,
"goodsIntrodution": goodsInfo.goodsIntrodution,
"isNormal": goodsInfo.isNormal,
"staticMulti": goodsInfo.staticMulti,
@@ -635,6 +690,7 @@
"costPrice": goodsInfo.costPrice,
"isSku": goodsInfo.isSku,
"thumb": goodsInfo.thumb,
+ "goodsDetails": goodsInfo.goodsDetails,
"thumbs": thumbs
});
@@ -665,23 +721,25 @@
imgSingleBind();
imgMultiBind();
- window.editor = E.createEditor({
- html: goodsInfo.goodsDetails,
- selector: '#editor-container',
- config : editorConfig,
- mode: 'default'
- });
-
- window.toolbar = E.createToolbar({
- editor,
- selector: '#toolbar-container',
- mode: 'default'
- });
+ // window.editor = E.createEditor({
+ // html: goodsInfo.goodsDetails,
+ // selector: '#editor-container',
+ // config : editorConfig,
+ // mode: 'default'
+ // });
+ //
+ // window.toolbar = E.createToolbar({
+ // editor,
+ // selector: '#toolbar-container',
+ // mode: 'default'
+ // });
if (skus) {
tableSkuData = skus;
reloadTable(skus);
}
+
+ editor.txt.html(goodsInfo.goodsDetails);
}
form.on('submit(goods-update-form-submit)', function (data) {
@@ -689,7 +747,8 @@
data.field.mailGoodsSkuDto = tableSkuData;
data.field.delSkuId=delSku;
data.field.categoryId = category.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',
--
Gitblit v1.9.1