diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp index 5ab0258..483ebd1 100644 --- a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp +++ b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp @@ -55,7 +55,7 @@ var queryObj = { page: 1, - pagesize: 5, + pagesize: 20, keyword: null }; diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp index 795b5ec..af05aa1 100644 --- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp +++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp @@ -178,7 +178,7 @@ 保存 - + @@ -429,7 +429,7 @@ form.on('submit(start)', function(e) { var status = $("select[name=status]").val(); console.log(status) - if(status == "1") { + if(status == "1" || status == "0") { $.post("/zzhnc/activity/updateActivityStatus", { status: "2" }, function(data) { @@ -466,7 +466,7 @@ }); //设置下一轮 - form.on('submit(nextround)', function(e) { + /*form.on('submit(nextround)', function(e) { var status = $("select[name=status]").val(); if(status == "3") { $.get("/zzhnc/activity/clearActivity", function(data) { @@ -480,7 +480,7 @@ } else { layer.msg("活动结束后才能开启下一轮"); } - }); + });*/ //数值转为true或false function toBool(v) { diff --git a/WebContent/WEB-INF/jsp/pc/report/fans.jsp b/WebContent/WEB-INF/jsp/pc/report/fans.jsp index b235e6a..c576df1 100644 --- a/WebContent/WEB-INF/jsp/pc/report/fans.jsp +++ b/WebContent/WEB-INF/jsp/pc/report/fans.jsp @@ -26,8 +26,8 @@ No 头像昵称 - 地区 - 上级粉丝id + 地区 + 上级粉丝id 小程序 openid 创建时间 上次登录时间 @@ -68,7 +68,7 @@ for(var i = 0; i < data.rows.length; i++) { str += '' + '' + ((data.page - 1) * data.pageSize + i + 1) + '' + - '' + data.rows[i].nickname + '' + + '' + isLogo(data.rows[i].logo, data.rows[i].nickname) +'' + '' + ToAddress(data.rows[i]) + '' + '' + data.rows[i].parentfansid + '' + '' + data.rows[i].miniopenid + '' + @@ -83,7 +83,7 @@ laypage.render({ elem: 'page', count: data.total, - limit: 10, + limit: 20, curr: queryObj.page, layout: ['count', 'prev', 'page', 'next', 'skip'], jump: function(obj, first) { @@ -122,6 +122,16 @@ var d = data.district || "" return !!(p + c + d) ? (p + c + d) : "未知城市" } + + function isLogo(logo, nickname){ + var val = "" + if(logo == "" || logo == null || logo == "null" || logo == undefined || logo == "undefined") { + val = ' 未授权' + }else{ + val = '' + nickname + } + return val; + } }) diff --git a/WebContent/WEB-INF/jsp/pc/report/goods.jsp b/WebContent/WEB-INF/jsp/pc/report/goods.jsp index 9659e56..0c6f3b9 100644 --- a/WebContent/WEB-INF/jsp/pc/report/goods.jsp +++ b/WebContent/WEB-INF/jsp/pc/report/goods.jsp @@ -72,7 +72,7 @@ //查询条件 var queryObj = { page: 1, - size: 10, + size: 20, sellerId: 0, sort: 1, key: null @@ -125,6 +125,7 @@ //查询 form.on('submit(querybtn)', function(data) { queryObj.page = 1; + queryObj.size = 20; queryObj.key = $("[name=key]").val(); queryObj.sort = $("[name=sort]").val(); initData(queryObj); @@ -135,6 +136,7 @@ $("[name=key]").val(""); $("[name=sort]").val("1"); queryObj.page = 1; + queryObj.size = 20; queryObj.key = null; queryObj.sort = 1; initData(queryObj); diff --git a/WebContent/WEB-INF/jsp/pc/report/prize.jsp b/WebContent/WEB-INF/jsp/pc/report/prize.jsp index 724386a..9acf5b2 100644 --- a/WebContent/WEB-INF/jsp/pc/report/prize.jsp +++ b/WebContent/WEB-INF/jsp/pc/report/prize.jsp @@ -37,6 +37,14 @@
+ +
+
@@ -77,9 +85,10 @@ //查询条件 var queryObj = { page: 1, - pagesize: 10, + pagesize: 20, turn: null, status: null, + type: 0, keyword: null } @@ -99,7 +108,7 @@ str += '' + '' + ((data.page - 1) * data.pageSize + i + 1) + '' + '' + data.rows[i].turn + '' + - '' + data.rows[i].nickname + '' + + '' + isLogo(data.rows[i].logo, data.rows[i].nickname) +'' + '' + showMny(data.rows[i].mny) + '' + '' + showPrizeName(data.rows[i].mny, data.rows[i].prizeName) + '' + '' + showStatus(data.rows[i].status) + ''+ @@ -110,6 +119,7 @@ form.render(); toNull_G(); } + console.log(queryObj.pagesize) laypage.render({ elem: 'page', count: data.total, @@ -132,11 +142,12 @@ //查询 form.on('submit(querybtn)', function(data) { - console.log(data.field) queryObj = data.field; queryObj.page = 1; + queryObj.pagesize = 20; queryObj.keyword = $("[name=keyword]").val(); queryObj.turn = $("[name=turn]").val(); + queryObj.type = $("[name=type]").val(); queryObj.status = $("[name=status]").val(); initData(queryObj); }); @@ -146,9 +157,13 @@ $("[name=keyword]").val(""); $("[name=turn]").val(""); $('[name=status]').val("") + $('[name=type]').val("") queryObj.turn = null; queryObj.keyword = null; - queryObj.status = null + queryObj.status = null; + queryObj.type = null; + queryObj.page = 1; + queryObj.pagesize = 20; form.render(); initData(queryObj); }) @@ -185,6 +200,16 @@ } return val; } + + function isLogo(logo, nickname){ + var val = "" + if(logo == "" || logo == null || logo == "null" || logo == undefined || logo == "undefined") { + val = ' 未授权' + }else{ + val = '' + nickname + } + return val; + } }) diff --git a/WebContent/WEB-INF/res/images/default_img.png b/WebContent/WEB-INF/res/images/default_img.png new file mode 100644 index 0000000..e92d24d Binary files /dev/null and b/WebContent/WEB-INF/res/images/default_img.png differ