Skip to content

zhangtai / zzhnc

转到一个项目
Commit 5c5bdf21 由 zxt@theyeasy.com
选项

Merge branch 'master' of http://120.76.158.63:18080/zhangtai/zzhnc

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