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/goodsAddNew.html | 197 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 141 insertions(+), 56 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 7924ed4..e2f5ff8 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,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>
@@ -109,6 +114,7 @@
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
<div class="layui-upload-list" id="demo2"></div>
</blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
</div>
</div>
</div>
@@ -128,6 +134,7 @@
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
<div class="layui-upload-list" id="thumbsBanners"></div>
</blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
</div>
</div>
</div>
@@ -140,12 +147,32 @@
</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>-->
+<!-- </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>-->
+ <!-- <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: 450px;"></div>
+ <div id="toolbar-container" class="toolbar"></div>
+ <div id="text-container" class="text" style="height: 450px;"></div>
</div>
</div>
</div>
@@ -242,6 +269,12 @@
.layui-table-cell {
height:auto;
}
+ .layui-upload-list {
+ margin: 0 !important;
+ }
+ .multi-images {
+ margin: 0 5px !important;
+ }
</style>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
@@ -275,27 +308,53 @@
form.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 editor = E.createEditor({
- selector: '#editor-container',
- config : editorConfig,
- mode: 'default'
- });
-
- const toolbar = E.createToolbar({
- editor,
- selector: '#toolbar-container',
- mode: 'default'
- });
+ 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, '')
+ // },
+ // }
+ //
+ // const editor = E.createEditor({
+ // selector: '#editor-container',
+ // config : editorConfig,
+ // mode: 'default'
+ // });
+ //
+ // const toolbar = E.createToolbar({
+ // editor,
+ // selector: '#toolbar-container',
+ // mode: 'default'
+ // });
laydate.render({
elem: '#febs-form-group-date'
@@ -491,7 +550,7 @@
,before: function(obj){
//预读本地文件示例，不支持ie8
obj.preview(function(index, file, result){
- $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
+ $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
});
}
,done: function(res){
@@ -501,8 +560,38 @@
}else{
$("#thumbs").val(thumbs + ',' + res.data.src);
}
+
+ imgUnBind(".multi-images");
+ imgMultiBind();
}
});
+
+ function imgUnBind(className) {
+ $(className).each(function() {
+ $(this).unbind('dblclick');
+ })
+ }
+
+ function imgMultiBind() {
+ $(".multi-images").each(function(index, element) {
+ $(this).on("dblclick", function() {
+ var imgThumb = $(".multi-images")[index];
+ $(imgThumb).remove();
+
+ var images = $("#thumbs").val();
+ var imagesArr;
+ if (images) {
+ imagesArr = images.split(",");
+ imagesArr.splice(index, 1);
+ images = imagesArr.join(",");
+ }
+ $("#thumbs").val(images);
+
+ imgUnBind(".multi-images");
+ imgMultiBind();
+ });
+ })
+ }
//图片上传
upload.render({
@@ -512,46 +601,42 @@
,before: function(obj){
//预读本地文件示例，不支持ie8
obj.preview(function(index, file, result){
- $('#demo2').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
+ if ($("#thumb").val()) {
+ $('#demo2').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img single-image" style="width: 130px">')
+ } else {
+ $('#demo2').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img single-image" style="width: 130px">')
+ }
+
});
}
,done: function(res){
$("#thumb").val(res.data.src);
+
+ imgUnBind(".single-image");
+ imgSingleBind();
}
});
- // layedit.set({ //设置图片接口
- // uploadImage: {
- // url: 'admin/goods/uploadFileBase64', //接口url
- // type: 'post',
- // }
- // });
- // //创建一个编辑器
- // var index = layedit.build('goodsDetailEdit', { height: '300px', });
- // //提交时把值同步到文本域中
- // form.verify({
- // //content富文本域中的lay-verify值
- // goodsDetails: function(value) {
- // return layedit.sync(index);
- // }
- // });
+ function imgSingleBind() {
+ $(".single-image").each(function(index, element) {
+ $(this).on("dblclick", function() {
+ var imgThumb = $(".single-image")[index];
+ $(imgThumb).remove();
+ $("#thumb").val("");
-
- // upload.render({
- // elem: '#skuImg'+index
- // ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
- // ,done: function(res){
- // febs.alert.success(res.data.src);
- // $('#imageUrls' + index).attr('src', res.data.src);
- // $('#skuImage'+ index).val(res.data.src);
- // }
- // });
+ imgUnBind(".single-image");
+ imgSingleBind();
+ });
+ })
+ }
form.on('submit(goods-add-form-submit)', function (data) {
data.field.goodsType = 1;
data.field.addMallGoodsSkuDtos = tableSkuData;
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/addMallGoods',
'type':'post',
--
Gitblit v1.9.1