From c456a6adeaf414f74cb2ef1e3c786285804e0e5c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 17:13:03 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 113 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 27 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 5cbc964..0f38712 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -109,6 +109,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 +129,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>
@@ -163,6 +165,7 @@
<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>
@@ -171,6 +174,21 @@
<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">
</div>
</div>
@@ -225,6 +243,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">
@@ -293,6 +317,9 @@
prop : {
value : 'id',
children : 'child'
+ },
+ iconfont: {
+ parent: 'hidden',
},
radio: true,
clickClose: true,
@@ -369,6 +396,14 @@
$('.multi-sku-table').hide();
} else {
$('.multi-sku-table').show();
+ }
+ });
+
+ form.on('radio(hasCarriage)', function(data){
+ if (data.value == 2) {
+ $('.carriage-input').hide();
+ } else {
+ $('.carriage-input').show();
}
});
@@ -464,7 +499,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){
@@ -474,8 +509,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({
@@ -485,40 +550,34 @@
,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;
--
Gitblit v1.9.1