Skip to content

zhangtai / zzhnc

转到一个项目
Commit 74a78005 由 zxt@theyeasy.com
选项

Merge branch 'master' into zxt

2 个父辈 753f9c13 b8320348
内嵌 并排
正在显示 6 个修改的文件 包含 51 行增加 和 14 行删除
WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
var queryObj = { var queryObj = {
page: 1, page: 1,
pagesize: 5, pagesize: 20,
keyword: null keyword: null
}; };
......
WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<a class="layui-btn" lay-submit lay-filter="submit">保存</a> <a class="layui-btn" lay-submit lay-filter="submit">保存</a>
<button class="layui-btn" lay-submit lay-filter="start">立即开启活动</button> <button class="layui-btn" lay-submit lay-filter="start">立即开启活动</button>
<button class="layui-btn" lay-submit lay-filter="finish">立即结束活动</button> <button class="layui-btn" lay-submit lay-filter="finish">立即结束活动</button>
<button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button> <!--<button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button>-->
</div> </div>
</form> </form>
</body> </body>
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
form.on('submit(start)', function(e) { form.on('submit(start)', function(e) {
var status = $("select[name=status]").val(); var status = $("select[name=status]").val();
console.log(status) console.log(status)
if(status == "1") { if(status == "1" || status == "0") {
$.post("/zzhnc/activity/updateActivityStatus", { $.post("/zzhnc/activity/updateActivityStatus", {
status: "2" status: "2"
}, function(data) { }, function(data) {
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
}); });
//设置下一轮 //设置下一轮
form.on('submit(nextround)', function(e) { /*form.on('submit(nextround)', function(e) {
var status = $("select[name=status]").val(); var status = $("select[name=status]").val();
if(status == "3") { if(status == "3") {
$.get("/zzhnc/activity/clearActivity", function(data) { $.get("/zzhnc/activity/clearActivity", function(data) {
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
} else { } else {
layer.msg("活动结束后才能开启下一轮"); layer.msg("活动结束后才能开启下一轮");
} }
}); });*/
//数值转为true或false //数值转为true或false
function toBool(v) { function toBool(v) {
......
WebContent/WEB-INF/jsp/pc/report/fans.jsp
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<tr> <tr>
<th>No</th> <th>No</th>
<th>头像昵称</th> <th>头像昵称</th>
<th>地区</th> <th style="min-width: 126px;">地区</th>
<th>上级粉丝id</th> <th style="min-width: 68px;">上级粉丝id</th>
<th>小程序 openid</th> <th>小程序 openid</th>
<th style="min-width: 84px;">创建时间</th> <th style="min-width: 84px;">创建时间</th>
<th style="min-width: 84px;">上次登录时间</th> <th style="min-width: 84px;">上次登录时间</th>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
str += '<tr>' + str += '<tr>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
'<td><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' + '<td>' + isLogo(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].parentfansid + '</td>' + '<td>' + data.rows[i].parentfansid + '</td>' +
'<td>' + data.rows[i].miniopenid + '</td>' + '<td>' + data.rows[i].miniopenid + '</td>' +
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
limit: 10, limit: 20,
curr: queryObj.page, curr: queryObj.page,
layout: ['count', 'prev', 'page', 'next', 'skip'], layout: ['count', 'prev', 'page', 'next', 'skip'],
jump: function(obj, first) { jump: function(obj, first) {
...@@ -123,6 +123,16 @@ ...@@ -123,6 +123,16 @@
return !!(p + c + d) ? (p + c + d) : "未知城市" return !!(p + c + d) ? (p + c + d) : "未知城市"
} }
function isLogo(logo, nickname){
var val = ""
if(logo == "" || logo == null || logo == "null" || logo == undefined || logo == "undefined") {
val = '<img class="fansImg" src="/zzhnc/res/images/default_img.png" /> 未授权'
}else{
val = '<img class="fansImg" src="' + logo + '" />' + nickname
}
return val;
}
}) })
</script> </script>
......
WebContent/WEB-INF/jsp/pc/report/goods.jsp
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
//查询条件 //查询条件
var queryObj = { var queryObj = {
page: 1, page: 1,
size: 10, size: 20,
sellerId: 0, sellerId: 0,
sort: 1, sort: 1,
key: null key: null
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
//查询 //查询
form.on('submit(querybtn)', function(data) { form.on('submit(querybtn)', function(data) {
queryObj.page = 1; queryObj.page = 1;
queryObj.size = 20;
queryObj.key = $("[name=key]").val(); queryObj.key = $("[name=key]").val();
queryObj.sort = $("[name=sort]").val(); queryObj.sort = $("[name=sort]").val();
initData(queryObj); initData(queryObj);
...@@ -135,6 +136,7 @@ ...@@ -135,6 +136,7 @@
$("[name=key]").val(""); $("[name=key]").val("");
$("[name=sort]").val("1"); $("[name=sort]").val("1");
queryObj.page = 1; queryObj.page = 1;
queryObj.size = 20;
queryObj.key = null; queryObj.key = null;
queryObj.sort = 1; queryObj.sort = 1;
initData(queryObj); initData(queryObj);
......
WebContent/WEB-INF/jsp/pc/report/prize.jsp
...@@ -37,6 +37,14 @@ ...@@ -37,6 +37,14 @@
</select> </select>
</div> </div>
<div class="layui-input-inline" style="width: 140px;"> <div class="layui-input-inline" style="width: 140px;">
<select name="type">
<option value="">奖品类型</option>
<option value="0">全部</option>
<option value="1">红包</option>
<!--<option value="2">否</option>-->
</select>
</div>
<div class="layui-input-inline" style="width: 140px;">
<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>
...@@ -77,9 +85,10 @@ ...@@ -77,9 +85,10 @@
//查询条件 //查询条件
var queryObj = { var queryObj = {
page: 1, page: 1,
pagesize: 10, pagesize: 20,
turn: null, turn: null,
status: null, status: null,
type: 0,
keyword: null keyword: null
} }
...@@ -99,7 +108,7 @@ ...@@ -99,7 +108,7 @@
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><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' + '<td>' + isLogo(data.rows[i].logo, data.rows[i].nickname) +'</td>' +
'<td>' + showMny(data.rows[i].mny) + '</td>' + '<td>' + showMny(data.rows[i].mny) + '</td>' +
'<td>' + showPrizeName(data.rows[i].mny, data.rows[i].prizeName) + '</td>' + '<td>' + showPrizeName(data.rows[i].mny, data.rows[i].prizeName) + '</td>' +
'<td>' + showStatus(data.rows[i].status) + '</td>'+ '<td>' + showStatus(data.rows[i].status) + '</td>'+
...@@ -110,6 +119,7 @@ ...@@ -110,6 +119,7 @@
form.render(); form.render();
toNull_G(); toNull_G();
} }
console.log(queryObj.pagesize)
laypage.render({ laypage.render({
elem: 'page', elem: 'page',
count: data.total, count: data.total,
...@@ -132,11 +142,12 @@ ...@@ -132,11 +142,12 @@
//查询 //查询
form.on('submit(querybtn)', function(data) { form.on('submit(querybtn)', function(data) {
console.log(data.field)
queryObj = data.field; queryObj = data.field;
queryObj.page = 1; queryObj.page = 1;
queryObj.pagesize = 20;
queryObj.keyword = $("[name=keyword]").val(); queryObj.keyword = $("[name=keyword]").val();
queryObj.turn = $("[name=turn]").val(); queryObj.turn = $("[name=turn]").val();
queryObj.type = $("[name=type]").val();
queryObj.status = $("[name=status]").val(); queryObj.status = $("[name=status]").val();
initData(queryObj); initData(queryObj);
}); });
...@@ -146,9 +157,13 @@ ...@@ -146,9 +157,13 @@
$("[name=keyword]").val(""); $("[name=keyword]").val("");
$("[name=turn]").val(""); $("[name=turn]").val("");
$('[name=status]').val("") $('[name=status]').val("")
$('[name=type]').val("")
queryObj.turn = null; queryObj.turn = null;
queryObj.keyword = null; queryObj.keyword = null;
queryObj.status = null queryObj.status = null;
queryObj.type = null;
queryObj.page = 1;
queryObj.pagesize = 20;
form.render(); form.render();
initData(queryObj); initData(queryObj);
}) })
...@@ -185,6 +200,16 @@ ...@@ -185,6 +200,16 @@
} }
return val; return val;
} }
function isLogo(logo, nickname){
var val = ""
if(logo == "" || logo == null || logo == "null" || logo == undefined || logo == "undefined") {
val = '<img class="fansImg" src="/zzhnc/res/images/default_img.png" /> 未授权'
}else{
val = '<img class="fansImg" src="' + logo + '" />' + nickname
}
return val;
}
}) })
</script> </script>
......
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！