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

Skip to content

L
liquidnet-bus-v1
Commit 2f507d5b authored by zhengfuxin's avatar zhengfuxin
Browse files
Options

Merge branch 'zfx-Recommend' into pre

parents 220fcf12 5971dda3
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 49 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/add.html
View file @ 2f507d5b
...@@ -283,6 +283,8 @@ ...@@ -283,6 +283,8 @@
let currentUrl = 'goblin/common/sku' let currentUrl = 'goblin/common/sku'
let activeTypeChangeVal = 1 let activeTypeChangeVal = 1
let varObj = {} let varObj = {}
let currentNum = null;
let currentSelect = null
$(document).ready(function () { $(document).ready(function () {
$('.sortable-list').sortable({connectWith: '.connectList'}).disableSelection() $('.sortable-list').sortable({connectWith: '.connectList'}).disableSelection()
...@@ -392,9 +394,10 @@ ...@@ -392,9 +394,10 @@
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
createListenerSearch(i + 1) createListenerSearch(i + 1)
$(`#listActiveType${i+1}`).change(function () { $(`#listActiveType${i+1}`).change(function () {
varObj[Object.keys(varObj)[i]].empty() $('#listRemoteSearch' + (currentSelect) + ' input').attr('value', '')
$('#listRemoteSearch' + (i + 1) + ' input').attr('value', '') $('#listRemoteSearch' + (currentSelect) + ' input').attr('data-id', '')
$('#listRemoteSearch' + (i + 1) + ' input').attr('data-id', '') varObj[Object.keys(varObj)[currentSelect - 1]].empty()
console.log('init-listener', varObj[Object.keys(varObj)[currentSelect - 1]])
}) })
$('#listRemoteSearch' + (i + 1) + ' input').focus(function () { $('#listRemoteSearch' + (i + 1) + ' input').focus(function () {
...@@ -423,7 +426,7 @@ ...@@ -423,7 +426,7 @@
<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"> <select id="listActiveType${index + 1}" value="${item.type}" class="form-control m-b"onclick="handleSelect('${index+1}')">
<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>
...@@ -434,7 +437,7 @@ ...@@ -434,7 +437,7 @@
<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${index + 1}" placeholder="请搜索" name="searchSelect${index + 1}" onclick="handleInput('${index+1}')"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -454,7 +457,7 @@ ...@@ -454,7 +457,7 @@
<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${count}" class="form-control m-b"> <select id="listActiveType${count}" class="form-control m-b" onclick="handleSelect('${count}')">
<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>
...@@ -465,7 +468,7 @@ ...@@ -465,7 +468,7 @@
<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${count}" placeholder="请搜索" name="searchSelect${count}"></div> <div id="listRemoteSearch${count}" placeholder="请搜索" name="searchSelect${count}" onclick="handleInput('${count}')"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -473,40 +476,43 @@ ...@@ -473,40 +476,43 @@
<div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem('${count}')" 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 (count >= 0 && count <= 19 ) { if (count >= 0 && count <= 20 ) {
$('.sortable-list').append(dynamicAddDom) $('.sortable-list').append(dynamicAddDom)
// 设置 实例化 一个 input search监听 // 设置 实例化 一个 input search监听
setTimeout(() => { setTimeout(() => {
varObj['listRemoteSearch'+count] = new searchSelect(`#listRemoteSearch${count}`, [], function(val) { varObj['listRemoteSearch'+count] = new searchSelect(`#listRemoteSearch${count}`, [], function(val) {
searchAjax(val, count) searchAjax(val, currentNum)
}) })
}, 500) }, 500)
setTimeout(() => { setTimeout(() => {
$(`#listActiveType${count}`).change(function () { $(`#listActiveType${count}`).change(function () {
varObj[Object.keys(varObj)[count - 1]].empty() $('#listRemoteSearch' + (currentSelect) + ' input').val('')
$('#listRemoteSearch' + (count) + ' input').attr('value', '') $('#listRemoteSearch' + (currentSelect) + ' input').attr('data-id', '')
$('#listRemoteSearch' + (count) + ' input').attr('data-id', '') varObj[Object.keys(varObj)[currentSelect - 1]].empty()
}) console.log('add-listener', varObj[Object.keys(varObj)[currentSelect - 1]])
$('#listRemoteSearch' + (count) + ' input').focus(function () {
$(this).val('')
$(this).attr('data-id', '')
}) })
}, 600)
setTimeout(() => {
$('#listRemoteSearch' + (count) + ' input').focus(function () { $('#listRemoteSearch' + (count) + ' input').focus(function () {
$(this).val('') $(this).val('')
$(this).attr('data-id', '') $(this).attr('data-id', '')
// varObj['listRemoteSearch'+currentSelect].empty()
}) })
}, 600) }, 400)
// setTimeout(() => {
// $('#listRemoteSearch' + (count) + ' input').focus(function () {
// $(this).val('')
// $(this).attr('data-id', '')
// varObj['listRemoteSearch'+currentSelect].empty()
// })
//
// }, 600)
} else { } else {
layer.msg('不能添加') layer.msg('不能添加')
...@@ -516,6 +522,16 @@ ...@@ -516,6 +522,16 @@
} }
// 点击select记录位置
function handleSelect (num) {
currentSelect = num
}
// 点击input记录位置
function handleInput(num) {
currentNum = num;
}
// 删除list item // 删除list item
function removeListItem (index) { function removeListItem (index) {
let evryGroup = $('#addClassify2').find($('.addAvatarItem')) let evryGroup = $('#addClassify2').find($('.addAvatarItem'))
...@@ -560,12 +576,14 @@ ...@@ -560,12 +576,14 @@
function createListenerSearch (index) { function createListenerSearch (index) {
varObj['listRemoteSearch'+index] = new searchSelect(`#listRemoteSearch${index}`, [], function(val) { varObj['listRemoteSearch'+index] = new searchSelect(`#listRemoteSearch${index}`, [], function(val) {
searchAjax(val, index) searchAjax(val, index)
}) })
} }
function searchAjax (val, index) { function searchAjax (val, index) {
console.log('当前的list下啦',val, index)
let _selectVal = $("#listActiveType" + index).find("option:selected").val() // 当前子select val let _selectVal = $("#listActiveType" + index).find("option:selected").val() // 当前子select val
if (_selectVal) { if (_selectVal) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/edit.html
View file @ 2f507d5b
...@@ -213,7 +213,6 @@ ...@@ -213,7 +213,6 @@
</span> </span>
<div class="input-group" style="width: 300px;"> <div class="input-group" style="width: 300px;">
<select name="status" id="status" class="form-control m-b"> <select name="status" id="status" class="form-control m-b">
<option value="">所有</option>
<option value="0">开启</option> <option value="0">开启</option>
<option value="1">未开启</option> <option value="1">未开启</option>
</select> </select>
...@@ -286,6 +285,8 @@ ...@@ -286,6 +285,8 @@
let _recommendId = '' let _recommendId = ''
let _recommendActiveId = '' let _recommendActiveId = ''
let varObj = {} let varObj = {}
let currentNum = null;
let currentSelect = null
$(document).ready(function () { $(document).ready(function () {
$('.sortable-list').sortable({connectWith: '.connectList'}).disableSelection() $('.sortable-list').sortable({connectWith: '.connectList'}).disableSelection()
...@@ -419,10 +420,13 @@ ...@@ -419,10 +420,13 @@
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
createListenerSearch(i + 1) createListenerSearch(i + 1)
$(`#listActiveType${i+1}`).change(function () { $(`#listActiveType${i+1}`).change(function () {
varObj[Object.keys(varObj)[i]].empty()
$('#listRemoteSearch' + (i + 1) + ' input').attr('value', '') $('#listRemoteSearch' + (currentSelect) + ' input').attr('value', '') // 重置功能
$('#listRemoteSearch' + (i + 1) + ' input').attr('data-id', '') $('#listRemoteSearch' + (currentSelect) + ' input').attr('data-id', '')
varObj[Object.keys(varObj)[currentSelect - 1]].empty()
console.log('init-listener', varObj[Object.keys(varObj)[currentSelect - 1]])
}) })
$('#listRemoteSearch' + (i + 1) + ' input').focus(function () { $('#listRemoteSearch' + (i + 1) + ' input').focus(function () {
$(this).val('') $(this).val('')
$(this).attr('data-id', '') $(this).attr('data-id', '')
...@@ -453,13 +457,13 @@ ...@@ -453,13 +457,13 @@
// 组装 html // 组装 html
function assembleDom (list) { function assembleDom (list) {
list.forEach((item, index) => { list.forEach((item, index) => { // index 0 1
count++ count = index + 1;
let dynamicAddDom = `<li class="info-element" id="liItem${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${count}" value="${item.type}" class="form-control m-b list-active-type"> <select id="listActiveType${index+1}" value="${item.type}" class="form-control m-b list-active-type" onclick="handleSelect('${index+1}')">
<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>
...@@ -470,7 +474,7 @@ ...@@ -470,7 +474,7 @@
<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${count}" placeholder="请搜索" name="searchSelect${count}"></div> <div id="listRemoteSearch${index+1}" placeholder="请搜索" name="searchSelect${index+1}" onclick="handleInput('${index+1}')"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -491,7 +495,7 @@ ...@@ -491,7 +495,7 @@
<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${count}" class="form-control m-b"> <select id="listActiveType${count}" class="form-control m-b" onclick="handleSelect('${count}')">
<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>
...@@ -502,7 +506,7 @@ ...@@ -502,7 +506,7 @@
<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${count}" placeholder="请搜索" name="searchSelect${count}"></div> <div id="listRemoteSearch${count}" placeholder="请搜索" name="searchSelect${count}" onclick="handleInput('${count}')"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -512,36 +516,37 @@ ...@@ -512,36 +516,37 @@
// 只有一组，可添加 // 只有一组，可添加
if (count >= 0 && count <= 19) { if (count >= 0 && count <= 20) {
$('.sortable-list').append(dynamicAddDom) $('.sortable-list').append(dynamicAddDom)
setTimeout(() => { setTimeout(() => {
varObj['listRemoteSearch'+count] = new searchSelect(`#listRemoteSearch${count}`, [], function(val) { varObj['listRemoteSearch'+count] = new searchSelect(`#listRemoteSearch${count}`, [], function(val) {
searchAjax(val, count) searchAjax(val, currentNum)
}) })
}, 500) }, 300)
setTimeout(() => { setTimeout(() => {
$(`#listActiveType${count}`).change(function () { $(`#listActiveType${count}`).change(function () { // 1
varObj[Object.keys(varObj)[count - 1]].empty()
$('#listRemoteSearch' + count + ' input').attr('value', '') $('#listRemoteSearch' + (currentSelect) + ' input').val(''); // 重置功能
$('#listRemoteSearch' + count + ' input').attr('data-id', '') $('#listRemoteSearch' + (currentSelect) + ' input').attr('data-id', '')
varObj[Object.keys(varObj)[currentSelect - 1]].empty()
console.log('add-listener', varObj[Object.keys(varObj)[currentSelect - 1]])
}) })
}, 600) }, 400)
setTimeout(() => { setTimeout(() => {
$('#listRemoteSearch' + count + ' input').focus(function () { $('#listRemoteSearch' + (count) + ' input').focus(function () {
$(this).val('') $(this).val('')
$(this).attr('data-id', '') $(this).attr('data-id', '')
// varObj[Object.keys(varObj)[currentSelect - 1]].empty()
}) })
// $('#listRemoteSearch' + count + ' input').blur(function () { }, 600)
//
// })
}, 800)
} else { } else {
layer.msg('不能添加') layer.msg('不能添加')
...@@ -551,6 +556,16 @@ ...@@ -551,6 +556,16 @@
} }
// 点击select记录位置
function handleSelect (num) {
currentSelect = num
}
// 点击input记录位置
function handleInput(num) {
currentNum = num;
}
// 删除list item // 删除list item
function removeListItem (index) { function removeListItem (index) {
let evryGroup = $('#addClassify2').find($('.addAvatarItem')) let evryGroup = $('#addClassify2').find($('.addAvatarItem'))
...@@ -599,7 +614,7 @@ ...@@ -599,7 +614,7 @@
} }
// 添加dom同时，添加表单监听 // 添加dom同时，添加表单监听
function createListenerSearch (index) { function createListenerSearch (index) { // index 1 2 3
varObj['listRemoteSearch'+index] = new searchSelect(`#listRemoteSearch${index}`, [], function(val) { varObj['listRemoteSearch'+index] = new searchSelect(`#listRemoteSearch${index}`, [], function(val) {
searchAjax(val, index) searchAjax(val, index)
...@@ -607,9 +622,12 @@ ...@@ -607,9 +622,12 @@
} }
function searchAjax (val, index) { function searchAjax (val, index) { // 1 2
let _selectVal = $("#listActiveType" + index).find("option:selected").val() // 当前子select val let _selectVal = $("#listActiveType" + index).find("option:selected").val() // 当前子select val
console.log('当前的list下啦', $("#listActiveType" + index), index)
if (_selectVal) { if (_selectVal) {
let _params = {} let _params = {}
if (_selectVal == 1) { if (_selectVal == 1) {
...@@ -636,8 +654,6 @@ ...@@ -636,8 +654,6 @@
let yan = res.value || [] let yan = res.value || []
let sp = res.data || [] let sp = res.data || []
console.log('_selectVal', _selectVal)
if (_selectVal == 1) { if (_selectVal == 1) {
_data = nft.map(item => { // 组装返回nft数据 _data = nft.map(item => { // 组装返回nft数据
return { id: item.spuId, value: item.spuName } return { id: item.spuId, value: item.spuName }
......
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