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/goodsUpdateNew.html | 130 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 insertions(+), 19 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 bfd4d27..fd10a17 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -125,6 +125,7 @@
style="margin-top: 10px;">
<div class="layui-upload-list" id="demo2"></div>
</blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
</div>
</div>
</div>
@@ -149,6 +150,7 @@
style="margin-top: 10px;">
<div class="layui-upload-list" id="thumbsBanners"></div>
</blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
</div>
</div>
</div>
@@ -196,6 +198,21 @@
<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>
@@ -262,6 +279,13 @@
.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">
@@ -321,6 +345,9 @@
prop : {
value : 'id',
children : 'child'
+ },
+ iconfont: {
+ parent: 'hidden',
},
radio: true,
clickClose: true,
@@ -410,6 +437,14 @@
}
});
+ form.on('radio(hasCarriage)', function(data){
+ if (data.value == 2) {
+ $('.carriage-input').hide();
+ } else {
+ $('.carriage-input').show();
+ }
+ });
+
function addTableDate(data) {
var hasData = table.cache['multiSku'];
@@ -496,39 +531,90 @@
//多图片上传
upload.render({
elem: '#thumbsBanner'
- , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
- , multiple: true
- , before: function (obj) {
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,multiple: true
+ ,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">')
+ obj.preview(function(index, file, result){
+ $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
});
}
- , done: function (res) {
+ ,done: function(res){
var thumbs = $("#thumbs").val();
- if (thumbs == '') {
+ if(thumbs == ''){
$("#thumbs").val(res.data.src);
- } else {
+ }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({
elem: '#test2'
- , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
- , multiple: true
- , before: function (obj) {
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,multiple: true
+ ,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">')
+ obj.preview(function(index, file, result){
+ 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) {
+ ,done: function(res){
$("#thumb").val(res.data.src);
+
+ imgUnBind(".single-image");
+ imgSingleBind();
}
});
+
+ function imgSingleBind() {
+ $(".single-image").each(function(index, element) {
+ $(this).on("dblclick", function() {
+ var imgThumb = $(".single-image")[index];
+ $(imgThumb).remove();
+ $("#thumb").val("");
+
+ imgUnBind(".single-image");
+ imgSingleBind();
+ });
+ })
+ }
function initValue() {
var images = goodsInfo.images;
@@ -552,7 +638,6 @@
"thumbs": thumbs
});
- console.log(goodsInfo.categoryId);
var arr = [];
arr.push(goodsInfo.categoryId)
category.setValue(arr);
@@ -571,10 +656,14 @@
}
for (let i = 0; i < images.length; i++) {
- $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img" style="width: 100px">')
+ $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img multi-images" style="width: 130px">')
}
- $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img" style="width: 100px">')
+ $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img single-image" style="width: 130px">')
+
+
+ imgSingleBind();
+ imgMultiBind();
window.editor = E.createEditor({
html: goodsInfo.goodsDetails,
@@ -588,8 +677,11 @@
selector: '#toolbar-container',
mode: 'default'
});
- tableSkuData = skus;
- reloadTable(skus);
+
+ if (skus) {
+ tableSkuData = skus;
+ reloadTable(skus);
+ }
}
form.on('submit(goods-update-form-submit)', function (data) {
--
Gitblit v1.9.1