Merge branch 'master' into zxt

WebContent/WEB-INF/jsp/pc/activity/activityList.jsp

@@ -55,7 +55,7 @@
 
 			var queryObj = {
 				page: 1,
-				pagesize: 5,
+				pagesize: 20,
 				keyword: null
 			};
 

WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp

@@ -178,7 +178,7 @@
 					<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="finish">立即结束活动</button>
-					<button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button>
+					<!--<button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button>-->
 				</div>
 			</form>
 		</body>
@@ -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) {

WebContent/WEB-INF/jsp/pc/report/fans.jsp

@@ -26,8 +26,8 @@
 				<tr>
 					<th>No</th>
 					<th>头像昵称</th>
-					<th>地区</th>
-					<th>上级粉丝id</th>
+					<th style="min-width: 126px;">地区</th>
+					<th style="min-width: 68px;">上级粉丝id</th>
 					<th>小程序 openid</th>
 					<th style="min-width: 84px;">创建时间</th>
 					<th style="min-width: 84px;">上次登录时间</th>
@@ -68,7 +68,7 @@
 						for(var i = 0; i < data.rows.length; i++) {
 							str += '<tr>' +
 								'<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>' + data.rows[i].parentfansid + '</td>' +
 								'<td>' + data.rows[i].miniopenid + '</td>' +
@@ -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) {
@@ -123,6 +123,16 @@
 				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>
 

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);

WebContent/WEB-INF/jsp/pc/report/prize.jsp

@@ -37,6 +37,14 @@
 					</select>
 				</div>
 				<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="关键字" />
 				</div>
 				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
@@ -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 += '<tr>' +
 								'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</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>' + showPrizeName(data.rows[i].mny, data.rows[i].prizeName) + '</td>' +
 								'<td>' + showStatus(data.rows[i].status) + '</td>'+
@@ -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 = '<img class="fansImg" src="/zzhnc/res/images/default_img.png" /> 未授权'
+				}else{
+					val = '<img class="fansImg" src="' + logo + '" />' + nickname 
+				}
+				return val;
+			}
 		})
 	</script>