Skip to content

zhangtai / zzhnc

转到一个项目
Commit f564a60f 由 沈姿.前端(已离职)
选项

Merge branch 'shenzi'

2 个父辈 b23b3ef6 5549ea27
内嵌 并排
正在显示 7 个修改的文件 包含 57 行增加 和 90 行删除
WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
...@@ -78,16 +78,14 @@ ...@@ -78,16 +78,14 @@
function initData(queryObj) { function initData(queryObj) {
$.get("/zzhnc/article/getArticlesList", queryObj, function(data) { $.get("/zzhnc/article/getArticlesList", queryObj, function(data) {
data = data.data; var data = data.data;
console.log(data) console.log(data)
$("#tablelist").html("");
var str = "";
if(data.rows.length < 1) { if(data.rows.length < 1) {
$(".nodata").show(); $(".nodata").show();
$("#page").hide();
} else { } else {
$(".nodata").hide(); $(".nodata").hide();
$("#page").show(); var str = "";
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
str += '<tr data-id=' + data.rows[i].id + '>' + str += '<tr data-id=' + data.rows[i].id + '>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
...@@ -100,11 +98,9 @@ ...@@ -100,11 +98,9 @@
'</td>' + '</td>' +
'</tr>'; '</tr>';
} }
}
$("#tablelist").html(str); $("#tablelist").html(str);
form.render();
toNull_G(); toNull_G();
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
...@@ -116,9 +112,10 @@ ...@@ -116,9 +112,10 @@
queryObj.page = obj.curr queryObj.page = obj.curr
initData(queryObj); initData(queryObj);
} }
} }
}); })
}
}) })
} }
......
WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
<body class="wrap"> <body class="wrap">
<div class="layui-form"> <div class="layui-form">
<div class="layui-form-item searchbox" style="margin-bottom: 0px;"> <div class="layui-form-mid">说明：添加或修改完关键字后，需要进行发布，以使新添加或修改的关键字生效。</div>
<div class="layui-input-inline" style="width: 200px;"> <div class="layui-form-item">
<div class="layui-input-inline">
<input type="text" class="layui-input" name="keyword" placeholder="关键字" /> <input type="text" class="layui-input" name="keyword" placeholder="关键字" />
</div> </div>
<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button> <button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
<button class="layui-btn layui-btn-primary resetBtn">重置</button> <button class="layui-btn layui-btn-primary resetBtn">重置</button>
<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加关键字</a> <a class="layui-btn layui-btn-warm createBtn"><i class="layui-icon">&#xe61f;</i> 添加关键字</a>
<a class="layui-btn publicBtn" href="#"><i class="layui-icon">&#xe609;</i> 发布</a> <a class="layui-btn publicBtn"><i class="layui-icon">&#xe609;</i> 发布</a>
</div> </div>
</div> </div>
<table class="layui-table"> <table class="layui-table">
...@@ -32,13 +33,11 @@ ...@@ -32,13 +33,11 @@
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody id="tablelist"> <tbody id="tablelist">
</tbody> </tbody>
</table> </table>
<div class="nodata">暂无数据</div> <div class="nodata">暂无数据</div>
<div id="page"></div> <div id="page"></div>
</body> </body>
<div class="popupbox" style="display:none;"> <div class="popupbox" style="display:none;">
<div class="popupbos"> <div class="popupbos">
...@@ -83,16 +82,13 @@ ...@@ -83,16 +82,13 @@
//页面初始化 //页面初始化
function initdata(queryObj) { function initdata(queryObj) {
$.get("/zzhnc/autoreply/getAutoreplyList", queryObj, function(data) { $.get("/zzhnc/autoreply/getAutoreplyList", queryObj, function(data) {
data = data.data; var data = data.data;
console.log(data) console.log(data)
var str = "";
if(data.rows.length < 1) { if(data.rows.length < 1) {
$(".nodata").show(); $(".nodata").show();
$("#page").hide();
} else { } else {
$(".nodata").hide(); $(".nodata").hide();
$("#page").show(); var str = "";
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
str += '<tr data-id=' + data.rows[i].id + '>' + str += '<tr data-id=' + data.rows[i].id + '>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
...@@ -104,10 +100,9 @@ ...@@ -104,10 +100,9 @@
'</td>' + '</td>' +
'</tr>'; '</tr>';
} }
}
$("#tablelist").html(str); $("#tablelist").html(str);
form.render();
toNull_G();
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
...@@ -120,8 +115,8 @@ ...@@ -120,8 +115,8 @@
initdata(queryObj); initdata(queryObj);
} }
} }
}); })
}
}) })
} }
...@@ -156,14 +151,6 @@ ...@@ -156,14 +151,6 @@
}) })
}) })
//发布按钮提示信息
$(".publicBtn").on("mouseenter", function() {
layer.tips('添加或修改完关键字后，需要进行发布，以使新添加或修改的关键字生效。', ".publicBtn", {
tips: [1, '#3595CC'],
time: 4000
});
})
//添加关键字 //添加关键字
$(document).on("click", ".createBtn", function() { $(document).on("click", ".createBtn", function() {
layer.open({ layer.open({
......
WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
...@@ -68,17 +68,14 @@ ...@@ -68,17 +68,14 @@
function initData(queryObj) { function initData(queryObj) {
$.get("/zzhnc/goods/search", queryObj, function(data) { $.get("/zzhnc/goods/search", queryObj, function(data) {
data = data.data; var data = data.data;
console.log(data) console.log(data)
$("#tablelist").html(""); $("#tablelist").html("");
var str = "";
if(data.rows.length < 1) { if(data.rows.length < 1) {
$(".nodata").show(); $(".nodata").show();
$("#page").hide();
} else { } else {
$(".nodata").hide(); $(".nodata").hide();
$("#page").show(); var str = "";
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
str += '<tr data-id=' + data.rows[i].id + '>' + str += '<tr data-id=' + data.rows[i].id + '>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
...@@ -90,17 +87,15 @@ ...@@ -90,17 +87,15 @@
'<td>' + data.rows[i].sellerName + '</td>' + '<td>' + data.rows[i].sellerName + '</td>' +
'<td>' + data.rows[i].sellerAddress + '</td>' + '<td>' + data.rows[i].sellerAddress + '</td>' +
'<td>' + data.rows[i].sellerPhone + '</td>' + '<td>' + data.rows[i].sellerPhone + '</td>' +
'<td>' + ' <input type="checkbox" disabled ' + (data.rows[i].isHome ? "checked" : "") + ' lay-skin="switch" lay-text="是|否"></td>' + '<td>' + isHome(data.rows[i].isHome) +'</td>' +
'<td><a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' + '<td><a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +
'<a href="#" class="layui-btn layui-btn-sm deleteBtn">删除</a>' + '<a href="#" class="layui-btn layui-btn-sm deleteBtn">删除</a>' +
'</td>' + '</td>' +
'</tr>'; '</tr>';
} }
$("#tablelist").html(str); $("#tablelist").html(str);
toNull_G();
form.render(); form.render();
} toNull_G();
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
...@@ -113,7 +108,8 @@ ...@@ -113,7 +108,8 @@
initData(queryObj); initData(queryObj);
} }
} }
}); })
}
}) })
} }
...@@ -187,6 +183,15 @@ ...@@ -187,6 +183,15 @@
}); });
}); });
function isHome(v){
if(v){
v = "是"
}else{
v = "否"
}
return v;
}
}) })
</script> </script>
......
WebContent/WEB-INF/jsp/pc/report/fans.jsp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<body class="wrap"> <body class="wrap">
<form class="layui-form"> <form class="layui-form">
<div class="layui-form-item searchbox"> <div class="layui-form-item">
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" name="keyword" placeholder="关键字" /> <input class="layui-input" name="keyword" placeholder="关键字" />
</div> </div>
...@@ -52,51 +52,37 @@ ...@@ -52,51 +52,37 @@
var queryObj = { var queryObj = {
page: 1, page: 1,
pagesize: 10,
keyword: null keyword: null
}; };
//初始化方法 //初始化方法
function initData(queryObj) { function initData(queryObj) {
$.post("/zzhnc/report/getFansList", queryObj, function(res) { $.get("/zzhnc/fans/search", queryObj, function(data) {
data = res.data;
console.log(data) console.log(data)
$("#fanslist").html("") $("#fanslist").html("")
if(data.rows.length < 1) { if(data.rows.length < 1) {
$(".nodata").show(); $(".nodata").show();
$("#page").hide();
} else { } else {
$(".nodata").hide(); $(".nodata").hide();
$("#page").show();
var str = ""; var str = "";
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
var nick = "";
if((data.rows[i].nickname == null || data.rows[i].nickname == "") && (data.rows[i].logo == null || data.rows[i].logo == "")) {
nick = '<div style="text-align:left;">未授权（id：' + data.rows[i].id + '）</div>';
} else {
if(data.rows[i].logo == null || data.rows[i].logo == "") {
nick = '<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + data.rows[i].nickname + '</span></div>';
} else {
nick = '<div class="nickbox"><div id="wlogo" style="background:url(' + data.rows[i].logo + ') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + data.rows[i].nickname + '</span></div>';
}
}
str += '<tr>' + str += '<tr>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
'<td>' + nick + '</td>' + '<td><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' +
'<td>' + ToAddress(data.rows[i]) + '</td>' + '<td>' + ToAddress(data.rows[i]) + '</td>' +
'<td>' + data.rows[i].parentfans + '</td>' + '<td>' + data.rows[i].parentfansid + '</td>' +
'<td>' + data.rows[i].miniopenid + '</td>' + '<td>' + data.rows[i].miniopenid + '</td>' +
'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' + '<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
'<td>' + toTime_G(data.rows[i].lastlogintime) + '</td>' + '<td>' + toTime_G(data.rows[i].lastlogintime) + '</td>' +
'</tr>' '</tr>'
} }
$("#fanslist").html(str) $("#fanslist").html(str)
form.render()
toNull_G(); toNull_G();
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
limit: queryObj.pagesize, limit: 10,
curr: queryObj.page, curr: queryObj.page,
skip: true, skip: true,
jump: function(obj, first) { jump: function(obj, first) {
...@@ -105,9 +91,8 @@ ...@@ -105,9 +91,8 @@
initData(queryObj) initData(queryObj)
} }
} }
}); })
} }
}) })
} }
......
WebContent/WEB-INF/jsp/pc/report/goods.jsp
...@@ -73,15 +73,13 @@ ...@@ -73,15 +73,13 @@
$.get("/zzhnc/goods/search", queryObj, function(data) { $.get("/zzhnc/goods/search", queryObj, function(data) {
data = data.data; data = data.data;
console.log(data) console.log(data)
$("#tablelist").html(""); $("#tablelist").html("");
var str = ""; var str = "";
if(data.rows.length < 1) { if(data.rows.length < 1) {
$(".nodata").show(); $(".nodata").show();
$("#page").hide();
} else { } else {
$(".nodata").hide(); $(".nodata").hide();
$("#page").show(); var str = "";
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
str += '<tr data-id=' + data.rows[i].id + '>' + str += '<tr data-id=' + data.rows[i].id + '>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
...@@ -92,10 +90,8 @@ ...@@ -92,10 +90,8 @@
'</tr>'; '</tr>';
} }
$("#tablelist").html(str); $("#tablelist").html(str);
toNull_G();
form.render(); form.render();
} toNull_G();
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
...@@ -108,7 +104,8 @@ ...@@ -108,7 +104,8 @@
initData(queryObj); initData(queryObj);
} }
} }
}); })
}
}) })
} }
......
WebContent/WEB-INF/jsp/pc/report/prize.jsp
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
//初始化方法 //初始化方法
function initData(queryObj) { function initData(queryObj) {
$.post("/zzhnc/activity/getLotteryLogList", queryObj, function(data) { $.post("/zzhnc/activity/lotterys", queryObj, function(data) {
data = data.data; data = data.data;
$('#moneySum').text(data.sum) $('#moneySum').text(data.sum)
console.log(data) console.log(data)
...@@ -98,30 +98,18 @@ ...@@ -98,30 +98,18 @@
$(".nodata").hide(); $(".nodata").hide();
$("#page").show(); $("#page").show();
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
var nick = "";
if((data.rows[i].nickname == null || data.rows[i].nickname == "") && (data.rows[i].logo == null || data.rows[i].logo == "")) {
nick = '<div style="text-align:left;">未授权（id：' + data.rows[i].id + '）</div>';
} else {
if(data.rows[i].logo == null || data.rows[i].logo == "") {
nick = '<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + data.rows[i].nickname + '</span></div>';
} else {
nick = '<div class="nickbox"><div id="wlogo" style="background:url(' + data.rows[i].logo + ') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + data.rows[i].nickname + '</span></div>';
}
}
str += '<tr>' + str += '<tr>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
'<td>' + data.rows[i].turn + '</td>' + '<td>' + data.rows[i].turn + '</td>' +
'<td>' + nick + '</td>' + '<td><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' +
'<td>' + data.rows[i].mny + '元</td>' + '<td>' + data.rows[i].mny + '元</td>' +
'<td>' + data.rows[i].name + '元</td>' + '<td>' + data.rows[i].name + '</td>' +
'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' + '<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
'</tr>'; '</tr>';
} }
}
$("#tablelist").html(str); $("#tablelist").html(str);
form.render();
toNull_G(); toNull_G();
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
...@@ -135,7 +123,8 @@ ...@@ -135,7 +123,8 @@
} }
} }
}); })
}
}) })
} }
......
WebContent/WEB-INF/res/css/basic.css
...@@ -137,6 +137,13 @@ ...@@ -137,6 +137,13 @@
height: 50px; height: 50px;
} }
.fansImg {
width: 40px;
height: 40px;
border-radius: 50%;
margin-right: 5px;
}
#upload{ #upload{
float: left; float: left;
margin-right: 10px; margin-right: 10px;
......
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！