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

Skip to content

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

将各个首页设置的各个功能整合成弹窗并修改精选商品添加方式

parent 4c733f66
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 32 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/RubikArea.html
View file @ 95178530
...@@ -148,14 +148,14 @@ ...@@ -148,14 +148,14 @@
<button type="button" class="btn btn-success" onclick="save()">保存</button> <button type="button" class="btn btn-success" onclick="save()">保存</button>
</div> </div>
</div> </div>
<div class="right_content"> <!-- <div class="right_content">
<div class="right_title"> <div class="right_title">
</div> </div>
<div class="function_area"> <div class="function_area">
<iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> <iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe>
</div> </div>
</div> </div> -->
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js" />
...@@ -413,6 +413,7 @@ ...@@ -413,6 +413,7 @@
return promiseMethods('/front-index/update', 'post', JSON.stringify(data), 'application/json') return promiseMethods('/front-index/update', 'post', JSON.stringify(data), 'application/json')
}).then(() => { }).then(() => {
layer.msg("保存成功！") layer.msg("保存成功！")
$.modal.close();
refreshItem() refreshItem()
}) })
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/carefullyGoods.html
View file @ 95178530
...@@ -143,6 +143,21 @@ ...@@ -143,6 +143,21 @@
<input type="radio" value="4" id="optionsRadios1" name="optionsRadios"><span>价格低</span></label> <input type="radio" value="4" id="optionsRadios1" name="optionsRadios"><span>价格低</span></label>
</div> </div>
</div> </div>
<div class="function_btn">
<div class="hot_title">
商品搜索：
</div>
<div class="tags">
<div class="input-group iptOrSelect">
<input id="searchIpt" data-id="" value="" type="text" class="form-control storeList" onFocus="focusMethod(this)" placeholder="请输入查询信息">
<div class="input-group-btn">
<ul class="dropdown-menu dropdown-menu-right" role="menu">
</ul>
</div>
</div>
</div>
<button type="button" class="btn btn-primary" onclick="addBox()">添加</button>
</div>
<div class="list_title"> <div class="list_title">
<div class="hot_title"> <div class="hot_title">
商品列表<span class="goodsNumber">(1998)</span>： 商品列表<span class="goodsNumber">(1998)</span>：
...@@ -163,26 +178,29 @@ ...@@ -163,26 +178,29 @@
<button type="button" class="btn btn-success" onclick="save()">保存</button> <button type="button" class="btn btn-success" onclick="save()">保存</button>
</div> </div>
</div> </div>
<div class="right_content"> <!-- <div class="right_content">
<div class="right_title"> <div class="right_title">
</div> </div>
<div class="function_area"> <div class="function_area">
<iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> <iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe>
</div> </div>
</div> </div> -->
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: bootstrap-suggest-js" />
<script th:src="@{/js/jquery-ui-1.10.4.min.js}"></script> <script th:src="@{/js/jquery-ui-1.10.4.min.js}"></script>
<script th:inline="javascript"> <script th:inline="javascript">
var prefix2 = ctx + "local"; var prefix2 = ctx + "local";
var platformUrl = [[${platformUrl}]]; var platformUrl = [[${platformUrl}]];
console.log(platformUrl, 'platformUrl')
let num = 0; let num = 0;
let type = 1; let type = 1;
let createTime = ''; let createTime = '';
let mid = ''; let mid = '';
let selectGoodsId = ''; let selectGoodsId = '';
let updateTime = ''; let updateTime = '';
let selectObj = {};
$(function() { $(function() {
let url = window.location.hostname; let url = window.location.hostname;
if (url.includes('test')) { if (url.includes('test')) {
...@@ -204,7 +222,7 @@ ...@@ -204,7 +222,7 @@
selectGoodsId = data[0].selectGoodsId; selectGoodsId = data[0].selectGoodsId;
updateTime = data[0].updateTime; updateTime = data[0].updateTime;
if (data[0].goblinGoodsList && data[0].goblinGoodsList.length > 0) { if (data[0].goblinGoodsList && data[0].goblinGoodsList.length > 0) {
$('.goodsNumber').text(res.data.length); $('.goodsNumber').text(data[0].goblinGoodsList.length);
let str = ''; let str = '';
data[0].goblinGoodsList.forEach((item,index)=>{ data[0].goblinGoodsList.forEach((item,index)=>{
str+= `<li id="item${index}" class="info-element" data-spuId="${item.spuId}"> str+= `<li id="item${index}" class="info-element" data-spuId="${item.spuId}">
...@@ -224,24 +242,68 @@ ...@@ -224,24 +242,68 @@
$(document).ready(function () { $(document).ready(function () {
$(".sortable-list").sortable({connectWith: ".connectList"}).disableSelection() $(".sortable-list").sortable({connectWith: ".connectList"}).disableSelection()
}); });
function focusMethod (e) {
let index = $(e).attr('id').replace(/[^\d]/g,''); // 选中的是第几组
let url = '';
$(".storeList").bsSuggest({
idField: 'spuId', // data.value 的第几个数据，作为input输入框的内容
keyField: 'name', // data.value 的第几个数据，作为input输入框的内容
allowNoKeyword: false, //是否允许无关键字时请求数据
showBtn:false,
multiWord: true, //以分隔符号分割的多关键字支持
hideOnSelect: true,
getDataMethod: "url", //获取数据的方式，总是从 URL 获取
effectiveFields: ['name'],
url: '/compilations/goodsList?name=',
/*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
//字符串转化为 js 对象
console.log(json, 'json')
let data = {};
data.value = json.data
return data
}
}).on('onDataRequestSuccess', function (e, result) {
}).on('onSetSelectValue', function (e, selectedData,selectedRawData ) { // 当前行的所有值都能拿到
console.log(selectedRawData, 'selectedData')
selectObj['title'] = selectedRawData.name;
selectObj['spuId'] = selectedRawData.spuId;
selectObj['priceGe'] = selectedRawData.priceGe;
}).on('onUnsetSelectValue', function (e) {
});;
}
function creatDom (num) { function creatDom (num) {
promiseMethods('/selectGoods/goodsList?type=' + num, 'get').then(res => { promiseMethods('/selectGoods/goodsList?type=' + num, 'get').then(res => {
console.log(res, 121212) console.log(res, 121212)
let { data } = res; let { data } = res;
$('.goodsNumber').text(data.length); // $('.goodsNumber').text(data.length);
let str = ''; // let str = '';
data.forEach((item,index)=>{ // data.forEach((item,index)=>{
str+= `<li id="item${index}" class="info-element" data-spuId="${item.spuId}"> // str+= `<li id="item${index}" class="info-element" data-spuId="${item.spuId}">
<span>${item.name}</span> // <span>${item.name}</span>
<div class="agile-detail"> // <div class="agile-detail">
<a href="#" class="pull-right btn btn-xs btn-white" style="margin-top:-15px;background: none;border: none;"><i class="fa fa-navicon"></i></a> // <a href="#" class="pull-right btn btn-xs btn-white" style="margin-top:-15px;background: none;border: none;"><i class="fa fa-navicon"></i></a>
<span>￥</span>${item.priceGe} // <span>￥</span>${item.priceGe}
</div> // </div>
</li>` // </li>`
}) // })
$(".connectList").html(str); // $(".connectList").html(str);
}) })
} }
function addBox () {
let str = '';
// console.log($('.goodsNumber').text()+1, 'sf')
let num = Number($('.goodsNumber').text()) + 1;
$('.goodsNumber').text(num)
str+= `<li id="item${Number($('.goodsNumber').text())-1}" class="info-element" data-spuId="${selectObj.spuId}">
<span>${selectObj.title}</span>
<div class="agile-detail">
<a href="#" class="pull-right btn btn-xs btn-white" style="margin-top:-15px;background: none;border: none;"><i class="fa fa-navicon"></i></a>
<span>￥</span>${selectObj.priceGe}
</div>
</li>`
$(".connectList").append(str);
}
$("input[name=optionsRadios]").change(function(e){ $("input[name=optionsRadios]").change(function(e){
type = e.target.value; type = e.target.value;
creatDom (type); creatDom (type);
...@@ -266,6 +328,7 @@ ...@@ -266,6 +328,7 @@
console.log(res, 'res') console.log(res, 'res')
if (res.code == 0) { if (res.code == 0) {
layer.msg('保存成功！') layer.msg('保存成功！')
$.modal.close();
refreshItem() refreshItem()
} }
}) })
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/index.html
View file @ 95178530
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
} }
.function_area { .function_area {
position: relative; position: relative;
width: 375px;
height: 1190px;
border: 1px solid #ccc;
} }
.function_area .banner { .function_area .banner {
position: absolute; position: absolute;
...@@ -30,6 +33,9 @@ ...@@ -30,6 +33,9 @@
left: 1px; left: 1px;
top: 104px; top: 104px;
cursor: pointer; cursor: pointer;
background: burlywood;
text-align: center;
line-height: 244px;
} }
.banner span, .searchAreaModeSp { .banner span, .searchAreaModeSp {
...@@ -53,6 +59,12 @@ ...@@ -53,6 +59,12 @@
width: 373px; width: 373px;
background: rgba(0,0,0,0); background: rgba(0,0,0,0);
cursor: pointer; cursor: pointer;
/* text-align: center; */
/* line-height: 160px; */
background: chocolate;
display: flex;
justify-content: center;
align-items: center;
} }
.moFang span, .jinGangWei span, .huDongBanner span { .moFang span, .jinGangWei span, .huDongBanner span {
/* display: inline-block; */ /* display: inline-block; */
...@@ -63,11 +75,20 @@ ...@@ -63,11 +75,20 @@
text-align: center; text-align: center;
line-height: 18px; line-height: 18px;
border: 2px solid yellowgreen; border: 2px solid yellowgreen;
right: -358px; right: -135px;
top: -10px; top: -80px;
color: yellowgreen; color: yellowgreen;
cursor: pointer; cursor: pointer;
display: none; display: none;
z-index: 100;
}
.moFang span {
right: -168px;
top: -225px;
}
.jinGangWei span {
right: -162px;
top: -122px;
} }
.function_area .moFang { .function_area .moFang {
position: absolute; position: absolute;
...@@ -76,6 +97,10 @@ ...@@ -76,6 +97,10 @@
background: rgba(0,0,0,0); background: rgba(0,0,0,0);
left: 1px; left: 1px;
cursor: pointer; cursor: pointer;
background: cyan;
display: flex;
justify-content: center;
align-items: center;
} }
.function_area .jinGangWei { .function_area .jinGangWei {
position: absolute; position: absolute;
...@@ -84,6 +109,10 @@ ...@@ -84,6 +109,10 @@
background: rgba(0,0,0,0); background: rgba(0,0,0,0);
left: 1px; left: 1px;
cursor: pointer; cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
background: deepskyblue;
} }
.banner:hover,.searchAreaMode:hover,.moFang:hover,.jinGangWei:hover,.huDongBanner:hover { .banner:hover,.searchAreaMode:hover,.moFang:hover,.jinGangWei:hover,.huDongBanner:hover {
border-radius: 8px; border-radius: 8px;
...@@ -100,6 +129,12 @@ ...@@ -100,6 +129,12 @@
left: 1px; left: 1px;
top: 56px; top: 56px;
cursor: pointer; cursor: pointer;
background: bisque;
text-align: center;
line-height: 46px;
}
body .layer-ext-moon .layui-layer-btn {
display: none !important;
} }
</style> </style>
</head> </head>
...@@ -124,21 +159,34 @@ ...@@ -124,21 +159,34 @@
</div> </div>
<div class="function_area" style="position: relative;"> <div class="function_area" style="position: relative;">
<div class="searchAreaMode" onclick="goArea(5)"> <div class="searchAreaMode" onclick="goArea(5)">
搜索位
<!-- <span class="searchAreaModeSp" onclick="delSearchAreaModeSpp()">X</span> --> <!-- <span class="searchAreaModeSp" onclick="delSearchAreaModeSpp()">X</span> -->
</div> </div>
<div class="banner" onclick="goArea(6)"> <div class="banner" onclick="goArea(6)">
顶部BANNER
<!-- <span class="bannerSp" onclick="delbannerSp()">X</span> --> <!-- <span class="bannerSp" onclick="delbannerSp()">X</span> -->
</div> </div>
<div class="moFang" onclick="goArea(4)"> <div class="moFang" onclick="goArea(4)">
<div>
魔方位
</div>
<span class="mofangSp" onclick="delSp()">X</span> <span class="mofangSp" onclick="delSp()">X</span>
</div> </div>
<div class="jinGangWei" onclick="goArea(1)"> <div class="jinGangWei" onclick="goArea(1)">
<div>
金刚位
</div>
<span class="jinGangWeiSp" onclick="delSp(1)">X</span> <span class="jinGangWeiSp" onclick="delSp(1)">X</span>
</div> </div>
<div class="huDongBanner" onclick="goArea(2)"> <div class="huDongBanner" onclick="goArea(2)">
<div>
活动BANNER
</div>
<span class="huDongBannerSp" onclick="delSp(2)">X</span> <span class="huDongBannerSp" onclick="delSp(2)">X</span>
</div> </div>
<iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> <!-- <iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> -->
</div> </div>
</div> </div>
...@@ -160,22 +208,28 @@ ...@@ -160,22 +208,28 @@
function goArea (num) { function goArea (num) {
switch(num) { switch(num) {
case 1: case 1:
$.modal.openTab('金刚位', prefix2 + "/kingArea?id=" + 1212) // $.modal.open('添加用户', prefix2 + "/form", '900', '320', callback);
$.modal.open('金刚位', prefix2 + "/kingArea?id=" + 1212)
break; break;
case 5: case 5:
$.modal.openTab('商品搜索', prefix2 + "/searchStore?id=" + 1212) $.modal.open('商品搜索', prefix2 + "/searchStore?id=" + 1212)
// $.modal.openTab('商品搜索', prefix2 + "/searchStore?id=" + 1212)
break; break;
case 6: case 6:
$.modal.openTab('顶部banner', prefix2 + "/topBanner?id=" + num) $.modal.open('顶部banner', prefix2 + "/topBanner?id=" + num)
// $.modal.openTab('顶部banner', prefix2 + "/topBanner?id=" + num)
break; break;
case 2: case 2:
$.modal.openTab('活动banner', prefix2 + "/topBanner?id=" + num) $.modal.open('活动banner', prefix2 + "/topBanner?id=" + num)
// $.modal.openTab('活动banner', prefix2 + "/topBanner?id=" + num)
break; break;
case 4: case 4:
$.modal.openTab('魔方位', prefix2 + "/RubikArea?id=" + num) $.modal.open('魔方位', prefix2 + "/RubikArea?id=" + num)
// $.modal.openTab('魔方位', prefix2 + "/RubikArea?id=" + num)
break; break;
case 7: case 7:
$.modal.openTab('精选商品', prefix2 + "/carefullyGoods?id=" + num) $.modal.open('精选商品', prefix2 + "/carefullyGoods?id=" + num)
// $.modal.openTab('精选商品', prefix2 + "/carefullyGoods?id=" + num)
break; break;
} }
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/kingArea.html
View file @ 95178530
...@@ -140,14 +140,14 @@ ...@@ -140,14 +140,14 @@
<button type="button" class="btn btn-success" onclick="save()">保存</button> <button type="button" class="btn btn-success" onclick="save()">保存</button>
</div> </div>
</div> </div>
<div class="right_content"> <!-- <div class="right_content">
<div class="right_title"> <div class="right_title">
</div> </div>
<div class="function_area"> <div class="function_area">
<iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> <iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe>
</div> </div>
</div> </div> -->
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js" />
...@@ -428,6 +428,8 @@ ...@@ -428,6 +428,8 @@
return promiseMethods('/front-index/update', 'post', JSON.stringify(data), 'application/json') return promiseMethods('/front-index/update', 'post', JSON.stringify(data), 'application/json')
}).then((res)=> { }).then((res)=> {
layer.msg('保存成功！') layer.msg('保存成功！')
// $.modal.closeTab();
$.modal.close();
refreshItem() refreshItem()
}) })
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/searchStore.html
View file @ 95178530
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
<button type="button" class="btn btn-success" onclick="save()">保存</button> <button type="button" class="btn btn-success" onclick="save()">保存</button>
</div> </div>
</div> </div>
<div class="right_content"> <!-- <div class="right_content">
<div class="right_title"> <div class="right_title">
</div> </div>
<div class="function_area"> <div class="function_area">
<iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> <iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe>
</div> </div>
</div> </div> -->
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
console.log(data, 'data222') console.log(data, 'data222')
promiseMethods('/hotWord/updateOrCreate', 'post', JSON.stringify(data), 'application/json').then(res => { promiseMethods('/hotWord/updateOrCreate', 'post', JSON.stringify(data), 'application/json').then(res => {
layer.msg('创建成功！') layer.msg('创建成功！')
$.modal.close();
$.operate.successCallback(res); $.operate.successCallback(res);
}) })
// refreshItem() // refreshItem()
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/topBanner.html
View file @ 95178530
...@@ -145,14 +145,14 @@ ...@@ -145,14 +145,14 @@
<button type="button" class="btn btn-success" onclick="save()">保存</button> <button type="button" class="btn btn-success" onclick="save()">保存</button>
</div> </div>
</div> </div>
<div class="right_content"> <!-- <div class="right_content">
<div class="right_title"> <div class="right_title">
</div> </div>
<div class="function_area"> <div class="function_area">
<iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe> <iframe id="iframe" src="http://172.16.3.82:8080/#/goods/home?place=admin" width="375" height="1190" frameborder="0"></iframe>
</div> </div>
</div> </div> -->
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js" />
...@@ -387,6 +387,7 @@ ...@@ -387,6 +387,7 @@
} }
}).then(res => { }).then(res => {
layer.msg("保存成功！") layer.msg("保存成功！")
$.modal.close();
refreshItem() refreshItem()
}) })
......
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