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

Skip to content

L
liquidnet-bus-v1
Commit 295140a5 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents 44a0c512 eaacaf1b
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 10 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/RubikArea.html
View file @ 295140a5
...@@ -123,12 +123,12 @@ ...@@ -123,12 +123,12 @@
<div class="tags"> <div class="tags">
<label> <label>
<input type="radio" value="1" id="optionsRadios1" name="optionsRadios"><span>一行一个</span></label> <input type="radio" value="1" id="optionsRadios1" name="optionsRadios"><span>一行一个</span></label>
<label> <!-- <label>
<input type="radio" value="2" id="optionsRadios2" name="optionsRadios"><span>一行两个</span></label> <input type="radio" value="2" id="optionsRadios2" name="optionsRadios"><span>一行两个</span></label>
<label> <label>
<input type="radio" value="3" id="optionsRadios3" name="optionsRadios"><span>一行三个</span></label> <input type="radio" value="3" id="optionsRadios3" name="optionsRadios"><span>一行三个</span></label>
<label> <label>
<input type="radio" value="4" id="optionsRadios4" name="optionsRadios"><span>上一下三</span></label> <input type="radio" value="4" id="optionsRadios4" name="optionsRadios"><span>上一下三</span></label> -->
</div> </div>
</div> </div>
<div class="function_btn"> <div class="function_btn">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/index.html
View file @ 295140a5
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.moFang span, .jinGangWei span, .huDongBanner span { .moFang span, .jinGangWei span, .huDongBanner span, .XINPINTUIJIAN span {
/* display: inline-block; */ /* display: inline-block; */
position: relative; position: relative;
width: 20px; width: 20px;
...@@ -88,6 +88,11 @@ ...@@ -88,6 +88,11 @@
display: none; display: none;
z-index: 100; z-index: 100;
} }
.XINPINTUIJIAN span {
/* display: inline-block; */
top: -225px;
right: -152px;
}
.moFang span { .moFang span {
right: -168px; right: -168px;
top: -225px; top: -225px;
...@@ -120,11 +125,23 @@ ...@@ -120,11 +125,23 @@
align-items: center; align-items: center;
background: deepskyblue; background: deepskyblue;
} }
.banner:hover,.searchAreaMode:hover,.moFang:hover,.jinGangWei:hover,.huDongBanner:hover { .function_area .XINPINTUIJIAN {
position: absolute;
width: 373px;
height: 450px;
background: rgba(0,0,0,0);
left: 1px;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
background: deeppink;
}
.banner:hover,.searchAreaMode:hover,.moFang:hover,.jinGangWei:hover,.huDongBanner:hover,.XINPINTUIJIAN:hover {
border-radius: 8px; border-radius: 8px;
border: 2px dashed yellowgreen; border: 2px dashed yellowgreen;
} }
.banner:hover .bannerSp,.searchAreaMode:hover .searchAreaModeSp, .moFang:hover .mofangSp, .jinGangWei:hover .jinGangWeiSp, .huDongBanner:hover .huDongBannerSp { .banner:hover .bannerSp,.searchAreaMode:hover .searchAreaModeSp, .moFang:hover .mofangSp, .jinGangWei:hover .jinGangWeiSp, .huDongBanner:hover .huDongBannerSp, .XINPINTUIJIAN:hover .XINPINTUIJIANSp {
display: inline-block; display: inline-block;
} }
.searchAreaMode { .searchAreaMode {
...@@ -151,7 +168,7 @@ ...@@ -151,7 +168,7 @@
营销组件 营销组件
</div> </div>
<div class="function_btn"> <div class="function_btn">
<button type="button" class="btn btn-primary" onclick="goArea(1)">金刚位</button> <button type="button" class="btn btn-primary" onclick="goArea(1)">焦点</button>
<button type="button" class="btn btn-warning" onclick="goArea(2)">活动banner</button> <button type="button" class="btn btn-warning" onclick="goArea(2)">活动banner</button>
<button type="button" class="btn btn-success" onclick="goArea(4)">魔方</button> <button type="button" class="btn btn-success" onclick="goArea(4)">魔方</button>
<button type="button" class="btn btn-info" onclick="goArea(7)">精选商品</button> <button type="button" class="btn btn-info" onclick="goArea(7)">精选商品</button>
...@@ -181,10 +198,16 @@ ...@@ -181,10 +198,16 @@
</div> </div>
<div class="jinGangWei" onclick="goArea(1)"> <div class="jinGangWei" onclick="goArea(1)">
<div> <div>
金刚位 焦点
</div> </div>
<span class="jinGangWeiSp" onclick="delSp(1)">X</span> <span class="jinGangWeiSp" onclick="delSp(1)">X</span>
</div> </div>
<div class="XINPINTUIJIAN" onclick="goArea(8)">
<div>
新品推荐
</div>
<span class="XINPINTUIJIANSp" onclick="delSp(5)">X</span>
</div>
<div class="huDongBanner" onclick="goArea(2)"> <div class="huDongBanner" onclick="goArea(2)">
<div> <div>
活动BANNER 活动BANNER
...@@ -246,7 +269,8 @@ ...@@ -246,7 +269,8 @@
{"mid":2,"moudleIndexId":"708754120962334729770775","moudleName":"jinGangWei","indexs":2,"updateTime":"2022-01-11 17:40:03","createTime":"2022-01-06 13:53:45","delTag":0,"status":0}, {"mid":2,"moudleIndexId":"708754120962334729770775","moudleName":"jinGangWei","indexs":2,"updateTime":"2022-01-11 17:40:03","createTime":"2022-01-06 13:53:45","delTag":0,"status":0},
{"mid":1,"moudleIndexId":"708753099180072962244503","moudleName":"huDongBanner","indexs":1,"updateTime":"2022-01-06 13:52:22","createTime":"2022-01-06 13:52:19","delTag":0,"status":0}, {"mid":1,"moudleIndexId":"708753099180072962244503","moudleName":"huDongBanner","indexs":1,"updateTime":"2022-01-06 13:52:22","createTime":"2022-01-06 13:52:19","delTag":0,"status":0},
{"mid":3,"moudleIndexId":"708754120962334729770777","moudleName":"xianShiMiaoSha","indexs":3,"updateTime":"2022-01-06 13:55:04","createTime":"2022-01-06 13:55:07","delTag":0,"status":0}, {"mid":3,"moudleIndexId":"708754120962334729770777","moudleName":"xianShiMiaoSha","indexs":3,"updateTime":"2022-01-06 13:55:04","createTime":"2022-01-06 13:55:07","delTag":0,"status":0},
{"mid":4,"moudleIndexId":"708754120962334729772770","moudleName":"moFang","indexs":3,"updateTime":"2022-01-14 13:32:40","createTime":"2022-01-06 13:55:34","delTag":0,"status":0} {"mid":4,"moudleIndexId":"708754120962334729772770","moudleName":"moFang","indexs":3,"updateTime":"2022-01-14 13:32:40","createTime":"2022-01-06 13:55:34","delTag":0,"status":0},
{"mid":5,"moudleIndexId":"70875412096233472977232","moudleName":"XINPINTUIJIAN","indexs":4,"updateTime":"2022-02-21 18:20:35","createTime":"2022-01-06 13:55:34","delTag":0,"status":0}
] ]
arr[num-1].delTag = 1; arr[num-1].delTag = 1;
$.ajax({ $.ajax({
...@@ -281,6 +305,7 @@ ...@@ -281,6 +305,7 @@
let {data} = res; let {data} = res;
let firstHeight = ''; let firstHeight = '';
let secondHeight = ''; let secondHeight = '';
let threeHeight = '';
let datas = [] let datas = []
data.map(item => { data.map(item => {
if (item.moudleIndexId != "708754120962334729770777") { if (item.moudleIndexId != "708754120962334729770777") {
...@@ -299,6 +324,8 @@ ...@@ -299,6 +324,8 @@
firstHeight = 591; firstHeight = 591;
} else if (item.moudleName == "moFang") { } else if (item.moudleName == "moFang") {
firstHeight = 791; firstHeight = 791;
} else if (item.moudleName == "XINPINTUIJIAN") {
firstHeight = 791;
} }
} else if (index == 1) { } else if (index == 1) {
$('.'+item.moudleName+'').css('top', firstHeight) $('.'+item.moudleName+'').css('top', firstHeight)
...@@ -308,9 +335,22 @@ ...@@ -308,9 +335,22 @@
secondHeight = firstHeight+250; secondHeight = firstHeight+250;
} else if (item.moudleName == "moFang") { } else if (item.moudleName == "moFang") {
secondHeight = firstHeight+450; secondHeight = firstHeight+450;
} else if (item.moudleName == "XINPINTUIJIAN") {
secondHeight = firstHeight+450;
} }
} else { } else if (index == 2) {
$('.'+item.moudleName+'').css('top', secondHeight) $('.'+item.moudleName+'').css('top', secondHeight)
if (item.moudleName == "huDongBanner") {
threeHeight = secondHeight+160;
} else if (item.moudleName == "jinGangWei") {
threeHeight = secondHeight+250;
} else if (item.moudleName == "moFang") {
threeHeight = secondHeight+450;
} else if (item.moudleName == "XINPINTUIJIAN") {
threeHeight = secondHeight+450;
}
} else {
$('.'+item.moudleName+'').css('top', threeHeight)
} }
}) })
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/newRecommended.html
View file @ 295140a5
...@@ -260,7 +260,9 @@ ...@@ -260,7 +260,9 @@
// }) // })
function addItem (data, i, arr) { function addItem (data, i, arr) {
let str = ''; let str = '';
if (count > 7) {
return layer.msg('新品推荐最多可添加8个商品')
}
if (data) { if (data) {
count = i; count = i;
str = `<div id="item${count}" class="items" data-id="${data[i].mid}"> str = `<div id="item${count}" class="items" data-id="${data[i].mid}">
......
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