diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
index 4347417..bb31e17 100644
--- a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
@@ -107,7 +107,8 @@
 
 					laypage.render({
 						elem: 'page',
-						count: data.totalPages,
+						count: data.total, 
+						limit: queryObj.pagesize,
 						curr: queryObj.page,
 						skip: true,
 						jump: function(obj, first) {
diff --git a/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp b/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
index aec08a2..c63b58f 100644
--- a/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
+++ b/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
@@ -110,9 +110,10 @@
 					
 					laypage.render({
 						elem: 'page',
-						count: data.totalPages, 
+						count: data.total, 
 						limit: queryObj.size,
 						curr: queryObj.page,
+						skip: true,
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
index a8373cd..bf1591e 100644
--- a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
@@ -103,8 +103,10 @@
 
 					laypage.render({
 						elem: 'page',
-						count: data.totalPages,
+						count: data.total, 
+						limit: queryObj.size,
 						curr: queryObj.page,
+						skip: true,
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
index 919a04d..89214b8 100644
--- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
@@ -378,19 +378,56 @@
 				})
 
 				form.on('submit(submit)', function(e) {
-					var lop = e.field.lotteryPercent;
-					e.field.lotteryPercent = lop;
-					console.log(lop);
-					//var data_=JSON.stringify(e.field);
-					var data_ = e.field;
-					$.post("/zzhnc/activity/editActivitySetting", data_, function(data) {
+					console.log(e.field)
+					//console.log(e.field.${"num"+"1"})
+					var p1, p2 = {};
+					if(e.field.num1 > 0){
+						p1 = {
+							num: e.field.num1,
+							probability: e.field.probability1,
+							isMoney: toBool(e.field.isMoney1),
+							mixMoney: e.field.mixMoney1,
+							maxMoney: e.filed.maxMoney1,
+							name: e.field.name1
+						}
+					}else{
+						p1 = null
+					}
+					
+					if(e.field.num2 > 0){
+						p2 = {
+							num: e.field.num2,
+							probability: e.field.probability2,
+							isMoney: toBool(e.field.isMoney2),
+							mixMoney: e.field.mixMoney2,
+							maxMoney: e.filed.maxMoney2,
+							name: e.field.name2
+						}
+					}else{
+						p2 = null
+					}
+					
+					if(e.field.num2 > 0){
+						var p1 = {
+							num: e.field.num2,
+							probability: e.field.probability2,
+							isMoney: toBool(e.field.isMoney2),
+							mixMoney: e.field.mixMoney2,
+							maxMoney: e.filed.maxMoney2,
+							name: e.field.name2
+						}
+					}else{
+						var p1 = null
+					}
+					
+					/*$.post("/zzhnc/activity/editActivitySetting", data_, function(data) {
 						console.log(data);
 						if(data.code == 0) {
 							top.layer.msg("修改成功");
 						} else {
 							top.layer.msg(data.msg);
 						}
-					})
+					})*/
 				});
 
 				//立即开始
@@ -453,26 +490,19 @@
 					}
 
 				});
+				
+				//数值转为true或false
+				function toBool(v){
+					if(v == "1"){
+						v = true
+					}else{
+						v = false
+					}
+					return v;
+				}
 
 			})
-
-			function toTime_G(v) {
-				if(v == null || v == "") {
-					return "";
-				} else {
-					var time = new Date(v)
-					var year = time.getFullYear()
-					var mon = time.getMonth() + 1;
-					var day = time.getDate();
-					var hour = time.getHours();
-					var min = time.getMinutes();
-					if(mon < 10) mon = "0" + mon
-					if(day < 10) day = "0" + day
-					if(hour < 10) hour = "0" + hour
-					if(min < 10) min = "0" + min
-					return year + "-" + mon + "-" + day + " " + hour + ":" + min
-				}
-			}
+			
 		</script>
 
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/fans.jsp b/WebContent/WEB-INF/jsp/pc/report/fans.jsp
index 837d532..99cd9ac 100644
--- a/WebContent/WEB-INF/jsp/pc/report/fans.jsp
+++ b/WebContent/WEB-INF/jsp/pc/report/fans.jsp
@@ -95,7 +95,8 @@
 
 						laypage.render({
 							elem: 'page',
-							count: data.totalPages,
+							count: data.total, 
+							limit: queryObj.pagesize,
 							curr: queryObj.page,
 							skip: true,
 							jump: function(obj, first) {
diff --git a/WebContent/WEB-INF/jsp/pc/report/goods.jsp b/WebContent/WEB-INF/jsp/pc/report/goods.jsp
index d39fba9..5cd97e0 100644
--- a/WebContent/WEB-INF/jsp/pc/report/goods.jsp
+++ b/WebContent/WEB-INF/jsp/pc/report/goods.jsp
@@ -27,7 +27,7 @@
 		<div class="layui-form">
 			<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="key" placeholder="关键字" />
 				</div>
 				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
 				<button class="layui-btn layui-btn-primary resetBtn" type="reset">重置</button>
@@ -63,16 +63,18 @@
 			//查询条件
 			var queryObj = {
 				page: 1,
-				pagesize: 10,
-				keyword: null
-			}
+				size: 10,
+				sellerId: 0,
+				key: null
+			};
 
 			//初始化方法
 			function initData(queryObj) {
-				$.post("/zzhnc/activity/getLotteryLogList", queryObj, function(data) {
+				$.get("/zzhnc/goods/search", queryObj, function(data) {
 					data = data.data;
 					console.log(data)
 
+					$("#tablelist").html("");
 					var str = "";
 					if(data.rows.length < 1) {
 						$(".nodata").show();
@@ -81,33 +83,23 @@
 						$(".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>' +
+							str += '<tr data-id=' + data.rows[i].id + '>' +
 								'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
-								'<td>' + data.rows[i].turn + '</td>' +
-								'<td>' + nick + '</td>' +
-								'<td>' + data.rows[i].mny + '元</td>' +
-								'<td>' + data.rows[i].name + '元</td>' +
-								'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
+								'<td><img class="imgUrl" src="' + data.rows[i].bannerUrl + '"  /></td>' +
+								'<td>' + data.rows[i].name + '</td>' +
+								'<td>' + data.rows[i].name + '</td>' +
+								'<td>' + data.rows[i].name + '</td>' +
 								'</tr>';
 						}
+						$("#tablelist").html(str);
+						toNull_G();
+						form.render();
 					}
 
-					$("#tablelist").html(str);
-					toNull_G();
-
 					laypage.render({
 						elem: 'page',
-						count: data.totalPages, //总页数
+						count: data.total, 
+						limit: queryObj.size,
 						curr: queryObj.page,
 						skip: true,
 						jump: function(obj, first) {
@@ -115,7 +107,6 @@
 								queryObj.page = obj.curr
 								initData(queryObj);
 							}
-
 						}
 					});
 				})
@@ -127,15 +118,15 @@
 			//查询
 			form.on('submit(querybtn)', function(data) {
 				queryObj.page = 1;
-				queryObj.keyword = $("[name=keyword]").val();
+				queryObj.key = $("[name=key]").val();
 				initData(queryObj);
 			});
 
 			//重置
 			$(".resetBtn").on("click", function() {
-				$("[name=keyword]").val("");
+				$("[name=key]").val("");
 				queryObj.page = 1;
-				queryObj.keyword = null;
+				queryObj.key = null;
 				initData(queryObj);
 			})
 
diff --git a/WebContent/WEB-INF/jsp/pc/report/prize.jsp b/WebContent/WEB-INF/jsp/pc/report/prize.jsp
index 8ddc794..c9f09f9 100644
--- a/WebContent/WEB-INF/jsp/pc/report/prize.jsp
+++ b/WebContent/WEB-INF/jsp/pc/report/prize.jsp
@@ -124,7 +124,8 @@
 
 					laypage.render({
 						elem: 'page',
-						count: data.totalPages, //总页数
+						count: data.total, 
+						limit: queryObj.pagesize,
 						curr: queryObj.page,
 						skip: true,
 						jump: function(obj, first) {