记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 519f9b95 authored by dongchun's avatar dongchun
Browse files
Options

修改bug

parent 6cd7e288
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 57 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/add.html
View file @ 519f9b95
...@@ -279,10 +279,9 @@ ...@@ -279,10 +279,9 @@
// let itemId = Number(getUrlParms('id')) // let itemId = Number(getUrlParms('id'))
let affiliatedUrl = ['goblin/common/sku', 'goblin/common/mix', 'kylin/performances/roadShow/performance/status', 'goblin/common/goods'] let affiliatedUrl = ['goblin/common/sku', 'goblin/common/mix', 'kylin/performances/roadShow/performance/status', 'goblin/common/goods']
let listData = [] let listData = []
let isOneDom = $('#addClassify2').find($('.addAvatarItem')).length + 1 // 判断是否默认一组表单 let count = 0 // 判断是否默认一组表单
let currentUrl = 'goblin/common/sku' let currentUrl = 'goblin/common/sku'
let activeTypeChangeVal = 1 let activeTypeChangeVal = 1
console.log('isOneDom-length', isOneDom)
let varObj = {} let varObj = {}
$(document).ready(function () { $(document).ready(function () {
...@@ -404,7 +403,8 @@ ...@@ -404,7 +403,8 @@
// 组装 html // 组装 html
function assembleDom (list) { function assembleDom (list) {
list.forEach((item, index) => { list.forEach((item, index) => {
let dynamicAddDom = `<li class="info-element"> count = index + 1;
let dynamicAddDom = `<li class="info-element" id="liItem${count}">
<div class="addAvatarItem" style="padding: 20px;"> <div class="addAvatarItem" style="padding: 20px;">
<div class="selectClassifyOne"> <div class="selectClassifyOne">
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span>
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
</div> </div>
</div> </div>
<div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div> <div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div>
<div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem(${index})" style="margin-top: 8px; position: absolute; left: 10px;"></i></div> <div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem('${count}')" style="margin-top: 8px; position: absolute; left: 10px;"></i></div>
</li>` </li>`
$('.sortable-list').append(dynamicAddDom) // 组装好，添加进去 $('.sortable-list').append(dynamicAddDom) // 组装好，添加进去
...@@ -434,13 +434,12 @@ ...@@ -434,13 +434,12 @@
// 添加关联推荐 html 单个添加 // 添加关联推荐 html 单个添加
function addDom () { function addDom () {
let dynamicDomLength = $('#addClassify2').find($('.addAvatarItem')).length // dom1 dom2 dom3 count++
let dynamicAddDom = `<li class="info-element" id="liItem${count}">
let dynamicAddDom = `<li class="info-element">
<div class="addAvatarItem" style="padding: 20px;"> <div class="addAvatarItem" style="padding: 20px;">
<div class="selectClassifyOne"> <div class="selectClassifyOne">
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span>
<select id="listActiveType${dynamicDomLength + 1}" class="form-control m-b"> <select id="listActiveType${count}" class="form-control m-b">
<option value="1">NFT</option> <option value="1">NFT</option>
<option value="2">组合购</option> <option value="2">组合购</option>
<option value="3">演出</option> <option value="3">演出</option>
...@@ -451,32 +450,31 @@ ...@@ -451,32 +450,31 @@
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐商品：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐商品：</span>
<div class="search-wrapper"> <div class="search-wrapper">
<div class="search-wrapper"> <div class="search-wrapper">
<div id="listRemoteSearch${dynamicDomLength + 1}" placeholder="请搜索" name="searchSelect${dynamicDomLength + 1}"></div> <div id="listRemoteSearch${count}" placeholder="请搜索" name="searchSelect${count}"></div>
</div> </div>
</div> </div>
</div> </div>
<div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div> <div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div>
<div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem(${dynamicDomLength})" style="margin-top: 8px; position: absolute; left: 10px;"></i></div> <div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem('${count}')" style="margin-top: 8px; position: absolute; left: 10px;"></i></div>
</li>` </li>`
// 只有一组，可添加 // 只有一组，可添加
if (dynamicDomLength >= 0 && dynamicDomLength <= 19 ) { if (count >= 0 && count <= 19 ) {
console.log('dynamicDomLength', dynamicDomLength)
$('.sortable-list').append(dynamicAddDom) $('.sortable-list').append(dynamicAddDom)
// 设置 实例化 一个 input search监听 // 设置 实例化 一个 input search监听
setTimeout(() => { setTimeout(() => {
varObj['listRemoteSearch'+(dynamicDomLength+1)] = new searchSelect(`#listRemoteSearch${dynamicDomLength + 1}`, [], function(val) { varObj['listRemoteSearch'+count] = new searchSelect(`#listRemoteSearch${count}`, [], function(val) {
searchAjax(val, dynamicDomLength + 1) searchAjax(val, count)
}) })
}, 500) }, 500)
setTimeout(() => { setTimeout(() => {
$(`#listActiveType${dynamicDomLength+1}`).change(function () { $(`#listActiveType${count}`).change(function () {
$('#listRemoteSearch' + (dynamicDomLength+1) + ' input').attr('value', '') $('#listRemoteSearch' + (count) + ' input').attr('value', '')
}) })
}, 800) }, 800)
...@@ -491,20 +489,13 @@ ...@@ -491,20 +489,13 @@
// 删除list item // 删除list item
function removeListItem (index) { function removeListItem (index) {
let evryGroup = $('#addClassify2').find($('.addAvatarItem')) let evryGroup = $('#addClassify2').find($('.addAvatarItem'))
console.log(evryGroup.length, index) if (evryGroup.length <= 1) return layer.msg('至少保留一个')
$.modal.loading("请稍等...");
if (evryGroup.length <= 1) { $(`#liItem${index}`).remove()
layer.msg('至少保留一个') setTimeout(function () {
} else { $.modal.closeLoading();
$(`#addClassify2 .addAvatarItem:eq(${index})`).parent().remove() }, 500)
$.modal.loading("请稍等...");
setTimeout(function () {
$.modal.closeLoading();
}, 500)
}
} }
// 保存 list // 保存 list
...@@ -618,7 +609,6 @@ ...@@ -618,7 +609,6 @@
$('#addClassify2').find($('.addAvatarItem')).each(function (index) { $('#addClassify2').find($('.addAvatarItem')).each(function (index) {
listData.push({ listData.push({
mid: $(this).find('input').attr('data-mid'), mid: $(this).find('input').attr('data-mid'),
recommendActiveId: _recommendActiveId,
recommendRelationId: $(this).find('input').attr('data-recommendRelationId'), recommendRelationId: $(this).find('input').attr('data-recommendRelationId'),
recommendBindId: $(this).find('input').attr('data-id'), recommendBindId: $(this).find('input').attr('data-id'),
type: Number($(this).find("option:selected").val()), type: Number($(this).find("option:selected").val()),
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/edit.html
View file @ 519f9b95
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
let currentUrl = 'goblin/common/sku' let currentUrl = 'goblin/common/sku'
let activeTypeChangeVal = 1 let activeTypeChangeVal = 1
let listData = [] let listData = []
let isOneDom = $('#addClassify2').find($('.addAvatarItem')).length + 1 // 判断是否默认一组表单 let count = 0 // 判断是否默认一组表单
let _recommendId = '' let _recommendId = ''
let _recommendActiveId = '' let _recommendActiveId = ''
let varObj = {} let varObj = {}
...@@ -440,11 +440,12 @@ ...@@ -440,11 +440,12 @@
// 组装 html // 组装 html
function assembleDom (list) { function assembleDom (list) {
list.forEach((item, index) => { list.forEach((item, index) => {
let dynamicAddDom = `<li class="info-element"> count++
let dynamicAddDom = `<li class="info-element" id="liItem${count}">
<div class="addAvatarItem" style="padding: 20px;"> <div class="addAvatarItem" style="padding: 20px;">
<div class="selectClassifyOne"> <div class="selectClassifyOne">
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span>
<select id="listActiveType${index + 1}" value="${item.type}" class="form-control m-b list-active-type"> <select id="listActiveType${count}" value="${item.type}" class="form-control m-b list-active-type">
<option value="1">NFT</option> <option value="1">NFT</option>
<option value="2">组合购</option> <option value="2">组合购</option>
<option value="3">演出</option> <option value="3">演出</option>
...@@ -455,12 +456,12 @@ ...@@ -455,12 +456,12 @@
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐商品：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐商品：</span>
<div class="search-wrapper"> <div class="search-wrapper">
<div class="search-wrapper"> <div class="search-wrapper">
<div id="listRemoteSearch${index + 1}" placeholder="请搜索" name="searchSelect${index + 1}"></div> <div id="listRemoteSearch${count}" placeholder="请搜索" name="searchSelect${count}"></div>
</div> </div>
</div> </div>
</div> </div>
<div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div> <div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div>
<div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem(${index})" style="margin-top: 8px; position: absolute; left: 10px;"></i></div> <div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem('${count}')" style="margin-top: 8px; position: absolute; left: 10px;"></i></div>
</li>` </li>`
$('.sortable-list').append(dynamicAddDom) // 组装好，添加进去 $('.sortable-list').append(dynamicAddDom) // 组装好，添加进去
...@@ -471,13 +472,12 @@ ...@@ -471,13 +472,12 @@
// 添加关联推荐 html 单个添加 // 添加关联推荐 html 单个添加
function addDom () { function addDom () {
let dynamicDomLength = $('#addClassify2').find($('.addAvatarItem')).length // dom1 dom2 dom3 count++;
let dynamicAddDom = `<li class="info-element" id="liItem${count}">
let dynamicAddDom = `<li class="info-element">
<div class="addAvatarItem" style="padding: 20px;"> <div class="addAvatarItem" style="padding: 20px;">
<div class="selectClassifyOne"> <div class="selectClassifyOne">
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐类型：</span>
<select id="listActiveType${dynamicDomLength + 1}" class="form-control m-b"> <select id="listActiveType${count}" class="form-control m-b">
<option value="1">NFT</option> <option value="1">NFT</option>
<option value="2">组合购</option> <option value="2">组合购</option>
<option value="3">演出</option> <option value="3">演出</option>
...@@ -488,29 +488,29 @@ ...@@ -488,29 +488,29 @@
<span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐商品：</span> <span class="span-label"><i style="color: red; position: relative; top: 3px;">*</i>推荐商品：</span>
<div class="search-wrapper"> <div class="search-wrapper">
<div class="search-wrapper"> <div class="search-wrapper">
<div id="listRemoteSearch${dynamicDomLength + 1}" placeholder="请搜索" name="searchSelect${dynamicDomLength + 1}"></div> <div id="listRemoteSearch${count}" placeholder="请搜索" name="searchSelect${count}"></div>
</div> </div>
</div> </div>
</div> </div>
<div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div> <div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div>
<div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem(${dynamicDomLength + 1})" style="margin-top: 8px; position: absolute; left: 10px;"></i></div> <div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem('${count}')" style="margin-top: 8px; position: absolute; left: 10px;"></i></div>
</li>` </li>`
// 只有一组，可添加 // 只有一组，可添加
if (dynamicDomLength >= 0 && dynamicDomLength <= 19) { if (count >= 0 && count <= 19) {
$('.sortable-list').append(dynamicAddDom) $('.sortable-list').append(dynamicAddDom)
setTimeout(() => { setTimeout(() => {
varObj['listRemoteSearch'+(dynamicDomLength+1)] = new searchSelect(`#listRemoteSearch${dynamicDomLength + 1}`, [], function(val) { varObj['listRemoteSearch'+couint] = new searchSelect(`#listRemoteSearch${count}`, [], function(val) {
searchAjax(val, dynamicDomLength + 1) searchAjax(val, count)
}) })
}, 500) }, 500)
setTimeout(() => { setTimeout(() => {
$(`#listActiveType${dynamicDomLength+1}`).change(function () { $(`#listActiveType${count}`).change(function () {
$('#listRemoteSearch' + (dynamicDomLength+1) + ' input').attr('value', '') $('#listRemoteSearch' + count + ' input').attr('value', '')
}) })
}, 800) }, 800)
...@@ -525,18 +525,13 @@ ...@@ -525,18 +525,13 @@
// 删除list item // 删除list item
function removeListItem (index) { function removeListItem (index) {
let evryGroup = $('#addClassify2').find($('.addAvatarItem')) let evryGroup = $('#addClassify2').find($('.addAvatarItem'))
if (evryGroup.length <= 1) return layer.msg('至少保留一个');
if (evryGroup.length <= 1) { $(`#liItem${index}`).remove()
layer.msg('至少保留一个') $.modal.loading("请稍等...");
} else { setTimeout(function () {
$(`#addClassify2 .addAvatarItem:eq(${index})`).parent().remove() $.modal.closeLoading();
$.modal.loading("请稍等..."); }, 500)
setTimeout(function () {
$.modal.closeLoading();
}, 500)
}
} }
// 保存 list // 保存 list
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment